[Tux4kids-commits] r917 - in tuxmath/trunk: . data data/fonts data/images data/images/backgrounds data/images/cities data/images/comets data/images/factoroids data/images/icons data/images/igloos data/images/penguins data/images/sprites data/images/status data/images/title data/images/tux data/missions data/missions/arcade data/missions/campaign data/missions/campaign/ace data/missions/campaign/cadet data/missions/campaign/commando data/missions/campaign/ranger data/missions/campaign/scout data/missions/lessons data/missions/multiplay data/sounds doc intl linebreak po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Mon Mar 2 20:54:10 UTC 2009
Author: dbruce-guest
Date: 2009-03-02 20:54:09 +0000 (Mon, 02 Mar 2009)
New Revision: 917
Modified:
tuxmath/trunk/Makefile.am
tuxmath/trunk/Makefile.in
tuxmath/trunk/aclocal.m4
tuxmath/trunk/config.guess
tuxmath/trunk/config.h.in
tuxmath/trunk/config.sub
tuxmath/trunk/configure
tuxmath/trunk/configure.ac
tuxmath/trunk/data/Makefile.in
tuxmath/trunk/data/fonts/Makefile.in
tuxmath/trunk/data/images/Makefile.in
tuxmath/trunk/data/images/backgrounds/Makefile.in
tuxmath/trunk/data/images/cities/Makefile.in
tuxmath/trunk/data/images/comets/Makefile.in
tuxmath/trunk/data/images/factoroids/Makefile.in
tuxmath/trunk/data/images/icons/Makefile.in
tuxmath/trunk/data/images/igloos/Makefile.in
tuxmath/trunk/data/images/penguins/Makefile.in
tuxmath/trunk/data/images/sprites/Makefile.in
tuxmath/trunk/data/images/status/Makefile.in
tuxmath/trunk/data/images/title/Makefile.in
tuxmath/trunk/data/images/tux/Makefile.in
tuxmath/trunk/data/missions/Makefile.in
tuxmath/trunk/data/missions/arcade/Makefile.in
tuxmath/trunk/data/missions/campaign/Makefile.in
tuxmath/trunk/data/missions/campaign/ace/Makefile.in
tuxmath/trunk/data/missions/campaign/cadet/Makefile.in
tuxmath/trunk/data/missions/campaign/commando/Makefile.in
tuxmath/trunk/data/missions/campaign/ranger/Makefile.in
tuxmath/trunk/data/missions/campaign/scout/Makefile.in
tuxmath/trunk/data/missions/lessons/Makefile.in
tuxmath/trunk/data/missions/multiplay/Makefile.in
tuxmath/trunk/data/sounds/Makefile.in
tuxmath/trunk/doc/Makefile.in
tuxmath/trunk/doc/changelog
tuxmath/trunk/intl/plural.c
tuxmath/trunk/linebreak/Makefile.in
tuxmath/trunk/po/ar.gmo
tuxmath/trunk/po/ar.po
tuxmath/trunk/po/cs.gmo
tuxmath/trunk/po/cs.po
tuxmath/trunk/po/de.gmo
tuxmath/trunk/po/de.po
tuxmath/trunk/po/en at boldquot.gmo
tuxmath/trunk/po/en at boldquot.po
tuxmath/trunk/po/en at quot.gmo
tuxmath/trunk/po/en at quot.po
tuxmath/trunk/po/en_GB.gmo
tuxmath/trunk/po/en_GB.po
tuxmath/trunk/po/es.gmo
tuxmath/trunk/po/es.po
tuxmath/trunk/po/fi.gmo
tuxmath/trunk/po/fi.po
tuxmath/trunk/po/fr.gmo
tuxmath/trunk/po/fr.po
tuxmath/trunk/po/ga.gmo
tuxmath/trunk/po/ga.po
tuxmath/trunk/po/he.gmo
tuxmath/trunk/po/he.po
tuxmath/trunk/po/hu.gmo
tuxmath/trunk/po/hu.po
tuxmath/trunk/po/it.gmo
tuxmath/trunk/po/it.po
tuxmath/trunk/po/ja.gmo
tuxmath/trunk/po/ja.po
tuxmath/trunk/po/nb.gmo
tuxmath/trunk/po/nb.po
tuxmath/trunk/po/nl.gmo
tuxmath/trunk/po/nl.po
tuxmath/trunk/po/nn.gmo
tuxmath/trunk/po/nn.po
tuxmath/trunk/po/oc.gmo
tuxmath/trunk/po/oc.po
tuxmath/trunk/po/pl.gmo
tuxmath/trunk/po/pl.po
tuxmath/trunk/po/pt.gmo
tuxmath/trunk/po/pt.po
tuxmath/trunk/po/pt_BR.gmo
tuxmath/trunk/po/pt_BR.po
tuxmath/trunk/po/ru.gmo
tuxmath/trunk/po/ru.po
tuxmath/trunk/po/sk.gmo
tuxmath/trunk/po/sk.po
tuxmath/trunk/po/sv.gmo
tuxmath/trunk/po/sv.po
tuxmath/trunk/po/tr.gmo
tuxmath/trunk/po/tr.po
tuxmath/trunk/po/tuxmath.pot
tuxmath/trunk/po/zh_CN.gmo
tuxmath/trunk/po/zh_CN.po
tuxmath/trunk/src/Makefile.in
tuxmath/trunk/src/SDL_extras.c
tuxmath/trunk/src/SDL_extras.h
tuxmath/trunk/src/factoroids.c
tuxmath/trunk/src/game.c
tuxmath/trunk/src/highscore.c
tuxmath/trunk/src/mathcards.c
tuxmath/trunk/src/titlescreen.c
tuxmath/trunk/tuxmath.spec.in
Log:
begin work on encapsulating SDL_Pango/SDL_ttf specific code inside of SDL_extras.
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/Makefile.am 2009-03-02 20:54:09 UTC (rev 917)
@@ -9,7 +9,6 @@
SUBDIRS = data \
doc \
- intl \
linebreak \
po \
src
Modified: tuxmath/trunk/Makefile.in
===================================================================
--- tuxmath/trunk/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -35,38 +35,27 @@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/tuxmath.spec.in $(top_srcdir)/configure \
- $(top_srcdir)/intl/Makefile.in \
+ $(srcdir)/tuxmath.spec.in $(srcdir)/tuxmath_preview.spec.in \
+ $(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
$(top_srcdir)/nsis/tuxmath.nsi.in \
$(top_srcdir)/nsis/tuxmath_with_conf.nsi.in ABOUT-NLS AUTHORS \
COPYING ChangeLog INSTALL NEWS config.guess config.rpath \
config.sub depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = tuxmath.spec nsis/tuxmath.nsi \
- nsis/tuxmath_with_conf.nsi intl/Makefile
+CONFIG_CLEAN_FILES = tuxmath.spec tuxmath_preview.spec \
+ nsis/tuxmath.nsi nsis/tuxmath_with_conf.nsi intl/Makefile
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -99,16 +88,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -116,45 +101,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -174,7 +139,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -182,12 +146,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -248,7 +209,6 @@
top_srcdir = @top_srcdir@
SUBDIRS = data \
doc \
- intl \
linebreak \
po \
src
@@ -321,6 +281,8 @@
-rm -f config.h stamp-h1
tuxmath.spec: $(top_builddir)/config.status $(srcdir)/tuxmath.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+tuxmath_preview.spec: $(top_builddir)/config.status $(srcdir)/tuxmath_preview.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
nsis/tuxmath.nsi: $(top_builddir)/config.status $(top_srcdir)/nsis/tuxmath.nsi.in
cd $(top_builddir) && $(SHELL) ./config.status $@
nsis/tuxmath_with_conf.nsi: $(top_builddir)/config.status $(top_srcdir)/nsis/tuxmath_with_conf.nsi.in
@@ -563,7 +525,6 @@
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& cd $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
- --with-included-gettext \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
Modified: tuxmath/trunk/aclocal.m4
===================================================================
--- tuxmath/trunk/aclocal.m4 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/aclocal.m4 2009-03-02 20:54:09 UTC (rev 917)
@@ -866,34 +866,13 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([m4/codeset.m4])
m4_include([m4/gettext.m4])
-m4_include([m4/glibc2.m4])
-m4_include([m4/glibc21.m4])
m4_include([m4/iconv.m4])
-m4_include([m4/intdiv0.m4])
-m4_include([m4/intl.m4])
-m4_include([m4/intldir.m4])
m4_include([m4/intlmacosx.m4])
-m4_include([m4/intmax.m4])
-m4_include([m4/inttypes-pri.m4])
-m4_include([m4/inttypes_h.m4])
-m4_include([m4/lcmessage.m4])
m4_include([m4/lib-ld.m4])
m4_include([m4/lib-link.m4])
m4_include([m4/lib-prefix.m4])
-m4_include([m4/lock.m4])
-m4_include([m4/longlong.m4])
m4_include([m4/nls.m4])
m4_include([m4/po.m4])
-m4_include([m4/printf-posix.m4])
m4_include([m4/progtest.m4])
-m4_include([m4/size_max.m4])
-m4_include([m4/stdint_h.m4])
-m4_include([m4/uintmax_t.m4])
-m4_include([m4/ulonglong.m4])
-m4_include([m4/visibility.m4])
-m4_include([m4/wchar_t.m4])
-m4_include([m4/wint_t.m4])
-m4_include([m4/xsize.m4])
m4_include([acinclude.m4])
Modified: tuxmath/trunk/config.guess
===================================================================
--- tuxmath/trunk/config.guess 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/config.guess 2009-03-02 20:54:09 UTC (rev 917)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-12-19'
+timestamp='2008-01-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -331,20 +331,7 @@
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
- # If there is a compiler, see if it is configured for 64-bit objects.
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
- # This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- SUN_ARCH="x86_64"
- fi
- fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -809,7 +796,7 @@
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd | genuineintel)
+ EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -948,9 +935,6 @@
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
- exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -1001,6 +985,9 @@
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
@@ -1154,16 +1141,6 @@
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- OS_REL='.3'
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1239,9 +1216,6 @@
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit ;;
- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
- exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
Modified: tuxmath/trunk/config.h.in
===================================================================
--- tuxmath/trunk/config.h.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/config.h.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -25,21 +25,9 @@
*/
#undef HAVE_ALLOCA_H
-/* Define to 1 if you have the `argz_count' function. */
-#undef HAVE_ARGZ_COUNT
-
/* Define to 1 if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
-/* Define to 1 if you have the `argz_next' function. */
-#undef HAVE_ARGZ_NEXT
-
-/* Define to 1 if you have the `argz_stringify' function. */
-#undef HAVE_ARGZ_STRINGIFY
-
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
/* Define to 1 if you have the `atexit' function. */
#undef HAVE_ATEXIT
@@ -49,9 +37,6 @@
/* Define to 1 if you have the `bcopy' function. */
#undef HAVE_BCOPY
-/* Define to 1 if the compiler understands __builtin_expect. */
-#undef HAVE_BUILTIN_EXPECT
-
/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
@@ -64,26 +49,6 @@
*/
#undef HAVE_DCGETTEXT
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
- don't. */
-#undef HAVE_DECL_FEOF_UNLOCKED
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
- you don't. */
-#undef HAVE_DECL_FGETS_UNLOCKED
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
- don't. */
-#undef HAVE_DECL_GETC_UNLOCKED
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
- don't. */
-#undef HAVE_DECL__SNPRINTF
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
- don't. */
-#undef HAVE_DECL__SNWPRINTF
-
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
@@ -103,55 +68,27 @@
/* Define to 1 if you have the <float.h> header file. */
#undef HAVE_FLOAT_H
-/* Define to 1 if you have the `fwprintf' function. */
-#undef HAVE_FWPRINTF
-
/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
-/* Define to 1 if you have the `getegid' function. */
-#undef HAVE_GETEGID
-
-/* Define to 1 if you have the `geteuid' function. */
-#undef HAVE_GETEUID
-
-/* Define to 1 if you have the `getgid' function. */
-#undef HAVE_GETGID
-
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
-/* Define to 1 if you have the `getuid' function. */
-#undef HAVE_GETUID
-
/* Define if you have the iconv() function and it works. */
#undef HAVE_ICONV
/* Define to 1 if you have the <iconv.h> header file. */
#undef HAVE_ICONV_H
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_INTMAX_T
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
- declares uintmax_t. */
-#undef HAVE_INTTYPES_H_WITH_UINTMAX
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
/* Define to 1 if you have the <langinfo.h> header file. */
#undef HAVE_LANGINFO_H
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
/* Define to 1 if you have the <libgen.h> header file. */
#undef HAVE_LIBGEN_H
@@ -182,9 +119,6 @@
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
-/* Define to 1 if the system has the type `long long int'. */
-#undef HAVE_LONG_LONG_INT
-
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
@@ -218,37 +152,15 @@
/* Define to 1 if you have the `nl_langinfo' function. */
#undef HAVE_NL_LANGINFO
-/* Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if
- _GNU_SOURCE is defined. */
-#undef HAVE_NL_LOCALE_NAME
-
-/* Define if your printf() function supports format strings with positions. */
-#undef HAVE_POSIX_PRINTF
-
-/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
-#undef HAVE_PTHREAD_MUTEX_RECURSIVE
-
-/* Define if the POSIX multithreading library has read/write locks. */
-#undef HAVE_PTHREAD_RWLOCK
-
/* Define to 1 if the system has the type `ptrdiff_t'. */
#undef HAVE_PTRDIFF_T
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
/* Define to 1 if you have the `scandir' function. */
#undef HAVE_SCANDIR
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
/* Define to 1 if `stat' has the bug that it succeeds when given the
zero-length file name argument. */
#undef HAVE_STAT_EMPTY_STRING_BUG
@@ -262,10 +174,6 @@
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
- uintmax_t. */
-#undef HAVE_STDINT_H_WITH_UINTMAX
-
/* Define to 1 if you have the <stdio_ext.h> header file. */
#undef HAVE_STDIO_EXT_H
@@ -326,37 +234,15 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
-/* Define to 1 if you have the `tsearch' function. */
-#undef HAVE_TSEARCH
-
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to 1 if the system has the type `unsigned long long int'. */
-#undef HAVE_UNSIGNED_LONG_LONG_INT
-
-/* Define to 1 or 0, depending whether the compiler supports simple visibility
- declarations. */
-#undef HAVE_VISIBILITY
-
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
/* Define to 1 if you have the <wchar.h> header file. */
#undef HAVE_WCHAR_H
-/* Define if you have the 'wchar_t' type. */
-#undef HAVE_WCHAR_T
-
-/* Define to 1 if you have the `wcslen' function. */
-#undef HAVE_WCSLEN
-
-/* Define if you have the 'wint_t' type. */
-#undef HAVE_WINT_T
-
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
@@ -369,15 +255,6 @@
/* Define to 1 if you have the `__argz_stringify' function. */
#undef HAVE___ARGZ_STRINGIFY
-/* Define to 1 if you have the `__fsetlocking' function. */
-#undef HAVE___FSETLOCKING
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#undef INTDIV0_RAISES_SIGFPE
-
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
@@ -400,19 +277,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-#undef PRI_MACROS_BROKEN
-
/* Tux Of Math Command */
#undef PROGRAM_NAME
-/* Define if the pthread_in_use() detection is hard. */
-#undef PTHREAD_IN_USE_DETECTION_HARD
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
- it. */
-#undef SIZE_MAX
-
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at runtime.
@@ -424,66 +291,14 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define if the POSIX multithreading library can be used. */
-#undef USE_POSIX_THREADS
-
-/* Define if references to the POSIX multithreading library should be made
- weak. */
-#undef USE_POSIX_THREADS_WEAK
-
-/* Define if the GNU Pth multithreading library can be used. */
-#undef USE_PTH_THREADS
-
-/* Define if references to the GNU Pth multithreading library should be made
- weak. */
-#undef USE_PTH_THREADS_WEAK
-
-/* Define if the old Solaris multithreading library can be used. */
-#undef USE_SOLARIS_THREADS
-
-/* Define if references to the old Solaris multithreading library should be
- made weak. */
-#undef USE_SOLARIS_THREADS_WEAK
-
-/* Define if the Win32 multithreading API can be used. */
-#undef USE_WIN32_THREADS
-
/* Version number of package */
#undef VERSION
-/* Define to 1 if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
- this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
@@ -496,49 +311,9 @@
/* Define to `int' if <sys/types.h> does not define. */
#undef mode_t
-/* Define as the type of the result of subtracting two pointers, if the system
- doesn't define it. */
-#undef ptrdiff_t
-
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
-/* Define to unsigned long or unsigned long long if <stdint.h> and
- <inttypes.h> don't define. */
-#undef uintmax_t
-
/* Define to empty if the keyword `volatile' does not work. Warning: valid
code using `volatile' can become incorrect without. Disable with care. */
#undef volatile
-
-
-#define __libc_lock_t gl_lock_t
-#define __libc_lock_define gl_lock_define
-#define __libc_lock_define_initialized gl_lock_define_initialized
-#define __libc_lock_init gl_lock_init
-#define __libc_lock_lock gl_lock_lock
-#define __libc_lock_unlock gl_lock_unlock
-#define __libc_lock_recursive_t gl_recursive_lock_t
-#define __libc_lock_define_recursive gl_recursive_lock_define
-#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized
-#define __libc_lock_init_recursive gl_recursive_lock_init
-#define __libc_lock_lock_recursive gl_recursive_lock_lock
-#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
-#define glthread_in_use libintl_thread_in_use
-#define glthread_lock_init libintl_lock_init
-#define glthread_lock_lock libintl_lock_lock
-#define glthread_lock_unlock libintl_lock_unlock
-#define glthread_lock_destroy libintl_lock_destroy
-#define glthread_rwlock_init libintl_rwlock_init
-#define glthread_rwlock_rdlock libintl_rwlock_rdlock
-#define glthread_rwlock_wrlock libintl_rwlock_wrlock
-#define glthread_rwlock_unlock libintl_rwlock_unlock
-#define glthread_rwlock_destroy libintl_rwlock_destroy
-#define glthread_recursive_lock_init libintl_recursive_lock_init
-#define glthread_recursive_lock_lock libintl_recursive_lock_lock
-#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock
-#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy
-#define glthread_once libintl_once
-#define glthread_once_call libintl_once_call
-#define glthread_once_singlethreaded libintl_once_singlethreaded
-
Modified: tuxmath/trunk/config.sub
===================================================================
--- tuxmath/trunk/config.sub 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/config.sub 2009-03-02 20:54:09 UTC (rev 917)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-01-19'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -122,7 +122,6 @@
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -250,16 +249,13 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
| mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
@@ -281,7 +277,7 @@
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -290,7 +286,7 @@
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k | z80)
+ | z8k)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
@@ -333,17 +329,14 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
| mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
@@ -365,20 +358,20 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-* | z80-*)
+ | z8k-*)
;;
# Recognize the basic CPU types without company name, with glob match.
xtensa*)
@@ -466,10 +459,6 @@
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -537,10 +526,6 @@
basic_machine=m88k-motorola
os=-sysv3
;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
@@ -1143,10 +1128,6 @@
basic_machine=z8k-unknown
os=-sim
;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -1185,7 +1166,7 @@
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1257,7 +1238,6 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1268,7 +1248,7 @@
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1408,9 +1388,6 @@
-zvmoe)
os=-zvmoe
;;
- -dicos*)
- os=-dicos
- ;;
-none)
;;
*)
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/configure 2009-03-02 20:54:09 UTC (rev 917)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.7.2.preview.
+# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.7.2.
#
# Report bugs to <tuxmath-devel at lists.sourceforge.net>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='Tux Of Math Command'
PACKAGE_TARNAME='tuxmath'
-PACKAGE_VERSION='1.7.2.preview'
-PACKAGE_STRING='Tux Of Math Command 1.7.2.preview'
+PACKAGE_VERSION='1.7.2'
+PACKAGE_STRING='Tux Of Math Command 1.7.2'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
ac_unique_file="src/tuxmath.c"
@@ -715,47 +715,15 @@
CCDEPMODE
am__fastdepCC_TRUE
am__fastdepCC_FALSE
-CPP
-GREP
-EGREP
-GLIBC2
-RANLIB
-CFLAG_VISIBILITY
-HAVE_VISIBILITY
-ALLOCA
-PRI_MACROS_BROKEN
-LIBPTH
-LTLIBPTH
-LIBPTH_PREFIX
-LIBTHREAD
-LTLIBTHREAD
-LIBMULTITHREAD
-LTLIBMULTITHREAD
+INTL_MACOSX_LIBS
LIBICONV
LTLIBICONV
-INTLBISON
-GLIBC21
-INTL_MACOSX_LIBS
-HAVE_POSIX_PRINTF
-HAVE_ASPRINTF
-HAVE_SNPRINTF
-HAVE_WPRINTF
-WOE32DLL
-WOE32
-WINDRES
-LTLIBC
-BUILD_INCLUDED_LIBINTL
-USE_INCLUDED_LIBINTL
-CATOBJEXT
-DATADIRNAME
-INSTOBJEXT
-GENCAT
-INTLOBJS
-INTL_LIBTOOL_SUFFIX_PREFIX
INTLLIBS
LIBINTL
LTLIBINTL
POSUB
+CPP
+RANLIB
YACC
YFLAGS
SDL_CONFIG
@@ -763,8 +731,12 @@
SDL_LIBS
BUILD_MINGW32_TRUE
BUILD_MINGW32_FALSE
+ALLOCA
+GREP
+EGREP
LIBOBJS
POW_LIB
+WINDRES
NSI_INSTALL_DIR
NSI_BUILD_TRUE
NSI_BUILD_FALSE
@@ -1285,7 +1257,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Tux Of Math Command 1.7.2.preview to adapt to many kinds of systems.
+\`configure' configures Tux Of Math Command 1.7.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1356,7 +1328,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Tux Of Math Command 1.7.2.preview:";;
+ short | recursive ) echo "Configuration of Tux Of Math Command 1.7.2:";;
esac
cat <<\_ACEOF
@@ -1366,9 +1338,6 @@
--disable-nls do not use Native Language Support
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
- --enable-threads={posix|solaris|pth|win32}
- specify multithreading API
- --disable-threads build without multithread safety
--disable-rpath do not hardcode runtime library paths
--disable-sdltest Do not try to compile and run a test SDL program
@@ -1376,11 +1345,8 @@
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-gnu-ld assume the C compiler uses GNU ld default=no
- --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib
- --without-libpth-prefix don't search for libpth in includedir and libdir
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
- --with-included-gettext use the GNU gettext library included here
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and libdir
--with-sdl-prefix=PFX Prefix where SDL is installed (optional)
@@ -1468,7 +1434,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Tux Of Math Command configure 1.7.2.preview
+Tux Of Math Command configure 1.7.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1482,7 +1448,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Tux Of Math Command $as_me 1.7.2.preview, which was
+It was created by Tux Of Math Command $as_me 1.7.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2349,7 +2315,7 @@
# Define the identity of the package.
PACKAGE='tuxmath'
- VERSION='1.7.2.preview'
+ VERSION='1.7.2'
cat >>confdefs.h <<_ACEOF
@@ -2817,6 +2783,22 @@
ac_config_commands="$ac_config_commands po-directories"
+
+ 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"
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -3907,2623 +3889,6 @@
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
-
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
-else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
- $ac_path_GREP_found && break 3
- done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-else
- ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
- $ac_path_EGREP_found && break 3
- done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
-
- fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-
- { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2 or newer" >&5
-echo $ECHO_N "checking whether we are using the GNU C Library 2 or newer... $ECHO_C" >&6; }
-if test "${ac_cv_gnu_library_2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2)
- Lucky GNU user
- #endif
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Lucky GNU user" >/dev/null 2>&1; then
- ac_cv_gnu_library_2=yes
-else
- ac_cv_gnu_library_2=no
-fi
-rm -f conftest*
-
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2" >&5
-echo "${ECHO_T}$ac_cv_gnu_library_2" >&6; }
-
- GLIBC2="$ac_cv_gnu_library_2"
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-
- CFLAG_VISIBILITY=
- HAVE_VISIBILITY=0
- if test -n "$GCC"; then
- { echo "$as_me:$LINENO: checking for simple visibility declarations" >&5
-echo $ECHO_N "checking for simple visibility declarations... $ECHO_C" >&6; }
- if test "${gl_cv_cc_visibility+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -fvisibility=hidden"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-extern __attribute__((__visibility__("hidden"))) int hiddenvar;
- extern __attribute__((__visibility__("default"))) int exportedvar;
- extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
- extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gl_cv_cc_visibility=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_cc_visibility=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$gl_save_CFLAGS"
-fi
-
- { echo "$as_me:$LINENO: result: $gl_cv_cc_visibility" >&5
-echo "${ECHO_T}$gl_cv_cc_visibility" >&6; }
- if test $gl_cv_cc_visibility = yes; then
- CFLAG_VISIBILITY="-fvisibility=hidden"
- HAVE_VISIBILITY=1
- fi
- fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_VISIBILITY $HAVE_VISIBILITY
-_ACEOF
-
-
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_inline=$ac_kw
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
-
-case $ac_cv_c_inline in
- inline | yes) ;;
- *)
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
- esac
- cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
- ;;
-esac
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_size_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_size_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-
- { echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
-if test "${gl_cv_header_stdint_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <stdint.h>
-int
-main ()
-{
-uintmax_t i = (uintmax_t) -1; return !i;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gl_cv_header_stdint_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_header_stdint_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
-echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; }
- if test $gl_cv_header_stdint_h = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-_ACEOF
-
- fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments. Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
- if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_working_alloca_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_working_alloca_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-# endif
-# endif
-# endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
- if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_alloca_works=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_alloca_works=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-else
- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble. Some versions do not even contain alloca or
-# contain a buggy version. If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
-
-
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "webecray" >/dev/null 2>&1; then
- ac_cv_os_cray=yes
-else
- ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
- break
-fi
-
- done
-fi
-
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_c_stack_direction=0
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-find_stack_direction ()
-{
- static char *addr = 0;
- auto char dummy;
- if (addr == 0)
- {
- addr = &dummy;
- return find_stack_direction ();
- }
- else
- return (&dummy > addr) ? 1 : -1;
-}
-
-int
-main ()
-{
- return find_stack_direction () < 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_stack_direction=1
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-
-
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------------------- ##
-## Report this to tuxmath-devel at lists.sourceforge.net ##
-## -------------------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_func in getpagesize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-{ echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_mmap_fixed_mapped=no
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
- Here is a matrix of mmap possibilities:
- mmap private not fixed
- mmap private fixed at somewhere currently unmapped
- mmap private fixed at somewhere already mapped
- mmap shared not fixed
- mmap shared fixed at somewhere currently unmapped
- mmap shared fixed at somewhere already mapped
- For private mappings, we should verify that changes cannot be read()
- back from the file, nor mmap's back from the file at a different
- address. (There have been systems where private was not correctly
- implemented like the infamous i386 svr4.0, and systems where the
- VM page cache was not coherent with the file system buffer cache
- like early versions of FreeBSD and possibly contemporary NetBSD.)
- For shared mappings, we should conversely verify that changes get
- propagated back to all the places they're supposed to be.
-
- Grep wants private fixed already mapped.
- The main things grep needs to know about mmap are:
- * does it exist and is it safe to write into the mmap'd area
- * how to use it (BSD variants) */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h. */
-#ifndef HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h. */
-# ifndef HAVE_SYS_PARAM_H
-# define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-# define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-# ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-# ifdef EXEC_PAGESIZE
-# define getpagesize() EXEC_PAGESIZE
-# else /* no EXEC_PAGESIZE */
-# ifdef NBPG
-# define getpagesize() NBPG * CLSIZE
-# ifndef CLSIZE
-# define CLSIZE 1
-# endif /* no CLSIZE */
-# else /* no NBPG */
-# ifdef NBPC
-# define getpagesize() NBPC
-# else /* no NBPC */
-# ifdef PAGESIZE
-# define getpagesize() PAGESIZE
-# endif /* PAGESIZE */
-# endif /* no NBPC */
-# endif /* no NBPG */
-# endif /* no EXEC_PAGESIZE */
-# else /* no HAVE_SYS_PARAM_H */
-# define getpagesize() 8192 /* punt totally */
-# endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
- char *data, *data2, *data3;
- int i, pagesize;
- int fd;
-
- pagesize = getpagesize ();
-
- /* First, make a file with some known garbage in it. */
- data = (char *) malloc (pagesize);
- if (!data)
- return 1;
- for (i = 0; i < pagesize; ++i)
- *(data + i) = rand ();
- umask (0);
- fd = creat ("conftest.mmap", 0600);
- if (fd < 0)
- return 1;
- if (write (fd, data, pagesize) != pagesize)
- return 1;
- close (fd);
-
- /* Next, try to mmap the file at a fixed address which already has
- something else allocated at it. If we can, also make sure that
- we see the same garbage. */
- fd = open ("conftest.mmap", O_RDWR);
- if (fd < 0)
- return 1;
- data2 = (char *) malloc (2 * pagesize);
- if (!data2)
- return 1;
- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
- return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data2 + i))
- return 1;
-
- /* Finally, make sure that changes to the mapped area do not
- percolate back to the file as seen by read(). (This is a bug on
- some variants of i386 svr4.0.) */
- for (i = 0; i < pagesize; ++i)
- *(data2 + i) = *(data2 + i) + 1;
- data3 = (char *) malloc (pagesize);
- if (!data3)
- return 1;
- if (read (fd, data3, pagesize) != pagesize)
- return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data3 + i))
- return 1;
- close (fd);
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_mmap_fixed_mapped=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
-
-fi
-rm -f conftest.mmap
-
-
-
- { echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
-echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6; }
-if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- gt_cv_int_divbyzero_sigfpe=
- case "$host_os" in
- macos* | darwin[6-9]* | darwin[1-9][0-9]*)
- # On MacOS X 10.2 or newer, just assume the same as when cross-
- # compiling. If we were to perform the real test, 1 Crash Report
- # dialog window would pop up.
- case "$host_cpu" in
- i[34567]86 | x86_64)
- gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
- esac
- ;;
- esac
- if test -z "$gt_cv_int_divbyzero_sigfpe"; then
- if test "$cross_compiling" = yes; then
-
- # Guess based on the CPU.
- case "$host_cpu" in
- alpha* | i[34567]86 | x86_64 | m68k | s390*)
- gt_cv_int_divbyzero_sigfpe="guessing yes";;
- *)
- gt_cv_int_divbyzero_sigfpe="guessing no";;
- esac
-
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-sigfpe_handler (int sig)
-{
- /* 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);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gt_cv_int_divbyzero_sigfpe=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_int_divbyzero_sigfpe=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
- fi
-
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
-echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6; }
- case "$gt_cv_int_divbyzero_sigfpe" in
- *yes) value=1;;
- *) value=0;;
- esac
-
-cat >>confdefs.h <<_ACEOF
-#define INTDIV0_RAISES_SIGFPE $value
-_ACEOF
-
-
-
- { echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
-if test "${gl_cv_header_inttypes_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <inttypes.h>
-int
-main ()
-{
-uintmax_t i = (uintmax_t) -1; return !i;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gl_cv_header_inttypes_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_header_inttypes_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; }
- if test $gl_cv_header_inttypes_h = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-_ACEOF
-
- fi
-
-
- { echo "$as_me:$LINENO: checking for unsigned long long int" >&5
-echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6; }
-if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-unsigned long long int ull = 18446744073709551615ULL;
- typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
- ? 1 : -1)];
- int i = 63;
-int
-main ()
-{
-unsigned long long int ullmax = 18446744073709551615ull;
- return (ull << 63 | ull >> 63 | ull << i | ull >> i
- | ullmax / ull | ullmax % ull);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_type_unsigned_long_long_int=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_unsigned_long_long_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6; }
- if test $ac_cv_type_unsigned_long_long_int = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-_ACEOF
-
- fi
-
-
-
-
- if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-
- test $ac_cv_type_unsigned_long_long_int = yes \
- && ac_type='unsigned long long' \
- || ac_type='unsigned long'
-
-cat >>confdefs.h <<_ACEOF
-#define uintmax_t $ac_type
-_ACEOF
-
- else
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTMAX_T 1
-_ACEOF
-
- fi
-
-
-
-for ac_header in inttypes.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------------------- ##
-## Report this to tuxmath-devel at lists.sourceforge.net ##
-## -------------------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
- if test $ac_cv_header_inttypes_h = yes; then
- { echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
-echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6; }
-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gt_cv_inttypes_pri_broken=no
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_inttypes_pri_broken=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
-echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6; }
- fi
- if test "$gt_cv_inttypes_pri_broken" = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define PRI_MACROS_BROKEN 1
-_ACEOF
-
- PRI_MACROS_BROKEN=1
- else
- PRI_MACROS_BROKEN=0
- fi
-
-
-
-{ echo "$as_me:$LINENO: checking for AIX" >&5
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef _AIX
- yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define _ALL_SOURCE 1
-_ACEOF
-
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-rm -f conftest*
-
-
-if test "${ac_cv_header_minix_config_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <minix/config.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <minix/config.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------------------- ##
-## Report this to tuxmath-devel at lists.sourceforge.net ##
-## -------------------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_minix_config_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
-
-fi
-if test $ac_cv_header_minix_config_h = yes; then
- MINIX=yes
-else
- MINIX=
-fi
-
-
-if test "$MINIX" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_SOURCE 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_1_SOURCE 2
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define _MINIX 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-
-
-
-
- { echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
-echo $ECHO_N "checking whether it is safe to define __EXTENSIONS__... $ECHO_C" >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-# define __EXTENSIONS__ 1
- $ac_includes_default
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_safe_to_define___extensions__=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_safe_to_define___extensions__=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
-echo "${ECHO_T}$ac_cv_safe_to_define___extensions__" >&6; }
- test $ac_cv_safe_to_define___extensions__ = yes &&
- cat >>confdefs.h <<\_ACEOF
-#define __EXTENSIONS__ 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define _TANDEM_SOURCE 1
-_ACEOF
-
-
-
-
-
-
- # Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then
- enableval=$enable_threads; gl_use_threads=$enableval
-else
- case "$host_os" in
- osf*) gl_use_threads=no ;;
- *) gl_use_threads=yes ;;
- esac
-
-fi
-
- if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
- # For using <pthread.h>:
- case "$host_os" in
- osf*)
- # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
- # groks <pthread.h>. cc also understands the flag -pthread, but
- # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
- # 2. putting a flag into CPPFLAGS that has an effect on the linker
- # causes the AC_TRY_LINK test below to succeed unexpectedly,
- # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
- CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- ;;
- esac
- # Some systems optimize for single-threaded programs by default, and
- # need special flags to disable these optimizations. For example, the
- # definition of 'errno' in <errno.h>.
- case "$host_os" in
- aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
- solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
- esac
- fi
-
-
-
-
-
- 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"
-
-
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -6693,702 +4058,12 @@
- gl_threads_api=none
- LIBTHREAD=
- LTLIBTHREAD=
- LIBMULTITHREAD=
- LTLIBMULTITHREAD=
- if test "$gl_use_threads" != no; then
- { echo "$as_me:$LINENO: checking whether imported symbols can be declared weak" >&5
-echo $ECHO_N "checking whether imported symbols can be declared weak... $ECHO_C" >&6; }
- gl_have_weak=no
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-extern void xyzzy ();
-#pragma weak xyzzy
-int
-main ()
-{
-xyzzy();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gl_have_weak=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $gl_have_weak" >&5
-echo "${ECHO_T}$gl_have_weak" >&6; }
- if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
- # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
- # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
- if test "${ac_cv_header_pthread_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for pthread.h" >&5
-echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_pthread_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking pthread.h usability" >&5
-echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <pthread.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-# Is the header present?
-{ echo "$as_me:$LINENO: checking pthread.h presence" >&5
-echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------------------- ##
-## Report this to tuxmath-devel at lists.sourceforge.net ##
-## -------------------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for pthread.h" >&5
-echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_pthread_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_pthread_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
-
-fi
-if test $ac_cv_header_pthread_h = yes; then
- gl_have_pthread_h=yes
-else
- gl_have_pthread_h=no
-fi
-
-
- if test "$gl_have_pthread_h" = yes; then
- # Other possible tests:
- # -lpthreads (FSU threads, PCthreads)
- # -lgthreads
- gl_have_pthread=
- # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
- # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
- # the second one only in libpthread, and lock.c needs it.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-int
-main ()
-{
-pthread_mutex_lock((pthread_mutex_t*)0);
- pthread_mutexattr_init((pthread_mutexattr_t*)0);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gl_have_pthread=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- # Test for libpthread by looking for pthread_kill. (Not pthread_self,
- # since it is defined as a macro on OSF/1.)
- if test -n "$gl_have_pthread"; then
- # The program links fine without libpthread. But it may actually
- # need to link with libpthread in order to create multiple threads.
- { echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
-echo $ECHO_N "checking for pthread_kill in -lpthread... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_kill ();
-int
-main ()
-{
-return pthread_kill ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_pthread_pthread_kill=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pthread_pthread_kill=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test $ac_cv_lib_pthread_pthread_kill = yes; then
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
- # On Solaris and HP-UX, most pthread functions exist also in libc.
- # Therefore pthread_in_use() needs to actually try to create a
- # thread: pthread_create from libc will fail, whereas
- # pthread_create will actually create a thread.
- case "$host_os" in
- solaris* | hpux*)
-
-cat >>confdefs.h <<\_ACEOF
-#define PTHREAD_IN_USE_DETECTION_HARD 1
-_ACEOF
-
- esac
-
-fi
-
- else
- # Some library is needed. Try libpthread and libc_r.
- { echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
-echo $ECHO_N "checking for pthread_kill in -lpthread... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_kill ();
-int
-main ()
-{
-return pthread_kill ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_pthread_pthread_kill=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pthread_pthread_kill=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test $ac_cv_lib_pthread_pthread_kill = yes; then
- gl_have_pthread=yes
- LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-fi
-
- if test -z "$gl_have_pthread"; then
- # For FreeBSD 4.
- { echo "$as_me:$LINENO: checking for pthread_kill in -lc_r" >&5
-echo $ECHO_N "checking for pthread_kill in -lc_r... $ECHO_C" >&6; }
-if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_kill ();
-int
-main ()
-{
-return pthread_kill ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_c_r_pthread_kill=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_c_r_pthread_kill=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_kill" >&5
-echo "${ECHO_T}$ac_cv_lib_c_r_pthread_kill" >&6; }
-if test $ac_cv_lib_c_r_pthread_kill = yes; then
- gl_have_pthread=yes
- LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
- LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
-fi
-
- fi
- fi
- if test -n "$gl_have_pthread"; then
- gl_threads_api=posix
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_POSIX_THREADS 1
-_ACEOF
-
- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
- if test $gl_have_weak = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_POSIX_THREADS_WEAK 1
-_ACEOF
-
- LIBTHREAD=
- LTLIBTHREAD=
- fi
- fi
- # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
- # pthread_rwlock_* functions.
- { echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5
-echo $ECHO_N "checking for pthread_rwlock_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-
-typedef pthread_rwlock_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_pthread_rwlock_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_pthread_rwlock_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5
-echo "${ECHO_T}$ac_cv_type_pthread_rwlock_t" >&6; }
-if test $ac_cv_type_pthread_rwlock_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_RWLOCK 1
-_ACEOF
-
-fi
-
- # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-int
-main ()
-{
-#if __FreeBSD__ == 4
-error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#else
-int x = (int)PTHREAD_MUTEX_RECURSIVE;
-return !x;
-#endif
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-_ACEOF
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- fi
- if test -z "$gl_have_pthread"; then
- if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
- gl_have_solaristhread=
- gl_save_LIBS="$LIBS"
- LIBS="$LIBS -lthread"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <thread.h>
-#include <synch.h>
-int
-main ()
-{
-thr_self();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gl_have_solaristhread=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gl_save_LIBS"
- if test -n "$gl_have_solaristhread"; then
- gl_threads_api=solaris
- LIBTHREAD=-lthread
- LTLIBTHREAD=-lthread
- LIBMULTITHREAD="$LIBTHREAD"
- LTLIBMULTITHREAD="$LTLIBTHREAD"
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_SOLARIS_THREADS 1
-_ACEOF
-
- if test $gl_have_weak = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_SOLARIS_THREADS_WEAK 1
-_ACEOF
-
- LIBTHREAD=
- LTLIBTHREAD=
- fi
- fi
- fi
- fi
- if test "$gl_use_threads" = pth; then
- gl_save_CPPFLAGS="$CPPFLAGS"
-
-
-
-
-
- { echo "$as_me:$LINENO: checking how to link with libpth" >&5
-echo $ECHO_N "checking how to link with libpth... $ECHO_C" >&6; }
-if test "${ac_cv_libpth_libs+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-
-
use_additional=yes
acl_save_prefix="$prefix"
@@ -7403,593 +4078,6 @@
prefix="$acl_save_prefix"
-# Check whether --with-libpth-prefix was given.
-if test "${with_libpth_prefix+set}" = set; then
- withval=$with_libpth_prefix;
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- fi
- fi
-
-fi
-
- LIBPTH=
- LTLIBPTH=
- INCPTH=
- LIBPTH_PREFIX=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='pth '
- 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"
- 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" || LIBPTH="${LIBPTH}${LIBPTH:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$value"
- else
- :
- fi
- else
- found_dir=
- found_la=
- found_so=
- found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
- if test $use_additional = yes; then
- dir="$additional_libdir"
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- else
- 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
- if test "$acl_hardcode_direct" = yes; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- 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
- haveit=
- for x in $LDFLAGS $LIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir"
- fi
- if test "$acl_hardcode_minus_L" != no; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- else
- LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_a"
- else
- LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir -l$name"
- fi
- fi
- additional_includedir=
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- LIBPTH_PREFIX="$basedir"
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- 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 $INCPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- 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
- INCPTH="${INCPTH}${INCPTH:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- if test -n "$found_la"; then
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; 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 $LIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- 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
- LIBPTH="${LIBPTH}${LIBPTH:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- 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
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- 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
- 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*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- LIBPTH="${LIBPTH}${LIBPTH:+ }$dep"
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$dep"
- ;;
- esac
- done
- fi
- else
- LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
- else
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-R$found_dir"
- done
- fi
-
- ac_cv_libpth_libs="$LIBPTH"
- ac_cv_libpth_ltlibs="$LTLIBPTH"
- ac_cv_libpth_cppflags="$INCPTH"
- ac_cv_libpth_prefix="$LIBPTH_PREFIX"
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_libpth_libs" >&5
-echo "${ECHO_T}$ac_cv_libpth_libs" >&6; }
- LIBPTH="$ac_cv_libpth_libs"
- LTLIBPTH="$ac_cv_libpth_ltlibs"
- INCPTH="$ac_cv_libpth_cppflags"
- LIBPTH_PREFIX="$ac_cv_libpth_prefix"
-
- for element in $INCPTH; do
- haveit=
- for x in $CPPFLAGS; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
- fi
- done
-
-
-
-
- HAVE_LIBPTH=yes
-
-
-
- gl_have_pth=
- gl_save_LIBS="$LIBS"
- LIBS="$LIBS -lpth"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pth.h>
-int
-main ()
-{
-pth_self();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gl_have_pth=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gl_save_LIBS"
- if test -n "$gl_have_pth"; then
- gl_threads_api=pth
- LIBTHREAD="$LIBPTH"
- LTLIBTHREAD="$LTLIBPTH"
- LIBMULTITHREAD="$LIBTHREAD"
- LTLIBMULTITHREAD="$LTLIBTHREAD"
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_PTH_THREADS 1
-_ACEOF
-
- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
- if test $gl_have_weak = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_PTH_THREADS_WEAK 1
-_ACEOF
-
- LIBTHREAD=
- LTLIBTHREAD=
- fi
- fi
- else
- CPPFLAGS="$gl_save_CPPFLAGS"
- fi
- fi
- if test -z "$gl_have_pthread"; then
- if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
- if { case "$host_os" in
- mingw*) true;;
- *) false;;
- esac
- }; then
- gl_threads_api=win32
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_WIN32_THREADS 1
-_ACEOF
-
- fi
- fi
- fi
- fi
- { echo "$as_me:$LINENO: checking for multithread API to use" >&5
-echo $ECHO_N "checking for multithread API to use... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $gl_threads_api" >&5
-echo "${ECHO_T}$gl_threads_api" >&6; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- use_additional=yes
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
-
# Check whether --with-libiconv-prefix was given.
if test "${with_libiconv_prefix+set}" = set; then
withval=$with_libiconv_prefix;
@@ -8411,270 +4499,45 @@
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BUILTIN_EXPECT 1
-_ACEOF
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-for ac_header in argz.h inttypes.h limits.h unistd.h sys/param.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------------------- ##
-## Report this to tuxmath-devel at lists.sourceforge.net ##
-## -------------------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-fi
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in getcwd getegid geteuid getgid getuid mempcpy munmap \
- stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
- argz_next __fsetlocking
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
+#include <CoreFoundation/CFPreferences.h>
int
main ()
{
-return $ac_func ();
+CFPreferencesCopyAppValue(NULL, NULL)
;
return 0;
}
@@ -8697,62 +4560,57 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
+ gt_cv_func_CFPreferencesCopyAppValue=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
+ gt_cv_func_CFPreferencesCopyAppValue=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
_ACEOF
-fi
-done
-
-
-
- { echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
-echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
+ fi
+ { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+#include <CoreFoundation/CFLocale.h>
int
main ()
{
-
-#ifndef feof_unlocked
- char *p = (char *) feof_unlocked;
-#endif
-
+CFLocaleCopyCurrent();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -8761,34 +4619,74 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_feof_unlocked=yes
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ gt_cv_func_CFLocaleCopyCurrent=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_have_decl_feof_unlocked=no
+ gt_cv_func_CFLocaleCopyCurrent=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6; }
- if test $ac_cv_have_decl_feof_unlocked = yes; then
- gt_value=1
- else
- gt_value=0
- fi
+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FEOF_UNLOCKED $gt_value
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CFLOCALECOPYCURRENT 1
_ACEOF
+ 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
- { echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
-echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
+
+
+
+
+ LIBINTL=
+ LTLIBINTL=
+ POSUB=
+
+ case " $gt_needs " in
+ *" need-formatstring-macros "*) gt_api_version=3 ;;
+ *" need-ngettext "*) gt_api_version=2 ;;
+ *) gt_api_version=1 ;;
+ esac
+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+
+
+ if test $gt_api_version -ge 3; then
+ gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+'
+ else
+ gt_revision_test_code=
+ fi
+ if test $gt_api_version -ge 2; then
+ gt_expression_test_code=' + * ngettext ("", "", 0)'
+ else
+ gt_expression_test_code=
+ fi
+
+ { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
+if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -8797,27 +4695,27 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
int
main ()
{
-
-#ifndef fgets_unlocked
- char *p = (char *) fgets_unlocked;
-#endif
-
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -8826,36 +4724,29 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_fgets_unlocked=yes
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$gt_func_gnugettext_libc=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_have_decl_fgets_unlocked=no
+ eval "$gt_func_gnugettext_libc=no"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6; }
- if test $ac_cv_have_decl_fgets_unlocked = yes; then
- gt_value=1
- else
- gt_value=0
- fi
+ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FGETS_UNLOCKED $gt_value
-_ACEOF
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-
-
-
am_save_CPPFLAGS="$CPPFLAGS"
for element in $INCICONV; do
@@ -9137,2887 +5028,11 @@
- if test "$am_cv_func_iconv" = yes; then
- { echo "$as_me:$LINENO: checking for iconv declaration" >&5
-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
- if test "${am_cv_proto_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <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
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- am_cv_proto_iconv_arg1=""
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- am_cv_proto_iconv_arg1="const"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 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);"
-fi
-
- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- { echo "$as_me:$LINENO: result: ${ac_t:-
- }$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
- }$am_cv_proto_iconv" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define ICONV_CONST $am_cv_proto_iconv_arg1
-_ACEOF
-
- fi
-
-
- { echo "$as_me:$LINENO: checking for NL_LOCALE_NAME macro" >&5
-echo $ECHO_N "checking for NL_LOCALE_NAME macro... $ECHO_C" >&6; }
-if test "${gt_cv_nl_locale_name+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <langinfo.h>
-#include <locale.h>
-int
-main ()
-{
-char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));
- return !cs;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gt_cv_nl_locale_name=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_nl_locale_name=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_nl_locale_name" >&5
-echo "${ECHO_T}$gt_cv_nl_locale_name" >&6; }
- if test $gt_cv_nl_locale_name = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NL_LOCALE_NAME 1
-_ACEOF
-
- fi
-
- for ac_prog in bison
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_INTLBISON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$INTLBISON"; then
- ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_INTLBISON="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-INTLBISON=$ac_cv_prog_INTLBISON
-if test -n "$INTLBISON"; then
- { echo "$as_me:$LINENO: result: $INTLBISON" >&5
-echo "${ECHO_T}$INTLBISON" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$INTLBISON" && break
-done
-
- if test -z "$INTLBISON"; then
- ac_verc_fail=yes
- else
- { echo "$as_me:$LINENO: checking version of bison" >&5
-echo $ECHO_N "checking version of bison... $ECHO_C" >&6; }
- 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].*)
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- esac
- { echo "$as_me:$LINENO: result: $ac_prog_version" >&5
-echo "${ECHO_T}$ac_prog_version" >&6; }
- fi
- if test $ac_verc_fail = yes; then
- INTLBISON=:
- fi
-
-
- { echo "$as_me:$LINENO: checking for long long int" >&5
-echo $ECHO_N "checking for long long int... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long_int+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Test preprocessor. */
- #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
- error in preprocessor;
- #endif
- #if ! (18446744073709551615ULL <= -1ull)
- error in preprocessor;
- #endif
- /* Test literals. */
- long long int ll = 9223372036854775807ll;
- long long int nll = -9223372036854775807LL;
- unsigned long long int ull = 18446744073709551615ULL;
- /* Test constant expressions. */
- typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
- ? 1 : -1)];
- typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
- ? 1 : -1)];
- int i = 63;
-int
-main ()
-{
-/* Test availability of runtime routines for shift and division. */
- long long int llmax = 9223372036854775807ll;
- unsigned long long int ullmax = 18446744073709551615ull;
- return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
- | (llmax / ll) | (llmax % ll)
- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
- | (ullmax / ull) | (ullmax % ull));
- ;
- return 0;
-}
-
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- if test "$cross_compiling" = yes; then
- ac_cv_type_long_long_int=yes
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <limits.h>
- #ifndef LLONG_MAX
- # define HALF \
- (1LL << (sizeof (long long int) * CHAR_BIT - 2))
- # define LLONG_MAX (HALF - 1 + HALF)
- #endif
-int
-main ()
-{
-long long int n = 1;
- int i;
- for (i = 0; ; i++)
- {
- long long int m = n << i;
- if (m >> i != n)
- return 1;
- if (LLONG_MAX / 2 < m)
- break;
- }
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_long_long_int=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_type_long_long_int=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_long_long_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_long_int" >&6; }
- if test $ac_cv_type_long_long_int = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG_INT 1
-_ACEOF
-
- fi
-
-
- { echo "$as_me:$LINENO: checking for wchar_t" >&5
-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
-if test "${gt_cv_c_wchar_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
- wchar_t foo = (wchar_t)'\0';
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gt_cv_c_wchar_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_c_wchar_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
-echo "${ECHO_T}$gt_cv_c_wchar_t" >&6; }
- if test $gt_cv_c_wchar_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WCHAR_T 1
-_ACEOF
-
- fi
-
-
- { echo "$as_me:$LINENO: checking for wint_t" >&5
-echo $ECHO_N "checking for wint_t... $ECHO_C" >&6; }
-if test "${gt_cv_c_wint_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
- before <wchar.h>. */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
- wint_t foo = (wchar_t)'\0';
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gt_cv_c_wint_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_c_wint_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
-echo "${ECHO_T}$gt_cv_c_wint_t" >&6; }
- if test $gt_cv_c_wint_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINT_T 1
-_ACEOF
-
- fi
-
-
-
-
- { echo "$as_me:$LINENO: checking for intmax_t" >&5
-echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; }
-if test "${gt_cv_c_intmax_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <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
-
-int
-main ()
-{
-intmax_t x = -1;
- return !x;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gt_cv_c_intmax_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_c_intmax_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
-echo "${ECHO_T}$gt_cv_c_intmax_t" >&6; }
- if test $gt_cv_c_intmax_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INTMAX_T 1
-_ACEOF
-
- fi
-
-
-
- { echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
-echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6; }
-if test "${gt_cv_func_printf_posix+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- if test "$cross_compiling" = yes; then
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
- notposix
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "notposix" >/dev/null 2>&1; then
- gt_cv_func_printf_posix="guessing no"
-else
- gt_cv_func_printf_posix="guessing yes"
-fi
-rm -f conftest*
-
-
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#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);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gt_cv_func_printf_posix=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_func_printf_posix=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
-echo "${ECHO_T}$gt_cv_func_printf_posix" >&6; }
- case $gt_cv_func_printf_posix in
- *yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_PRINTF 1
-_ACEOF
-
- ;;
- esac
-
-
- { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
-echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6; }
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
- Lucky GNU user
- #endif
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Lucky GNU user" >/dev/null 2>&1; then
- ac_cv_gnu_library_2_1=yes
-else
- ac_cv_gnu_library_2_1=no
-fi
-rm -f conftest*
-
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; }
-
- GLIBC21="$ac_cv_gnu_library_2_1"
-
-
-
-
-for ac_header in stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------------------- ##
-## Report this to tuxmath-devel at lists.sourceforge.net ##
-## -------------------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
- { echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
-echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6; }
- if test "${gl_cv_size_max+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- gl_cv_size_max=
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Found it" >/dev/null 2>&1; then
- gl_cv_size_max=yes
-fi
-rm -f conftest*
-
- if test -z "$gl_cv_size_max"; then
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) size_t_bits_minus_1=$ac_lo;;
-'') size_t_bits_minus_1= ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-#include <limits.h>
-static long int longval () { return sizeof (size_t) * CHAR_BIT - 1; }
-static unsigned long int ulongval () { return sizeof (size_t) * CHAR_BIT - 1; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if ((sizeof (size_t) * CHAR_BIT - 1) < 0)
- {
- long int i = longval ();
- if (i != (sizeof (size_t) * CHAR_BIT - 1))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != (sizeof (size_t) * CHAR_BIT - 1))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- size_t_bits_minus_1=`cat conftest.val`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-size_t_bits_minus_1=
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) fits_in_uint=$ac_lo;;
-'') fits_in_uint= ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); }
-static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
- {
- long int i = longval ();
- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- fits_in_uint=`cat conftest.val`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-fits_in_uint=
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
- if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
- if test $fits_in_uint = 1; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
- extern size_t foo;
- extern unsigned long foo;
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- fits_in_uint=0
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $fits_in_uint = 1; then
- gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
- else
- gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
- fi
- else
- gl_cv_size_max='((size_t)~(size_t)0)'
- fi
- fi
-
-fi
-
- { echo "$as_me:$LINENO: result: $gl_cv_size_max" >&5
-echo "${ECHO_T}$gl_cv_size_max" >&6; }
- if test "$gl_cv_size_max" != yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define SIZE_MAX $gl_cv_size_max
-_ACEOF
-
- fi
-
-
-
-
-
-for ac_header in stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------------------- ##
-## Report this to tuxmath-devel at lists.sourceforge.net ##
-## -------------------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
- { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
-echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <CoreFoundation/CFPreferences.h>
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gt_cv_func_CFPreferencesCopyAppValue=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
-_ACEOF
-
- fi
- { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
-echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <CoreFoundation/CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gt_cv_func_CFLocaleCopyCurrent=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_CFLocaleCopyCurrent=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFLOCALECOPYCURRENT 1
-_ACEOF
-
- 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
-
-
-
-
-
-
-
- { echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-typedef ptrdiff_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_ptrdiff_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_ptrdiff_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
-if test $ac_cv_type_ptrdiff_t = yes; then
- :
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define ptrdiff_t long
-_ACEOF
-
-
-fi
-
-
-
-
-for ac_header in stddef.h stdlib.h string.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------------------- ##
-## Report this to tuxmath-devel at lists.sourceforge.net ##
-## -------------------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-for ac_func in asprintf fwprintf putenv setenv setlocale snprintf wcslen
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
- { echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
-echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl__snprintf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef _snprintf
- char *p = (char *) _snprintf;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl__snprintf=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl__snprintf=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6; }
- if test $ac_cv_have_decl__snprintf = yes; then
- gt_value=1
- else
- gt_value=0
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNPRINTF $gt_value
-_ACEOF
-
-
-
- { echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
-echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl__snwprintf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef _snwprintf
- char *p = (char *) _snwprintf;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl__snwprintf=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl__snwprintf=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6; }
- if test $ac_cv_have_decl__snwprintf = yes; then
- gt_value=1
- else
- gt_value=0
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNWPRINTF $gt_value
-_ACEOF
-
-
-
-
- { echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
-echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef getc_unlocked
- char *p = (char *) getc_unlocked;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_getc_unlocked=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_getc_unlocked=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6; }
- if test $ac_cv_have_decl_getc_unlocked = yes; then
- gt_value=1
- else
- gt_value=0
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED $gt_value
-_ACEOF
-
-
-
- case $gt_cv_func_printf_posix in
- *yes) HAVE_POSIX_PRINTF=1 ;;
- *) HAVE_POSIX_PRINTF=0 ;;
- esac
-
- if test "$ac_cv_func_asprintf" = yes; then
- HAVE_ASPRINTF=1
- else
- HAVE_ASPRINTF=0
- fi
-
- if test "$ac_cv_func_snprintf" = yes; then
- HAVE_SNPRINTF=1
- else
- HAVE_SNPRINTF=0
- fi
-
- if test "$ac_cv_func_wprintf" = yes; then
- HAVE_WPRINTF=1
- else
- HAVE_WPRINTF=0
- fi
-
-
-
- { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
-if test "${am_cv_langinfo_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <langinfo.h>
-int
-main ()
-{
-char* cs = nl_langinfo(CODESET); return !cs;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- am_cv_langinfo_codeset=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_langinfo_codeset=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
- if test $am_cv_langinfo_codeset = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
-
- fi
-
-
- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
-if test "${gt_cv_val_LC_MESSAGES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <locale.h>
-int
-main ()
-{
-return LC_MESSAGES
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gt_cv_val_LC_MESSAGES=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_val_LC_MESSAGES=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$gt_cv_val_LC_MESSAGES" >&6; }
- if test $gt_cv_val_LC_MESSAGES = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
-
- fi
-
-
- if test "$enable_shared" = yes; then
- case "$host_os" in
- mingw* | cygwin*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
- is_woe32dll=no
- fi
- WOE32DLL=$is_woe32dll
-
-
- case "$host_os" in
- mingw* | cygwin*) is_woe32=yes ;;
- *) is_woe32=no ;;
- esac
- WOE32=$is_woe32
-
- if test $WOE32 = yes; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$WINDRES"; then
- ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-WINDRES=$ac_cv_prog_WINDRES
-if test -n "$WINDRES"; then
- { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WINDRES"; then
- ac_ct_WINDRES=$WINDRES
- # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_WINDRES"; then
- ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_WINDRES="windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
-if test -n "$ac_ct_WINDRES"; then
- { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_WINDRES" = x; then
- WINDRES=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- WINDRES=$ac_ct_WINDRES
- fi
-else
- WINDRES="$ac_cv_prog_WINDRES"
-fi
-
- fi
-
- case "$host_os" in
- hpux*) LTLIBC="" ;;
- *) LTLIBC="-lc" ;;
- esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
-echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <CoreFoundation/CFPreferences.h>
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gt_cv_func_CFPreferencesCopyAppValue=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
-_ACEOF
-
- fi
- { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
-echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <CoreFoundation/CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- gt_cv_func_CFLocaleCopyCurrent=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_CFLocaleCopyCurrent=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFLOCALECOPYCURRENT 1
-_ACEOF
-
- 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
-
-
-
-
-
-
- BUILD_INCLUDED_LIBINTL=no
- USE_INCLUDED_LIBINTL=no
-
- LIBINTL=
- LTLIBINTL=
- POSUB=
-
- case " $gt_needs " in
- *" need-formatstring-macros "*) gt_api_version=3 ;;
- *" need-ngettext "*) gt_api_version=2 ;;
- *) gt_api_version=1 ;;
- esac
- gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
- gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
- if test "$USE_NLS" = "yes"; then
- gt_use_preinstalled_gnugettext=no
-
- { echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
-echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6; }
-
-# Check whether --with-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
- withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
-else
- nls_cv_force_use_gnu_gettext=no
-fi
-
- { echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
-echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6; }
-
- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-
-
- if test $gt_api_version -ge 3; then
- gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-'
- else
- gt_revision_test_code=
- fi
- if test $gt_api_version -ge 2; then
- gt_expression_test_code=' + * ngettext ("", "", 0)'
- else
- gt_expression_test_code=
- fi
-
- { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$gt_func_gnugettext_libc=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$gt_func_gnugettext_libc=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-
-
-
-
-
use_additional=yes
acl_save_prefix="$prefix"
@@ -12586,26 +5601,7 @@
fi
- if test "$gt_use_preinstalled_gnugettext" != "yes"; then
- nls_cv_use_gnu_gettext=yes
- fi
- fi
- if test "$nls_cv_use_gnu_gettext" = "yes"; then
- BUILD_INCLUDED_LIBINTL=yes
- USE_INCLUDED_LIBINTL=yes
- LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV $LIBTHREAD"
- LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV $LTLIBTHREAD"
- 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
- 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
@@ -12695,36 +5691,7 @@
fi
- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
- BUILD_INCLUDED_LIBINTL=yes
- fi
-
-
-
-
- nls_cv_header_intl=
- nls_cv_header_libgt=
-
- DATADIRNAME=share
-
-
- INSTOBJEXT=.mo
-
-
- GENCAT=gencat
-
-
- INTLOBJS=
- if test "$USE_INCLUDED_LIBINTL" = yes; then
- INTLOBJS="\$(GETTOBJS)"
- fi
-
-
- INTL_LIBTOOL_SUFFIX_PREFIX=
-
-
-
INTLLIBS="$LIBINTL"
@@ -12732,9 +5699,10 @@
+#AM_GNU_GETTEXT
+#AM_GNU_GETTEXT_INTL_SUBDIR
-
# ----------------------------------------------------------------------
# Checks for programs.
# ----------------------------------------------------------------------
@@ -14839,6 +7807,412 @@
# Checks for header files.
# --------------------------------------------------------------------------------------
+
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_GREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_EGREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_stdc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
@@ -17877,7 +11251,7 @@
# Create Makefiles
# ---------------------------------------------------------------
-ac_config_files="$ac_config_files Makefile tuxmath.spec data/Makefile data/fonts/Makefile data/images/Makefile data/images/backgrounds/Makefile data/images/cities/Makefile data/images/comets/Makefile data/images/icons/Makefile data/images/igloos/Makefile data/images/penguins/Makefile data/images/sprites/Makefile data/images/status/Makefile data/images/title/Makefile data/images/tux/Makefile data/images/factoroids/Makefile data/missions/Makefile data/missions/arcade/Makefile data/missions/campaign/Makefile data/missions/campaign/ace/Makefile data/missions/campaign/cadet/Makefile data/missions/campaign/commando/Makefile data/missions/campaign/ranger/Makefile data/missions/campaign/scout/Makefile data/missions/lessons/Makefile data/missions/multiplay/Makefile data/sounds/Makefile doc/Makefile nsis/tuxmath.nsi nsis/tuxmath_with_conf.nsi src/Makefile intl/Makefile linebreak/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile tuxmath.spec tuxmath_preview.spec data/Makefile data/fonts/Makefile data/images/Makefile data/images/backgrounds/Makefile data/images/cities/Makefile data/images/comets/Makefile data/images/icons/Makefile data/images/igloos/Makefile data/images/penguins/Makefile data/images/sprites/Makefile data/images/status/Makefile data/images/title/Makefile data/images/tux/Makefile data/images/factoroids/Makefile data/missions/Makefile data/missions/arcade/Makefile data/missions/campaign/Makefile data/missions/campaign/ace/Makefile data/missions/campaign/cadet/Makefile data/missions/campaign/commando/Makefile data/missions/campaign/ranger/Makefile data/missions/campaign/scout/Makefile data/missions/lessons/Makefile data/missions/multiplay/Makefile data/sounds/Makefile doc/Makefile nsis/tuxmath.nsi nsis/tuxmath_with_conf.nsi src/Makefile intl/Makefile linebreak/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
@@ -18311,7 +11685,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Tux Of Math Command $as_me 1.7.2.preview, which was
+This file was extended by Tux Of Math Command $as_me 1.7.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18364,7 +11738,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Tux Of Math Command config.status 1.7.2.preview
+Tux Of Math Command config.status 1.7.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -18490,6 +11864,7 @@
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"tuxmath.spec") CONFIG_FILES="$CONFIG_FILES tuxmath.spec" ;;
+ "tuxmath_preview.spec") CONFIG_FILES="$CONFIG_FILES tuxmath_preview.spec" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"data/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES data/fonts/Makefile" ;;
"data/images/Makefile") CONFIG_FILES="$CONFIG_FILES data/images/Makefile" ;;
@@ -18723,47 +12098,15 @@
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-GLIBC2!$GLIBC2$ac_delim
-RANLIB!$RANLIB$ac_delim
-CFLAG_VISIBILITY!$CFLAG_VISIBILITY$ac_delim
-HAVE_VISIBILITY!$HAVE_VISIBILITY$ac_delim
-ALLOCA!$ALLOCA$ac_delim
-PRI_MACROS_BROKEN!$PRI_MACROS_BROKEN$ac_delim
-LIBPTH!$LIBPTH$ac_delim
-LTLIBPTH!$LTLIBPTH$ac_delim
-LIBPTH_PREFIX!$LIBPTH_PREFIX$ac_delim
-LIBTHREAD!$LIBTHREAD$ac_delim
-LTLIBTHREAD!$LTLIBTHREAD$ac_delim
-LIBMULTITHREAD!$LIBMULTITHREAD$ac_delim
-LTLIBMULTITHREAD!$LTLIBMULTITHREAD$ac_delim
+INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
LIBICONV!$LIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
-INTLBISON!$INTLBISON$ac_delim
-GLIBC21!$GLIBC21$ac_delim
-INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
-HAVE_POSIX_PRINTF!$HAVE_POSIX_PRINTF$ac_delim
-HAVE_ASPRINTF!$HAVE_ASPRINTF$ac_delim
-HAVE_SNPRINTF!$HAVE_SNPRINTF$ac_delim
-HAVE_WPRINTF!$HAVE_WPRINTF$ac_delim
-WOE32DLL!$WOE32DLL$ac_delim
-WOE32!$WOE32$ac_delim
-WINDRES!$WINDRES$ac_delim
-LTLIBC!$LTLIBC$ac_delim
-BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim
-USE_INCLUDED_LIBINTL!$USE_INCLUDED_LIBINTL$ac_delim
-CATOBJEXT!$CATOBJEXT$ac_delim
-DATADIRNAME!$DATADIRNAME$ac_delim
-INSTOBJEXT!$INSTOBJEXT$ac_delim
-GENCAT!$GENCAT$ac_delim
-INTLOBJS!$INTLOBJS$ac_delim
-INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
INTLLIBS!$INTLLIBS$ac_delim
LIBINTL!$LIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
+CPP!$CPP$ac_delim
+RANLIB!$RANLIB$ac_delim
YACC!$YACC$ac_delim
YFLAGS!$YFLAGS$ac_delim
SDL_CONFIG!$SDL_CONFIG$ac_delim
@@ -18771,8 +12114,12 @@
SDL_LIBS!$SDL_LIBS$ac_delim
BUILD_MINGW32_TRUE!$BUILD_MINGW32_TRUE$ac_delim
BUILD_MINGW32_FALSE!$BUILD_MINGW32_FALSE$ac_delim
+ALLOCA!$ALLOCA$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
POW_LIB!$POW_LIB$ac_delim
+WINDRES!$WINDRES$ac_delim
NSI_INSTALL_DIR!$NSI_INSTALL_DIR$ac_delim
NSI_BUILD_TRUE!$NSI_BUILD_TRUE$ac_delim
NSI_BUILD_FALSE!$NSI_BUILD_FALSE$ac_delim
@@ -18781,7 +12128,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/configure.ac 2009-03-02 20:54:09 UTC (rev 917)
@@ -1,6 +1,6 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Of Math Command],[1.7.2.preview],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
+AC_INIT([Tux Of Math Command],[1.7.2],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
AC_CONFIG_SRCDIR([src/tuxmath.c])
AC_PREREQ(2.61)
@@ -21,8 +21,9 @@
# Needed for gettext:
AC_GNU_SOURCE
AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_INTL_SUBDIR
+AM_GNU_GETTEXT([external])
+#AM_GNU_GETTEXT
+#AM_GNU_GETTEXT_INTL_SUBDIR
# ----------------------------------------------------------------------
@@ -204,6 +205,7 @@
AC_CONFIG_FILES([
Makefile
tuxmath.spec
+tuxmath_preview.spec
data/Makefile
data/fonts/Makefile
data/images/Makefile
Modified: tuxmath/trunk/data/Makefile.in
===================================================================
--- tuxmath/trunk/data/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -35,23 +35,12 @@
subdir = data
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -79,16 +68,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -96,45 +81,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -154,7 +119,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -162,12 +126,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/fonts/Makefile.in
===================================================================
--- tuxmath/trunk/data/fonts/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/fonts/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -35,23 +35,12 @@
subdir = data/fonts
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -67,16 +56,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -84,45 +69,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -142,7 +107,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -150,12 +114,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -35,23 +35,12 @@
subdir = data/images
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -79,16 +68,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -96,45 +81,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -154,7 +119,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -162,12 +126,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/backgrounds/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/backgrounds/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/backgrounds/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_backgrounds_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/cities/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/cities/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/cities/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_cities_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/comets/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/comets/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/comets/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_comets_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/factoroids/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/factoroids/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/factoroids/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_comets_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/icons/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/icons/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/icons/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_icons_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/igloos/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/igloos/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/igloos/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_igloos_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/penguins/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/penguins/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/penguins/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_penguins_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/sprites/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/sprites/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_sprites_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/status/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/status/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/status/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_status_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/title/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/title/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/title/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_title_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/images/tux/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/tux/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/images/tux/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_tux_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_missions_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -90,16 +79,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -107,45 +92,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -165,7 +130,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -173,12 +137,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/arcade/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/arcade/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/arcade/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_arcade_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/campaign/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/campaign/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/campaign/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_campaign_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -90,16 +79,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -107,45 +92,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -165,7 +130,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -173,12 +137,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/campaign/ace/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/campaign/ace/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/campaign/ace/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_campaignace_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/campaign/cadet/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/campaign/cadet/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/campaign/cadet/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_campaigncadet_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/campaign/commando/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/campaign/commando/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/campaign/commando/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_campaigncommando_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/campaign/ranger/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/campaign/ranger/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/campaign/ranger/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_campaignranger_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/campaign/scout/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/campaign/scout/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/campaign/scout/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_campaignscout_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/lessons/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/lessons/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/lessons/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_lessons_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/missions/multiplay/Makefile.in
===================================================================
--- tuxmath/trunk/data/missions/multiplay/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/missions/multiplay/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_multiplay_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/data/sounds/Makefile.in
===================================================================
--- tuxmath/trunk/data/sounds/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/data/sounds/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_sounds_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/doc/Makefile.in
===================================================================
--- tuxmath/trunk/doc/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/doc/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -37,23 +37,12 @@
DIST_COMMON = $(dist_doc_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -78,16 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -95,45 +80,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -153,7 +118,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -161,12 +125,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/doc/changelog
===================================================================
--- tuxmath/trunk/doc/changelog 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/doc/changelog 2009-03-02 20:54:09 UTC (rev 917)
@@ -1,3 +1,23 @@
+2009.Feb.28
+ Text drawing - as all of this is handled by functions within SDL_extras,
+ there isn't any need for code elsewhere in the program to have to know
+ about TTF fonts - changed BlackOutline() to take int size parameter instead
+ of a TTF_Font* parameter. With a little more work we can confine all mention
+ of SDL_Pango/SDL_ttf to within SDL_extras. When this is done, we will not
+ have any dependencies on specific fonts (or need to bundle them) whenever
+ SDL_Pango is available.
+
+ David Bruce <davidstuartbruce at gmail.com>
+
+2009.Feb.28
+ Build - added tuxmath.spec.in and tuxmath_preview.spec.in, which
+ are processed by configure to give the corresponding specfiles.
+ tuxmath.spec is for rpm packaging of official releases. tuxmath_preview.spec
+ generates rpm packages with "tuxmath_preview" as the title, but otherwise
+ identical.
+
+ David Bruce <davidstuartbruce at gmail.com>
+
2009.Feb.17 (svn.debian.org/tux4kids - revision 892)
Fix convert_utf filename in CMake build. Eliminate the last few
warnings (David got almost all of them), so now tuxmath builds
Modified: tuxmath/trunk/intl/plural.c
===================================================================
--- tuxmath/trunk/intl/plural.c 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/intl/plural.c 2009-03-02 20:54:09 UTC (rev 917)
@@ -1,23 +1,24 @@
+/* A Bison parser, made by GNU Bison 2.3a. */
-/* A Bison parser, made by GNU Bison 2.4.1. */
-
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -46,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3a"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -54,30 +55,23 @@
/* Pure parsers. */
#define YYPURE 1
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
/* Using locations. */
#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
-#define yyparse __gettextparse
-#define yylex __gettextlex
-#define yyerror __gettexterror
-#define yylval __gettextlval
-#define yychar __gettextchar
-#define yydebug __gettextdebug
-#define yynerrs __gettextnerrs
+#define yyparse __gettextparse
+#define yylex __gettextlex
+#define yyerror __gettexterror
+#define yylval __gettextlval
+#define yychar __gettextchar
+#define yydebug __gettextdebug
+#define yynerrs __gettextnerrs
/* Copy the first part of user declarations. */
+/* Line 164 of yacc.c. */
+#line 1 "plural.y"
-/* Line 189 of yacc.c */
-#line 1 "../../trunk/intl/plural.y"
-
/* Expression parsing for plural form selection.
Copyright (C) 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper at cygnus.com>, 2000.
@@ -125,9 +119,6 @@
#define YYPARSE_PARAM arg
-/* Line 189 of yacc.c */
-#line 130 "../../trunk/intl/plural.c"
-
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
@@ -172,31 +163,28 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{
+{/* Line 191 of yacc.c. */
+#line 51 "plural.y"
-/* Line 214 of yacc.c */
-#line 51 "../../trunk/intl/plural.y"
-
unsigned long int num;
enum expression_operator op;
struct expression *exp;
-
-
-
-/* Line 214 of yacc.c */
-#line 188 "../../trunk/intl/plural.c"
-} YYSTYPE;
+}
+/* Line 191 of yacc.c. */
+#line 175 "plural.c"
+ YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
#endif
-/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 57 "../../trunk/intl/plural.y"
+/* Copy the second part of user declarations. */
+/* Line 221 of yacc.c. */
+#line 57 "plural.y"
+
/* Prototypes for local functions. */
static int yylex (YYSTYPE *lval, const char **pexp);
static void yyerror (const char *str);
@@ -272,10 +260,9 @@
}
+/* Line 221 of yacc.c. */
+#line 265 "plural.c"
-/* Line 264 of yacc.c */
-#line 278 "../../trunk/intl/plural.c"
-
#ifdef short
# undef short
#endif
@@ -437,9 +424,9 @@
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
+ yytype_int16 yyss;
+ YYSTYPE yyvs;
+ };
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -473,12 +460,12 @@
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -896,11 +883,11 @@
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- YYFPRINTF (stderr, "\n");
+ fprintf (stderr, "\n");
}
}
@@ -1180,8 +1167,10 @@
break;
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
+
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1200,10 +1189,11 @@
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+/*----------.
+| yyparse. |
+`----------*/
+
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
@@ -1226,46 +1216,22 @@
#endif
#endif
{
-/* The lookahead symbol. */
+ /* The lookahead symbol. */
int yychar;
/* The semantic value of the lookahead symbol. */
YYSTYPE yylval;
- /* Number of syntax errors so far. */
- int yynerrs;
+/* Number of syntax errors so far. */
+int yynerrs;
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
-
+ int yystate;
int yyn;
int yyresult;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
/* Lookahead token as an internal (translated) token number. */
- int yytoken;
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
+ int yytoken = 0;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
char yymsgbuf[128];
@@ -1273,28 +1239,51 @@
YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
+
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss = yyssa;
+ yytype_int16 *yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp;
+
+
+
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+ YYSIZE_T yystacksize = YYINITDEPTH;
+
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+
+
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
+
yyssp = yyss;
yyvsp = yyvs;
@@ -1324,6 +1313,7 @@
YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss;
+
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
@@ -1331,6 +1321,7 @@
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
+
&yystacksize);
yyss = yyss1;
@@ -1353,8 +1344,9 @@
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1365,6 +1357,7 @@
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
+
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -1475,9 +1468,8 @@
switch (yyn)
{
case 2:
-
-/* Line 1455 of yacc.c */
-#line 155 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 155 "plural.y"
{
if ((yyvsp[(1) - (1)].exp) == NULL)
YYABORT;
@@ -1486,90 +1478,80 @@
break;
case 3:
-
-/* Line 1455 of yacc.c */
-#line 163 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 163 "plural.y"
{
(yyval.exp) = new_exp_3 (qmop, (yyvsp[(1) - (5)].exp), (yyvsp[(3) - (5)].exp), (yyvsp[(5) - (5)].exp));
}
break;
case 4:
-
-/* Line 1455 of yacc.c */
-#line 167 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 167 "plural.y"
{
(yyval.exp) = new_exp_2 (lor, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 5:
-
-/* Line 1455 of yacc.c */
-#line 171 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 171 "plural.y"
{
(yyval.exp) = new_exp_2 (land, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 6:
-
-/* Line 1455 of yacc.c */
-#line 175 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 175 "plural.y"
{
(yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 7:
-
-/* Line 1455 of yacc.c */
-#line 179 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 179 "plural.y"
{
(yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 8:
-
-/* Line 1455 of yacc.c */
-#line 183 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 183 "plural.y"
{
(yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 9:
-
-/* Line 1455 of yacc.c */
-#line 187 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 187 "plural.y"
{
(yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 10:
-
-/* Line 1455 of yacc.c */
-#line 191 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 191 "plural.y"
{
(yyval.exp) = new_exp_1 (lnot, (yyvsp[(2) - (2)].exp));
}
break;
case 11:
-
-/* Line 1455 of yacc.c */
-#line 195 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 195 "plural.y"
{
(yyval.exp) = new_exp_0 (var);
}
break;
case 12:
-
-/* Line 1455 of yacc.c */
-#line 199 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 199 "plural.y"
{
if (((yyval.exp) = new_exp_0 (num)) != NULL)
(yyval.exp)->val.num = (yyvsp[(1) - (1)].num);
@@ -1577,18 +1559,16 @@
break;
case 13:
-
-/* Line 1455 of yacc.c */
-#line 204 "../../trunk/intl/plural.y"
+/* Line 1269 of yacc.c. */
+#line 204 "plural.y"
{
(yyval.exp) = (yyvsp[(2) - (3)].exp);
}
break;
-
-/* Line 1455 of yacc.c */
-#line 1592 "../../trunk/intl/plural.c"
+/* Line 1269 of yacc.c. */
+#line 1572 "plural.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1599,6 +1579,7 @@
*++yyvsp = yyval;
+
/* Now `shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -1761,7 +1742,7 @@
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -1798,11 +1779,10 @@
}
+/* Line 1486 of yacc.c. */
+#line 209 "plural.y"
-/* Line 1675 of yacc.c */
-#line 209 "../../trunk/intl/plural.y"
-
void
internal_function
FREE_EXPRESSION (struct expression *exp)
Modified: tuxmath/trunk/linebreak/Makefile.in
===================================================================
--- tuxmath/trunk/linebreak/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/linebreak/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -36,23 +36,12 @@
subdir = linebreak
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -89,16 +78,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -106,45 +91,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -164,7 +129,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -172,12 +136,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/po/ar.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/ar.po
===================================================================
--- tuxmath/trunk/po/ar.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/ar.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-02-15 03:00+0100\n"
"Last-Translator: Caroline Ford <caroline.ford.work at googlemail.com>\n"
"Language-Team: \n"
@@ -12,91 +12,99 @@
"X-Poedit-Language: Arabic\n"
"X-Poedit-Country: UNITED KINGDOM\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -104,27 +112,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -263,44 +263,44 @@
msgid "Do it now, and then play!"
msgstr "افعلها اﻷن, ثم ابدأ اللعب !"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "قاعة الشهره"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "مبتدئ"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "الكشفيه"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "حارس"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "اس"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -320,112 +320,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "Tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "مساعدة"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "مزيد من الخيارات"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "خروج"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "اكاديميه التدريب"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "لعبه تقليدية"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "لعبة مخصصة"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "القائمة الرئيسية"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "حرر ملف 'الخيارات' فى مجلدك الافتراضى"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "لإنشاء لعبة مخصصة"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "اضغط فوق مفتاح أو انقر الماوس لبدء اللعبة."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Readme.txt انظر لمزيد من المعلومات"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "ديمو"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "معلومات المشروع"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "فريق العمل"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "القائمة الرئيسية"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath برنامج حر مفتوح المصدر"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "يمكنك المساعدة بجعلها افضل بإرسال اى مشاكل تواجها,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "أو اى مقترحات أو كتابة أكواد"
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net ناقش المستقبل على "
Modified: tuxmath/trunk/po/cs.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/cs.po
===================================================================
--- tuxmath/trunk/po/cs.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/cs.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2007-11-12 20:54+0100\n"
"Last-Translator: JardaK <krejci at zstenis.com>\n"
"Language-Team: czech <cs at li.org>\n"
@@ -17,91 +17,99 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -109,27 +117,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -267,44 +267,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Síň slávy"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Nováček"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Průzkumník"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Střelec"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Borec"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -324,112 +324,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Nápověda"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Více možností"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Ukončit"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Akademie vesmírné matematiky"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Hra"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Vlastní hra"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Hlavní menu"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Uprav soubor «options » ve své domovské složce,"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "abys mohl vytvořit vlastní hru!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Zmáčkni klávesu nebo klikni tlačítkem myši, abys začal hru"
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Pokud chceš více informací, podívej se na README.txt"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Info o projektu"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Poděkování"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Hlavní menu"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath je svobodný software!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "I ty ho můžeš vylepšit, když oznámíš chyby, "
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "navrhneš vylepšení nebo přidáš svůj kód"
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskutuj o budoucnosti na tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/de.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/de.po
===================================================================
--- tuxmath/trunk/po/de.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/de.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-05-02 16:08+0200\n"
"Last-Translator: Lars Vogdt <lars at linux-schulserver.de>\n"
"MIME-Version: 1.0\n"
@@ -14,91 +14,99 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -106,27 +114,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -265,44 +265,44 @@
msgid "Do it now, and then play!"
msgstr "Tu es jetzt - und dann spiele!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Ruhmeshalle"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Raumkadett"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Aufklärer"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Jäger"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Ass"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -322,112 +322,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Hilfe"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Weitere Optionen"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Ende"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Math Command Trainings-Akademie"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Spiele Arcade Spiel"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Spiele angepasstes Spiel"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Hauptmenü"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Editiere die 'options' Datei in deinem Benutzerverzeichnis"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "um ein angepasstes Spiel zu erzeugen."
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Drücke eine Taste oder klicke mit der Maus um ein Spiel zu starten"
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Lies die README.txt Datei für weitere Infrormationen"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demonstration"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Projekt Information"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Abspann"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Hauptmenü"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath ist frei und OpenSource!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Du kannst bei der Verbesserung helfen, wenn du Probleme "
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "meldest, Wünsche außerst oder Programmcode beisteuerst."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr ""
"Diskutiere die Zukunft von TuxMath auf tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/en at boldquot.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/en at boldquot.po
===================================================================
--- tuxmath/trunk/po/en at boldquot.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/en at boldquot.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -29,10 +29,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: tuxmath 1.7.2.preview\n"
+"Project-Id-Version: tuxmath 1.7.2\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
-"PO-Revision-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
+"PO-Revision-Date: 2009-03-02 12:41-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -40,19 +40,27 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr "Congratulations! You win!"
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr "Round"
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr "-[Esc] to skip"
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr "Mission One: Careful Cadet"
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr "I'm so glad you've come!"
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
@@ -62,15 +70,15 @@
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr "Do your best!"
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr "Mission Two: Smart Scout"
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
@@ -78,7 +86,7 @@
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
@@ -86,15 +94,15 @@
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr "But you can save them!"
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr "Mission Three: Royal Ranger"
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
@@ -102,7 +110,7 @@
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
@@ -112,11 +120,11 @@
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr "Mission Four: Imperial Ace"
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
@@ -124,7 +132,7 @@
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
@@ -132,15 +140,15 @@
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr "Now is no time for resting; the city needs your help!"
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr "Final Mission: Computing Commando"
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -152,27 +160,19 @@
"you this clue: first do multiplication and division, and then do addition "
"and subtraction."
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr "I hope that hint helps!"
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr "This is it! You can stop these attacks forever, Commando!"
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Congratulations! You win!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Round"
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr "Sorry, try again!"
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr "Mission accomplished. The galaxy is safe!"
@@ -313,44 +313,44 @@
msgid "Do it now, and then play!"
msgstr "Do it now, and then play!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Hall Of Fame"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Space Cadet"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Ace"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr "Commando"
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr "Factors"
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr "Fractions"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr "You Are In The Hall of Fame!"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr "Enter Your Name:"
@@ -370,112 +370,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr "Play Alone"
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr "Play With Friends"
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr "Factoroids!"
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Help"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "More Options"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Quit"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Math Command Training Academy"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr "Math Command Fleet Missions"
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Play Arcade Game"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Play Custom Game"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Main menu"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr "Score Sweep"
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr "Elimination"
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr "How many kids are playing?"
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr "(Between 2 and 4 players)"
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Edit ‘[1moptions[0m’ file in your home directory"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "to create customized game!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Press a key or click your mouse to start game."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "See README.txt for more information"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Project Info"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Credits"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Main Menu"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath is free and open-source!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "You can help make it better by reporting problems,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "suggesting improvements, or adding code."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/en at quot.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/en at quot.po
===================================================================
--- tuxmath/trunk/po/en at quot.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/en at quot.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -26,10 +26,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: tuxmath 1.7.2.preview\n"
+"Project-Id-Version: tuxmath 1.7.2\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
-"PO-Revision-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
+"PO-Revision-Date: 2009-03-02 12:41-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -37,19 +37,27 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr "Congratulations! You win!"
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr "Round"
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr "-[Esc] to skip"
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr "Mission One: Careful Cadet"
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr "I'm so glad you've come!"
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
@@ -59,15 +67,15 @@
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr "Do your best!"
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr "Mission Two: Smart Scout"
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
@@ -75,7 +83,7 @@
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
@@ -83,15 +91,15 @@
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr "But you can save them!"
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr "Mission Three: Royal Ranger"
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
@@ -99,7 +107,7 @@
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
@@ -109,11 +117,11 @@
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr "Mission Four: Imperial Ace"
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
@@ -121,7 +129,7 @@
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
@@ -129,15 +137,15 @@
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr "Now is no time for resting; the city needs your help!"
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr "Final Mission: Computing Commando"
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -149,27 +157,19 @@
"you this clue: first do multiplication and division, and then do addition "
"and subtraction."
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr "I hope that hint helps!"
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr "This is it! You can stop these attacks forever, Commando!"
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Congratulations! You win!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Round"
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr "Sorry, try again!"
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr "Mission accomplished. The galaxy is safe!"
@@ -310,44 +310,44 @@
msgid "Do it now, and then play!"
msgstr "Do it now, and then play!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Hall Of Fame"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Space Cadet"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Ace"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr "Commando"
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr "Factors"
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr "Fractions"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr "You Are In The Hall of Fame!"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr "Enter Your Name:"
@@ -367,112 +367,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr "Play Alone"
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr "Play With Friends"
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr "Factoroids!"
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Help"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "More Options"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Quit"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Math Command Training Academy"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr "Math Command Fleet Missions"
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Play Arcade Game"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Play Custom Game"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Main menu"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr "Score Sweep"
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr "Elimination"
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr "How many kids are playing?"
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr "(Between 2 and 4 players)"
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Edit ‘options’ file in your home directory"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "to create customized game!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Press a key or click your mouse to start game."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "See README.txt for more information"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Project Info"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Credits"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Main Menu"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath is free and open-source!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "You can help make it better by reporting problems,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "suggesting improvements, or adding code."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/en_GB.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/en_GB.po
===================================================================
--- tuxmath/trunk/po/en_GB.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/en_GB.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-05-09 21:05+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -16,91 +16,99 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -108,27 +116,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -266,44 +266,44 @@
msgid "Do it now, and then play!"
msgstr "Do it now, and then play!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Hall Of Fame"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Space Cadet"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Ace"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -323,112 +323,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Help"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "More Options"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Quit"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Math Command Training Academy"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Play Arcade Game"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Play Custom Game"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Main menu"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Edit ‘options’ file in your home directory"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "to create customised game!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Press a key or click your mouse to start game."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "See README.txt for more information"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Project Info"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Credits"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Main Menu"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath is free and open-source!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "You can help make it better by reporting problems,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "suggesting improvements, or adding code."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuss the future at tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/es.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/es.po
===================================================================
--- tuxmath/trunk/po/es.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/es.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 1.6.2\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-04-26\n"
"Last-Translator: Angela Ruiz <angieruiz211 at hotmail.com>\n"
"Language-Team: espanol <LL at li.org>\n"
@@ -15,91 +15,99 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -107,27 +115,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -266,44 +266,44 @@
msgid "Do it now, and then play!"
msgstr "haclo ahora y luego juega"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "sala de fama"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "cadete espacial"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "escout"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "guardador"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "ace"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -323,114 +323,114 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr ""
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "ayda"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "mas opciones"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "terminar"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Academia de entrenamiento de matematicas"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Juega el juego de arcade"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "juega el juego hecho especialmente"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "menu principal"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "editar opciones del archivo del directorio principal"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "para crear un juego especialmente"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "aprieta un tecla y con tu mouse oprime la opcion de empesar el juego"
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "ver README.txt para mas informacion"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "demostracion"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "informacion del projecto"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "creditos"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "menu principal"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath es gratis y es una opcion abierta"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr ""
"puedes hacer que el programa funcione mejor si reportas problems con el "
"programa"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "sugestiones para mejorar el programa o para anadir un codigo"
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "discute el futuro en tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/fi.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/fi.po
===================================================================
--- tuxmath/trunk/po/fi.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/fi.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-03-22 06:59+0000\n"
"Last-Translator: Miika Metsälä <Unknown>\n"
"Language-Team: Finnish <fi at li.org>\n"
@@ -19,91 +19,99 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -111,27 +119,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -269,44 +269,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Parhaat tulokset"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Astronautti"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Tiedustelija"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Jousimies"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr ""
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -326,113 +326,113 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "O_hje"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Lisää asetuksia"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Lopeta"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr ""
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Pelaa arcade-peliä"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr ""
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Päävalikko"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Muokkaa 'options' tiedostoa kotikansiossasi"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "tehdäksesi kustomoidun pelin!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr ""
"Paina mitä tahansa näppäintä tai napsauta hiirellä aloittaaksesi pelin."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Katso README.txt saadaksesi lisätietoja"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr ""
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Tietoa projektista"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Tekijät"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Päävalikko"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath on vapaa ja avointa koodia!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Voit auttaa meitä tekemään sen paremmaksi ilmoittamalla ongelmista,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "ehdottamalla parannuksista, tai lisäämällä koodia."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr ""
"Keskustele tuxmathin tulevaisuudesta osoitteesta tuxmath-devel at lists."
Modified: tuxmath/trunk/po/fr.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/fr.po
===================================================================
--- tuxmath/trunk/po/fr.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/fr.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 1.5.8\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2007-11-15 09:00+0100\n"
"Last-Translator: Grumeau Rémi <remi at beosfrance.com>\n"
"Language-Team: Dutch <LL at li.org>\n"
@@ -15,91 +15,99 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -107,27 +115,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -265,44 +265,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Tableau des scores"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Cadet de l'espace"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "As"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -322,112 +322,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Aide"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Plus d'options"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Quitter"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Ecole d'entrainement au Math"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Jouer en mode arcade"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Jouer en mode personnalisé"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Menu principal"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Editer le fichier 'option' dans le dossier home"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "pour créer une partie personnalisée !"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Appuyez sur une touche ou cliquez pour commencer"
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Lisez README.txt pour plus d'informations"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "A propos"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Crédits"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Menu principal"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath est gratuit et open-source!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Participez à l'amélioration du jeu en nous signalant des problemes,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "vos suggestions, ou en développement."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Parlons-en sur tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/ga.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/ga.po
===================================================================
--- tuxmath/trunk/po/ga.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/ga.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-07-13 23:16-0000\n"
"Last-Translator: Seanán à CoistÃn <seananoc at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -14,91 +14,99 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -106,27 +114,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -264,44 +264,44 @@
msgid "Do it now, and then play!"
msgstr "Déan anois é, agus ansin imir!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Réim na gCuradh"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Glasearcach"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Gasóg"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "RánaÃ"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Curadh"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -321,112 +321,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Cabhair"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Tuilleadh Roghanna"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Scoir"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Lárionad Oiliúna an Cheannais Mata"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Imir an Gnáthchluiche"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Imir Cluiche Saincheaptha"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "An PrÃomh Roghchlár"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Cuir in eagar an comhad 'roghanna' i do chomhadlann baile"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "chun cluiche saincheaptha a chruthú!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Brúigh cnaipe nó brúigh do luchóg chun an cluiche a thosú."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Féach ar README.txt le haghaidh breis eolas"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Taispeántas"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Faisnéis an Tionscadail"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "BuÃochas le"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "An PrÃomh Roghchlár"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "Tá TuxMath ar fáil saor in aisce agus le foinse oscailte!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Is féidir leat cuidiú é a fheabhsú trà fadhbanna a fhógrú,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "feabhsaithe a mholadh, nó trà cód a chur leis."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Plé an todhchaà ag tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/he.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/he.po
===================================================================
--- tuxmath/trunk/po/he.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/he.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2009-01-17 10:32+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Hebrew <sh.yaron at gmail.com>\n"
@@ -23,91 +23,99 @@
"X-Poedit-Country: ISRAEL\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -115,27 +123,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -273,44 +273,44 @@
msgid "Do it now, and then play!"
msgstr "עשה זאת כעת, שחק לאחר מכן!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "היכל התהילה"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "טירון"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "תלמיד"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "מתמצא"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "תותח"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -330,112 +330,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "עזרה"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "אפשרויות נוספות"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "יציאה"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "האקדמיה לאימון פעולות מתמטיות"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "שחק משחק ארקייד"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "שחק משחק מותאם"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "תפריט ראשי"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "ערוך את קובץ האפשרויות ('options') בתיקיית הבית שלך"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "כדי ליצור משחק מותאם אישית!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "לחץ על מקש במקלדת או בעכבר כדי להתחיל במשחק."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "עיין בקובץ README.TXT למידע נוסף"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "הדגמה"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "מידע על המיזם"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "תודות"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "תפריט ראשי"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "טאקסמטיקה הינה חופשית ובעלת קוד פתוח!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "תוכל לעזור לנו לשפר אותו על ידי דיווח תקלות,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "הצעת שיפורים או הוספת קוד."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "דון בעתיד טאקסמטיקה ברשימת הדיוור tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/hu.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/hu.po
===================================================================
--- tuxmath/trunk/po/hu.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/hu.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-02-11 21:56+0100\n"
"Last-Translator: Miklos Merenyi <mermik at freemail.hu>\n"
"Language-Team: LANGUAGE <HU at li.org>\n"
@@ -14,91 +14,99 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -106,27 +114,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -265,44 +265,44 @@
msgid "Do it now, and then play!"
msgstr "Lépj ki, és kezdd a játékot!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Dicsőséglista"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Újonc"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Felderítő"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Járőrparancsnok"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Mesterpilóta"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -322,112 +322,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Segítség"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Egyebek"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Kilépés"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Matek-Parancsnok Képző Akadémia"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Beépített játékok"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Testreszabott játékok"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Főmenü"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "A home-könyvtáradban levő 'options' fájl "
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "szerkesztésével készíthetsz testreszabott játékot."
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Nyomj le egy billentyűt vagy egy egérgombot a kezdéshez!"
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "További részletek a README.txt fájlban."
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Projekt információ"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Köszönetnyilvánítás"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Főmenü"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "A TuxMath ingyenes és nyílt forráskódú!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Te is segíthetsz még jobbá tenni az észlelt hibák bejelentésével,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "továbbfejlesztési ötletekkel, vagy programkóddal."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Levelezőlista (angol nyelvű): tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/it.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/it.po
===================================================================
--- tuxmath/trunk/po/it.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/it.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-03-01 11:49+0000\n"
"Last-Translator: Giovanni Condello <condellog at gmail.com>\n"
"Language-Team: Italian <it at li.org>\n"
@@ -22,91 +22,99 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -114,27 +122,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -272,44 +272,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Galleria dei campioni"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Cadetto spaziale"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Asso"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -329,113 +329,113 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Aiuto"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Altre opzioni"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Esci"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr ""
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr ""
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
#, fuzzy
msgid "Play Custom Game"
msgstr "Gioca una partita personalizzata"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Menu principale"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Modifica il file 'options' nella tua cartella home"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "per creare una partita personalizzata!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Premi un tasto o fai click con il mouse per iniziare il gioco."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Vedi il file README.txt per maggiori informazioni"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Informazioni sul progetto"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Ringraziamenti"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Menu principale"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath è gratuito ed open-source!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Puoi aiutare a migliorarlo riportando i problemi,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "proponendo miglioramenti o con l'aggiunta di codice."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuti del futuro su tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/ja.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/ja.po
===================================================================
--- tuxmath/trunk/po/ja.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/ja.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-03-05 15:29+0000\n"
"Last-Translator: CMasami <Unknown>\n"
"Language-Team: Japanese <ja at li.org>\n"
@@ -20,91 +20,99 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -112,27 +120,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -270,44 +270,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "殿堂入り"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "訓練生"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "上等兵"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "特殊部隊"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "超能力者"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -327,112 +327,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "ヘルプ"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "他のオプション"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "終了"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "計算戦隊訓練学校"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "一般訓練開始"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "特殊訓練開始"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "メインメニュー"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "ホーム・ディレクトリの'optoins'ファイルを編集して"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "オリジナルのゲームを作ろう!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "キーを押すかクリックしてゲーム開始"
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "詳しい説明はREADME.txtを見てください"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "デモ"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "プロジェクト情報"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "クレジット"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "メインメニュー"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath は自由でオープンソースです!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "問題点を報告してゲームを改善することができます。"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "新機能の提案や、コードの追加も歓迎します。"
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "連絡先はこちら tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/nb.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/nb.po
===================================================================
--- tuxmath/trunk/po/nb.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/nb.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-09-21 19:08+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -17,91 +17,99 @@
"X-Generator: Lokalize 0.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -109,27 +117,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -267,44 +267,44 @@
msgid "Do it now, and then play!"
msgstr "Prøv det nå, og start spillet!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Rekordar"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Romkadett"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Romlærling"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Romvokter"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Romsjef"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr "Romkommandør"
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr "Faktorer"
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr "Brøker"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -324,113 +324,113 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr "Spill alene"
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr "Spill med venner"
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
#, fuzzy
msgid "Factoroids!"
msgstr "Faktorer"
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Hjelp"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Flere valg"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Avslutt"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Kadettskole"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr "Oppdrag"
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Arkadespill"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Selvlaget spill"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Hovedmeny"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Rediger «options»-fila i hjemmemappa di"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "for å lage ditt eget spill."
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Trykk en tast eller med musen for å starte spillet."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Se «README.txt» for mer informasjon."
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demonstrasjon"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Prosjektinfo"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Bidragsytere"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Hovedmeny"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath er fri programvare!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Du kan være med på å gjøre spillet bedre, ved å melde fra"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "om feil, foreslå forbedringer eller bidra med programkode."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskuter framtiden på tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/nl.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/nl.po
===================================================================
--- tuxmath/trunk/po/nl.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/nl.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2007-11-15 09:00+0100\n"
"Last-Translator: Schrijvers Luc <Begasus at skynet.be>\n"
"Language-Team: Dutch <LL at li.org>\n"
@@ -15,91 +15,99 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -107,27 +115,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -265,44 +265,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Hoogste scores"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Ruimte kadet"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Ranger"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Ace"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -322,112 +322,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Help"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Meer opties"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Afsluiten"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Reken commando training academie"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Speel Arcade spel"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Speel je eigen spel"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Hoofdmenu"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Bewerk 'options' bestand in je home folder"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "voor een eigen spel!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Druk op een toets of de muis om het spel te starten."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Lees README.txt voor meer informatie"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Projekt info"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Kredieten"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Hoofdmenu"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath is gratis en open-source!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Je kan helpen met het verbeteren door problemen te melden,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "suggesties verbeteringen, of code toevoegen."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Praat over de toekomst via tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/nn.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/nn.po
===================================================================
--- tuxmath/trunk/po/nn.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/nn.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2009-01-13 23:58+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -17,93 +17,101 @@
"X-Generator: Lokalize 0.3\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr "Gratulerer! Du vann!"
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr "Runde"
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr "(Trykk «Escape» for å hoppa over.)"
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr "Oppdrag 1: Kampklare kadett"
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr "Eg er så glad du endeleg er her!"
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr "Gjer ditt beste!"
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr "Oppdrag 2: Listige læring"
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr "Men du kan redda dei!"
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr "Oppdrag 3: Vaktsam vaktar"
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr "Oppdrag fire: Supersjef"
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
#, fuzzy
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr "kjem det eit angrep frå deleland!"
-#: src/campaign.h:69
+#: src/campaign.c:154
#, fuzzy
msgid "Now is no time for resting; the city needs your help!"
msgstr "Inga tid til å kvila på laurbæra; byen"
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr "Siste oppdrag: Kodeknekkingskommandør"
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -111,28 +119,20 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr "Håpar tipset er til hjelp!"
-#: src/campaign.h:80
+#: src/campaign.c:165
#, fuzzy
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr "Endeleg! No kan du klara å stoppa angrepa"
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Gratulerer! Du vann!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Runde"
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr "Prøv på nytt!"
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr "Oppdrag utførd. Galaksen er no trygg!"
@@ -273,44 +273,44 @@
msgid "Do it now, and then play!"
msgstr "Prøv det no, og start spelet!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Rekordar"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Romkadett"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Romlærling"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Romvaktar"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Romsjef"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr "Romkommandør"
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr "Faktorar"
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr "Brøkar"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -330,112 +330,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr "Spel åleine"
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr "Spel med venner"
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr "Faktoroidar!"
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Hjelp"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Fleire val"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Avslutt"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Kadettskule"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr "Oppdrag"
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Arkadespel"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Sjølvlaga spel"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Hovudmeny"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr "Poengsamling"
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr "Eliminering"
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr "Kor mange spelar?"
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr "(2 til 4 spelarar)"
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Rediger «options»-fila i heimemappa di"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "for å laga ditt eige spel."
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Trykk ein tast eller med musa for å starta spelet."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Sjå «README.txt» for meir informasjon."
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demonstrasjon"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Prosjektinfo"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Bidragsytarar"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Hovudmeny"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath er fri programvare!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Du kan vera med på å gjera spelet betre, ved å melda frå"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "om feil, foreslå forbetringar eller bidra med programkode."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskuter framtida på tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/oc.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/oc.po
===================================================================
--- tuxmath/trunk/po/oc.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/oc.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-02-25 16:55+0000\n"
"Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannig at marchegay.org>\n"
"Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -19,91 +19,99 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -111,27 +119,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -269,44 +269,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr ""
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr ""
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr ""
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr ""
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr ""
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -326,112 +326,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Ajuda"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Mai d'opcions"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Sortir"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr ""
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr ""
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr ""
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Menut principal"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr ""
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr ""
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr ""
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr ""
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr ""
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Mercejaments"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Menut principal"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr ""
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr ""
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr ""
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr ""
Modified: tuxmath/trunk/po/pl.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/pl.po
===================================================================
--- tuxmath/trunk/po/pl.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/pl.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-02-25 18:43+0000\n"
"Last-Translator: Mateusz Tybura <wujciol at gmail.com>\n"
"Language-Team: Polish <pl at li.org>\n"
@@ -22,91 +22,99 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -114,27 +122,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -272,44 +272,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Lista najlepszych"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Kosmiczny Kadet"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Strzelec"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Strażnik"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "As"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -329,113 +329,113 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Pomoc"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Więcej opcji"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Wyjdź"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Akademia Treningowa Poleceń Math"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Zagraj w grę zręcznościową"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Zagraj w wybraną grę"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Menu główne"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Edytuj pik 'options' w swoim katalogu domowym"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr ""
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Naciśnij klawisz albo kliknij myszką aby uruchomić grę."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Przeczytaj README.txt, żeby uzyskać więcej informacji"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demonstracja"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Informacja o projekcie"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Twórcy"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Menu główne"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath jest wolny i ma otwarte źródła"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Możesz pomóc uczynić go lepszym zgłaszając błędy."
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
#, fuzzy
msgid "suggesting improvements, or adding code."
msgstr "Zasugeruj ulepszenia lub dodaj kod"
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Dyskutuj na temat przyszłości na tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/pt.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/pt.po
===================================================================
--- tuxmath/trunk/po/pt.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/pt.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-04-12 04:12+0000\n"
"Last-Translator: Mykas0 <Mykas0 at gmail.com>\n"
"Language-Team: Portuguese <pt at li.org>\n"
@@ -21,91 +21,99 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -113,27 +121,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -271,44 +271,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Corredor da Fama"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Cadete Espacial"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Batedor"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr ""
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Ás"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -328,112 +328,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Ajuda"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Mais Opções"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Sair"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr ""
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr ""
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr ""
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Menu principal"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr ""
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr ""
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Pressione uma tecla ou clique o rato para começar o jogo."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Veja o README.txt para mais informações!"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demonstração"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Informação do Projecto"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Créditos"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Menu Principal"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath é livre e com código aberto!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Você pode ajudar o TuxMath ao reportar problemas,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "sugerindo melhorias, ou adicionando código."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Discuta o futuro em tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/pt_BR.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/pt_BR.po
===================================================================
--- tuxmath/trunk/po/pt_BR.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/pt_BR.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-03-03 21:35+0000\n"
"Last-Translator: Laudeci Oliveira <laudeci at gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR at li.org>\n"
@@ -23,91 +23,99 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -115,27 +123,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -273,44 +273,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Hall da Fama"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Cadete Espacial"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Sentinela"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Defensor"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Especialista"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -330,112 +330,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Ajuda"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Mais Opções"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Sair"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Comando de Treinamento Matemático Acadêmico"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Jogar jogo de Arcade"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Jogar um Jogo Personalizado"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Menu Principal"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Edite o arquivo 'options\" no seu diretório home"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "criar jogo personalizado!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Pressione uma tecla ou clique com seu mouse para iniciar o jogo."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Leia o README.txt para mais informações"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demonstração"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Informação do Projeto"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Créditos"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Menu Principal"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath é gratuíto e software livre!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Você pode ajudar a torná-lo melhor reportando problemas."
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "sugerindo melhorias, ou programando."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Discutir o futuro em tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/ru.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/ru.po
===================================================================
--- tuxmath/trunk/po/ru.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/ru.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-03-01 06:56+0000\n"
"Last-Translator: Александр AldeX Крылов <Unknown>\n"
"Language-Team: Russian <ru at li.org>\n"
@@ -20,91 +20,99 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -112,27 +120,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -270,44 +270,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Зал славы"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Космический курсант"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Разведчик"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Рейнджер"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Ас"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -327,112 +327,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Помощь"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Дополнительные настройки"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Выход"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Учебная академия по арифметике"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Играть в аркадную игру"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Играть в пользовательскую игру"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Главное меню"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Редактировать файл параметров в вашей домашней директории"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "для создания пользовательской игры!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Нажмите клавишу или кликните мышью для запуска игры."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Смотрите README.txt для дополнительной информации"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Демонстрация"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Информация о проекте"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Разработчики"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Главное меню"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath свободный и открытый!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Вы можете улучшить этот продукт, сообщив о проблеме,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "предложив улучшение или добавив код."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Обсудите будущее программы на tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/sk.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/sk.po
===================================================================
--- tuxmath/trunk/po/sk.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/sk.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-03-16 09:41+0000\n"
"Last-Translator: Štefan Lučivjanský <lucorp at azet.sk>\n"
"Language-Team: Slovak <sk at li.org>\n"
@@ -20,91 +20,99 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -112,27 +120,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -270,44 +270,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Sieň slávy"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Vesmírny kadet"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Skaut"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Poručík"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Eso"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -327,112 +327,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Pomocník"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Viac možností"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Koniec"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Cvičná akadémia matematického ovládania"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Hrať arkádovú hru"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Hrať vlastnú hru"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Hlavná ponuka"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Uprav súbor «options » vo svojom domovskom priečinku,"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "aby si mohol vytvoriť svoju vlastnú hru!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Pre spustenie hry stlačte ľubovoľnú klávesu, alebo kliknite myšou."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Pre viac informácií pozrite README.txt"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demo"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Informácie o projekte"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Tvorcovia"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Hlavná ponuka"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath je slobodný software!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Môžeš ho vylepšiť aj ty oznamovaním problémov,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "navrhovaním vylepšení, alebo pridaním kódu"
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskutuj o budúcnosti na tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/sv.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/sv.po
===================================================================
--- tuxmath/trunk/po/sv.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/sv.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: \n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -16,93 +16,101 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Poedit-Language: Swedish\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr "Gratulerar! Du vann!"
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr "Omgång"
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr "-[Esc] för att hoppa över"
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr "Uppdrag 1: Försiktig kadett"
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr "Jag är så glad att du kom!"
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr "Gör ditt yttersta!"
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr "Uppdrag 2: Smart scout"
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr "Du kan rädda dem!"
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr "Uppdrag 3: Kunglig jägare"
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr "Uppdrag 4: Empirisk mästare"
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
#, fuzzy
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr "en ny attack från Divisionslandet!"
-#: src/campaign.h:69
+#: src/campaign.c:154
#, fuzzy
msgid "Now is no time for resting; the city needs your help!"
msgstr "Det finns ingen tid att förlora. Staden"
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr "Sista uppdraget: Beräknande kommandosoldat"
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -110,28 +118,20 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr "Jag hoppas att tipset hjälper!"
-#: src/campaign.h:80
+#: src/campaign.c:165
#, fuzzy
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr "Nu gäller det! Du kan stoppa dessa"
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Gratulerar! Du vann!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Omgång"
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr "Tyvärr, försök igen!"
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr "Uppdraget slutfört! Galaxen är säker!"
@@ -272,44 +272,44 @@
msgid "Do it now, and then play!"
msgstr "Gör det nu och spela sedan!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Poänglistan"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Rymdkadett"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "Scout"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Jägare"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "Mästare"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr "Kommandosoldat"
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr "Nämnare"
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr "Bråk"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr "Du kom med på poänglistan!"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr "Skriv ditt namn:"
@@ -329,113 +329,113 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr "Spela ensam"
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr "Spela med vänner"
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
#, fuzzy
msgid "Factoroids!"
msgstr "Nämnare"
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Hjälp"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Fler alternativ"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Avsluta"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Akademin för matematikträning"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr "Uppdrag för matematikflottan"
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Spela arkadspel"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Spela anpassat spel"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Huvudmeny"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Redigera filen \"options\" i din hemkatalog"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "för att skapa anpassade spel!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Tryck på en tangent eller klicka med musen för att starta spelet."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Se README.txt för mer information"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Demonstration"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Projektinformation"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Tack till"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Huvudmeny"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath är gratis och öppen källkod!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Du kan hjälpa oss att göra det bättre genom att rapportera problem,"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "föreslå förbättringar eller bidra med programkod."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "Diskutera framtiden på tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/tr.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/tr.po
===================================================================
--- tuxmath/trunk/po/tr.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/tr.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tr2\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2008-12-07 15:54+0200\n"
"Last-Translator: Doruk Fisek <dfisek at fisek.com.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@ -15,93 +15,101 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr "Tebrikler! Kazandın!"
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr "Tur"
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr "-Atlamak için [Esc]"
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr "Görev Bir : Dikkatli Tertip"
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr "Geldiğine çok sevindim!"
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr "En iyisini yap!"
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr "Görev İki: Akıllı İzci"
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr "Ama sen onları kurtarabilirsin!"
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr "Görev Üç: Asil Korucu"
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr "Görev Dört: İmparatorluk Ası"
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
#, fuzzy
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr "yeni bir saldırı başlar!"
-#: src/campaign.h:69
+#: src/campaign.c:154
#, fuzzy
msgid "Now is no time for resting; the city needs your help!"
msgstr "Şimdi dinlenmek için zaman yok; şehrin"
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr "Son Görev: Hesaplama Komandosu"
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -109,28 +117,20 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr "Umarım bu ipucu işine yarar!"
-#: src/campaign.h:80
+#: src/campaign.c:165
#, fuzzy
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr "Hepsi bu! Bu saldırıları sonsuza dek"
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "Tebrikler! Kazandın!"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "Tur"
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr "Üzgünüm, tekrar dene!"
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr "Görev başarıyla tamamlandı. Galaksi güvenli!"
@@ -270,44 +270,44 @@
msgid "Do it now, and then play!"
msgstr "Hemen şimdi yap ve sonra oyna!"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "Gurur Tablosu"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "Uzay Tertibi"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "İzci"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "Korucu"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "As"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr "Komando"
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr "Çarpanlar"
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr "Kesirler"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -327,113 +327,113 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr "Yalnız Oyna"
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr "Arkadaşlarla Oyna"
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
#, fuzzy
msgid "Factoroids!"
msgstr "Çarpanlar"
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "Yardım"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "Daha Çok Seçenek"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "Çıkış"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "Matematik Komutanlığı Eğitim Akademisi"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr "Matematik Komutanlığı Donanması Görevleri"
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "Eğlence Oyunu Oyna"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "Özel Oyun Oyna"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "Ana menü"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "Özelleştirilmiş oyun yaratmak için"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "ev dizinindeki 'options' dosyasını düzenle!"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "Oyuna başlamak için bir tuşa basın ya da fareye tıklayın."
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "Daha fazla bilgi için README.txt dosyasına bakın"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "Gösteri (Demo)"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "Proje Bilgisi"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "Hazırlayanlar"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "Ana Menü"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath özgür ve açık kaynak kodlu!"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "Sorunları bildirerek, iyileştirmeler önererek ya da kod yazarak"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "daha iyi olmasına yardımcı olabilirsin."
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr ""
"tuxmath-devel at lists.sourceforge.net e-posta listesinde TuxMath'in geleceğini "
Modified: tuxmath/trunk/po/tuxmath.pot
===================================================================
--- tuxmath/trunk/po/tuxmath.pot 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/tuxmath.pot 2009-03-02 20:54:09 UTC (rev 917)
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: tuxmath 1.7.2.preview\n"
+"Project-Id-Version: tuxmath 1.7.2\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,91 +15,99 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr ""
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr ""
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr ""
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr ""
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr ""
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
"secret code that will zap each comet."
msgstr ""
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr ""
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr ""
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr ""
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr ""
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr ""
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
"think you can do it. Join the Rangers and help save the city!"
msgstr ""
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr ""
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
msgstr ""
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr ""
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr ""
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr ""
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -107,27 +115,19 @@
"and subtraction."
msgstr ""
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr ""
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr ""
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr ""
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr ""
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr ""
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr ""
@@ -265,44 +265,44 @@
msgid "Do it now, and then play!"
msgstr ""
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr ""
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr ""
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr ""
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr ""
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr ""
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr ""
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr ""
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -322,112 +322,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr ""
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr ""
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr ""
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr ""
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr ""
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr ""
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr ""
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr ""
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr ""
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr ""
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr ""
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr ""
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr ""
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr ""
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr ""
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr ""
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr ""
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr ""
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr ""
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr ""
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr ""
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr ""
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr ""
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr ""
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr ""
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr ""
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr ""
Modified: tuxmath/trunk/po/zh_CN.gmo
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/po/zh_CN.po
===================================================================
--- tuxmath/trunk/po/zh_CN.po 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/po/zh_CN.po 2009-03-02 20:54:09 UTC (rev 917)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-02-19 12:21-0600\n"
+"POT-Creation-Date: 2009-03-02 12:41-0600\n"
"PO-Revision-Date: 2009-02-07 18:04+0800\n"
"Last-Translator: Xavier <XavierXavierye at gmail.com>\n"
"Language-Team: Simplified Chinese <zh_CN at li.org>\n"
@@ -19,19 +19,27 @@
"X-Launchpad-Export-Date: 2008-05-06 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/campaign.h:30
+#: src/campaign.c:30
+msgid "Congratulations! You win!"
+msgstr "恭喜！你赢了！"
+
+#: src/campaign.c:48
+msgid "Round"
+msgstr "回合"
+
+#: src/campaign.c:115
msgid "-[Esc] to skip"
msgstr "按Esc键跳过"
-#: src/campaign.h:31
+#: src/campaign.c:116
msgid "Mission One: Careful Cadet"
msgstr "第一个任务:认真的军校学员"
-#: src/campaign.h:33
+#: src/campaign.c:118
msgid "I'm so glad you've come!"
msgstr "很高兴你来了"
-#: src/campaign.h:35
+#: src/campaign.c:120
msgid ""
"The penguins need your help! Comets are falling from the sky, and are "
"melting the penguins' igloos. To save their homes, we need you to find the "
@@ -40,43 +48,43 @@
"企鹅需要你的帮助！彗星从天而降，正在融化企鹅的小屋。为了保护它们的房子，需要"
"你找到密码打败"
-#: src/campaign.h:37
+#: src/campaign.c:122
msgid "Do your best!"
msgstr "尽你所能！"
-#: src/campaign.h:43
+#: src/campaign.c:128
msgid "Mission Two: Smart Scout"
msgstr "第二个任务：聪明的侦察员"
-#: src/campaign.h:45
+#: src/campaign.c:130
msgid ""
"Great job! Since you saved the penguins' homes, we are promoting you to "
"Scout. Scouts are good for keeping an eye out for trouble..."
msgstr "干的好！因为你保护了企鹅的小屋，提升你为侦察员，监控可能的麻烦..."
-#: src/campaign.h:47
+#: src/campaign.c:132
msgid ""
"...like what's happening right now! The TakeAways have come, and they're "
"sending new, trickier comets against the penguins!"
msgstr ""
"...就象正在发生的!掠夺者来了，他们正在发射新的，更狡猾的彗星来攻击企鹅！"
-#: src/campaign.h:48
+#: src/campaign.c:133
msgid "But you can save them!"
msgstr "但是你可以保护他们！"
-#: src/campaign.h:54
+#: src/campaign.c:139
msgid "Mission Three: Royal Ranger"
msgstr "第三个任务：皇家突击队"
-#: src/campaign.h:56
+#: src/campaign.c:141
msgid ""
"You've done it again! The Penguin Emperor has chosen you to join his team of "
"Rangers that help protect the city. We're sending you there now..."
msgstr ""
"你又做到了！企鹅国王挑选你参加他的突击队，保卫城市。我们现在就送你到那儿去..."
-#: src/campaign.h:58
+#: src/campaign.c:143
msgid ""
"...oh no! Now the Emperor himself is under attack, from new types of comets: "
"these problems are multiplying! To fight these, you need great skill. We "
@@ -85,11 +93,11 @@
"...哦不！现在国王自己受到来自新的彗星攻击了，这些是乘法问题！你需要更强的技能"
"击败攻击。我们相信你能做到。加入突击队保卫城市吧！"
-#: src/campaign.h:64
+#: src/campaign.c:149
msgid "Mission Four: Imperial Ace"
msgstr "第四个任务：皇家王牌飞行员"
-#: src/campaign.h:66
+#: src/campaign.c:151
msgid ""
"You did it! The Emperor wants to thank you in person. We are taking you to "
"his ice palace for a great honor: you will become the Imperial Ace!"
@@ -97,21 +105,21 @@
"你做到了！国外想亲自感谢你。我们非常荣幸地带你到他的冰做的宫殿去：你将成为皇"
"家王牌飞行员！"
-#: src/campaign.h:68
+#: src/campaign.c:153
msgid ""
"But right in the middle of the ceremony, a new attack from the land of "
"Division starts!"
msgstr "但就在庆典时，一个来自除法之地的新攻击开始了！"
-#: src/campaign.h:69
+#: src/campaign.c:154
msgid "Now is no time for resting; the city needs your help!"
msgstr "现在没有时间让你休息；城市需要你的帮助！"
-#: src/campaign.h:75
+#: src/campaign.c:160
msgid "Final Mission: Computing Commando"
msgstr "最后任务：计算突击队"
-#: src/campaign.h:77
+#: src/campaign.c:162
msgid ""
"Penguin scientists have learned that all these attacks are coming from a "
"secret base, and they need you to go fight the final battle. They also give "
@@ -121,27 +129,19 @@
"企鹅科学家研究后发显，所有的攻击都来自一个秘密基地，他们需要你去打赢这最后的"
"战斗。科学家们还给你一个线索：先做乘法再做除法，然后做加法和减法。"
-#: src/campaign.h:78
+#: src/campaign.c:163
msgid "I hope that hint helps!"
msgstr "希望提示能帮到你！"
-#: src/campaign.h:80
+#: src/campaign.c:165
msgid "This is it! You can stop these attacks forever, Commando!"
msgstr "就是这样！你是突击队员，你可以永远制止这些攻击，"
-#: src/campaign.c:30
-msgid "Congratulations! You win!"
-msgstr "恭喜！你赢了！"
-
-#: src/campaign.c:48
-msgid "Round"
-msgstr "回合"
-
-#: src/campaign.c:158
+#: src/campaign.c:229
msgid "Sorry, try again!"
msgstr "对不起，请再试一次！"
-#: src/campaign.c:165
+#: src/campaign.c:236
msgid "Mission accomplished. The galaxy is safe!"
msgstr "任务完成。银河系安全了！"
@@ -279,44 +279,44 @@
msgid "Do it now, and then play!"
msgstr "现在就做，开始吧！"
-#: src/highscore.c:214 src/titlescreen.c:865
+#: src/highscore.c:212 src/titlescreen.c:849
msgid "Hall Of Fame"
msgstr "排行榜"
-#: src/highscore.c:236 src/highscore.c:257 src/titlescreen.c:801
-#: src/titlescreen.c:860
+#: src/highscore.c:232 src/highscore.c:253 src/titlescreen.c:785
+#: src/titlescreen.c:844
msgid "Space Cadet"
msgstr "太空警"
-#: src/highscore.c:239 src/titlescreen.c:802 src/titlescreen.c:861
+#: src/highscore.c:235 src/titlescreen.c:786 src/titlescreen.c:845
msgid "Scout"
msgstr "童子军"
-#: src/highscore.c:242 src/titlescreen.c:803 src/titlescreen.c:862
+#: src/highscore.c:238 src/titlescreen.c:787 src/titlescreen.c:846
msgid "Ranger"
msgstr "巡逻兵"
-#: src/highscore.c:245 src/titlescreen.c:804 src/titlescreen.c:863
+#: src/highscore.c:241 src/titlescreen.c:788 src/titlescreen.c:847
msgid "Ace"
msgstr "王牌飞行员"
-#: src/highscore.c:248 src/titlescreen.c:805 src/titlescreen.c:864
+#: src/highscore.c:244 src/titlescreen.c:789 src/titlescreen.c:848
msgid "Commando"
msgstr "突击队"
-#: src/highscore.c:251 src/titlescreen.c:984
+#: src/highscore.c:247 src/titlescreen.c:968
msgid "Factors"
msgstr "系数"
-#: src/highscore.c:254 src/titlescreen.c:985
+#: src/highscore.c:250 src/titlescreen.c:969
msgid "Fractions"
msgstr "分数"
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "You Are In The Hall of Fame!"
msgstr ""
-#: src/highscore.c:360
+#: src/highscore.c:353
msgid "Enter Your Name:"
msgstr ""
@@ -336,112 +336,112 @@
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:663
+#: src/titlescreen.c:647
msgid "Play Alone"
msgstr "自己玩"
-#: src/titlescreen.c:664
+#: src/titlescreen.c:648
msgid "Play With Friends"
msgstr "和朋友一起玩"
-#: src/titlescreen.c:665
+#: src/titlescreen.c:649
msgid "Factoroids!"
msgstr "因数分解！"
-#: src/titlescreen.c:666
+#: src/titlescreen.c:650
msgid "Help"
msgstr "帮助"
-#: src/titlescreen.c:667
+#: src/titlescreen.c:651
msgid "More Options"
msgstr "更多选项"
-#: src/titlescreen.c:668
+#: src/titlescreen.c:652
msgid "Quit"
msgstr "退出"
-#: src/titlescreen.c:742
+#: src/titlescreen.c:726
msgid "Math Command Training Academy"
msgstr "数学运算练习"
-#: src/titlescreen.c:743
+#: src/titlescreen.c:727
msgid "Math Command Fleet Missions"
msgstr "数学命令舰队任务"
-#: src/titlescreen.c:744
+#: src/titlescreen.c:728
msgid "Play Arcade Game"
msgstr "街机游戏"
-#: src/titlescreen.c:745
+#: src/titlescreen.c:729
msgid "Play Custom Game"
msgstr "自定义游戏"
-#: src/titlescreen.c:746 src/titlescreen.c:797 src/titlescreen.c:806
-#: src/titlescreen.c:866 src/titlescreen.c:986
+#: src/titlescreen.c:730 src/titlescreen.c:781 src/titlescreen.c:790
+#: src/titlescreen.c:850 src/titlescreen.c:970
msgid "Main menu"
msgstr "主菜单"
-#: src/titlescreen.c:795
+#: src/titlescreen.c:779
msgid "Score Sweep"
msgstr "消除得分"
-#: src/titlescreen.c:796
+#: src/titlescreen.c:780
msgid "Elimination"
msgstr "消减"
-#: src/titlescreen.c:840
+#: src/titlescreen.c:824
msgid "How many kids are playing?"
msgstr "参加游戏的小朋友数量？"
-#: src/titlescreen.c:841
+#: src/titlescreen.c:825
msgid "(Between 2 and 4 players)"
msgstr "(２到４个玩家)"
-#: src/titlescreen.c:960
+#: src/titlescreen.c:944
msgid "Edit 'options' file in your home directory"
msgstr "在你的主文件夹编辑'options' 选项文件"
-#: src/titlescreen.c:961
+#: src/titlescreen.c:945
msgid "to create customized game!"
msgstr "创建自定义游戏！"
-#: src/titlescreen.c:962
+#: src/titlescreen.c:946
msgid "Press a key or click your mouse to start game."
msgstr "按任意键或点击鼠标开始游戏。"
-#: src/titlescreen.c:963
+#: src/titlescreen.c:947
msgid "See README.txt for more information"
msgstr "查看 README.txt 文件以获得更多信息"
-#: src/titlescreen.c:1078
+#: src/titlescreen.c:1062
msgid "Demo"
msgstr "演示"
-#: src/titlescreen.c:1079
+#: src/titlescreen.c:1063
msgid "Project Info"
msgstr "工程信息"
-#: src/titlescreen.c:1080
+#: src/titlescreen.c:1064
msgid "Credits"
msgstr "贡献者"
-#: src/titlescreen.c:1081
+#: src/titlescreen.c:1065
msgid "Main Menu"
msgstr "主菜单"
-#: src/titlescreen.c:1129
+#: src/titlescreen.c:1113
msgid "TuxMath is free and open-source!"
msgstr "TuxMath 是自由软件而且是开放源代码的！"
-#: src/titlescreen.c:1130
+#: src/titlescreen.c:1114
msgid "You can help make it better by reporting problems,"
msgstr "你可以改进它或报告程序错误，"
-#: src/titlescreen.c:1131
+#: src/titlescreen.c:1115
msgid "suggesting improvements, or adding code."
msgstr "提出改进建议或增加代码。"
-#: src/titlescreen.c:1132
+#: src/titlescreen.c:1116
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "讨论TuxMath： tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/src/Makefile.in
===================================================================
--- tuxmath/trunk/src/Makefile.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/src/Makefile.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -40,23 +40,12 @@
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
- $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -119,16 +108,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -136,45 +121,25 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
@@ -194,7 +159,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
RANLIB = @RANLIB@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
@@ -202,12 +166,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Modified: tuxmath/trunk/src/SDL_extras.c
===================================================================
--- tuxmath/trunk/src/SDL_extras.c 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/src/SDL_extras.c 2009-03-02 20:54:09 UTC (rev 917)
@@ -13,14 +13,11 @@
#include "SDL_extras.h"
#include "tuxmath.h"
+#include "loaders.h"
#include "pixels.h"
-#ifdef HAVE_LIBSDL_PANGO
-#include "SDL_Pango.h"
-SDLPango_Context* context = NULL;
-static SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color* cl);
-#endif
+
/* DrawButton() creates and draws a translucent button with */
/* rounded ends. All colors and alpha values are supported.*/
void DrawButton(SDL_Rect* target_rect,
@@ -351,251 +348,6 @@
return ret;
}
-
-#ifdef HAVE_LIBSDL_PANGO
-/* NOTE these functions are wrapped within SDL_extras.c/h because there */
-/* appears to be a bug in SDL_Pango that causes symbol collision errors */
-/* on some compilers if more than one file has #include "SDL_Pango.h" */
-
-void init_SDLPango_Context()
-{
- context = SDLPango_CreateContext_GivenFontDesc(DEFAULT_FONT_NAME);
-}
-
-void free_SDLPango_Context()
-{
- if(context != NULL)
- SDLPango_FreeContext(context);
- context = NULL;
-}
-
-
-void SetupSDL_Pango()
-{
- if (SDLPango_Init () < 0)
- {
- fprintf(stderr,
- "\nWarning: I could not initialize SDL_Pango !\n"
- "%s\n\n", SDL_GetError());
- }
- else
- {
- init_SDLPango_Context();
- }
-}
-
-
-SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color *cl)
-{
- SDLPango_Matrix *colour;
- colour=malloc(sizeof(SDLPango_Matrix));
- int k;
- for(k=0;k<4;k++){
- (*colour).m[0][k]=(*cl).r;
- (*colour).m[1][k]=(*cl).g;
- (*colour).m[2][k]=(*cl).b;
- }
- (*colour).m[3][0]=0;
- (*colour).m[3][1]=255;
- (*colour).m[3][2]=0;
- (*colour).m[3][3]=0;
-
- return colour;
-}
-
-#endif
-
-
-/* BlackOutline() creates a surface containing text of the designated */
-/* foreground color, surrounded by a black shadow, on a transparent */
-/* background. The appearance can be tuned by adjusting the number of */
-/* background copies and the offset where the foreground text is */
-/* finally written (see below). */
-SDL_Surface* BlackOutline(const char *t, TTF_Font *font, SDL_Color *c)
-{
- SDL_Surface* out = NULL;
- SDL_Surface* black_letters = NULL;
- SDL_Surface* white_letters = NULL;
- SDL_Surface* bg = NULL;
- SDL_Rect dstrect;
- Uint32 color_key;
-
- if (!t || !font || !c)
- {
- fprintf(stderr, "BlackOutline(): invalid ptr parameter, returning.");
- return NULL;
- }
-
- if (t[0] == '\0')
- {
- fprintf(stderr, "BlackOutline(): empty string, returning");
- return NULL;
- }
-
-#ifdef TUXMATH_DEBUG
- fprintf( stderr, "\nEntering BlackOutline(): \n");
- fprintf( stderr, "BlackOutline of \"%s\"\n", t );
-#endif
-
-#ifndef HAVE_LIBSDL_PANGO
- black_letters = TTF_RenderUTF8_Blended(font, t, black);
-#else
- if( context != NULL)
- {
- SDLPango_SetDefaultColor(context, MATRIX_TRANSPARENT_BACK_BLACK_LETTER);
- SDLPango_SetText(context, t, -1);
- black_letters = SDLPango_CreateSurfaceDraw(context);
- }
- else {
- black_letters = TTF_RenderUTF8_Blended(font, t, black);
- }
-#endif
-
- if (!black_letters)
- {
- fprintf (stderr, "Warning - BlackOutline() could not create image for %s\n", t);
- return NULL;
- }
-
- bg = SDL_CreateRGBSurface(SDL_SWSURFACE,
- (black_letters->w) + 5,
- (black_letters->h) + 5,
- 32,
- rmask, gmask, bmask, amask);
- /* Use color key for eventual transparency: */
- color_key = SDL_MapRGB(bg->format, 01, 01, 01);
- SDL_FillRect(bg, NULL, color_key);
-
- /* Now draw black outline/shadow 2 pixels on each side: */
- dstrect.w = black_letters->w;
- dstrect.h = black_letters->h;
-
- /* NOTE: can make the "shadow" more or less pronounced by */
- /* changing the parameters of these loops. */
- for (dstrect.x = 1; dstrect.x < 4; dstrect.x++)
- for (dstrect.y = 1; dstrect.y < 3; dstrect.y++)
- SDL_BlitSurface(black_letters , NULL, bg, &dstrect );
-
- SDL_FreeSurface(black_letters);
-
- /* --- Put the color version of the text on top! --- */
-#ifndef HAVE_LIBSDL_PANGO
- white_letters = TTF_RenderUTF8_Blended(font, t, *c);
-#else
- if( context != NULL)
- {
- /* convert color arg: */
- SDLPango_Matrix* color_matrix = SDL_Colour_to_SDLPango_Matrix(c);
-
- if (color_matrix)
- SDLPango_SetDefaultColor(context, color_matrix);
- else /* fall back to just using white if conversion fails: */
- SDLPango_SetDefaultColor(context, MATRIX_TRANSPARENT_BACK_WHITE_LETTER);
-
- white_letters = SDLPango_CreateSurfaceDraw(context);
- free(color_matrix);
- }
- else
- {
- white_letters = TTF_RenderUTF8_Blended(font, t, *c);
- }
-#endif
-
- dstrect.x = 1;
- dstrect.y = 1;
- SDL_BlitSurface(white_letters, NULL, bg, &dstrect);
- SDL_FreeSurface(white_letters);
-
- /* --- Convert to the screen format for quicker blits --- */
- SDL_SetColorKey(bg, SDL_SRCCOLORKEY|SDL_RLEACCEL, color_key);
- out = SDL_DisplayFormatAlpha(bg);
- SDL_FreeSurface(bg);
-
-#ifdef TUXMATH_DEBUG
- fprintf( stderr, "\nLeaving BlackOutline(): \n");
-#endif
-
- return out;
-}
-
-
-/* This (fast) function just returns a non-outlined surf */
-/* using SDL_Pango if available, SDL_ttf as fallback */
-SDL_Surface* SimpleText(const char *t, TTF_Font* font, SDL_Color* col)
-{
- SDL_Surface* surf = NULL;
- int using_pango = 0;
-
-#ifdef HAVE_LIBSDL_PANGO
- using_pango = (context != NULL);
-#endif
-
- if (using_pango) {
-#ifdef HAVE_LIBSDL_PANGO
- SDLPango_Matrix colormatrix = {
- col->r, col->r, 0, 0,
- col->g, col->g, 0, 0,
- col->b, col->b, 0, 0,
- 0, 255, 0, 0,
- };
- SDLPango_SetDefaultColor(context, &colormatrix );
- SDLPango_SetText(context, t, -1);
- surf = SDLPango_CreateSurfaceDraw(context);
-#endif
- }
- else {
- surf = TTF_RenderUTF8_Blended(font, t, *col);
- }
-
- return surf;
-}
-
-
-/* This (fast) function just returns a non-outlined surf */
-/* using SDL_Pango if available, SDL_ttf as fallback */
-SDL_Surface* SimpleTextWithOffset(const char *t, TTF_Font* font, SDL_Color* col, int *glyph_offset)
-{
- SDL_Surface* surf = NULL;
- int using_pango = 0;
-
-#ifdef HAVE_LIBSDL_PANGO
- using_pango = (context != NULL);
-#endif
-
- if (using_pango) {
-#ifdef HAVE_LIBSDL_PANGO
- SDLPango_Matrix colormatrix = {
- col->r, col->r, 0, 0,
- col->g, col->g, 0, 0,
- col->b, col->b, 0, 0,
- 0, 255, 0, 0,
- };
- SDLPango_SetDefaultColor(context, &colormatrix );
- SDLPango_SetText(context, t, -1);
- surf = SDLPango_CreateSurfaceDraw(context);
- *glyph_offset = 0; // fixme?
-#endif
- }
- else {
- surf = TTF_RenderUTF8_Blended(font, t, *col);
- int h;
- int hmax = 0;
- int len = strlen(t);
- int i;
- for (i = 0; i < len; i++) {
- TTF_GlyphMetrics(font, t[i], NULL, NULL, NULL, &h, NULL);
- if (h > hmax)
- hmax = h;
- }
- *glyph_offset = hmax - TTF_FontAscent(font);
- }
-
- return surf;
-}
-
-
-
-
int inRect( SDL_Rect r, int x, int y) {
if ((x < r.x) || (y < r.y) || (x > r.x + r.w) || (y > r.y + r.h))
return 0;
@@ -827,3 +579,326 @@
return s;
}
+/************************************************************************/
+/* */
+/* Begin text drawing functions */
+/* */
+/* These functions support text drawing using either SDL_Pango */
+/* or SDL_ttf. SDL_Pango is preferable but is not available on all */
+/* platforms. Code outside of this file does not have to worry about */
+/* which library is used to do the actual rendering. */
+/************************************************************************/
+
+
+#ifdef HAVE_LIBSDL_PANGO
+#include "SDL_Pango.h"
+SDLPango_Context* context = NULL;
+static SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color* cl);
+#else
+#include "SDL_ttf.h"
+TTF_Font* menu_font = NULL;
+TTF_Font* help_font = NULL;
+TTF_Font* HS_title_font = NULL;
+TTF_Font* HS_player_font = NULL;
+#endif
+
+/* For setup, we either initialize SDL_Pango and set its context, */
+/* or we initialize SDL_ttf and load required fonts: */
+int Setup_SDL_Text(void)
+{
+#ifdef HAVE_LIBSDL_PANGO
+ char buf[64];
+
+ SDLPango_Init();
+
+ snprintf(buf, 64, "[%s][][%d]", DEFAULT_FONT_NAME, DEFAULT_MENU_FONT_SIZE);
+ context = SDLPango_CreateContext_GivenFontDesc(buf);
+ if (!context)
+ {
+ fprintf(stderr, "\nError: I could not set SDL_Pango context\n");
+ return 0;
+ }
+ return 1;
+
+#else
+/* using SDL_ttf: */
+
+ if (TTF_Init() < 0)
+ {
+ fprintf(stderr, "\nError: I could not initialize SDL_ttf\n");
+ return 0;
+ }
+
+
+#endif
+}
+
+
+
+#ifdef HAVE_LIBSDL_PANGO
+/* NOTE these functions are wrapped within SDL_extras.c/h because there */
+/* appears to be a bug in SDL_Pango that causes symbol collision errors */
+/* on some compilers if more than one file has #include "SDL_Pango.h" */
+
+void init_SDLPango_Context()
+{
+ char buf[64];
+ snprintf(buf, 64, "[%s][][%d]", DEFAULT_FONT_NAME, DEFAULT_MENU_FONT_SIZE);
+ context = SDLPango_CreateContext_GivenFontDesc(buf);
+}
+
+void free_SDLPango_Context()
+{
+ if(context != NULL)
+ SDLPango_FreeContext(context);
+ context = NULL;
+}
+
+
+void SetupSDL_Pango()
+{
+ if (SDLPango_Init () < 0)
+ {
+ fprintf(stderr,
+ "\nWarning: I could not initialize SDL_Pango !\n"
+ "%s\n\n", SDL_GetError());
+ }
+ else
+ {
+ init_SDLPango_Context();
+ }
+}
+
+
+SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color *cl)
+{
+ int k = 0;
+ SDLPango_Matrix* colour = NULL;
+
+ if (!cl)
+ {
+ fprintf(stderr, "Invalid SDL_Color* arg\n");
+ return NULL;
+ }
+
+ colour = (SDLPango_Matrix*)malloc(sizeof(SDLPango_Matrix));
+
+ for(k = 0; k < 4; k++)
+ {
+ (*colour).m[0][k] = (*cl).r;
+ (*colour).m[1][k] = (*cl).g;
+ (*colour).m[2][k] = (*cl).b;
+ }
+ (*colour).m[3][0] = 0;
+ (*colour).m[3][1] = 255;
+ (*colour).m[3][2] = 0;
+ (*colour).m[3][3] = 0;
+
+ return colour;
+}
+
+#endif
+
+
+/* BlackOutline() creates a surface containing text of the designated */
+/* foreground color, surrounded by a black shadow, on a transparent */
+/* background. The appearance can be tuned by adjusting the number of */
+/* background copies and the offset where the foreground text is */
+/* finally written (see below). */
+//SDL_Surface* BlackOutline(const char *t, TTF_Font *font, SDL_Color *c)
+SDL_Surface* BlackOutline(const char* t, int size, SDL_Color* c)
+{
+ SDL_Surface* out = NULL;
+ SDL_Surface* black_letters = NULL;
+ SDL_Surface* white_letters = NULL;
+ SDL_Surface* bg = NULL;
+ SDL_Rect dstrect;
+ Uint32 color_key;
+
+#ifndef HAVE_LIBSDL_PANGO
+ TTF_Font* font = LoadFont(DEFAULT_FONT_NAME, size);
+ if (!font)
+ {
+ fprintf(stderr, "BlackOutline(): could not load needed font - returning.");
+ return NULL;
+ }
+#else
+ if (!context)
+ {
+ fprintf(stderr, "BlackOutline(): invalid SDL_Pango context - returning.");
+ return NULL;
+ }
+#endif
+
+ if (!t || !c)
+ {
+ fprintf(stderr, "BlackOutline(): invalid ptr parameter, returning.");
+ return NULL;
+ }
+
+ if (t[0] == '\0')
+ {
+ fprintf(stderr, "BlackOutline(): empty string, returning");
+ return NULL;
+ }
+
+#ifdef TUXMATH_DEBUG
+ fprintf( stderr, "\nEntering BlackOutline(): \n");
+ fprintf( stderr, "BlackOutline of \"%s\"\n", t );
+#endif
+
+#ifndef HAVE_LIBSDL_PANGO
+ black_letters = TTF_RenderUTF8_Blended(font, t, black);
+#else
+ SDLPango_SetDefaultColor(context, MATRIX_TRANSPARENT_BACK_BLACK_LETTER);
+ SDLPango_SetText(context, t, -1);
+ black_letters = SDLPango_CreateSurfaceDraw(context);
+#endif
+
+ if (!black_letters)
+ {
+ fprintf (stderr, "Warning - BlackOutline() could not create image for %s\n", t);
+ return NULL;
+ }
+
+ bg = SDL_CreateRGBSurface(SDL_SWSURFACE,
+ (black_letters->w) + 5,
+ (black_letters->h) + 5,
+ 32,
+ rmask, gmask, bmask, amask);
+ /* Use color key for eventual transparency: */
+ color_key = SDL_MapRGB(bg->format, 01, 01, 01);
+ SDL_FillRect(bg, NULL, color_key);
+
+ /* Now draw black outline/shadow 2 pixels on each side: */
+ dstrect.w = black_letters->w;
+ dstrect.h = black_letters->h;
+
+ /* NOTE: can make the "shadow" more or less pronounced by */
+ /* changing the parameters of these loops. */
+ for (dstrect.x = 1; dstrect.x < 4; dstrect.x++)
+ for (dstrect.y = 1; dstrect.y < 3; dstrect.y++)
+ SDL_BlitSurface(black_letters , NULL, bg, &dstrect );
+
+ SDL_FreeSurface(black_letters);
+
+ /* --- Put the color version of the text on top! --- */
+#ifndef HAVE_LIBSDL_PANGO
+ white_letters = TTF_RenderUTF8_Blended(font, t, *c);
+ TTF_CloseFont(font);
+#else
+ /* convert color arg: */
+ SDLPango_Matrix* color_matrix = SDL_Colour_to_SDLPango_Matrix(c);
+
+ if (color_matrix)
+ {
+ SDLPango_SetDefaultColor(context, color_matrix);
+ free(color_matrix);
+ }
+ else /* fall back to just using white if conversion fails: */
+ SDLPango_SetDefaultColor(context, MATRIX_TRANSPARENT_BACK_WHITE_LETTER);
+
+ white_letters = SDLPango_CreateSurfaceDraw(context);
+#endif
+
+ if (!white_letters)
+ {
+ fprintf (stderr, "Warning - BlackOutline() could not create image for %s\n", t);
+ return NULL;
+ }
+
+ dstrect.x = 1;
+ dstrect.y = 1;
+ SDL_BlitSurface(white_letters, NULL, bg, &dstrect);
+ SDL_FreeSurface(white_letters);
+
+ /* --- Convert to the screen format for quicker blits --- */
+ SDL_SetColorKey(bg, SDL_SRCCOLORKEY|SDL_RLEACCEL, color_key);
+ out = SDL_DisplayFormatAlpha(bg);
+ SDL_FreeSurface(bg);
+
+#ifdef TUXMATH_DEBUG
+ fprintf( stderr, "\nLeaving BlackOutline(): \n");
+#endif
+
+ return out;
+}
+
+
+/* This (fast) function just returns a non-outlined surf */
+/* using SDL_Pango if available, SDL_ttf as fallback */
+SDL_Surface* SimpleText(const char *t, TTF_Font* font, SDL_Color* col)
+{
+ SDL_Surface* surf = NULL;
+ int using_pango = 0;
+
+#ifdef HAVE_LIBSDL_PANGO
+ using_pango = (context != NULL);
+#endif
+
+ if (using_pango) {
+#ifdef HAVE_LIBSDL_PANGO
+ SDLPango_Matrix colormatrix = {
+ col->r, col->r, 0, 0,
+ col->g, col->g, 0, 0,
+ col->b, col->b, 0, 0,
+ 0, 255, 0, 0,
+ };
+ SDLPango_SetDefaultColor(context, &colormatrix );
+ SDLPango_SetText(context, t, -1);
+ surf = SDLPango_CreateSurfaceDraw(context);
+#endif
+ }
+ else {
+ surf = TTF_RenderUTF8_Blended(font, t, *col);
+ }
+
+ return surf;
+}
+
+
+/* This (fast) function just returns a non-outlined surf */
+/* using SDL_Pango if available, SDL_ttf as fallback */
+SDL_Surface* SimpleTextWithOffset(const char *t, TTF_Font* font, SDL_Color* col, int *glyph_offset)
+{
+ SDL_Surface* surf = NULL;
+ int using_pango = 0;
+
+#ifdef HAVE_LIBSDL_PANGO
+ using_pango = (context != NULL);
+#endif
+
+ if (using_pango) {
+#ifdef HAVE_LIBSDL_PANGO
+ SDLPango_Matrix colormatrix = {
+ col->r, col->r, 0, 0,
+ col->g, col->g, 0, 0,
+ col->b, col->b, 0, 0,
+ 0, 255, 0, 0,
+ };
+ SDLPango_SetDefaultColor(context, &colormatrix );
+ SDLPango_SetText(context, t, -1);
+ surf = SDLPango_CreateSurfaceDraw(context);
+ *glyph_offset = 0; // fixme?
+#endif
+ }
+ else {
+ surf = TTF_RenderUTF8_Blended(font, t, *col);
+ int h;
+ int hmax = 0;
+ int len = strlen(t);
+ int i;
+ for (i = 0; i < len; i++) {
+ TTF_GlyphMetrics(font, t[i], NULL, NULL, NULL, &h, NULL);
+ if (h > hmax)
+ hmax = h;
+ }
+ *glyph_offset = hmax - TTF_FontAscent(font);
+ }
+
+ return surf;
+}
+
+
+
+
Modified: tuxmath/trunk/src/SDL_extras.h
===================================================================
--- tuxmath/trunk/src/SDL_extras.h 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/src/SDL_extras.h 2009-03-02 20:54:09 UTC (rev 917)
@@ -32,15 +32,13 @@
#ifdef HAVE_LIBSDL_PANGO
void init_SDLPango_Context();
void free_SDLPango_Context();
-void SetupSDL_Pango();
+void SetupSDL_Pango(void);
#endif
+/* Non-text graphics functions: */
void DrawButton(SDL_Rect* target_rect, int radius, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
void RoundCorners(SDL_Surface* s, Uint16 radius);
SDL_Surface* Flip(SDL_Surface *in, int x, int y);
-SDL_Surface* BlackOutline(const char *t, TTF_Font* font, SDL_Color* c);
-SDL_Surface* SimpleText(const char *t, TTF_Font* font, SDL_Color* col);
-SDL_Surface* SimpleTextWithOffset(const char *t, TTF_Font* font, SDL_Color* col, int *glyph_offset);
int inRect(SDL_Rect r, int x, int y);
void DarkenScreen(Uint8 bits);
void SwitchScreenMode(void);
@@ -48,5 +46,11 @@
SDL_Surface* Blend(SDL_Surface *S1, SDL_Surface *S2,float gamma);
SDL_Surface* zoom(SDL_Surface* src, int new_w, int new_h);
+/*Text rendering functions: */
+int Setup_SDL_Text();
+SDL_Surface* BlackOutline(const char* t, int size, SDL_Color* c);
+SDL_Surface* SimpleText(const char *t, TTF_Font* font, SDL_Color* col);
+SDL_Surface* SimpleTextWithOffset(const char *t, TTF_Font* font, SDL_Color* col, int *glyph_offset);
+int Cleanup_SDL_Text();
#endif
Modified: tuxmath/trunk/src/factoroids.c
===================================================================
--- tuxmath/trunk/src/factoroids.c 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/src/factoroids.c 2009-03-02 20:54:09 UTC (rev 917)
@@ -1718,17 +1718,17 @@
#endif
if (str1)
- s1 = BlackOutline(str1, default_font, &white);
+ s1 = BlackOutline(str1, DEFAULT_MENU_FONT_SIZE, &white);
if (str2)
- s2 = BlackOutline(str2, default_font, &white);
+ s2 = BlackOutline(str2, DEFAULT_MENU_FONT_SIZE, &white);
if (str3)
- s3 = BlackOutline(str3, default_font, &white);
+ s3 = BlackOutline(str3, DEFAULT_MENU_FONT_SIZE, &white);
/* When we get going with i18n may need to modify following - see below: */
if (str4)
- s4 = BlackOutline(str4, default_font, &white);
+ s4 = BlackOutline(str4, DEFAULT_MENU_FONT_SIZE, &white);
#ifdef TUXMATH_DEBUG
- fprintf(stderr, "NotImplemented() - drawing screen\n" );
+ fprintf(stderr, "ShowMessage() - drawing screen\n" );
#endif
Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/src/game.c 2009-03-02 20:54:09 UTC (rev 917)
@@ -946,7 +946,7 @@
SDL_Rect rect;
if (strlen(msg->message) > 0) {
- surf = BlackOutline( _(msg->message), help_font, &white);
+ surf = BlackOutline( _(msg->message), DEFAULT_HELP_FONT_SIZE, &white);
rect.w = surf->w;
rect.h = surf->h;
if (msg->x < 0)
@@ -2199,7 +2199,7 @@
for (i = 0; i < mp_get_parameter(PLAYERS); ++i)
{
snprintf(str, 64, "%s: %d", mp_get_player_name(i),mp_get_player_score(i));
- SDL_Surface* score = BlackOutline(str, default_font, &white);
+ SDL_Surface* score = BlackOutline(str, DEFAULT_MENU_FONT_SIZE, &white);
SDL_Rect loc = {screen->w - score->w, score->h * (i + 2), 0, 0};
SDL_BlitSurface(score, NULL, screen, &loc);
}
Modified: tuxmath/trunk/src/highscore.c
===================================================================
--- tuxmath/trunk/src/highscore.c 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/src/highscore.c 2009-03-02 20:54:09 UTC (rev 917)
@@ -58,11 +58,9 @@
int score_table_y = 100;
sprite* Tux = LoadSprite("tux/bigtux", IMG_ALPHA);
+ const int title_font_size = 32;
+ const int player_font_size = 14;
- TTF_Font* title_font = LoadFont(DEFAULT_FONT_NAME, 32);
- TTF_Font* player_font = LoadFont(DEFAULT_FONT_NAME, 14);
- if (!player_font || !title_font)
- return; // Get out if we can't load fonts - should not happen!
/* --- Set up the rects for drawing various things: ----------- */
@@ -211,7 +209,7 @@
SDL_Surface* srfc = NULL;
SDL_Rect text_rect, button_rect;
- srfc = BlackOutline(_("Hall Of Fame"), title_font, &yellow);
+ srfc = BlackOutline(_("Hall Of Fame"), title_font_size, &yellow);
if (srfc)
{
button_rect.x = text_rect.x = (screen->w)/2 - (srfc->w)/2 + 50;
@@ -228,34 +226,31 @@
srfc = NULL;
}
- if (title_font)
+ switch (diff_level)
{
- switch (diff_level)
- {
- case CADET_HIGH_SCORE:
- srfc = BlackOutline(_("Space Cadet"), title_font, &white);
- break;
- case SCOUT_HIGH_SCORE:
- srfc = BlackOutline(_("Scout"), title_font, &white);
- break;
- case RANGER_HIGH_SCORE:
- srfc = BlackOutline(_("Ranger"), title_font, &white);
- break;
- case ACE_HIGH_SCORE:
- srfc = BlackOutline(_("Ace"), title_font, &white);
- break;
- case COMMANDO_HIGH_SCORE:
- srfc = BlackOutline(_("Commando"), title_font, &white);
- break;
- case FACTORS_HIGH_SCORE:
- srfc = BlackOutline(_("Factors"), title_font, &white);
- break;
- case FRACTIONS_HIGH_SCORE:
- srfc = BlackOutline(_("Fractions"), title_font, &white);
- break;
- default:
- srfc = BlackOutline(_("Space Cadet"), title_font, &white);
- }
+ case CADET_HIGH_SCORE:
+ srfc = BlackOutline(_("Space Cadet"), title_font_size, &white);
+ break;
+ case SCOUT_HIGH_SCORE:
+ srfc = BlackOutline(_("Scout"), title_font_size, &white);
+ break;
+ case RANGER_HIGH_SCORE:
+ srfc = BlackOutline(_("Ranger"), title_font_size, &white);
+ break;
+ case ACE_HIGH_SCORE:
+ srfc = BlackOutline(_("Ace"), title_font_size, &white);
+ break;
+ case COMMANDO_HIGH_SCORE:
+ srfc = BlackOutline(_("Commando"), title_font_size, &white);
+ break;
+ case FACTORS_HIGH_SCORE:
+ srfc = BlackOutline(_("Factors"), title_font_size, &white);
+ break;
+ case FRACTIONS_HIGH_SCORE:
+ srfc = BlackOutline(_("Fractions"), title_font_size, &white);
+ break;
+ default:
+ srfc = BlackOutline(_("Space Cadet"), title_font_size, &white);
}
if (srfc)
@@ -289,9 +284,9 @@
SDL_FreeSurface(score_surfs[i]);
if (HS_Score(diff_level, i) == Opts_LastScore() && frame % 5 < 2)
- score_surfs[i] = BlackOutline(N_(score_strings[i]), player_font, &yellow);
+ score_surfs[i] = BlackOutline(N_(score_strings[i]), player_font_size, &yellow);
else
- score_surfs[i] = BlackOutline(N_(score_strings[i]), player_font, &white);
+ score_surfs[i] = BlackOutline(N_(score_strings[i]), player_font_size, &white);
/* Get out if BlackOutline() fails: */
if (!score_surfs[i])
@@ -344,9 +339,7 @@
}
frame++;
} // End of while (!finished) loop
- TTF_CloseFont(title_font);
- TTF_CloseFont(player_font);
- title_font = player_font = NULL;
+
FreeSprite(Tux);
}
@@ -376,7 +369,7 @@
Uint32 frame = 0;
Uint32 start = 0;
wchar_t wchar_buf[HIGH_SCORE_NAME_LENGTH + 1] = {'\0'};
- TTF_Font* name_font = NULL;
+// TTF_Font* name_font = NULL;
const int NAME_FONT_SIZE = 32;
const int BG_Y = 100;
const int BG_WIDTH = 400;
@@ -387,9 +380,6 @@
if (!pl_name)
return;
- name_font = LoadFont(DEFAULT_FONT_NAME, NAME_FONT_SIZE);
- if (!name_font)
- return;
/* We need to get Unicode vals from SDL keysyms */
SDL_EnableUNICODE(SDL_ENABLE);
@@ -440,7 +430,7 @@
/* Draw heading: */
{
SDL_Surface* s = BlackOutline(_(heading),
- default_font, &white);
+ DEFAULT_MENU_FONT_SIZE, &white);
if (s)
{
loc.x = (screen->w/2) - (s->w/2);
@@ -450,7 +440,7 @@
}
s = BlackOutline(_(sub),
- default_font, &white);
+ DEFAULT_MENU_FONT_SIZE, &white);
if (s)
{
loc.x = (screen->w/2) - (s->w/2);
@@ -550,7 +540,7 @@
redraw_rect.h);
}
- s = BlackOutline(UTF8_buf, name_font, &yellow);
+ s = BlackOutline(UTF8_buf, NAME_FONT_SIZE, &yellow);
if (s)
{
/* set up loc and blit: */
@@ -605,7 +595,6 @@
frame++;
} // End of while (!finished) loop
- TTF_CloseFont(name_font);
FreeSprite(Tux);
/* Turn off SDL Unicode lookup (because has some overhead): */
Modified: tuxmath/trunk/src/mathcards.c
===================================================================
--- tuxmath/trunk/src/mathcards.c 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/src/mathcards.c 2009-03-02 20:54:09 UTC (rev 917)
@@ -12,7 +12,10 @@
*
* Copyright: See COPYING file that comes with this distribution. (Briefly, GNU GPL).
*
+* Revised extensively in 2008 by Brendan Luchen, Tim Holy, and David Bruce
+*
*/
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: tuxmath/trunk/src/titlescreen.c
===================================================================
--- tuxmath/trunk/src/titlescreen.c 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/src/titlescreen.c 2009-03-02 20:54:09 UTC (rev 917)
@@ -513,32 +513,16 @@
#endif
if (str1)
- s1 = BlackOutline(str1, default_font, &white);
+ s1 = BlackOutline(str1, DEFAULT_MENU_FONT_SIZE, &white);
if (str2)
- s2 = BlackOutline(str2, default_font, &white);
+ s2 = BlackOutline(str2, DEFAULT_MENU_FONT_SIZE, &white);
if (str3)
- s3 = BlackOutline(str3, default_font, &white);
- /* When we get going with i18n may need to modify following - see below: */
+ s3 = BlackOutline(str3, DEFAULT_MENU_FONT_SIZE, &white);
if (str4)
- s4 = BlackOutline(str4, default_font, &white);
+ s4 = BlackOutline(str4, DEFAULT_MENU_FONT_SIZE, &white);
-// /* we always want the URL in english */
-// if (!useEnglish)
-// {
-// TTF_Font *english_font;
-// useEnglish = 1;
-// english_font = LoadFont( menu_font, menu_font_size );
-// s4 = black_outline( "tuxmath-devel at lists.sourceforge.net", english_font, &white);
-// TTF_CloseFont(english_font);
-// useEnglish = 0;
-// }
-// else
-// {
-// s4 = black_outline( "tuxmath-devel at lists.sourceforge.net", default_font, &white);
-// }
-
#ifdef TUXMATH_DEBUG
- fprintf(stderr, "NotImplemented() - drawing screen\n" );
+ fprintf(stderr, "ShowMessage() - drawing screen\n" );
#endif
/* Redraw background: */
@@ -1428,18 +1412,18 @@
/**** Render the menu choices ****/
if (title_offset)
{
- menu_item_unselected[0] = BlackOutline( _(menu_opts.title),default_font,&red);
+ menu_item_unselected[0] = BlackOutline( _(menu_opts.title), DEFAULT_MENU_FONT_SIZE, &red);
// It will never be selected, so we don't have to do anything for selected.
menu_item_selected[0] = NULL;
}
for (i = 0; i < n_menu_entries; i++)
{
- menu_item_unselected[i+title_offset] = BlackOutline( _(menu_text[i]), default_font, &white );
- menu_item_selected[i+title_offset] = BlackOutline( _(menu_text[i]), default_font, &yellow);
+ menu_item_unselected[i+title_offset] = BlackOutline( _(menu_text[i]), DEFAULT_MENU_FONT_SIZE, &white );
+ menu_item_selected[i+title_offset] = BlackOutline( _(menu_text[i]), DEFAULT_MENU_FONT_SIZE, &yellow);
}
if (have_trailer) {
- menu_item_unselected[n_menu_entries+title_offset] = BlackOutline( _(menu_opts.trailer), default_font, &white );
- menu_item_selected[n_menu_entries+title_offset] = BlackOutline( _(menu_opts.trailer), default_font, &yellow);
+ menu_item_unselected[n_menu_entries+title_offset] = BlackOutline( _(menu_opts.trailer), DEFAULT_MENU_FONT_SIZE, &white );
+ menu_item_selected[n_menu_entries+title_offset] = BlackOutline( _(menu_opts.trailer), DEFAULT_MENU_FONT_SIZE, &yellow);
}
// We won't need the menu_text again, so now we can keep track of
// the total entries including the title & trailer
Modified: tuxmath/trunk/tuxmath.spec.in
===================================================================
--- tuxmath/trunk/tuxmath.spec.in 2009-03-02 15:10:45 UTC (rev 916)
+++ tuxmath/trunk/tuxmath.spec.in 2009-03-02 20:54:09 UTC (rev 917)
@@ -1,5 +1,5 @@
## tuxmath.spec.in - process with configure to substitute in PACKAGE
-# VERSION strings
+## VERSION strings
#
# spec file for package tuxmath
#
@@ -9,7 +9,11 @@
Name: @PACKAGE@
+Obsoletes: tuxmath = 2001.09.07
+Obsoletes: tuxmath_preview <= @VERSION@
+Provides: tuxmath_preview = @VERSION@
%define realname tuxmath_w_fonts
+%define progname tuxmath
Summary: Tux Math - educational math game
Version: @VERSION@
Release: 1
@@ -17,26 +21,33 @@
Group: Productivity/Scientific/Math
Url: http://tux4kids.alioth.debian.org/
Vendor: openSUSE-Education
-Obsoletes: tuxmath = 2001.09.07
+
BuildRequires: SDL_image-devel >= 1.2.2
BuildRequires: SDL_ttf-devel > 2.0.8
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
BuildRequires: SDL_Pango-devel
+BuildRequires: ImageMagick
+
%if 0%{?suse_version}
BuildRequires: update-desktop-files
BuildRequires: fdupes
%endif
+
%if 0%{?fedora_version}
BuildRequires: desktop-file-utils
%endif
+
%if 0%{?mandriva_version}
BuildRequires: desktop-file-utils
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
%endif
+%if 0%{?mandriva_version} >= 2009
+BuildRequires: pulseaudio-esound-compat
+%endif
+
Source0: %realname-%version.tar.bz2
-Source1: tuxmath.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -67,13 +78,14 @@
make %{?jobs:-j %jobs}
%install
-install -d %buildroot/{%_bindir,%_datadir/pixmaps,%_datadir/applications,%_datadir/%name,%_defaultdocdir/%name}
+install -d %buildroot/{%_bindir,%_datadir/pixmaps,%_datadir/applications,%_datadir/%progname,%_defaultdocdir/%progname}
make DESTDIR=%{buildroot} install
-install -m 644 data/images/icons/icon.png %buildroot%_datadir/pixmaps/%name.png
+install -m 644 data/images/icons/icon.png %buildroot%_datadir/pixmaps/%progname.png
+
%if 0%{?suse_version}
# handle special docdir path
-mv %buildroot/%_datadir/doc/%name/* %buildroot/%_defaultdocdir/%name/
-rm -rf %buildroot/%_datadir/doc/%name
+mv %buildroot/%_datadir/doc/%progname/* %buildroot/%_defaultdocdir/%progname/
+rm -rf %buildroot/%_datadir/doc/%progname
# install desktop file
%suse_update_desktop_file -i tuxmath Education Math
%fdupes -s %buildroot
@@ -82,16 +94,16 @@
# install desktop file
desktop-file-install --vendor="%{vendor}" \
--dir=%buildroot/%_datadir/applications \
- %{SOURCE1}
+ tuxmath.desktop
%endif
%if 0%{?mandriva_version}
desktop-file-install --vendor="%{vendor}" \
--dir=%buildroot/%_datadir/applications \
- %{SOURCE1}
+ tuxmath.desktop
%endif
# remove invalid locale directories
rm -rf %buildroot/%{_datadir}/locale/en@*
-%find_lang %name
+%find_lang %progname
%if 0%{?mandriva_version}
%post
@@ -104,12 +116,12 @@
%clean
rm -rf %buildroot
-%files -f %name.lang
+%files -f %progname.lang
%defattr(-,root,root)
-%doc %_defaultdocdir/%name
+%doc %_defaultdocdir/%progname
%_bindir/*
%_datadir/pixmaps/*
%_datadir/applications/*
-%_datadir/%name
+%_datadir/%progname
%changelog
More information about the Tux4kids-commits
mailing list