diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.in | 46 | ||||
| -rw-r--r-- | aclocal.m4 | 2699 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | dist-generated | 1 | ||||
| -rw-r--r-- | flatspec.c | 47 | ||||
| -rw-r--r-- | flatten.c | 4 | ||||
| -rw-r--r-- | flatten.h | 4 | ||||
| -rw-r--r-- | manpo/.cvsignore | 2 | ||||
| -rw-r--r-- | manpo/da.po | 100 | ||||
| -rw-r--r-- | manpo/manpages.pot | 91 | ||||
| -rw-r--r-- | options.i | 19 | ||||
| -rw-r--r-- | po/da.po | 124 | ||||
| -rw-r--r-- | po/xcftools.pot | 122 | ||||
| -rw-r--r-- | test/answer/odoodle.png | bin | 1036 -> 979 bytes | |||
| -rwxr-xr-x | test/dotest | 8 | ||||
| -rw-r--r-- | test/source/tiletest.xcf.gz | bin | 11130 -> 11030 bytes | |||
| -rw-r--r-- | xcf2png.10 | 5 | ||||
| -rw-r--r-- | xcf2pnm.10 | 5 |
21 files changed, 370 insertions, 2939 deletions
@@ -14,6 +14,7 @@ nlsini.c xcfinfo xcf2pnm xcf2png +xcfview xcf**.1i xcf*.1il *.1 @@ -1,3 +1,14 @@ +2006-02-22 Henning Makholm <henning@makholm.net> + + * Version 1.0.2 + * Don't ship aclocal.m4 in tarball; it will be re-assembled + whenever needed anyway. + * Add option -C to autocrop to visible layers, suggested + by Anthony DeRobertis (Debian bug #353883). + * Change metavariable for -Z option argument from "cmd" + to "command", following suggestion by Anthony DeRobertis + (Debian bug #353872). + 2006-02-20 Henning Makholm <henning@makholm.net> * Version 1.0.1 diff --git a/Makefile.in b/Makefile.in index 8c61d46..4b58441 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,7 +67,7 @@ endif $(CC) $(CFLAGS) -o $@ -c $< -all: $(BINARIES) $(SCRIPTS) $(MANPAGES) po/stamp manpo/stamp +all: $(BINARIES) $(SCRIPTS) $(MANPAGES) po/stamp manpo/all xcfinfo$e: xcfinfo.$o $(FILEIO).$o enums.$o xcf-general.$o utils.$o nlsini.$o $(CC) $(LDFLAGS) $(LIBS) $^ -o $@ @@ -171,29 +171,31 @@ po/stamp: $(patsubst %,po/%.mo,$(LINGUAS)) POTFILES_MAN = options.mi $(patsubst %.1,%.10,$(MANPAGES)) \ exit.1i +options.mi: manpo/optipot.pl options.i + $(PERL) manpo/optipot.pl > $@ +manpo/manpages.pot$(SUPPRESS_AUTOFOO): manpo/mantranslate.pl $(POTFILES_MAN) + $(PERL) manpo/mantranslate.pl -x $(POTFILES_MAN) > $@.tmp + if diff $@ $@.tmp | \ + grep -v '^\([^<>]\|. \?"POT-Creation-Date:\)' > /dev/null; \ + then mv -f $@.tmp $@ ; \ + else echo OK, $@ is unchanged ; rm $@.tmp ; fi + manpo/%.po: manpo/manpages.pot test -f $@ msgmerge -U $@ $< touch $@ -manpo/stamp: $(patsubst %,manpo/%.po,$(MANLINGUAS)) $(MANPAGES) - touch manpo/manpages.pot - touch $^ +manpo/stamp: $(patsubst %,manpo/%.po,$(MANLINGUAS)) + if ! make -q manpo/manpages.pot ; then \ + touch manpo/manpages.pot ; touch $^ ; fi + touch $@ + +manpo/all: manpo/stamp $(MANPAGES) for L in $(MANLINGUAS) ; do \ for P in $(patsubst %.1,%,$(MANPAGES)) ; do \ $(PERL) manpo/mantranslate.pl manpo/$$L.po $$P.1 \ > manpo/$$P.$$L.1 || exit 1; done ; done ; touch $@ - - -options.mi: manpo/optipot.pl options.i - $(PERL) manpo/optipot.pl > $@ -manpo/manpages.pot$(SUPPORESS_AUTOFOO): manpo/mantranslate.pl $(POTFILES_MAN) - $(PERL) manpo/mantranslate.pl -x $(POTFILES_MAN) > $@.tmp - if diff $@ $@.tmp | \ - grep -v '^\([^<>]\|. \?"POT-Creation-Date:\)' > /dev/null; \ - then mv -f $@.tmp $@ ; \ - else echo OK, $@ is unchanged ; rm $@.tmp ; fi ############################################################################# # @@ -225,15 +227,16 @@ check: $(BINARIES) clean: $(RM) *.$o */*~ *~ .*~ xcf*.1i xcf*.1il *.1 *.oi *.mi $(RM) enums.h $(C_GENERATED) $(BINARIES) - $(RM) po/*.mo */stamp manpo/*.1 + $(RM) po/*.mo */stamp manpo/all manpo/*.1 cd test && $(MAKE) clean distclean: clean $(RM) Makefile config.log config.cache config.status config.h + $(RM) aclocal.m4 $(RM) -r autom4te.cache realclean: distclean - $(RM) configure config.hin aclocal.m4 + $(RM) configure config.hin .SUFFIXES: .c .$o @@ -265,15 +268,12 @@ endif # # Autofoo rules: -aclocal.m4$(SUPPRESS_AUTOFOO): configure.ac - aclocal - -$(srcdir)/configure$(SUPPRESS_AUTOFOO): configure.ac aclocal.m4 +$(srcdir)/configure$(SUPPRESS_AUTOFOO): configure.ac + cd $(srcdir) && aclocal cd $(srcdir) && autoconf - -$(srcdir)/config.hin$(SUPPRESS_AUTOFOO): configure.ac aclocal.m4 cd $(srcdir) && autoheader - touch $@ + +$(srcdir)/config.hin$(SUPPRESS_AUTOFOO): $(srcdir)/configure config.status: $(srcdir)/configure config.sub config.guess if [ -f config.status ] ; \ diff --git a/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index 5d4b5b7..0000000 --- a/aclocal.m4 +++ /dev/null @@ -1,2699 +0,0 @@ -# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- - -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# 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. - -# 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. - -# gettext.m4 serial 37 (gettext-0.14.4) -dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. - -dnl Macro to add for using GNU gettext. - -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The -dnl default (if it is not specified or empty) is 'no-libtool'. -dnl INTLSYMBOL should be 'external' for packages with no intl directory, -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. -dnl If INTLSYMBOL is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. If NEEDSYMBOL is specified and is -dnl 'need-formatstring-macros', then GNU gettext implementations that don't -dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. -dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_GNU_GETTEXT], -[ - dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT -])])])]) - define([gt_included_intl], ifelse([$1], [external], [no], [yes])) - define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) - - AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) - - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Sometimes libintl requires libiconv, so first search for libiconv. - dnl Ideally we would do this search only after the - dnl if test "$USE_NLS" = "yes"; then - dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT - dnl the configure script would need to contain the same shell code - dnl again, outside any 'if'. There are two solutions: - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not - dnl documented, we avoid it. - ifelse(gt_included_intl, yes, , [ - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - ]) - - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. - gt_INTL_MACOSX - - dnl Set USE_NLS. - AM_NLS - - ifelse(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - ]) - LIBINTL= - LTLIBINTL= - POSUB= - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no - ifelse(gt_included_intl, yes, [ - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - ]) - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. - - dnl Add a version number to the cache macros. - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) - - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include <libintl.h> -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], [])[extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) - - if test "$gt_cv_func_gnugettext_libc" != "yes"; then - dnl Sometimes libintl requires libiconv, so first search for libiconv. - ifelse(gt_included_intl, yes, , [ - AM_ICONV_LINK - ]) - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL - dnl even if libiconv doesn't exist. - AC_LIB_LINKFLAGS_BODY([intl]) - AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include <libintl.h> -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], [])[extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) - dnl Now see whether libintl exists and depends on libiconv. - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include <libintl.h> -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], [])[extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext_libintl=yes - ]) - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - fi - - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then - gt_use_preinstalled_gnugettext=yes - else - dnl Reset the values set by searching for libintl. - LIBINTL= - LTLIBINTL= - INCINTL= - fi - - ifelse(gt_included_intl, yes, [ - if test "$gt_use_preinstalled_gnugettext" != "yes"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on included GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - - CATOBJEXT= - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions to use GNU gettext tools. - CATOBJEXT=.gmo - fi - ]) - - if test -n "$INTL_MACOSX_LIBS"; then - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Some extra flags are needed during linking. - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" - fi - fi - - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) - else - USE_NLS=no - fi - fi - - AC_MSG_CHECKING([whether to use NLS]) - AC_MSG_RESULT([$USE_NLS]) - if test "$USE_NLS" = "yes"; then - AC_MSG_CHECKING([where the gettext function comes from]) - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - gt_source="external libintl" - else - gt_source="libc" - fi - else - gt_source="included intl directory" - fi - AC_MSG_RESULT([$gt_source]) - fi - - if test "$USE_NLS" = "yes"; then - - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - AC_MSG_CHECKING([how to link with libintl]) - AC_MSG_RESULT([$LIBINTL]) - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) - fi - - dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, - [Define if the GNU dcgettext() function is already present or preinstalled.]) - fi - - dnl We need to process the po/ directory. - POSUB=po - fi - - ifelse(gt_included_intl, yes, [ - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then - BUILD_INCLUDED_LIBINTL=yes - fi - - dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) - - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share - AC_SUBST(DATADIRNAME) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST(GENCAT) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLOBJS= - if test "$USE_INCLUDED_LIBINTL" = yes; then - INTLOBJS="\$(GETTOBJS)" - fi - AC_SUBST(INTLOBJS) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) - ]) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) - - dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) -]) - - -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], -[ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([gt_GLIBC2])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([bh_C_SIGNED])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl - AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl - AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_REQUIRE([gt_TYPE_INTMAX_T]) - AC_REQUIRE([gt_PRINTF_POSIX]) - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([gl_GLIBC21])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - AC_REQUIRE([gl_XSIZE])dnl - AC_REQUIRE([gt_INTL_MACOSX])dnl - - AC_CHECK_TYPE([ptrdiff_t], , - [AC_DEFINE([ptrdiff_t], [long], - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) - ]) - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \ -mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ -strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ -__fsetlocking]) - - dnl Use the _snprintf function only if it is declared (because on NetBSD it - dnl is defined as a weak alias of snprintf; we prefer to use the latter). - gt_CHECK_DECL(_snprintf, [#include <stdio.h>]) - gt_CHECK_DECL(_snwprintf, [#include <stdio.h>]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>]) - gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>]) - gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>]) - - case $gt_cv_func_printf_posix in - *yes) HAVE_POSIX_PRINTF=1 ;; - *) HAVE_POSIX_PRINTF=0 ;; - esac - AC_SUBST([HAVE_POSIX_PRINTF]) - if test "$ac_cv_func_asprintf" = yes; then - HAVE_ASPRINTF=1 - else - HAVE_ASPRINTF=0 - fi - AC_SUBST([HAVE_ASPRINTF]) - if test "$ac_cv_func_snprintf" = yes; then - HAVE_SNPRINTF=1 - else - HAVE_SNPRINTF=0 - fi - AC_SUBST([HAVE_SNPRINTF]) - if test "$ac_cv_func_wprintf" = yes; then - HAVE_WPRINTF=1 - else - HAVE_WPRINTF=0 - fi - AC_SUBST([HAVE_WPRINTF]) - - AM_ICONV - AM_LANGINFO_CODESET - if test $ac_cv_header_locale_h = yes; then - gt_LC_MESSAGES - fi - - if test -n "$INTL_MACOSX_LIBS"; then - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi -]) - - -dnl Checks for special options needed on MacOS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in MacOS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" - gt_save_LIBS="$LIBS" - LIBS="$LIBS -framework CoreFoundation" - AC_TRY_LINK([#include <CFPreferences.h>], - [CFPreferencesCopyAppValue(NULL, NULL)], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" - gt_save_LIBS="$LIBS" - LIBS="$LIBS -framework CoreFoundation" - AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) -]) - - -dnl gt_CHECK_DECL(FUNC, INCLUDES) -dnl Check whether a function is declared. -AC_DEFUN([gt_CHECK_DECL], -[ - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, - [AC_TRY_COMPILE([$2], [ -#ifndef $1 - char *p = (char *) $1; -#endif -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) - if test $ac_cv_have_decl_$1 = yes; then - gt_value=1 - else - gt_value=0 - fi - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) -]) - - -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) - -# po.m4 serial 7 (gettext-0.14.3) -dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. - -AC_PREREQ(2.50) - -dnl Checks for all prerequisites of the po subdirectory. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AM_NLS])dnl - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Search for GNU xgettext 0.12 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU msgfmt. - if test "$GMSGFMT" != ":"; then - dnl If it is no GNU msgfmt we define it as : so that the - dnl Makefiles still can work. - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` - AC_MSG_RESULT( - [found $GMSGFMT program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - fi - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - fi - - AC_OUTPUT_COMMANDS([ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - # Treat a directory as a PO directory if and only if it has a - # POTFILES.in file. This allows packages to have multiple PO - # directories under different names or in different locations. - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done], - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) -]) - -dnl Postprocesses a Makefile in a directory containing PO files. -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], -[ - # When this code is run, in config.status, two variables have already been - # set: - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, - # - LINGUAS is the value of the environment variable LINGUAS at configure - # time. - -changequote(,)dnl - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - # Find a way to echo strings without interpreting backslash. - if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='echo' - else - if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='printf %s\n' - else - echo_func () { - cat <<EOT -$* -EOT - } - gt_echo='echo_func' - fi - fi - - # A sed script that extracts the value of VARIABLE from a Makefile. - sed_x_variable=' -# Test if the hold space is empty. -x -s/P/P/ -x -ta -# Yes it was empty. Look if we have the expected variable definition. -/^[ ]*VARIABLE[ ]*=/{ - # Seen the first line of the variable definition. - s/^[ ]*VARIABLE[ ]*=// - ba -} -bd -:a -# Here we are processing a line from the variable definition. -# Remove comment, more precisely replace it with a space. -s/#.*$/ / -# See if the line ends in a backslash. -tb -:b -s/\\$// -# Print the line, without the trailing backslash. -p -tc -# There was no trailing backslash. The end of the variable definition is -# reached. Clear the hold space. -s/^.*$// -x -bd -:c -# A trailing backslash means that the variable definition continues in the -# next line. Put a nonempty string into the hold space to indicate this. -s/^.*$/P/ -x -:d -' -changequote([,])dnl - - # Set POTFILES to the value of the Makefile variable POTFILES. - sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`" - POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"` - # Compute POTFILES_DEPS as - # $(foreach file, $(POTFILES), $(top_srcdir)/$(file)) - POTFILES_DEPS= - for file in $POTFILES; do - POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file" - done - POMAKEFILEDEPS="" - - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. - sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`" - ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` - fi - # Hide the ALL_LINGUAS assigment from automake. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - # Compute PROPERTIESFILES - # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties) - # Compute CLASSFILES - # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class) - # Compute QMFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) - # Compute MSGFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) - # Compute RESOURCESDLLFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - PROPERTIESFILES= - CLASSFILES= - QMFILES= - MSGFILES= - RESOURCESDLLFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties" - CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class" - QMFILES="$QMFILES $srcdirpre$lang.qm" - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - JAVACATALOGS= - QTCATALOGS= - TCLCATALOGS= - CSHARPCATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties" - QTCATALOGS="$QTCATALOGS $lang.qm" - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" - done - fi - - sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - cat >> "$ac_file.tmp" <<EOF -$frobbedlang.msg: $lang.po - @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ - \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } -EOF - done - fi - if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - cat >> "$ac_file.tmp" <<EOF -$frobbedlang/\$(DOMAIN).resources.dll: $lang.po - @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ - \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } -EOF - done - fi - if test -n "$POMAKEFILEDEPS"; then - cat >> "$ac_file.tmp" <<EOF -Makefile: $POMAKEFILEDEPS -EOF - fi - mv "$ac_file.tmp" "$ac_file" -]) - -# nls.m4 serial 2 (gettext-0.14.3) -dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. - -AC_PREREQ(2.50) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) -]) - -AC_DEFUN([AM_MKINSTALLDIRS], -[ - dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])]) - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but $(top_srcdir). - dnl Try to locate it. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - case "$ac_aux_dir" in - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; - esac - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) -]) - -# progtest.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper <drepper@cygnus.com>, 1996. - -AC_PREREQ(2.50) - -# Search path for a program which passes the given test. - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[ -# Prepare PATH_SEPARATOR. -# 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 - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - [[\\/]]* | ?:[[\\/]]*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in ifelse([$5], , $PATH, [$5]); do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - -# lib-prefix.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -# lib-link.m4 serial 6 (gettext-0.14.3) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_PREREQ(2.50) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 </dev/null` in -*GNU* | *'with BFD'*) - acl_cv_prog_gnu_ld=yes ;; -*) - acl_cv_prog_gnu_ld=no ;; -esac]) -with_gnu_ld=$acl_cv_prog_gnu_ld -]) - -dnl From libtool-1.4. Sets the variable LD. -AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --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([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -# Prepare PATH_SEPARATOR. -# 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 -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 GCC]) - 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. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path 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 -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_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_LIB_PROG_LD_GNU -]) - -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) - -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) -]) - -AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include <stdlib.h> -#include <iconv.h> -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi -]) - -# glibc2.m4 serial 1 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -# Test for the GNU C Library, version 2.0 or newer. -# From Bruno Haible. - -AC_DEFUN([gt_GLIBC2], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer, - ac_cv_gnu_library_2, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include <features.h> -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2=yes, - ac_cv_gnu_library_2=no) - ] - ) - AC_SUBST(GLIBC2) - GLIBC2="$ac_cv_gnu_library_2" - ] -) - -# isc-posix.m4 serial 2 (gettext-0.11.2) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. - -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - -undefine([AC_ISC_POSIX]) - -AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) - -# signed.m4 serial 1 (gettext-0.10.40) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([bh_C_SIGNED], -[ - AC_CACHE_CHECK([for signed], bh_cv_c_signed, - [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) - if test $bh_cv_c_signed = no; then - AC_DEFINE(signed, , - [Define to empty if the C compiler doesn't support this keyword.]) - fi -]) - -# longlong.m4 serial 5 -dnl Copyright (C) 1999-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_LONG_LONG if 'long long' works. - -AC_DEFUN([gl_AC_TYPE_LONG_LONG], -[ - AC_CACHE_CHECK([for long long], ac_cv_type_long_long, - [AC_TRY_LINK([long long ll = 1LL; int i = 63;], - [long long llmax = (long long) -1; - return ll << i | ll >> i | llmax / ll | llmax % ll;], - ac_cv_type_long_long=yes, - ac_cv_type_long_long=no)]) - if test $ac_cv_type_long_long = yes; then - AC_DEFINE(HAVE_LONG_LONG, 1, - [Define if you have the 'long long' type.]) - fi -]) - -# longdouble.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether the compiler supports the 'long double' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_LONGDOUBLE], -[ - AC_CACHE_CHECK([for long double], gt_cv_c_long_double, - [if test "$GCC" = yes; then - gt_cv_c_long_double=yes - else - AC_TRY_COMPILE([ - /* The Stardent Vistra knows sizeof(long double), but does not support it. */ - long double foo = 0.0; - /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ - int array [2*(sizeof(long double) >= sizeof(double)) - 1]; - ], , - gt_cv_c_long_double=yes, gt_cv_c_long_double=no) - fi]) - if test $gt_cv_c_long_double = yes; then - AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) - fi -]) - -# wchar_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether <stddef.h> has the 'wchar_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WCHAR_T], -[ - AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, - [AC_TRY_COMPILE([#include <stddef.h> - wchar_t foo = (wchar_t)'\0';], , - gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) - if test $gt_cv_c_wchar_t = yes; then - AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) - fi -]) - -# wint_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether <wchar.h> has the 'wint_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WINT_T], -[ - AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, - [AC_TRY_COMPILE([#include <wchar.h> - wint_t foo = (wchar_t)'\0';], , - gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) - fi -]) - -# inttypes_h.m4 serial 6 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, -# doesn't clash with <sys/types.h>, and declares uintmax_t. - -AC_DEFUN([gl_AC_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, - [AC_TRY_COMPILE( - [#include <sys/types.h> -#include <inttypes.h>], - [uintmax_t i = (uintmax_t) -1;], - gl_cv_header_inttypes_h=yes, - gl_cv_header_inttypes_h=no)]) - if test $gl_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, - [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, - and declares uintmax_t. ]) - fi -]) - -# stdint_h.m4 serial 5 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, -# doesn't clash with <sys/types.h>, and declares uintmax_t. - -AC_DEFUN([gl_AC_HEADER_STDINT_H], -[ - AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, - [AC_TRY_COMPILE( - [#include <sys/types.h> -#include <stdint.h>], - [uintmax_t i = (uintmax_t) -1;], - gl_cv_header_stdint_h=yes, - gl_cv_header_stdint_h=no)]) - if test $gl_cv_header_stdint_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, - [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, - and declares uintmax_t. ]) - fi -]) - -# intmax.m4 serial 2 (gettext-0.14.2) -dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether the system has the 'intmax_t' type, but don't attempt to -dnl find a replacement if it is lacking. - -AC_DEFUN([gt_TYPE_INTMAX_T], -[ - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, - [AC_TRY_COMPILE([ -#include <stddef.h> -#include <stdlib.h> -#if HAVE_STDINT_H_WITH_UINTMAX -#include <stdint.h> -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -#include <inttypes.h> -#endif -], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) - if test $gt_cv_c_intmax_t = yes; then - AC_DEFINE(HAVE_INTMAX_T, 1, - [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) - fi -]) - -# printf-posix.m4 serial 2 (gettext-0.13.1) -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether the printf() function supports POSIX/XSI format strings with -dnl positions. - -AC_DEFUN([gt_PRINTF_POSIX], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], - gt_cv_func_printf_posix, - [ - AC_TRY_RUN([ -#include <stdio.h> -#include <string.h> -/* The string "%2$d %1$d", with dollar characters protected from the shell's - dollar expansion (possibly an autoconf bug). */ -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; -static char buf[100]; -int main () -{ - sprintf (buf, format, 33, 55); - return (strcmp (buf, "55 33") != 0); -}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, - [ - AC_EGREP_CPP(notposix, [ -#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ - notposix -#endif - ], gt_cv_func_printf_posix="guessing no", - gt_cv_func_printf_posix="guessing yes") - ]) - ]) - case $gt_cv_func_printf_posix in - *yes) - AC_DEFINE(HAVE_POSIX_PRINTF, 1, - [Define if your printf() function supports format strings with positions.]) - ;; - esac -]) - -# glibc21.m4 serial 3 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([gl_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include <features.h> -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) - -# intdiv0.m4 serial 1 (gettext-0.11.3) -dnl Copyright (C) 2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([gt_INTDIV0], -[ - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - - AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], - gt_cv_int_divbyzero_sigfpe, - [ - AC_TRY_RUN([ -#include <stdlib.h> -#include <signal.h> - -static void -#ifdef __cplusplus -sigfpe_handler (int sig) -#else -sigfpe_handler (sig) int sig; -#endif -{ - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ - exit (sig != SIGFPE); -} - -int x = 1; -int y = 0; -int z; -int nan; - -int main () -{ - signal (SIGFPE, sigfpe_handler); -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) - signal (SIGTRAP, sigfpe_handler); -#endif -/* Linux/SPARC yields signal SIGILL. */ -#if defined (__sparc__) && defined (__linux__) - signal (SIGILL, sigfpe_handler); -#endif - - z = x / y; - nan = y / y; - exit (1); -} -], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, - [ - # Guess based on the CPU. - case "$host_cpu" in - alpha* | i[34567]86 | m68k | s390*) - gt_cv_int_divbyzero_sigfpe="guessing yes";; - *) - gt_cv_int_divbyzero_sigfpe="guessing no";; - esac - ]) - ]) - case "$gt_cv_int_divbyzero_sigfpe" in - *yes) value=1;; - *) value=0;; - esac - AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, - [Define if integer division by zero raises signal SIGFPE.]) -]) - -# uintmax_t.m4 serial 9 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -AC_PREREQ(2.13) - -# Define uintmax_t to 'unsigned long' or 'unsigned long long' -# if it is not already defined in <stdint.h> or <inttypes.h>. - -AC_DEFUN([gl_AC_TYPE_UINTMAX_T], -[ - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then - AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) - test $ac_cv_type_unsigned_long_long = yes \ - && ac_type='unsigned long long' \ - || ac_type='unsigned long' - AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, - [Define to unsigned long or unsigned long long - if <stdint.h> and <inttypes.h> don't define.]) - else - AC_DEFINE(HAVE_UINTMAX_T, 1, - [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) - fi -]) - -# ulonglong.m4 serial 4 -dnl Copyright (C) 1999-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. - -AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG], -[ - AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, - [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], - [unsigned long long ullmax = (unsigned long long) -1; - return ull << i | ull >> i | ullmax / ull | ullmax % ull;], - ac_cv_type_unsigned_long_long=yes, - ac_cv_type_unsigned_long_long=no)]) - if test $ac_cv_type_unsigned_long_long = yes; then - AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, - [Define if you have the 'unsigned long long' type.]) - fi -]) - -# inttypes.m4 serial 1 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with -# <sys/types.h>. - -AC_DEFUN([gt_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, - [ - AC_TRY_COMPILE( - [#include <sys/types.h> -#include <inttypes.h>], - [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) - ]) - if test $gt_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, - [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.]) - fi -]) - -# inttypes-pri.m4 serial 1 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* -# macros to non-string values. This is the case on AIX 4.3.3. - -AC_DEFUN([gt_INTTYPES_PRI], -[ - AC_REQUIRE([gt_HEADER_INTTYPES_H]) - if test $gt_cv_header_inttypes_h = yes; then - AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], - gt_cv_inttypes_pri_broken, - [ - AC_TRY_COMPILE([#include <inttypes.h> -#ifdef PRId32 -char *p = PRId32; -#endif -], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) - ]) - fi - if test "$gt_cv_inttypes_pri_broken" = yes; then - AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, - [Define if <inttypes.h> exists and defines unusable PRI* macros.]) - fi -]) - -# xsize.m4 serial 3 -dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_XSIZE], -[ - dnl Prerequisites of lib/xsize.h. - AC_REQUIRE([gl_SIZE_MAX]) - AC_REQUIRE([AC_C_INLINE]) - AC_CHECK_HEADERS(stdint.h) -]) - -# size_max.m4 serial 2 -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([gl_SIZE_MAX], -[ - AC_CHECK_HEADERS(stdint.h) - dnl First test whether the system already has SIZE_MAX. - AC_MSG_CHECKING([for SIZE_MAX]) - result= - AC_EGREP_CPP([Found it], [ -#include <limits.h> -#if HAVE_STDINT_H -#include <stdint.h> -#endif -#ifdef SIZE_MAX -Found it -#endif -], result=yes) - if test -z "$result"; then - dnl Define it ourselves. Here we assume that the type 'size_t' is not wider - dnl than the type 'unsigned long'. - dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', - dnl which is guaranteed to work from LONG_MIN to LONG_MAX. - _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, - [#include <stddef.h>], result=?) - _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, - [#include <stddef.h>], result=?) - _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, - [#include <stddef.h>], result=?) - if test "$fits_in_uint" = 1; then - dnl Even though SIZE_MAX fits in an unsigned int, it must be of type - dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. - AC_TRY_COMPILE([#include <stddef.h> - extern size_t foo; - extern unsigned long foo; - ], [], fits_in_uint=0) - fi - if test -z "$result"; then - if test "$fits_in_uint" = 1; then - result="$res_hi$res_lo"U - else - result="$res_hi$res_lo"UL - fi - else - dnl Shouldn't happen, but who knows... - result='~(size_t)0' - fi - fi - AC_MSG_RESULT([$result]) - if test "$result" != yes; then - AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], - [Define as the maximum value of type 'size_t', if the system doesn't define it.]) - fi -]) - -# codeset.m4 serial AM1 (gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include <langinfo.h>], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) - fi -]) - -# lcmessage.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper <drepper@cygnus.com>, 1995. - -# Check whether LC_MESSAGES is available in <locale.h>. - -AC_DEFUN([gt_LC_MESSAGES], -[ - AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], - gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)]) - if test $gt_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your <locale.h> file defines LC_MESSAGES.]) - fi -]) - @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Xcftools 1.0.1. +# Generated by GNU Autoconf 2.59 for Xcftools 1.0.2. # # Report bugs to <henning@makholm.net>. # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Xcftools' PACKAGE_TARNAME='xcftools' -PACKAGE_VERSION='1.0.1' -PACKAGE_STRING='Xcftools 1.0.1' +PACKAGE_VERSION='1.0.2' +PACKAGE_STRING='Xcftools 1.0.2' PACKAGE_BUGREPORT='henning@makholm.net' ac_unique_file="xcfinfo.c" @@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xcftools 1.0.1 to adapt to many kinds of systems. +\`configure' configures Xcftools 1.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -846,7 +846,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xcftools 1.0.1:";; + short | recursive ) echo "Configuration of Xcftools 1.0.2:";; esac cat <<\_ACEOF @@ -976,7 +976,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Xcftools configure 1.0.1 +Xcftools configure 1.0.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -990,7 +990,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xcftools $as_me 1.0.1, which was +It was created by Xcftools $as_me 1.0.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -6464,7 +6464,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Xcftools $as_me 1.0.1, which was +This file was extended by Xcftools $as_me 1.0.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6527,7 +6527,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Xcftools config.status 1.0.1 +Xcftools config.status 1.0.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 3db4bc9..979a256 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA dnl dnl ------------------------ dnl The following line is the MASTER SOURCE for the version number -AC_INIT(Xcftools,1.0.1,henning@makholm.net,xcftools) +AC_INIT(Xcftools,1.0.2,henning@makholm.net,xcftools) AC_CONFIG_SRCDIR(xcfinfo.c) AC_PROG_INSTALL diff --git a/dist-generated b/dist-generated index 81650d1..9a9fe59 100644 --- a/dist-generated +++ b/dist-generated @@ -1,4 +1,3 @@ -aclocal.m4 config.guess config.hin config.sub @@ -24,9 +24,7 @@ void init_flatspec(struct FlattenSpec *spec) { - spec->dim.c.l = spec->dim.c.r = spec->dim.c.t = spec->dim.c.b = 0 ; - spec->dim.height = -1 ; - spec->dim.width = -1 ; + spec->window_mode = USE_CANVAS ; spec->default_pixel = PERHAPS_ALPHA_CHANNEL ; spec->numLayers = 0 ; spec->layers = NULL ; @@ -120,12 +118,6 @@ complete_flatspec(struct FlattenSpec *spec, guesser guess_callback) { unsigned i ; int anyPartial ; - - if( spec->dim.height == -1 ) { - spec->dim.height = XCF.height ; - spec->dim.width = XCF.width ; - } - computeDimensions(&spec->dim); /* Find the layers to convert. */ @@ -182,6 +174,43 @@ complete_flatspec(struct FlattenSpec *spec, guesser guess_callback) } else spec->gimpish_indexed = 0 ; + /* compute dimensions of the window */ + if( spec->window_mode == AUTOCROP ) { + int first = 1 ; + for( i=0; i<spec->numLayers; i++ ) + if( spec->layers[i].isVisible ) { + computeDimensions(&spec->layers[i].dim) ; + if( first ) { + spec->dim = spec->layers[i].dim ; + first = 0 ; + } else { + if( spec->dim.c.l < spec->layers[i].dim.c.l ) + spec->dim.c.l = spec->layers[i].dim.c.l ; + if( spec->dim.c.r > spec->layers[i].dim.c.r ) + spec->dim.c.r = spec->layers[i].dim.c.r ; + if( spec->dim.c.t < spec->layers[i].dim.c.t ) + spec->dim.c.t = spec->layers[i].dim.c.t ; + if( spec->dim.c.b > spec->layers[i].dim.c.b ) + spec->dim.c.b = spec->layers[i].dim.c.b ; + } + } + if( first ) { + spec->window_mode = USE_CANVAS ; + } else { + spec->dim.width = spec->dim.c.r - spec->dim.c.l ; + spec->dim.height = spec->dim.c.b - spec->dim.c.t ; + } + } + if( spec->window_mode != AUTOCROP ) { + if( (spec->window_mode & MANUAL_OFFSET) == 0 ) + spec->dim.c.t = spec->dim.c.l = 0 ; + if( (spec->window_mode & MANUAL_CROP) == 0 ) { + spec->dim.height = XCF.height ; + spec->dim.width = XCF.width ; + } + } + computeDimensions(&spec->dim); + /* Turn off layers that we don't hit at all */ for( i=0; i<spec->numLayers; i++ ) if( spec->layers[i].isVisible && @@ -53,6 +53,10 @@ composite_one(rgba bot,rgba top) * top pixel is completely transparent, and we get a division * by zero if _both_ pixels are fully transparent. These cases * must be handled by all callers. + * More snooping in the Gimp sources reveal that it uses + * floating-point for its equivalent of tfrac when the + * bottom layer has an alpha channel. (alphify() macro + * in paint-funcs.c). What gives? */ } return (alpha << ALPHA_SHIFT) @@ -46,6 +46,10 @@ struct FlattenSpec { FORBID_PARTIAL_TRANSPARENCY, PARTIAL_TRANSPARENCY_IMPOSSIBLE } partial_transparency_mode ; + enum { USE_CANVAS = 0, + MANUAL_OFFSET = 1, + MANUAL_CROP = 2, + AUTOCROP = 4 } window_mode ; int process_in_memory ; int gimpish_indexed ; }; diff --git a/manpo/.cvsignore b/manpo/.cvsignore index c413eba..5991035 100644 --- a/manpo/.cvsignore +++ b/manpo/.cvsignore @@ -1,2 +1,4 @@ *.1 stamp +all + diff --git a/manpo/da.po b/manpo/da.po index d9258d5..f613c3c 100644 --- a/manpo/da.po +++ b/manpo/da.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Xcftools 0.9.1a\n" "Report-Msgid-Bugs-To: henning@makholm.net\n" -"POT-Creation-Date: 2006-02-20 04:06+0100\n" -"PO-Revision-Date: 2006-02-20 02:01+0100\n" +"POT-Creation-Date: 2006-02-22 01:46+0100\n" +"PO-Revision-Date: 2006-02-22 01:48+0100\n" "Last-Translator: Henning Makholm <henning@makholm.net>\n" "Language-Team: None; proof-of-concept translation by upstream author\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgid "Default if the filename ends with B{gz}." msgstr "Vælges automatisk hvis filnavnet slutter med B{gz}." #: options.i:61 -msgid "cmd" +msgid "command" msgstr "kommando" #: options.i:61 @@ -285,11 +285,11 @@ msgstr "bB{x}h" msgid "Crop the converted image to width I{w} and height I{h}." msgstr "Beskær det konverterede billede til bredde I{b} og højde I{b}." -#: options.i:287 +#: options.i:289 msgid "xB{,}y" msgstr "xB{,}y" -#: options.i:287 +#: options.i:289 msgid "" "Offset the converted part of the image from the top-left corner\n" "of the XCF canvas. Usually used with B{-S}." @@ -298,18 +298,40 @@ msgstr "" "hjørne af XCF-lærredet. Bruges normalt sammen med B{-S}." #: options.i:308 +msgid "" +"Crop and offset the converted part of the image to just include\n" +"the boundaries of the visible (or selected) layers." +msgstr "" +"Skær det konvertede billede til så det netop dækker alle de synlige\n" +"(eller valgte) lag." + +#: options.i:310 +msgid "" +"(Note that the I{contents} of the layers is not taken into\n" +"account when autocropping)." +msgstr "" +"(Bemærk at tilskæringen ikke tager hensyn til\n" +"I{indholdet} af lagene)." + +#: options.i:314 +msgid "" +"In the absence of options that specify otherwise, the converted\n" +"image will cover the entire XCF canvas." +msgstr "Normalt vil det konverterede område være det samme som XCF-lærredet." + +#: options.i:325 msgid "mode" msgstr "tilstand" -#: options.i:308 +#: options.i:325 msgid "Set the layer mode (e.g., B{Normal} or B{Multiply})." msgstr "Vælg lagtilstanden (fx B{Normal} eller B{LægTil})." -#: options.i:331 options.i:345 +#: options.i:348 options.i:362 msgid "n" msgstr "n" -#: options.i:331 +#: options.i:348 msgid "" "Set the opacity on a scale from 0 to 100 (as in the Gimp user\n" "interface)." @@ -317,21 +339,21 @@ msgstr "" "Vælg gennemsigtighed på en skala fra 0 (helt gennemsigtigt)\n" "til 100 (helt ugennemsigtig)." -#: options.i:345 +#: options.i:362 msgid "Set the opacity on a scale from 0 to 255 (as used internally)" msgstr "" "Vælg gennemsigtighed på en skala fra 0 (helt gennemsigtigt)\n" "til 255 (helt ugennemsigtig)." -#: options.i:359 +#: options.i:376 msgid "Enable the layer mask." msgstr "Aktivér lagmasken." -#: options.i:365 +#: options.i:382 msgid "Disable the layer mask." msgstr "Deaktivér lagmasken." -#: options.i:375 +#: options.i:392 msgid "" "Use the raw UTF-8 representation from the XCF file to compare and\n" "display layer names." @@ -339,7 +361,7 @@ msgstr "" "Brug den rå UTF-8-repræsentation fra XCF-filen til at sammenligne\n" "og vise lagnavne." -#: options.i:377 +#: options.i:394 msgid "" "Ordinarily, layer names will be converted to the character set of\n" "the current locale." @@ -463,7 +485,7 @@ msgstr "" "Lagtilstanden, samt ugennemsigtigheden (hvis den ikke er 100%), og\n" "B{/mask} hvis laget har en aktiv lagmaske." -#: xcfinfo.10:74 +#: xcfinfo.10:74 xcf2pnm.10:69 xcf2png.10:63 msgid "5)" msgstr "5)" @@ -471,17 +493,17 @@ msgstr "5)" msgid "The name of the layer." msgstr "Lagets navn." -#: xcfinfo.10:77 xcf2pnm.10:122 xcf2png.10:101 xcfview.10:54 +#: xcfinfo.10:77 xcf2pnm.10:127 xcf2png.10:106 xcfview.10:54 msgid "AUTHOR" msgstr "FORFATTER" -#: xcfinfo.10:78 xcf2pnm.10:123 xcf2png.10:102 xcfview.10:55 +#: xcfinfo.10:78 xcf2pnm.10:128 xcf2png.10:107 xcfview.10:55 msgid "B{%s} was written by Henning Makholm <henning@makholm.net>." msgstr "" "B{%s} og denne manualside\n" "er skrevet af Henning Makholm <henning@makholm>." -#: xcfinfo.10:81 xcf2pnm.10:126 xcf2png.10:105 xcfview.10:61 +#: xcfinfo.10:81 xcf2pnm.10:131 xcf2png.10:110 xcfview.10:61 msgid "SEE ALSO" msgstr "SE OGSÅ" @@ -538,11 +560,15 @@ msgstr "B{-D} og B{-G}." msgid "B{-j}, B{-z}, and B{-Z}." msgstr "B{-j}, B{-z} og B{-Z}." -#: xcf2pnm.10:68 xcf2png.10:62 +#: xcf2pnm.10:70 xcf2png.10:64 +msgid "B{-C} and B{-O}/B{-S}." +msgstr "B{-C} og B{-O}/B{-S}." + +#: xcf2pnm.10:73 xcf2png.10:67 msgid "LAYER SPECIFICATIONS" msgstr "VALG AF LAG" -#: xcf2pnm.10:69 xcf2png.10:63 +#: xcf2pnm.10:74 xcf2png.10:68 msgid "" "If no I{layer name} is given on the command line, all of the\n" "visible layers in the XCF file are merged to produce the output\n" @@ -552,7 +578,7 @@ msgstr "" "alle de synlige lag i XCF-filen fladgjort til et enkelt\n" "uddatabillede." -#: xcf2pnm.10:73 xcf2png.10:67 +#: xcf2pnm.10:78 xcf2png.10:72 msgid "" "It is also possible to specify the layers to merge explicitly, by\n" "giving their names as separate arguments after the input\n" @@ -569,7 +595,7 @@ msgstr "" "til venstre, som det \"nederste\" \\- det vil sige at den indbyrdes\n" "position i XCF filen ikke betyder noget." -#: xcf2pnm.10:82 xcf2png.10:76 +#: xcf2pnm.10:87 xcf2png.10:81 msgid "" "The following options can be given I{after} a layer name to\n" "override the global properties of the layer:" @@ -577,29 +603,29 @@ msgstr "" "De følgende flag kan gives I{efter} et lagnavn for at tilsidesætte\n" "lagets globale egenskaber:" -#: xcf2pnm.10:87 +#: xcf2pnm.10:92 msgid "EXAMPLES" msgstr "EKSEMPLER" -#: xcf2pnm.10:89 +#: xcf2pnm.10:94 msgid "B{xcf2pnm -b white foo.xcf > foo.ppm}" msgstr "B{xcf2pnm -b white noget.xcf > noget.ppm}" -#: xcf2pnm.10:91 +#: xcf2pnm.10:96 msgid "B{xcf2pnm -a footrans.pgm -o foo.ppm foo.xcf Layer1 Layer2}" msgstr "B{xcf2pnm -a noget-gnms.pgm -o noget.pgm noget.xcf Lag1 Lag2}" -#: xcf2pnm.10:93 +#: xcf2pnm.10:98 msgid "To test whether the flattened image has any transparency, use" msgstr "" "Følgende kommando tjekker om det fladgjorte billede indeholder\n" "nogen gennemsigtighed:" -#: xcf2pnm.10:95 +#: xcf2pnm.10:100 msgid "B{xcf2pnm foo.xcf > /dev/null}" msgstr "B{xcf2pnm noget.xcf /dev/null}" -#: xcf2pnm.10:97 +#: xcf2pnm.10:102 msgid "" "To test whether the flattened image has I{partially} transparent\n" "pixels, use" @@ -607,15 +633,15 @@ msgstr "" "For at tjekke om det fladgjorte indeholder nogen\n" "I{delvis} gennemsigtighed kan man bruge" -#: xcf2pnm.10:101 +#: xcf2pnm.10:106 msgid "B{xcf2pnm -b white -G > /dev/null}" msgstr "B{xcf2pnm -b white -G > /dev/null}" -#: xcf2pnm.10:102 xcf2png.10:81 +#: xcf2pnm.10:107 xcf2png.10:86 msgid "BUGS AND LIMITATIONS" msgstr "FEJL OG BEGRÆNSNINGER" -#: xcf2pnm.10:104 xcf2png.10:83 +#: xcf2pnm.10:109 xcf2png.10:88 msgid "" "When several partially transparent layers are merged, the pixel\n" "values are interpolated without gamma correction. (The Gimp also\n" @@ -632,11 +658,11 @@ msgstr "" "Gimp self, især når der er tale om mere end to lag, eller\n" "ved nogen af de mere eksotiske lagtilstande." -#: xcf2pnm.10:112 xcf2png.10:91 +#: xcf2pnm.10:117 xcf2png.10:96 msgid "These differences are usually not visible to the eye." msgstr "Disse forskelle er normalt ikke synlige." -#: xcf2pnm.10:114 xcf2png.10:93 +#: xcf2pnm.10:119 xcf2png.10:98 msgid "" "There are probably other bugs lurking in corner cases. If you\n" "discover one, please notify the author." @@ -644,19 +670,19 @@ msgstr "" "Der er sikkert også andre fejl som viser sig i særlige situationer.\n" "Hvis du finder en, så vær rar at fortælle forfatteren om den." -#: xcf2pnm.10:117 xcf2png.10:96 +#: xcf2pnm.10:122 xcf2png.10:101 msgid "FILES" msgstr "FILER" -#: xcf2pnm.10:119 xcf2png.10:98 +#: xcf2pnm.10:124 xcf2png.10:103 msgid "B{/usr/lib/X11/rgb.txt}" msgstr "B{/usr/lib/X11/rgb.txt}" -#: xcf2pnm.10:120 xcf2png.10:99 +#: xcf2pnm.10:125 xcf2png.10:104 msgid "Color name database for B{-b}." msgstr "Database med farvenavne der forstås af B{-b}." -#: xcf2pnm.10:126 +#: xcf2pnm.10:131 msgid "B{xcfinfo}(1), B{xcf2png}(1)" msgstr "B{xcfinfo}(1), B{xcf2png}(1)" @@ -680,7 +706,7 @@ msgstr "" msgid "B{-g}and B{-c}." msgstr "B{-g} og B{-c}." -#: xcf2png.10:105 +#: xcf2png.10:110 msgid "B{xcfinfo}(1), B{xcf2pnm}(1)" msgstr "B{xcfinfo}(1), B{xcf2pnm}(1)" diff --git a/manpo/manpages.pot b/manpo/manpages.pot index 21bc966..f2ff83f 100644 --- a/manpo/manpages.pot +++ b/manpo/manpages.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Xcftools-manpages VERSION\n" "Report-Msgid-Bugs-To: henning@makholm.net\n" -"POT-Creation-Date: 2006-02-20 04:06+0100\n" +"POT-Creation-Date: 2006-02-22 01:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -46,7 +46,7 @@ msgid "Default if the filename ends with B{gz}." msgstr "" #: options.i:61 -msgid "cmd" +msgid "command" msgstr "" #: options.i:61 @@ -208,50 +208,65 @@ msgstr "" msgid "Crop the converted image to width I{w} and height I{h}." msgstr "" -#: options.i:287 +#: options.i:289 msgid "xB{,}y" msgstr "" -#: options.i:287 +#: options.i:289 msgid "Offset the converted part of the image from the top-left corner\n" "of the XCF canvas. Usually used with B{-S}." msgstr "" #: options.i:308 +msgid "Crop and offset the converted part of the image to just include\n" + "the boundaries of the visible (or selected) layers." +msgstr "" + +#: options.i:310 +msgid "(Note that the I{contents} of the layers is not taken into\n" + "account when autocropping)." +msgstr "" + +#: options.i:314 +msgid "In the absence of options that specify otherwise, the converted\n" + "image will cover the entire XCF canvas." +msgstr "" + +#: options.i:325 msgid "mode" msgstr "" -#: options.i:308 +#: options.i:325 msgid "Set the layer mode (e.g., B{Normal} or B{Multiply})." msgstr "" -#: options.i:331 options.i:345 +#: options.i:348 options.i:362 msgid "n" msgstr "" -#: options.i:331 +#: options.i:348 msgid "Set the opacity on a scale from 0 to 100 (as in the Gimp user\n" "interface)." msgstr "" -#: options.i:345 +#: options.i:362 msgid "Set the opacity on a scale from 0 to 255 (as used internally)" msgstr "" -#: options.i:359 +#: options.i:376 msgid "Enable the layer mask." msgstr "" -#: options.i:365 +#: options.i:382 msgid "Disable the layer mask." msgstr "" -#: options.i:375 +#: options.i:392 msgid "Use the raw UTF-8 representation from the XCF file to compare and\n" "display layer names." msgstr "" -#: options.i:377 +#: options.i:394 msgid "Ordinarily, layer names will be converted to the character set of\n" "the current locale." msgstr "" @@ -361,7 +376,7 @@ msgid "The layer mode, as well as the opacity if not 100%, and B{/mask}\n" "if the layer has an active layer mask." msgstr "" -#: xcfinfo.10:74 +#: xcfinfo.10:74 xcf2pnm.10:69 xcf2png.10:63 msgid "5)" msgstr "" @@ -369,15 +384,15 @@ msgstr "" msgid "The name of the layer." msgstr "" -#: xcfinfo.10:77 xcf2pnm.10:122 xcf2png.10:101 xcfview.10:54 +#: xcfinfo.10:77 xcf2pnm.10:127 xcf2png.10:106 xcfview.10:54 msgid "AUTHOR" msgstr "" -#: xcfinfo.10:78 xcf2pnm.10:123 xcf2png.10:102 xcfview.10:55 +#: xcfinfo.10:78 xcf2pnm.10:128 xcf2png.10:107 xcfview.10:55 msgid "B{%s} was written by Henning Makholm <henning@makholm.net>." msgstr "" -#: xcfinfo.10:81 xcf2pnm.10:126 xcf2png.10:105 xcfview.10:61 +#: xcfinfo.10:81 xcf2pnm.10:131 xcf2png.10:110 xcfview.10:61 msgid "SEE ALSO" msgstr "" @@ -426,17 +441,21 @@ msgstr "" msgid "B{-j}, B{-z}, and B{-Z}." msgstr "" -#: xcf2pnm.10:68 xcf2png.10:62 +#: xcf2pnm.10:70 xcf2png.10:64 +msgid "B{-C} and B{-O}/B{-S}." +msgstr "" + +#: xcf2pnm.10:73 xcf2png.10:67 msgid "LAYER SPECIFICATIONS" msgstr "" -#: xcf2pnm.10:69 xcf2png.10:63 +#: xcf2pnm.10:74 xcf2png.10:68 msgid "If no I{layer name} is given on the command line, all of the\n" "visible layers in the XCF file are merged to produce the output\n" "image." msgstr "" -#: xcf2pnm.10:73 xcf2png.10:67 +#: xcf2pnm.10:78 xcf2png.10:72 msgid "It is also possible to specify the layers to merge explicitly, by\n" "giving their names as separate arguments after the input\n" "filename. In that case, the output will contain I{only} the named\n" @@ -445,45 +464,45 @@ msgid "It is also possible to specify the layers to merge explicitly, by\n" "the layer ordering in the XCF file will be ignored." msgstr "" -#: xcf2pnm.10:82 xcf2png.10:76 +#: xcf2pnm.10:87 xcf2png.10:81 msgid "The following options can be given I{after} a layer name to\n" "override the global properties of the layer:" msgstr "" -#: xcf2pnm.10:87 +#: xcf2pnm.10:92 msgid "EXAMPLES" msgstr "" -#: xcf2pnm.10:89 +#: xcf2pnm.10:94 msgid "B{xcf2pnm -b white foo.xcf > foo.ppm}" msgstr "" -#: xcf2pnm.10:91 +#: xcf2pnm.10:96 msgid "B{xcf2pnm -a footrans.pgm -o foo.ppm foo.xcf Layer1 Layer2}" msgstr "" -#: xcf2pnm.10:93 +#: xcf2pnm.10:98 msgid "To test whether the flattened image has any transparency, use" msgstr "" -#: xcf2pnm.10:95 +#: xcf2pnm.10:100 msgid "B{xcf2pnm foo.xcf > /dev/null}" msgstr "" -#: xcf2pnm.10:97 +#: xcf2pnm.10:102 msgid "To test whether the flattened image has I{partially} transparent\n" "pixels, use" msgstr "" -#: xcf2pnm.10:101 +#: xcf2pnm.10:106 msgid "B{xcf2pnm -b white -G > /dev/null}" msgstr "" -#: xcf2pnm.10:102 xcf2png.10:81 +#: xcf2pnm.10:107 xcf2png.10:86 msgid "BUGS AND LIMITATIONS" msgstr "" -#: xcf2pnm.10:104 xcf2png.10:83 +#: xcf2pnm.10:109 xcf2png.10:88 msgid "When several partially transparent layers are merged, the pixel\n" "values are interpolated without gamma correction. (The Gimp also\n" "does it this way). Some slight rounding errors in the\n" @@ -493,28 +512,28 @@ msgid "When several partially transparent layers are merged, the pixel\n" "layer modes." msgstr "" -#: xcf2pnm.10:112 xcf2png.10:91 +#: xcf2pnm.10:117 xcf2png.10:96 msgid "These differences are usually not visible to the eye." msgstr "" -#: xcf2pnm.10:114 xcf2png.10:93 +#: xcf2pnm.10:119 xcf2png.10:98 msgid "There are probably other bugs lurking in corner cases. If you\n" "discover one, please notify the author." msgstr "" -#: xcf2pnm.10:117 xcf2png.10:96 +#: xcf2pnm.10:122 xcf2png.10:101 msgid "FILES" msgstr "" -#: xcf2pnm.10:119 xcf2png.10:98 +#: xcf2pnm.10:124 xcf2png.10:103 msgid "B{/usr/lib/X11/rgb.txt}" msgstr "" -#: xcf2pnm.10:120 xcf2png.10:99 +#: xcf2pnm.10:125 xcf2png.10:104 msgid "Color name database for B{-b}." msgstr "" -#: xcf2pnm.10:126 +#: xcf2pnm.10:131 msgid "B{xcfinfo}(1), B{xcf2png}(1)" msgstr "" @@ -533,7 +552,7 @@ msgstr "" msgid "B{-g}and B{-c}." msgstr "" -#: xcf2png.10:105 +#: xcf2png.10:110 msgid "B{xcfinfo}(1), B{xcf2pnm}(1)" msgstr "" @@ -57,7 +57,7 @@ OPTION('z',--gzip,input is gzip compressed, unzipper = "zcat" ; break ; -OPTION('Z',--unpack,(cmd) use 'cmd' to decompress input, +OPTION('Z',--unpack,(command) use 'command' to decompress input, (Specify a command that the input file is filtered through before being interpreted as an XCF file. The command is invoked as .I command filename @@ -276,6 +276,8 @@ OPTION('S',--size,(w"x"h) crop image while converting, int n = 0 ; sscanf(optarg,"%ux%u%n",&w,&h,&n) ; if( n && n == strlen(optarg) ) { + if( flatspec.window_mode == AUTOCROP ) flatspec.window_mode = USE_CANVAS ; + flatspec.window_mode |= MANUAL_CROP ; flatspec.dim.width = w ; flatspec.dim.height = h ; } else @@ -293,6 +295,8 @@ OPTION('O',--offset,(x","y) translate converted part of image, int n = 0 ; sscanf(optarg,"%d,%d%n",&x,&y,&n) ; if( n && n == strlen(optarg) ) { + if( flatspec.window_mode == AUTOCROP ) flatspec.window_mode = USE_CANVAS ; + flatspec.window_mode |= MANUAL_OFFSET ; flatspec.dim.c.l = x ; flatspec.dim.c.t = y ; } else @@ -300,6 +304,19 @@ OPTION('O',--offset,(x","y) translate converted part of image, break ; } +OPTION('C',--autocrop,autocrop to visible layer boundaries, + (Crop and offset the converted part of the image to just include + the boundaries of the visible (or selected) layers. + (Note that the + .I contents + of the layers is not taken into account when autocropping). + .IP + In the absence of options that specify otherwise, the converted + image will cover the entire XCF canvas. + )); +flatspec.window_mode = AUTOCROP ; +break ; + #ifndef XCFVIEW OPTIONGROUP(1il,Layer-selection options); #endif @@ -6,154 +6,158 @@ msgid "" msgstr "" "Project-Id-Version: xcftools 0.9\n" "Report-Msgid-Bugs-To: henning@makholm.net\n" -"POT-Creation-Date: 2006-02-20 04:06+0100\n" -"PO-Revision-Date: 2006-02-15 18:32+0100\n" +"POT-Creation-Date: 2006-02-22 01:38+0100\n" +"PO-Revision-Date: 2006-02-22 01:45+0100\n" "Last-Translator: Henning Makholm <henning@makholm.net>\n" "Language-Team: Til test af l10n-faciliteter; ikke vedligeholdt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: xcfinfo.oi:24 xcfinfo.oi:35 xcf2pnm.oi:46 xcf2pnm.oi:63 xcf2png.oi:43 -#: xcf2png.oi:60 xcfview.oi:43 xcfview.oi:60 -msgid "cmd" +#: xcfinfo.oi:24 xcfinfo.oi:35 xcf2pnm.oi:48 xcf2pnm.oi:64 xcf2png.oi:45 +#: xcf2png.oi:61 xcfview.oi:45 xcfview.oi:61 +msgid "command" msgstr "kommando" -#: xcfinfo.oi:26 xcf2pnm.oi:54 xcf2png.oi:51 xcfview.oi:51 +#: xcfinfo.oi:26 xcf2pnm.oi:55 xcf2png.oi:52 xcfview.oi:52 msgid "show this message" msgstr "vis denne tekst" -#: xcfinfo.oi:28 xcf2pnm.oi:56 xcf2png.oi:53 xcfview.oi:53 +#: xcfinfo.oi:28 xcf2pnm.oi:57 xcf2png.oi:54 xcfview.oi:54 msgid "show version" msgstr "vis versionsnummer" -#: xcfinfo.oi:30 xcf2pnm.oi:58 xcf2png.oi:55 xcfview.oi:55 +#: xcfinfo.oi:30 xcf2pnm.oi:59 xcf2png.oi:56 xcfview.oi:56 msgid "show progress messages" msgstr "giv fremgangsbeskeder" -#: xcfinfo.oi:32 xcf2pnm.oi:60 xcf2png.oi:57 xcfview.oi:57 +#: xcfinfo.oi:32 xcf2pnm.oi:61 xcf2png.oi:58 xcfview.oi:58 msgid "input is bzip2 compressed" msgstr "inddata er pakket med bzip2" -#: xcfinfo.oi:34 xcf2pnm.oi:62 xcf2png.oi:59 xcfview.oi:59 +#: xcfinfo.oi:34 xcf2pnm.oi:63 xcf2png.oi:60 xcfview.oi:60 msgid "input is gzip compressed" msgstr "inddata er pakket med gzip" -#: xcfinfo.oi:36 xcf2pnm.oi:64 xcf2png.oi:61 xcfview.oi:61 -msgid "use 'cmd' to decompress input" +#: xcfinfo.oi:36 xcf2pnm.oi:65 xcf2png.oi:62 xcfview.oi:62 +msgid "use 'command' to decompress input" msgstr "brug »kommando« til at pakke inddata ud" -#: xcfinfo.oi:38 xcf2pnm.oi:105 xcf2png.oi:96 xcfview.oi:95 +#: xcfinfo.oi:38 xcf2pnm.oi:108 xcf2png.oi:99 xcfview.oi:98 msgid "use UTF-8 for layer names" msgstr "brug UTF-8 til lagnavne" -#: xcf2pnm.oi:47 xcf2pnm.oi:69 xcf2png.oi:44 xcf2png.oi:64 xcfview.oi:44 -#: xcfview.oi:64 xcf2png.c:147 +#: xcf2pnm.oi:47 xcf2pnm.oi:70 xcf2png.oi:44 xcf2png.oi:65 xcfview.oi:44 +#: xcfview.oi:65 xcf2png.c:147 msgid "color" msgstr "farve" -#: xcf2pnm.oi:48 xcf2pnm.oi:65 xcf2pnm.oi:67 xcf2png.oi:45 xcf2png.oi:62 -#: xcfview.oi:45 xcfview.oi:62 +#: xcf2pnm.oi:49 xcf2pnm.oi:66 xcf2pnm.oi:68 xcf2png.oi:46 xcf2png.oi:63 +#: xcfview.oi:46 xcfview.oi:63 msgid "filename" msgstr "filnavn" -#: xcf2pnm.oi:49 xcf2pnm.oi:94 xcf2png.oi:46 xcf2png.oi:85 xcfview.oi:46 -#: xcfview.oi:84 +#: xcf2pnm.oi:50 xcf2pnm.oi:97 xcf2png.oi:47 xcf2png.oi:88 xcfview.oi:47 +#: xcfview.oi:87 msgid "mode" msgstr "tilstand" -#: xcf2pnm.oi:50 xcf2pnm.oi:96 xcf2pnm.oi:98 xcf2png.oi:47 xcf2png.oi:87 -#: xcf2png.oi:89 xcfview.oi:47 xcfview.oi:86 xcfview.oi:88 +#: xcf2pnm.oi:51 xcf2pnm.oi:99 xcf2pnm.oi:101 xcf2png.oi:48 xcf2png.oi:90 +#: xcf2png.oi:92 xcfview.oi:48 xcfview.oi:89 xcfview.oi:91 msgid "n" msgstr "n" -#: xcf2pnm.oi:51 xcf2pnm.oi:89 xcf2png.oi:48 xcf2png.oi:80 xcfview.oi:48 -#: xcfview.oi:80 +#: xcf2pnm.oi:52 xcf2pnm.oi:90 xcf2png.oi:49 xcf2png.oi:81 xcfview.oi:49 +#: xcfview.oi:81 msgid "wxh" msgstr "bxh" -#: xcf2pnm.oi:52 xcf2pnm.oi:91 xcf2png.oi:49 xcf2png.oi:82 xcfview.oi:49 -#: xcfview.oi:82 +#: xcf2pnm.oi:53 xcf2pnm.oi:92 xcf2png.oi:50 xcf2png.oi:83 xcfview.oi:50 +#: xcfview.oi:83 msgid "x,y" msgstr "x,y" -#: xcf2pnm.oi:66 xcf2png.oi:63 xcfview.oi:63 +#: xcf2pnm.oi:67 xcf2png.oi:64 xcfview.oi:64 msgid "name output file" msgstr "angiv navn på uddatafil" -#: xcf2pnm.oi:68 +#: xcf2pnm.oi:69 msgid "write transparency map" msgstr "skriv gennemsigtighedsmaske" -#: xcf2pnm.oi:70 xcf2png.oi:65 xcfview.oi:65 +#: xcf2pnm.oi:71 xcf2png.oi:66 xcfview.oi:66 msgid "select background color" msgstr "vælg baggrundsfarve" -#: xcf2pnm.oi:72 xcf2png.oi:67 xcfview.oi:67 +#: xcf2pnm.oi:73 xcf2png.oi:68 xcfview.oi:68 msgid "force alpha channel in output" msgstr "insistér på alfakanal i uddata" -#: xcf2pnm.oi:74 xcf2png.oi:69 xcfview.oi:69 +#: xcf2pnm.oi:75 xcf2png.oi:70 xcfview.oi:70 msgid "select color output" msgstr "vælg uddata i farver" -#: xcf2pnm.oi:76 xcf2png.oi:71 xcfview.oi:71 +#: xcf2pnm.oi:77 xcf2png.oi:72 xcfview.oi:72 msgid "select grayscale output" msgstr "vælg uddata i gråtoner" -#: xcf2pnm.oi:78 +#: xcf2pnm.oi:79 msgid "select monochrome output" msgstr "vælg uddata i sort/hvid" -#: xcf2pnm.oi:80 +#: xcf2pnm.oi:81 msgid "select -c/-g/-m by image contents" msgstr "vælg -c, -g eller -m alt efter billedet indhold" -#: xcf2pnm.oi:82 xcf2png.oi:73 xcfview.oi:73 +#: xcf2pnm.oi:83 xcf2png.oi:74 xcfview.oi:74 msgid "treat indexed images as RGB for flattening" msgstr "fladgør indekserede billeder som om de var RGB" -#: xcf2pnm.oi:84 xcf2png.oi:75 xcfview.oi:75 +#: xcf2pnm.oi:85 xcf2png.oi:76 xcfview.oi:76 msgid "disallow partial transparency" msgstr "forbyd delvis gennemsigtighed" -#: xcf2pnm.oi:86 xcf2png.oi:77 xcfview.oi:77 +#: xcf2pnm.oi:87 xcf2png.oi:78 xcfview.oi:78 msgid "dissolve partial transparency" msgstr "opløs delvis gennemsigtighed" -#: xcf2pnm.oi:88 xcf2png.oi:79 xcfview.oi:79 +#: xcf2pnm.oi:89 xcf2png.oi:80 xcfview.oi:80 msgid "flatten to memory; then analyse" msgstr "fladgør til arbejdslager; analysér bagefter" -#: xcf2pnm.oi:90 xcf2png.oi:81 xcfview.oi:81 +#: xcf2pnm.oi:91 xcf2png.oi:82 xcfview.oi:82 msgid "crop image while converting" msgstr "tilskær billedet under konverteringen" -#: xcf2pnm.oi:92 xcf2png.oi:83 xcfview.oi:83 +#: xcf2pnm.oi:93 xcf2png.oi:84 xcfview.oi:84 msgid "translate converted part of image" msgstr "forskyd den konverterede del af billedet" -#: xcf2pnm.oi:93 xcf2png.oi:84 +#: xcf2pnm.oi:95 xcf2png.oi:86 xcfview.oi:86 +msgid "autocrop to visible layer boundaries" +msgstr "tilskær til netop at dække synlige lag" + +#: xcf2pnm.oi:96 xcf2png.oi:87 msgid "Layer-selection options" msgstr "Flag vedr. valg af lag" -#: xcf2pnm.oi:95 xcf2png.oi:86 xcfview.oi:85 +#: xcf2pnm.oi:98 xcf2png.oi:89 xcfview.oi:88 msgid "set layer mode" msgstr "ændr lagtilstand" -#: xcf2pnm.oi:97 xcf2png.oi:88 xcfview.oi:87 +#: xcf2pnm.oi:100 xcf2png.oi:91 xcfview.oi:90 msgid "set opacity in percent" msgstr "ændr dækningsgrad i procent" -#: xcf2pnm.oi:99 xcf2png.oi:90 xcfview.oi:89 +#: xcf2pnm.oi:102 xcf2png.oi:93 xcfview.oi:92 msgid "set opacity in 1/255 units" msgstr "ændr dækningsgrad i 255-dele" -#: xcf2pnm.oi:101 xcf2png.oi:92 xcfview.oi:91 +#: xcf2pnm.oi:104 xcf2png.oi:95 xcfview.oi:94 msgid "enable layer mask" msgstr "aktivér lagmaske" -#: xcf2pnm.oi:103 xcf2png.oi:94 xcfview.oi:93 +#: xcf2pnm.oi:106 xcf2png.oi:97 xcfview.oi:96 msgid "disable layer mask" msgstr "deaktivér lagmaske" @@ -167,27 +171,27 @@ msgstr "Kunne ikke åbne farvenavnsdatabasen %s\n" msgid "Unknown background color '%s'" msgstr "Ukendt baggrundsfarve »%s«" -#: options.i:282 +#: options.i:284 #, c-format msgid "-S option must have an argument of the form wxh" msgstr "-S-flaget skal have et argument på formen bxh" -#: options.i:299 +#: options.i:303 #, c-format msgid "-O option must have an argument of the form x,y" msgstr "-O-flaget skal have et argument på formen x,y" -#: options.i:323 +#: options.i:340 #, c-format msgid "Layer mode '%s' is unknown" msgstr "Lagtilstanden »%s« er ukendt" -#: options.i:339 +#: options.i:356 #, c-format msgid "The argument to --percent is not a percentage" msgstr "Argumentet til --percent er ikke et procenttal" -#: options.i:352 +#: options.i:369 #, c-format msgid "The argument to --opacity is not a number between 0 and 255" msgstr "Argumentet til --opacity er ikke et tal mellem 0 og 255" @@ -348,53 +352,53 @@ msgstr "" msgid "Fractal" msgstr "" -#: flatspec.c:47 utils.c:110 +#: flatspec.c:45 utils.c:110 #, c-format msgid "Out of memory" msgstr "Ikke mere lagerplads" -#: flatspec.c:59 +#: flatspec.c:57 #, c-format msgid "The %s option must follow a layer name on the command line" msgstr "%s-flaget skal komme efter navnet på et lag" -#: flatspec.c:143 +#: flatspec.c:135 #, c-format msgid "The image has no layer called '%s'" msgstr "Billedet har ikke noget lag der hedder »%s«" -#: flatspec.c:156 +#: flatspec.c:148 #, c-format msgid "Layer '%s' has no layer mask to enable" msgstr "Laget »%s« har ikke nogen lagmaske at tænde for" -#: flatspec.c:233 xcfinfo.c:97 +#: flatspec.c:262 xcfinfo.c:97 #, c-format msgid "/mask" msgstr "/maske" -#: flatspec.c:319 xcf2png.c:233 xcf2pnm.c:158 +#: flatspec.c:348 xcf2png.c:233 xcf2pnm.c:158 #, c-format msgid "Grayscale output selected, but colored pixel(s) found" msgstr "Der er valgt gråtoneformat, men billedet indeholder farvede pixels" -#: flatspec.c:323 xcf2pnm.c:172 +#: flatspec.c:352 xcf2pnm.c:172 #, c-format msgid "Monochrome output selected, but not all pixels are black or white" msgstr "" "Der er valgt sort/hvid-format, men billedet indeholder farver eller gråtoner" -#: flatten.c:382 +#: flatten.c:386 #, c-format msgid "'%s' layer mode" msgstr "Lagtilstanden »%s«" -#: flatten.c:562 +#: flatten.c:566 #, c-format msgid "Flattened image has partially transparent pixels" msgstr "Der er halvgennemsigtige pixels i det fladgjorde billede" -#: flatten.c:668 +#: flatten.c:672 #, c-format msgid "Flattening image ..." msgstr "Fladgør billede ..." diff --git a/po/xcftools.pot b/po/xcftools.pot index b376efd..48e3cea 100644 --- a/po/xcftools.pot +++ b/po/xcftools.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: henning@makholm.net\n" -"POT-Creation-Date: 2006-02-20 04:06+0100\n" +"POT-Creation-Date: 2006-02-22 01:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -15,146 +15,150 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: xcfinfo.oi:24 xcfinfo.oi:35 xcf2pnm.oi:46 xcf2pnm.oi:63 xcf2png.oi:43 -#: xcf2png.oi:60 xcfview.oi:43 xcfview.oi:60 -msgid "cmd" +#: xcfinfo.oi:24 xcfinfo.oi:35 xcf2pnm.oi:48 xcf2pnm.oi:64 xcf2png.oi:45 +#: xcf2png.oi:61 xcfview.oi:45 xcfview.oi:61 +msgid "command" msgstr "" -#: xcfinfo.oi:26 xcf2pnm.oi:54 xcf2png.oi:51 xcfview.oi:51 +#: xcfinfo.oi:26 xcf2pnm.oi:55 xcf2png.oi:52 xcfview.oi:52 msgid "show this message" msgstr "" -#: xcfinfo.oi:28 xcf2pnm.oi:56 xcf2png.oi:53 xcfview.oi:53 +#: xcfinfo.oi:28 xcf2pnm.oi:57 xcf2png.oi:54 xcfview.oi:54 msgid "show version" msgstr "" -#: xcfinfo.oi:30 xcf2pnm.oi:58 xcf2png.oi:55 xcfview.oi:55 +#: xcfinfo.oi:30 xcf2pnm.oi:59 xcf2png.oi:56 xcfview.oi:56 msgid "show progress messages" msgstr "" -#: xcfinfo.oi:32 xcf2pnm.oi:60 xcf2png.oi:57 xcfview.oi:57 +#: xcfinfo.oi:32 xcf2pnm.oi:61 xcf2png.oi:58 xcfview.oi:58 msgid "input is bzip2 compressed" msgstr "" -#: xcfinfo.oi:34 xcf2pnm.oi:62 xcf2png.oi:59 xcfview.oi:59 +#: xcfinfo.oi:34 xcf2pnm.oi:63 xcf2png.oi:60 xcfview.oi:60 msgid "input is gzip compressed" msgstr "" -#: xcfinfo.oi:36 xcf2pnm.oi:64 xcf2png.oi:61 xcfview.oi:61 -msgid "use 'cmd' to decompress input" +#: xcfinfo.oi:36 xcf2pnm.oi:65 xcf2png.oi:62 xcfview.oi:62 +msgid "use 'command' to decompress input" msgstr "" -#: xcfinfo.oi:38 xcf2pnm.oi:105 xcf2png.oi:96 xcfview.oi:95 +#: xcfinfo.oi:38 xcf2pnm.oi:108 xcf2png.oi:99 xcfview.oi:98 msgid "use UTF-8 for layer names" msgstr "" -#: xcf2pnm.oi:47 xcf2pnm.oi:69 xcf2png.oi:44 xcf2png.oi:64 xcfview.oi:44 -#: xcfview.oi:64 xcf2png.c:147 +#: xcf2pnm.oi:47 xcf2pnm.oi:70 xcf2png.oi:44 xcf2png.oi:65 xcfview.oi:44 +#: xcfview.oi:65 xcf2png.c:147 msgid "color" msgstr "" -#: xcf2pnm.oi:48 xcf2pnm.oi:65 xcf2pnm.oi:67 xcf2png.oi:45 xcf2png.oi:62 -#: xcfview.oi:45 xcfview.oi:62 +#: xcf2pnm.oi:49 xcf2pnm.oi:66 xcf2pnm.oi:68 xcf2png.oi:46 xcf2png.oi:63 +#: xcfview.oi:46 xcfview.oi:63 msgid "filename" msgstr "" -#: xcf2pnm.oi:49 xcf2pnm.oi:94 xcf2png.oi:46 xcf2png.oi:85 xcfview.oi:46 -#: xcfview.oi:84 +#: xcf2pnm.oi:50 xcf2pnm.oi:97 xcf2png.oi:47 xcf2png.oi:88 xcfview.oi:47 +#: xcfview.oi:87 msgid "mode" msgstr "" -#: xcf2pnm.oi:50 xcf2pnm.oi:96 xcf2pnm.oi:98 xcf2png.oi:47 xcf2png.oi:87 -#: xcf2png.oi:89 xcfview.oi:47 xcfview.oi:86 xcfview.oi:88 +#: xcf2pnm.oi:51 xcf2pnm.oi:99 xcf2pnm.oi:101 xcf2png.oi:48 xcf2png.oi:90 +#: xcf2png.oi:92 xcfview.oi:48 xcfview.oi:89 xcfview.oi:91 msgid "n" msgstr "" -#: xcf2pnm.oi:51 xcf2pnm.oi:89 xcf2png.oi:48 xcf2png.oi:80 xcfview.oi:48 -#: xcfview.oi:80 +#: xcf2pnm.oi:52 xcf2pnm.oi:90 xcf2png.oi:49 xcf2png.oi:81 xcfview.oi:49 +#: xcfview.oi:81 msgid "wxh" msgstr "" -#: xcf2pnm.oi:52 xcf2pnm.oi:91 xcf2png.oi:49 xcf2png.oi:82 xcfview.oi:49 -#: xcfview.oi:82 +#: xcf2pnm.oi:53 xcf2pnm.oi:92 xcf2png.oi:50 xcf2png.oi:83 xcfview.oi:50 +#: xcfview.oi:83 msgid "x,y" msgstr "" -#: xcf2pnm.oi:66 xcf2png.oi:63 xcfview.oi:63 +#: xcf2pnm.oi:67 xcf2png.oi:64 xcfview.oi:64 msgid "name output file" msgstr "" -#: xcf2pnm.oi:68 +#: xcf2pnm.oi:69 msgid "write transparency map" msgstr "" -#: xcf2pnm.oi:70 xcf2png.oi:65 xcfview.oi:65 +#: xcf2pnm.oi:71 xcf2png.oi:66 xcfview.oi:66 msgid "select background color" msgstr "" -#: xcf2pnm.oi:72 xcf2png.oi:67 xcfview.oi:67 +#: xcf2pnm.oi:73 xcf2png.oi:68 xcfview.oi:68 msgid "force alpha channel in output" msgstr "" -#: xcf2pnm.oi:74 xcf2png.oi:69 xcfview.oi:69 +#: xcf2pnm.oi:75 xcf2png.oi:70 xcfview.oi:70 msgid "select color output" msgstr "" -#: xcf2pnm.oi:76 xcf2png.oi:71 xcfview.oi:71 +#: xcf2pnm.oi:77 xcf2png.oi:72 xcfview.oi:72 msgid "select grayscale output" msgstr "" -#: xcf2pnm.oi:78 +#: xcf2pnm.oi:79 msgid "select monochrome output" msgstr "" -#: xcf2pnm.oi:80 +#: xcf2pnm.oi:81 msgid "select -c/-g/-m by image contents" msgstr "" -#: xcf2pnm.oi:82 xcf2png.oi:73 xcfview.oi:73 +#: xcf2pnm.oi:83 xcf2png.oi:74 xcfview.oi:74 msgid "treat indexed images as RGB for flattening" msgstr "" -#: xcf2pnm.oi:84 xcf2png.oi:75 xcfview.oi:75 +#: xcf2pnm.oi:85 xcf2png.oi:76 xcfview.oi:76 msgid "disallow partial transparency" msgstr "" -#: xcf2pnm.oi:86 xcf2png.oi:77 xcfview.oi:77 +#: xcf2pnm.oi:87 xcf2png.oi:78 xcfview.oi:78 msgid "dissolve partial transparency" msgstr "" -#: xcf2pnm.oi:88 xcf2png.oi:79 xcfview.oi:79 +#: xcf2pnm.oi:89 xcf2png.oi:80 xcfview.oi:80 msgid "flatten to memory; then analyse" msgstr "" -#: xcf2pnm.oi:90 xcf2png.oi:81 xcfview.oi:81 +#: xcf2pnm.oi:91 xcf2png.oi:82 xcfview.oi:82 msgid "crop image while converting" msgstr "" -#: xcf2pnm.oi:92 xcf2png.oi:83 xcfview.oi:83 +#: xcf2pnm.oi:93 xcf2png.oi:84 xcfview.oi:84 msgid "translate converted part of image" msgstr "" -#: xcf2pnm.oi:93 xcf2png.oi:84 +#: xcf2pnm.oi:95 xcf2png.oi:86 xcfview.oi:86 +msgid "autocrop to visible layer boundaries" +msgstr "" + +#: xcf2pnm.oi:96 xcf2png.oi:87 msgid "Layer-selection options" msgstr "" -#: xcf2pnm.oi:95 xcf2png.oi:86 xcfview.oi:85 +#: xcf2pnm.oi:98 xcf2png.oi:89 xcfview.oi:88 msgid "set layer mode" msgstr "" -#: xcf2pnm.oi:97 xcf2png.oi:88 xcfview.oi:87 +#: xcf2pnm.oi:100 xcf2png.oi:91 xcfview.oi:90 msgid "set opacity in percent" msgstr "" -#: xcf2pnm.oi:99 xcf2png.oi:90 xcfview.oi:89 +#: xcf2pnm.oi:102 xcf2png.oi:93 xcfview.oi:92 msgid "set opacity in 1/255 units" msgstr "" -#: xcf2pnm.oi:101 xcf2png.oi:92 xcfview.oi:91 +#: xcf2pnm.oi:104 xcf2png.oi:95 xcfview.oi:94 msgid "enable layer mask" msgstr "" -#: xcf2pnm.oi:103 xcf2png.oi:94 xcfview.oi:93 +#: xcf2pnm.oi:106 xcf2png.oi:97 xcfview.oi:96 msgid "disable layer mask" msgstr "" @@ -168,27 +172,27 @@ msgstr "" msgid "Unknown background color '%s'" msgstr "" -#: options.i:282 +#: options.i:284 #, c-format msgid "-S option must have an argument of the form wxh" msgstr "" -#: options.i:299 +#: options.i:303 #, c-format msgid "-O option must have an argument of the form x,y" msgstr "" -#: options.i:323 +#: options.i:340 #, c-format msgid "Layer mode '%s' is unknown" msgstr "" -#: options.i:339 +#: options.i:356 #, c-format msgid "The argument to --percent is not a percentage" msgstr "" -#: options.i:352 +#: options.i:369 #, c-format msgid "The argument to --opacity is not a number between 0 and 255" msgstr "" @@ -349,52 +353,52 @@ msgstr "" msgid "Fractal" msgstr "" -#: flatspec.c:47 utils.c:110 +#: flatspec.c:45 utils.c:110 #, c-format msgid "Out of memory" msgstr "" -#: flatspec.c:59 +#: flatspec.c:57 #, c-format msgid "The %s option must follow a layer name on the command line" msgstr "" -#: flatspec.c:143 +#: flatspec.c:135 #, c-format msgid "The image has no layer called '%s'" msgstr "" -#: flatspec.c:156 +#: flatspec.c:148 #, c-format msgid "Layer '%s' has no layer mask to enable" msgstr "" -#: flatspec.c:233 xcfinfo.c:97 +#: flatspec.c:262 xcfinfo.c:97 #, c-format msgid "/mask" msgstr "" -#: flatspec.c:319 xcf2png.c:233 xcf2pnm.c:158 +#: flatspec.c:348 xcf2png.c:233 xcf2pnm.c:158 #, c-format msgid "Grayscale output selected, but colored pixel(s) found" msgstr "" -#: flatspec.c:323 xcf2pnm.c:172 +#: flatspec.c:352 xcf2pnm.c:172 #, c-format msgid "Monochrome output selected, but not all pixels are black or white" msgstr "" -#: flatten.c:382 +#: flatten.c:386 #, c-format msgid "'%s' layer mode" msgstr "" -#: flatten.c:562 +#: flatten.c:566 #, c-format msgid "Flattened image has partially transparent pixels" msgstr "" -#: flatten.c:668 +#: flatten.c:672 #, c-format msgid "Flattening image ..." msgstr "" diff --git a/test/answer/odoodle.png b/test/answer/odoodle.png Binary files differindex 50e1800..267aa8a 100644 --- a/test/answer/odoodle.png +++ b/test/answer/odoodle.png diff --git a/test/dotest b/test/dotest index 1e53549..17b9e83 100755 --- a/test/dotest +++ b/test/dotest @@ -357,7 +357,7 @@ Version 0, 161x161 RGB color, 10 layers, compressed RLE + 122x13+19+74 RGB-alpha Normal Long and low + 13x122+74+19 RGB-alpha Difference Tall and narrow + 118x118+38+47 RGB-alpha Normal/65% Displaced loop -- 161x161+0+0 RGB-alpha Normal Doodle +- 144x141+4+18 RGB-alpha Normal Doodle + 161x161+0+0 RGB-alpha Normal Straight loop + 50x50+100+105 RGB-alpha Normal/mask Crossed + 50x50+8+8 RGB-alpha Normal Mid @@ -624,17 +624,17 @@ EOF testpng A:: B:1,0,0 doodle tiletest Doodle -b '#f00' -f # 2 colors plus transparency -testpng odoodle tiletest Doodle 'Straight loop' -f +testpng odoodle tiletest Doodle 'Straight loop' -f -S5x5 -C # 3 colors cat <<EOF > pngtype.want -161x161x2 +144x141x2 color+index z0 f0 i0 PLTE(9) 00 00 FF EE 6F 00 FF FF FF EOF -testpng A:: B:0,0,1 odoodle tiletest Doodle 'Straight loop' -fb '#00F' +testpng A:: B:0,0,1 odoodle tiletest Doodle 'Straight loop' -fb '#00F' -O0,0 -C # 4 colors cat <<EOF > pngtype.want diff --git a/test/source/tiletest.xcf.gz b/test/source/tiletest.xcf.gz Binary files differindex c2fbc45..b6992b9 100644 --- a/test/source/tiletest.xcf.gz +++ b/test/source/tiletest.xcf.gz @@ -59,6 +59,11 @@ and .BR \-z , and .BR \-Z . +.TP +5) +.B \-C +and +.BR \-O / \-S . .SH LAYER SPECIFICATIONS If no .I layer name @@ -65,6 +65,11 @@ and .BR \-z , and .BR \-Z . +.TP +5) +.B \-C +and +.BR \-O / \-S . .SH LAYER SPECIFICATIONS If no .I layer name |
