[Tux4kids-commits] r219 - in tuxtype/branches/tuxtype-indic: . tuxtype tuxtype/data/images/hands tuxtype/data/scripts tuxtype/data/themes/malayalam tuxtype/data/themes/malayalam/images/keyboard
mobin-guest at alioth.debian.org
mobin-guest at alioth.debian.org
Fri Aug 31 19:29:09 UTC 2007
Author: mobin-guest
Date: 2007-08-31 19:29:09 +0000 (Fri, 31 Aug 2007)
New Revision: 219
Added:
tuxtype/branches/tuxtype-indic/tuxtype.spec
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/scripts/
Modified:
tuxtype/branches/tuxtype-indic/Makefile
tuxtype/branches/tuxtype-indic/config.h
tuxtype/branches/tuxtype-indic/config.log
tuxtype/branches/tuxtype-indic/config.status
tuxtype/branches/tuxtype-indic/configure
tuxtype/branches/tuxtype-indic/configure.ac
tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/0.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/1.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/2.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/3.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/4.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/5.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/6.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/7.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/8.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/9.png
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/hands.png
tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Lesson_1.xml
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.am
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/keyboard/key.png
tuxtype/branches/tuxtype-indic/tuxtype/globals.h
tuxtype/branches/tuxtype-indic/tuxtype/practice.c
tuxtype/branches/tuxtype-indic/tuxtype/scripting.c
tuxtype/branches/tuxtype-indic/tuxtype/theme.c
Log:
Modified Malayalam Lessons in Indic Subproject
Modified: tuxtype/branches/tuxtype-indic/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/Makefile 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/Makefile 2007-08-31 19:29:09 UTC (rev 219)
@@ -74,11 +74,11 @@
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run tar
-AUTOCONF = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run automake-1.10
+ACLOCAL = ${SHELL} /usr/local/src/new/missing --run aclocal-1.10
+AMTAR = ${SHELL} /usr/local/src/new/missing --run tar
+AUTOCONF = ${SHELL} /usr/local/src/new/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/local/src/new/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/local/src/new/missing --run automake-1.10
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -101,10 +101,10 @@
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LDFLAGS =
LIBOBJS =
-LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/local/src/new/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NSIS = no
NSI_DLL_DIR = /home/mobin/tuxtype_dll
@@ -125,10 +125,10 @@
STRIP =
VERSION = 1.5.10
WINDRES =
-abs_builddir = /home/mobin/Desktop/tuxtype-indic
-abs_srcdir = /home/mobin/Desktop/tuxtype-indic
-abs_top_builddir = /home/mobin/Desktop/tuxtype-indic
-abs_top_srcdir = /home/mobin/Desktop/tuxtype-indic
+abs_builddir = /usr/local/src/new
+abs_srcdir = /usr/local/src/new
+abs_top_builddir = /usr/local/src/new
+abs_top_srcdir = /usr/local/src/new
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
@@ -155,7 +155,7 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/mobin/Desktop/tuxtype-indic/install-sh
+install_sh = $(SHELL) /usr/local/src/new/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
Modified: tuxtype/branches/tuxtype-indic/config.h
===================================================================
--- tuxtype/branches/tuxtype-indic/config.h 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/config.h 2007-08-31 19:29:09 UTC (rev 219)
@@ -16,6 +16,9 @@
/* Define to 1 if you have the `SDL_mixer' library (-lSDL_mixer). */
#define HAVE_LIBSDL_MIXER 1
+/* Define to 1 if you have the `SDL_Pango' library (-lSDL_Pango). */
+#define HAVE_LIBSDL_PANGO 1
+
/* Define to 1 if you have the `SDL_ttf' library (-lSDL_ttf). */
#define HAVE_LIBSDL_TTF 1
@@ -65,19 +68,19 @@
#define PACKAGE_NAME "tuxtype"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "tuxtype 1.5.9"
+#define PACKAGE_STRING "tuxtype 1.5.10"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "tuxtype"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.9"
+#define PACKAGE_VERSION "1.5.10"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.5.9"
+#define VERSION "1.5.10"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
Modified: tuxtype/branches/tuxtype-indic/config.log
===================================================================
--- tuxtype/branches/tuxtype-indic/config.log 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/config.log 2007-08-31 19:29:09 UTC (rev 219)
@@ -4,17 +4,17 @@
It was created by tuxtype configure 1.5.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
- $ configure --cache-file=cross-config.cache --target=i586-mingw32msvc --host=i586-mingw32msvc --build=i386-linux --prefix=/usr/local/cross-tools/i586-mingw32msvc --with-sdl-prefix
+ $ ./configure --prefix /usr/local --no-create --no-recursion
## --------- ##
## Platform. ##
## --------- ##
-hostname = debian
+hostname = stallman
uname -m = x86_64
-uname -r = 2.6.20
+uname -r = 2.6.18-4-amd64
uname -s = Linux
-uname -v = #1 SMP PREEMPT Thu Mar 29 14:40:23 EDT 2007
+uname -v = #1 SMP Mon Mar 26 19:17:44 UTC 2007
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
@@ -27,26 +27,25 @@
/usr/bin/oslevel = unknown
/bin/universe = unknown
-PATH: /usr/local/cross-tools/bin
-PATH: /usr/local/cross-tools/i586-mingw32msvc/bin
-PATH: /home/dbruce/bin
+PATH: /usr/local/sbin
PATH: /usr/local/bin
+PATH: /usr/sbin
PATH: /usr/bin
+PATH: /sbin
PATH: /bin
-PATH: /usr/games
+PATH: /usr/X11R6/bin
## ----------- ##
## Core tests. ##
## ----------- ##
-configure:1682: creating cache cross-config.cache
configure:1804: checking build system type
-configure:1822: result: i386-pc-linux-gnu
+configure:1822: result: x86_64-unknown-linux-gnu
configure:1844: checking host system type
-configure:1859: result: i586-pc-mingw32msvc
+configure:1859: result: x86_64-unknown-linux-gnu
configure:1881: checking target system type
-configure:1896: result: i586-pc-mingw32msvc
+configure:1896: result: x86_64-unknown-linux-gnu
configure:1941: checking for a BSD-compatible install
configure:1997: result: /usr/bin/install -c
configure:2008: checking whether build environment is sane
@@ -54,66 +53,64 @@
configure:2079: checking for a thread-safe mkdir -p
configure:2118: result: /bin/mkdir -p
configure:2131: checking for gawk
-configure:2161: result: no
-configure:2131: checking for mawk
-configure:2147: found /usr/bin/mawk
-configure:2158: result: mawk
+configure:2147: found /usr/bin/gawk
+configure:2158: result: gawk
configure:2169: checking whether make sets $(MAKE)
configure:2190: result: yes
-configure:2270: checking for i586-mingw32msvc-strip
-configure:2286: found /usr/bin/i586-mingw32msvc-strip
-configure:2297: result: i586-mingw32msvc-strip
-configure:2390: checking for i586-mingw32msvc-gcc
-configure:2406: found /usr/bin/i586-mingw32msvc-gcc
-configure:2417: result: i586-mingw32msvc-gcc
+configure:2430: checking for gcc
+configure:2446: found /usr/bin/gcc
+configure:2457: result: gcc
configure:2695: checking for C compiler version
-configure:2702: i586-mingw32msvc-gcc --version >&5
-i586-mingw32msvc-gcc (GCC) 3.4.5 (mingw special)
-Copyright (C) 2004 Free Software Foundation, Inc.
+configure:2702: gcc --version >&5
+gcc (GCC) 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)
+Copyright (C) 2006 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
configure:2705: $? = 0
-configure:2712: i586-mingw32msvc-gcc -v >&5
-Reading specs from /usr/lib/gcc/i586-mingw32msvc/3.4.5/specs
-Configured with: /home/ron/devel/debian/mingw32/mingw32-3.4.5.20060117.1.dfsg/build_dir/src/gcc-3.4.5-20060117-1-dfsg/configure -v --prefix=/usr --target=i586-mingw32msvc --enable-languages=c,c++ --enable-threads --enable-sjlj-exceptions --disable-multilib --enable-version-specific-runtime-libs
-Thread model: win32
-gcc version 3.4.5 (mingw special)
+configure:2712: gcc -v >&5
+Using built-in specs.
+Target: i486-linux-gnu
+Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --with-tune=i686 --enable-checking=release i486-linux-gnu
+Thread model: posix
+gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)
configure:2715: $? = 0
-configure:2722: i586-mingw32msvc-gcc -V >&5
-i586-mingw32msvc-gcc: `-V' option must have argument
+configure:2722: gcc -V >&5
+gcc: '-V' option must have argument
configure:2725: $? = 1
configure:2748: checking for C compiler default output file name
-configure:2775: i586-mingw32msvc-gcc -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c >&5
+configure:2775: gcc conftest.c >&5
configure:2778: $? = 0
-configure:2816: result: a.exe
+configure:2816: result: a.out
configure:2833: checking whether the C compiler works
+configure:2843: ./a.out
+configure:2846: $? = 0
configure:2863: result: yes
configure:2870: checking whether we are cross compiling
-configure:2872: result: yes
+configure:2872: result: no
configure:2875: checking for suffix of executables
-configure:2882: i586-mingw32msvc-gcc -o conftest.exe -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c >&5
+configure:2882: gcc -o conftest conftest.c >&5
configure:2885: $? = 0
-configure:2909: result: .exe
+configure:2909: result:
configure:2915: checking for suffix of object files
-configure:2941: i586-mingw32msvc-gcc -c -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
+configure:2941: gcc -c conftest.c >&5
configure:2944: $? = 0
configure:2967: result: o
configure:2971: checking whether we are using the GNU C compiler
-configure:3000: i586-mingw32msvc-gcc -c -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
+configure:3000: gcc -c conftest.c >&5
configure:3006: $? = 0
configure:3023: result: yes
-configure:3028: checking whether i586-mingw32msvc-gcc accepts -g
-configure:3058: i586-mingw32msvc-gcc -c -g -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
+configure:3028: checking whether gcc accepts -g
+configure:3058: gcc -c -g conftest.c >&5
configure:3064: $? = 0
configure:3163: result: yes
-configure:3180: checking for i586-mingw32msvc-gcc option to accept ISO C89
-configure:3254: i586-mingw32msvc-gcc -c -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
+configure:3180: checking for gcc option to accept ISO C89
+configure:3254: gcc -c -g -O2 conftest.c >&5
configure:3260: $? = 0
configure:3283: result: none needed
configure:3312: checking for style of include used by make
configure:3340: result: GNU
-configure:3365: checking dependency style of i586-mingw32msvc-gcc
+configure:3365: checking dependency style of gcc
configure:3456: result: gcc3
configure:3484: checking for a BSD-compatible install
configure:3540: result: /usr/bin/install -c
@@ -125,24 +122,35 @@
configure:3668: found /usr/bin/sdl-config
configure:3681: result: /usr/bin/sdl-config
configure:3690: checking for SDL - version >= 1.2.5
+configure:3785: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL >&5
+configure:3788: $? = 0
+configure:3794: ./conftest
+configure:3797: $? = 0
configure:3817: result: yes
configure:3913: checking for Mix_PlayMusic in -lSDL_mixer
-configure:3948: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_mixer >&5
+configure:3948: gcc -o conftest -g -O2 conftest.c -lSDL_mixer >&5
configure:3954: $? = 0
configure:3972: result: yes
configure:3988: checking for TTF_Init in -lSDL_ttf
-configure:4023: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_ttf -lSDL_mixer >&5
+configure:4023: gcc -o conftest -g -O2 conftest.c -lSDL_ttf -lSDL_mixer >&5
configure:4029: $? = 0
configure:4047: result: yes
configure:4063: checking for IMG_Load in -lSDL_image
-configure:4098: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:4098: gcc -o conftest -g -O2 conftest.c -lSDL_image -lSDL_ttf -lSDL_mixer >&5
configure:4104: $? = 0
configure:4122: result: yes
configure:4138: checking for SDLPango_Init in -lSDL_Pango
-configure:4173: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
-/usr/lib/gcc/i586-mingw32msvc/3.4.5/../../../../i586-mingw32msvc/bin/ld: cannot find -lSDL_Pango
-collect2: ld returned 1 exit status
-configure:4179: $? = 1
+configure:4173: gcc -o conftest -g -O2 conftest.c -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:4179: $? = 0
+configure:4197: result: yes
+configure:4220: checking for native Win32
+configure:4230: result: no
+configure:4303: checking how to run the C preprocessor
+configure:4343: gcc -E conftest.c
+configure:4349: $? = 0
+configure:4380: gcc -E conftest.c
+conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
+configure:4386: $? = 1
configure: failed program was:
| /* confdefs.h. */
| #define PACKAGE_NAME "tuxtype"
@@ -155,112 +163,224 @@
| #define HAVE_LIBSDL_MIXER 1
| #define HAVE_LIBSDL_TTF 1
| #define HAVE_LIBSDL_IMAGE 1
+| #define HAVE_LIBSDL_PANGO 1
| /* 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 SDLPango_Init ();
-| int
-| main ()
-| {
-| return SDLPango_Init ();
-| ;
-| return 0;
-| }
-configure:4197: result: no
-configure:4207: error: SDL_pango not found http://sdlpango.sourceforge.net/
+| #include <ac_nonexistent.h>
+configure:4419: result: gcc -E
+configure:4448: gcc -E conftest.c
+configure:4454: $? = 0
+configure:4485: gcc -E conftest.c
+conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
+configure:4491: $? = 1
+configure: failed program was:
+| /* confdefs.h. */
+| #define PACKAGE_NAME "tuxtype"
+| #define PACKAGE_TARNAME "tuxtype"
+| #define PACKAGE_VERSION "1.5.10"
+| #define PACKAGE_STRING "tuxtype 1.5.10"
+| #define PACKAGE_BUGREPORT "tuxmath-devel at lists.sourceforge.net"
+| #define PACKAGE "tuxtype"
+| #define VERSION "1.5.10"
+| #define HAVE_LIBSDL_MIXER 1
+| #define HAVE_LIBSDL_TTF 1
+| #define HAVE_LIBSDL_IMAGE 1
+| #define HAVE_LIBSDL_PANGO 1
+| /* end confdefs.h. */
+| #include <ac_nonexistent.h>
+configure:4529: checking for grep that handles long lines and -e
+configure:4603: result: /bin/grep
+configure:4608: checking for egrep
+configure:4686: result: /bin/grep -E
+configure:4691: checking for ANSI C header files
+configure:4721: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4727: $? = 0
+configure:4826: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:4829: $? = 0
+configure:4835: ./conftest
+configure:4838: $? = 0
+configure:4855: result: yes
+configure:4879: checking for sys/types.h
+configure:4900: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4906: $? = 0
+configure:4922: result: yes
+configure:4879: checking for sys/stat.h
+configure:4900: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4906: $? = 0
+configure:4922: result: yes
+configure:4879: checking for stdlib.h
+configure:4900: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4906: $? = 0
+configure:4922: result: yes
+configure:4879: checking for string.h
+configure:4900: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4906: $? = 0
+configure:4922: result: yes
+configure:4879: checking for memory.h
+configure:4900: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4906: $? = 0
+configure:4922: result: yes
+configure:4879: checking for strings.h
+configure:4900: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4906: $? = 0
+configure:4922: result: yes
+configure:4879: checking for inttypes.h
+configure:4900: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4906: $? = 0
+configure:4922: result: yes
+configure:4879: checking for stdint.h
+configure:4900: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4906: $? = 0
+configure:4922: result: yes
+configure:4879: checking for unistd.h
+configure:4900: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:4906: $? = 0
+configure:4922: result: yes
+configure:4940: checking for stdlib.h
+configure:4946: result: yes
+configure:4940: checking for string.h
+configure:4946: result: yes
+configure:5082: checking for an ANSI C-conforming const
+configure:5157: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:5163: $? = 0
+configure:5178: result: yes
+configure:5188: checking for inline
+configure:5214: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
+configure:5220: $? = 0
+configure:5238: result: inline
+configure:5267: checking for atexit
+configure:5323: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:5329: $? = 0
+configure:5347: result: yes
+configure:5267: checking for memset
+configure:5323: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+conftest.c:50: warning: conflicting types for built-in function 'memset'
+configure:5329: $? = 0
+configure:5347: result: yes
+configure:5267: checking for strchr
+configure:5323: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+conftest.c:51: warning: conflicting types for built-in function 'strchr'
+configure:5329: $? = 0
+configure:5347: result: yes
+configure:5267: checking for strstr
+configure:5323: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+conftest.c:52: warning: conflicting types for built-in function 'strstr'
+configure:5329: $? = 0
+configure:5347: result: yes
+configure:5267: checking for malloc
+configure:5323: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+conftest.c:53: warning: conflicting types for built-in function 'malloc'
+configure:5329: $? = 0
+configure:5347: result: yes
+configure:5399: checking for makensis
+configure:5430: result: no
+configure:5571: creating ./config.status
## ---------------- ##
## Cache variables. ##
## ---------------- ##
-ac_cv_build=i386-pc-linux-gnu
+ac_cv_build=x86_64-unknown-linux-gnu
ac_cv_c_compiler_gnu=yes
+ac_cv_c_const=yes
+ac_cv_c_inline=inline
ac_cv_env_CC_set=
ac_cv_env_CC_value=
ac_cv_env_CFLAGS_set=
ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=set
-ac_cv_env_CPPFLAGS_value=-I/usr/local/cross-tools/i586-mingw32msvc/include
+ac_cv_env_CPPFLAGS_set=
+ac_cv_env_CPPFLAGS_value=
ac_cv_env_CPP_set=
ac_cv_env_CPP_value=
-ac_cv_env_LDFLAGS_set=set
-ac_cv_env_LDFLAGS_value=-L/usr/local/cross-tools/i586-mingw32msvc/lib
+ac_cv_env_LDFLAGS_set=
+ac_cv_env_LDFLAGS_value=
ac_cv_env_LIBS_set=
ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=set
-ac_cv_env_build_alias_value=i386-linux
-ac_cv_env_host_alias_set=set
-ac_cv_env_host_alias_value=i586-mingw32msvc
-ac_cv_env_target_alias_set=set
-ac_cv_env_target_alias_value=i586-mingw32msvc
-ac_cv_exeext=.exe
-ac_cv_host=i586-pc-mingw32msvc
-ac_cv_lib_SDL_Pango_SDLPango_Init=no
+ac_cv_env_build_alias_set=
+ac_cv_env_build_alias_value=
+ac_cv_env_host_alias_set=
+ac_cv_env_host_alias_value=
+ac_cv_env_target_alias_set=
+ac_cv_env_target_alias_value=
+ac_cv_func_atexit=yes
+ac_cv_func_malloc=yes
+ac_cv_func_memset=yes
+ac_cv_func_strchr=yes
+ac_cv_func_strstr=yes
+ac_cv_header_inttypes_h=yes
+ac_cv_header_memory_h=yes
+ac_cv_header_stdc=yes
+ac_cv_header_stdint_h=yes
+ac_cv_header_stdlib_h=yes
+ac_cv_header_string_h=yes
+ac_cv_header_strings_h=yes
+ac_cv_header_sys_stat_h=yes
+ac_cv_header_sys_types_h=yes
+ac_cv_header_unistd_h=yes
+ac_cv_host=x86_64-unknown-linux-gnu
+ac_cv_lib_SDL_Pango_SDLPango_Init=yes
ac_cv_lib_SDL_image_IMG_Load=yes
ac_cv_lib_SDL_mixer_Mix_PlayMusic=yes
ac_cv_lib_SDL_ttf_TTF_Init=yes
ac_cv_objext=o
+ac_cv_path_EGREP='/bin/grep -E'
+ac_cv_path_GREP=/bin/grep
+ac_cv_path_NSIS=no
ac_cv_path_SDL_CONFIG=/usr/bin/sdl-config
ac_cv_path_install='/usr/bin/install -c'
ac_cv_path_mkdir=/bin/mkdir
-ac_cv_prog_AWK=mawk
-ac_cv_prog_CC=i586-mingw32msvc-gcc
-ac_cv_prog_STRIP=i586-mingw32msvc-strip
+ac_cv_prog_AWK=gawk
+ac_cv_prog_CPP='gcc -E'
+ac_cv_prog_ac_ct_CC=gcc
ac_cv_prog_cc_c89=
ac_cv_prog_cc_g=yes
ac_cv_prog_make_make_set=yes
-ac_cv_target=i586-pc-mingw32msvc
+ac_cv_target=x86_64-unknown-linux-gnu
am_cv_CC_dependencies_compiler_type=gcc3
## ----------------- ##
## Output variables. ##
## ----------------- ##
-ACLOCAL='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10'
+ACLOCAL='${SHELL} /usr/local/src/new/missing --run aclocal-1.10'
AMDEPBACKSLASH='\'
AMDEP_FALSE='#'
AMDEP_TRUE=''
-AMTAR='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar'
-AUTOCONF='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10'
-AWK='mawk'
+AMTAR='${SHELL} /usr/local/src/new/missing --run tar'
+AUTOCONF='${SHELL} /usr/local/src/new/missing --run autoconf'
+AUTOHEADER='${SHELL} /usr/local/src/new/missing --run autoheader'
+AUTOMAKE='${SHELL} /usr/local/src/new/missing --run automake-1.10'
+AWK='gawk'
BUILD_MINGW32_FALSE=''
-BUILD_MINGW32_TRUE=''
-CC='i586-mingw32msvc-gcc'
+BUILD_MINGW32_TRUE='#'
+CC='gcc'
CCDEPMODE='depmode=gcc3'
-CFLAGS='-g -O2'
-CPP=''
-CPPFLAGS='-I/usr/local/cross-tools/i586-mingw32msvc/include'
+CFLAGS='-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
+CPP='gcc -E'
+CPPFLAGS=' -DDATA_PREFIX=\"$(prefix)\"'
CYGPATH_W='echo'
-DEFS=''
+DEFS='-DHAVE_CONFIG_H'
DEPDIR='.deps'
ECHO_C=''
ECHO_N='-n'
ECHO_T=''
-EGREP=''
-EXEEXT='.exe'
-GREP=''
+EGREP='/bin/grep -E'
+EXEEXT=''
+GREP='/bin/grep'
INSTALL_DATA='${INSTALL} -m 644'
INSTALL_PROGRAM='${INSTALL}'
INSTALL_SCRIPT='${INSTALL}'
INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
-LDFLAGS='-L/usr/local/cross-tools/i586-mingw32msvc/lib'
+LDFLAGS=''
LIBOBJS=''
-LIBS='-lSDL_image -lSDL_ttf -lSDL_mixer '
+LIBS='-L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer '
LN_S='ln -s'
LTLIBOBJS=''
-MAKEINFO='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo'
-NSIS=''
-NSI_BUILD_FALSE=''
+MAKEINFO='${SHELL} /usr/local/src/new/missing --run makeinfo'
+NSIS='no'
+NSI_BUILD_FALSE='#'
NSI_BUILD_TRUE=''
-NSI_DLL_DIR=''
-NSI_INSTALL_DIR=''
+NSI_DLL_DIR='/home/mobin/tuxtype_dll'
+NSI_INSTALL_DIR='mingw32'
OBJEXT='o'
PACKAGE='tuxtype'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
@@ -274,10 +394,10 @@
SDL_LIBS='-L/usr/lib -lSDL'
SET_MAKE=''
SHELL='/bin/sh'
-STRIP='i586-mingw32msvc-strip'
+STRIP=''
VERSION='1.5.10'
WINDRES=''
-ac_ct_CC=''
+ac_ct_CC='gcc'
am__fastdepCC_FALSE='#'
am__fastdepCC_TRUE=''
am__include='include'
@@ -287,25 +407,25 @@
am__tar='${AMTAR} chof - "$$tardir"'
am__untar='${AMTAR} xf -'
bindir='${exec_prefix}/bin'
-build='i386-pc-linux-gnu'
-build_alias='i386-linux'
-build_cpu='i386'
+build='x86_64-unknown-linux-gnu'
+build_alias=''
+build_cpu='x86_64'
build_os='linux-gnu'
-build_vendor='pc'
+build_vendor='unknown'
datadir='${datarootdir}'
datarootdir='${prefix}/share'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
dvidir='${docdir}'
-exec_prefix='NONE'
-host='i586-pc-mingw32msvc'
-host_alias='i586-mingw32msvc'
-host_cpu='i586'
-host_os='mingw32msvc'
-host_vendor='pc'
+exec_prefix='${prefix}'
+host='x86_64-unknown-linux-gnu'
+host_alias=''
+host_cpu='x86_64'
+host_os='linux-gnu'
+host_vendor='unknown'
htmldir='${docdir}'
includedir='${prefix}/include'
infodir='${datarootdir}/info'
-install_sh='$(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh'
+install_sh='$(SHELL) /usr/local/src/new/install-sh'
libdir='${exec_prefix}/lib'
libexecdir='${exec_prefix}/libexec'
localedir='${datarootdir}/locale'
@@ -314,17 +434,17 @@
mkdir_p='/bin/mkdir -p'
oldincludedir='/usr/include'
pdfdir='${docdir}'
-prefix='/usr/local/cross-tools/i586-mingw32msvc'
-program_transform_name='s&^&i586-mingw32msvc-&'
+prefix='/usr/local'
+program_transform_name='s,x,x,'
psdir='${docdir}'
sbindir='${exec_prefix}/sbin'
sharedstatedir='${prefix}/com'
sysconfdir='${prefix}/etc'
-target='i586-pc-mingw32msvc'
-target_alias='i586-mingw32msvc'
-target_cpu='i586'
-target_os='mingw32msvc'
-target_vendor='pc'
+target='x86_64-unknown-linux-gnu'
+target_alias=''
+target_cpu='x86_64'
+target_os='linux-gnu'
+target_vendor='unknown'
## ----------- ##
## confdefs.h. ##
@@ -340,5 +460,137 @@
#define HAVE_LIBSDL_MIXER 1
#define HAVE_LIBSDL_TTF 1
#define HAVE_LIBSDL_IMAGE 1
+#define HAVE_LIBSDL_PANGO 1
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_ATEXIT 1
+#define HAVE_MEMSET 1
+#define HAVE_STRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_MALLOC 1
-configure: exit 1
+configure: exit 0
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by tuxtype config.status 1.5.10, which was
+generated by GNU Autoconf 2.61. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ./config.status
+
+on stallman
+
+config.status:738: creating Makefile
+config.status:738: creating tuxtype/Makefile
+config.status:738: creating tuxtype/data/Makefile
+config.status:738: creating tuxtype/data/fonts/Makefile
+config.status:738: creating tuxtype/data/images/Makefile
+config.status:738: creating tuxtype/data/images/backgrounds/Makefile
+config.status:738: creating tuxtype/data/images/cities/Makefile
+config.status:738: creating tuxtype/data/images/comets/Makefile
+config.status:738: creating tuxtype/data/images/hands/Makefile
+config.status:738: creating tuxtype/data/images/keyboard/Makefile
+config.status:738: creating tuxtype/data/images/menu/Makefile
+config.status:738: creating tuxtype/data/images/status/Makefile
+config.status:738: creating tuxtype/data/images/tux/Makefile
+config.status:738: creating tuxtype/data/scripts/Makefile
+config.status:738: creating tuxtype/data/sounds/Makefile
+config.status:738: creating tuxtype/data/themes/Makefile
+config.status:738: creating tuxtype/data/themes/armenian/Makefile
+config.status:738: creating tuxtype/data/themes/armenian/images/Makefile
+config.status:738: creating tuxtype/data/themes/bokmal/Makefile
+config.status:738: creating tuxtype/data/themes/bokmal/words/Makefile
+config.status:738: creating tuxtype/data/themes/bokmal/images/Makefile
+config.status:738: creating tuxtype/data/themes/bokmal/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/brazilian-portuguese/Makefile
+config.status:738: creating tuxtype/data/themes/brazilian-portuguese/images/Makefile
+config.status:738: creating tuxtype/data/themes/brazilian-portuguese/words/Makefile
+config.status:738: creating tuxtype/data/themes/catalan/Makefile
+config.status:738: creating tuxtype/data/themes/catalan/words/Makefile
+config.status:738: creating tuxtype/data/themes/dansk/Makefile
+config.status:738: creating tuxtype/data/themes/dansk/sounds/Makefile
+config.status:738: creating tuxtype/data/themes/dansk/words/Makefile
+config.status:738: creating tuxtype/data/themes/deutsch/Makefile
+config.status:738: creating tuxtype/data/themes/deutsch/words/Makefile
+config.status:738: creating tuxtype/data/themes/espanol/Makefile
+config.status:738: creating tuxtype/data/themes/espanol/images/Makefile
+config.status:738: creating tuxtype/data/themes/espanol/words/Makefile
+config.status:738: creating tuxtype/data/themes/euskara/Makefile
+config.status:738: creating tuxtype/data/themes/euskara/images/Makefile
+config.status:738: creating tuxtype/data/themes/euskara/words/Makefile
+config.status:738: creating tuxtype/data/themes/french/Makefile
+config.status:738: creating tuxtype/data/themes/french/words/Makefile
+config.status:738: creating tuxtype/data/themes/greek/Makefile
+config.status:738: creating tuxtype/data/themes/greek/words/Makefile
+config.status:738: creating tuxtype/data/themes/italian/Makefile
+config.status:738: creating tuxtype/data/themes/italian/words/Makefile
+config.status:738: creating tuxtype/data/themes/jamaican/Makefile
+config.status:738: creating tuxtype/data/themes/jamaican/images/Makefile
+config.status:738: creating tuxtype/data/themes/jamaican/words/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/images/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/sounds/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/words/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/images/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/images/keyboard/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/words/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/scripts/Makefile
+config.status:738: creating tuxtype/data/themes/nederlands/Makefile
+config.status:738: creating tuxtype/data/themes/nederlands/words/Makefile
+config.status:738: creating tuxtype/data/themes/nynorsk/Makefile
+config.status:738: creating tuxtype/data/themes/nynorsk/images/Makefile
+config.status:738: creating tuxtype/data/themes/nynorsk/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/nynorsk/words/Makefile
+config.status:738: creating tuxtype/data/themes/russian/Makefile
+config.status:738: creating tuxtype/data/themes/russian/images/Makefile
+config.status:738: creating tuxtype/data/themes/russian/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/russian/words/Makefile
+config.status:738: creating tuxtype/data/themes/svenska/Makefile
+config.status:738: creating tuxtype/data/themes/svenska/words/Makefile
+config.status:738: creating tuxtype/data/themes/swahili/Makefile
+config.status:738: creating tuxtype/data/themes/swahili/words/Makefile
+config.status:738: creating tuxtype/data/words/Makefile
+config.status:738: creating tuxtype/docs/Makefile
+config.status:738: creating tuxtype/docs/en/Makefile
+config.status:738: creating tuxtype.spec
+config.status:738: creating nsis/tuxtype.nsi
+config.status:738: creating config.h
+config.status:975: config.h is unchanged
+config.status:1021: executing depfiles commands
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by tuxtype config.status 1.5.10, which was
+generated by GNU Autoconf 2.61. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ./config.status config.h
+
+on stallman
+
+config.status:738: creating config.h
+config.status:975: config.h is unchanged
Modified: tuxtype/branches/tuxtype-indic/config.status
===================================================================
--- tuxtype/branches/tuxtype-indic/config.status 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/config.status 2007-08-31 19:29:09 UTC (rev 219)
@@ -288,7 +288,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tuxtype $as_me 1.5.9, which was
+This file was extended by tuxtype $as_me 1.5.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -301,7 +301,7 @@
"
# Files that config.status was made for.
-config_files=" Makefile tuxtype/Makefile tuxtype/data/Makefile tuxtype/data/fonts/Makefile tuxtype/data/images/Makefile tuxtype/data/images/backgrounds/Makefile tuxtype/data/images/cities/Makefile tuxtype/data/images/comets/Makefile tuxtype/data/images/hands/Makefile tuxtype/data/images/keyboard/Makefile tuxtype/data/images/menu/Makefile tuxtype/data/images/status/Makefile tuxtype/data/images/tux/Makefile tuxtype/data/scripts/Makefile tuxtype/data/sounds/Makefile tuxtype/data/themes/Makefile tuxtype/data/themes/armenian/Makefile tuxtype/data/themes/armenian/images/Makefile tuxtype/data/themes/bokmal/Makefile tuxtype/data/themes/bokmal/words/Makefile tuxtype/data/themes/bokmal/images/Makefile tuxtype/data/themes/bokmal/images/status/Makefile tuxtype/data/themes/brazilian-portuguese/Makefile tuxtype/data/themes/brazilian-portuguese/images/Makefile tuxtype/data/themes/brazilian-portuguese/words/Makefile tuxtype/data/themes/catalan/Makefile tuxtype/data/themes/catalan/words/Makefile tuxtype/data/themes/dansk/Makefile tuxtype/data/themes/dansk/sounds/Makefile tuxtype/data/themes/dansk/words/Makefile tuxtype/data/themes/deutsch/Makefile tuxtype/data/themes/deutsch/words/Makefile tuxtype/data/themes/espanol/Makefile tuxtype/data/themes/espanol/images/Makefile tuxtype/data/themes/espanol/words/Makefile tuxtype/data/themes/euskara/Makefile tuxtype/data/themes/euskara/images/Makefile tuxtype/data/themes/euskara/words/Makefile tuxtype/data/themes/french/Makefile tuxtype/data/themes/french/words/Makefile tuxtype/data/themes/greek/Makefile tuxtype/data/themes/greek/words/Makefile tuxtype/data/themes/italian/Makefile tuxtype/data/themes/italian/words/Makefile tuxtype/data/themes/jamaican/Makefile tuxtype/data/themes/jamaican/images/Makefile tuxtype/data/themes/jamaican/words/Makefile tuxtype/data/themes/lithuanian/Makefile tuxtype/data/themes/lithuanian/images/Makefile tuxtype/data/themes/lithuanian/images/status/Makefile tuxtype/data/themes/lithuanian/sounds/Makefile tuxtype/data/themes/lithuanian/words/Makefile tuxtype/data/themes/nederlands/Makefile tuxtype/data/themes/malayalam/Makefile tuxtype/data/themes/malayalam/images/Makefile tuxtype/data/themes/malayalam/images/keyboard/Makefile tuxtype/data/themes/malayalam/images/status/Makefile tuxtype/data/themes/malayalam/words/Makefile tuxtype/data/themes/nederlands/words/Makefile tuxtype/data/themes/nynorsk/Makefile tuxtype/data/themes/nynorsk/images/Makefile tuxtype/data/themes/nynorsk/images/status/Makefile tuxtype/data/themes/nynorsk/words/Makefile tuxtype/data/themes/russian/Makefile tuxtype/data/themes/russian/images/Makefile tuxtype/data/themes/russian/images/status/Makefile tuxtype/data/themes/russian/words/Makefile tuxtype/data/themes/svenska/Makefile tuxtype/data/themes/svenska/words/Makefile tuxtype/data/themes/swahili/Makefile tuxtype/data/themes/swahili/words/Makefile tuxtype/data/words/Makefile tuxtype/docs/Makefile tuxtype/docs/en/Makefile tuxtype.spec nsis/tuxtype.nsi"
+config_files=" Makefile tuxtype/Makefile tuxtype/data/Makefile tuxtype/data/fonts/Makefile tuxtype/data/images/Makefile tuxtype/data/images/backgrounds/Makefile tuxtype/data/images/cities/Makefile tuxtype/data/images/comets/Makefile tuxtype/data/images/hands/Makefile tuxtype/data/images/keyboard/Makefile tuxtype/data/images/menu/Makefile tuxtype/data/images/status/Makefile tuxtype/data/images/tux/Makefile tuxtype/data/scripts/Makefile tuxtype/data/sounds/Makefile tuxtype/data/themes/Makefile tuxtype/data/themes/armenian/Makefile tuxtype/data/themes/armenian/images/Makefile tuxtype/data/themes/bokmal/Makefile tuxtype/data/themes/bokmal/words/Makefile tuxtype/data/themes/bokmal/images/Makefile tuxtype/data/themes/bokmal/images/status/Makefile tuxtype/data/themes/brazilian-portuguese/Makefile tuxtype/data/themes/brazilian-portuguese/images/Makefile tuxtype/data/themes/brazilian-portuguese/words/Makefile tuxtype/data/themes/catalan/Makefile tuxtype/data/themes/catalan/words/Makefile tuxtype/data/themes/dansk/Makefile tuxtype/data/themes/dansk/sounds/Makefile tuxtype/data/themes/dansk/words/Makefile tuxtype/data/themes/deutsch/Makefile tuxtype/data/themes/deutsch/words/Makefile tuxtype/data/themes/espanol/Makefile tuxtype/data/themes/espanol/images/Makefile tuxtype/data/themes/espanol/words/Makefile tuxtype/data/themes/euskara/Makefile tuxtype/data/themes/euskara/images/Makefile tuxtype/data/themes/euskara/words/Makefile tuxtype/data/themes/french/Makefile tuxtype/data/themes/french/words/Makefile tuxtype/data/themes/greek/Makefile tuxtype/data/themes/greek/words/Makefile tuxtype/data/themes/italian/Makefile tuxtype/data/themes/italian/words/Makefile tuxtype/data/themes/jamaican/Makefile tuxtype/data/themes/jamaican/images/Makefile tuxtype/data/themes/jamaican/words/Makefile tuxtype/data/themes/lithuanian/Makefile tuxtype/data/themes/lithuanian/images/Makefile tuxtype/data/themes/lithuanian/images/status/Makefile tuxtype/data/themes/lithuanian/sounds/Makefile tuxtype/data/themes/lithuanian/words/Makefile tuxtype/data/themes/malayalam/Makefile tuxtype/data/themes/malayalam/images/Makefile tuxtype/data/themes/malayalam/images/keyboard/Makefile tuxtype/data/themes/malayalam/images/status/Makefile tuxtype/data/themes/malayalam/words/Makefile tuxtype/data/themes/malayalam/scripts/Makefile tuxtype/data/themes/nederlands/Makefile tuxtype/data/themes/nederlands/words/Makefile tuxtype/data/themes/nynorsk/Makefile tuxtype/data/themes/nynorsk/images/Makefile tuxtype/data/themes/nynorsk/images/status/Makefile tuxtype/data/themes/nynorsk/words/Makefile tuxtype/data/themes/russian/Makefile tuxtype/data/themes/russian/images/Makefile tuxtype/data/themes/russian/images/status/Makefile tuxtype/data/themes/russian/words/Makefile tuxtype/data/themes/svenska/Makefile tuxtype/data/themes/svenska/words/Makefile tuxtype/data/themes/swahili/Makefile tuxtype/data/themes/swahili/words/Makefile tuxtype/data/words/Makefile tuxtype/docs/Makefile tuxtype/docs/en/Makefile tuxtype.spec nsis/tuxtype.nsi"
config_headers=" config.h"
config_commands=" depfiles"
@@ -333,15 +333,15 @@
Report bugs to <bug-autoconf at gnu.org>."
ac_cs_version="\
-tuxtype config.status 1.5.9
+tuxtype config.status 1.5.10
configured by ./configure, generated by GNU Autoconf 2.61,
- with options \"--prefix /usr/local\"
+ with options \"'--prefix' '/usr/local'\"
Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/home/mobin/Desktop/tuxtype-indic'
+ac_pwd='/usr/local/src/new'
srcdir='.'
INSTALL='/usr/bin/install -c'
MKDIR_P='/bin/mkdir -p'
@@ -410,10 +410,10 @@
fi
if $ac_cs_recheck; then
- echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " --prefix /usr/local $ac_configure_extra_args " --no-create --no-recursion" >&6
+ echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--prefix' '/usr/local' $ac_configure_extra_args " --no-create --no-recursion" >&6
CONFIG_SHELL=/bin/sh
export CONFIG_SHELL
- exec /bin/sh "./configure" --prefix /usr/local $ac_configure_extra_args --no-create --no-recursion
+ exec /bin/sh "./configure" '--prefix' '/usr/local' $ac_configure_extra_args --no-create --no-recursion
fi
exec 5>>config.log
@@ -489,13 +489,12 @@
"tuxtype/data/themes/lithuanian/images/status/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/images/status/Makefile" ;;
"tuxtype/data/themes/lithuanian/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/sounds/Makefile" ;;
"tuxtype/data/themes/lithuanian/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/words/Makefile" ;;
-
"tuxtype/data/themes/malayalam/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/Makefile" ;;
"tuxtype/data/themes/malayalam/images/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/Makefile" ;;
"tuxtype/data/themes/malayalam/images/keyboard/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/keyboard/Makefile" ;;
"tuxtype/data/themes/malayalam/images/status/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/status/Makefile" ;;
"tuxtype/data/themes/malayalam/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/words/Makefile" ;;
-
+ "tuxtype/data/themes/malayalam/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/scripts/Makefile" ;;
"tuxtype/data/themes/nederlands/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nederlands/Makefile" ;;
"tuxtype/data/themes/nederlands/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nederlands/words/Makefile" ;;
"tuxtype/data/themes/nynorsk/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nynorsk/Makefile" ;;
@@ -576,8 +575,8 @@
s, at PATH_SEPARATOR@,|#_!!_#|:,g
s, at PACKAGE_NAME@,|#_!!_#|tuxtype,g
s, at PACKAGE_TARNAME@,|#_!!_#|tuxtype,g
-s, at PACKAGE_VERSION@,|#_!!_#|1.5.9,g
-s, at PACKAGE_STRING@,|#_!!_#|tuxtype 1.5.9,g
+s, at PACKAGE_VERSION@,|#_!!_#|1.5.10,g
+s, at PACKAGE_STRING@,|#_!!_#|tuxtype 1.5.10,g
s, at PACKAGE_BUGREPORT@,|#_!!_#|tuxmath-devel@|#_!!_#|lists.sourceforge.net,g
s, at exec_prefix@,|#_!!_#|${prefix},g
s, at prefix@,|#_!!_#|/usr/local,g
@@ -605,7 +604,7 @@
s, at ECHO_C@,|#_!!_#|,g
s, at ECHO_N@,|#_!!_#|-n,g
s, at ECHO_T@,|#_!!_#|,g
-s, at LIBS@,|#_!!_#|-L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer ,g
+s, at LIBS@,|#_!!_#|-L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer ,g
s, at build_alias@,|#_!!_#|,g
s, at host_alias@,|#_!!_#|,g
s, at target_alias@,|#_!!_#|,g
@@ -627,20 +626,20 @@
s, at am__isrc@,|#_!!_#|,g
s, at CYGPATH_W@,|#_!!_#|echo,g
s, at PACKAGE@,|#_!!_#|tuxtype,g
-s, at VERSION@,|#_!!_#|1.5.9,g
-s, at ACLOCAL@,|#_!!_#|${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run aclocal-1.10,g
-s, at AUTOCONF@,|#_!!_#|${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run autoconf,g
-s, at AUTOMAKE@,|#_!!_#|${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run automake-1.10,g
-s, at AUTOHEADER@,|#_!!_#|${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run autoheader,g
-s, at MAKEINFO@,|#_!!_#|${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run makeinfo,g
-s, at install_sh@,|#_!!_#|$(SHELL) /home/mobin/Desktop/tuxtype-indic/install-sh,g
+s, at VERSION@,|#_!!_#|1.5.10,g
+s, at ACLOCAL@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run aclocal-1.10,g
+s, at AUTOCONF@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run autoconf,g
+s, at AUTOMAKE@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run automake-1.10,g
+s, at AUTOHEADER@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run autoheader,g
+s, at MAKEINFO@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run makeinfo,g
+s, at install_sh@,|#_!!_#|$(SHELL) /usr/local/src/new/install-sh,g
s, at STRIP@,|#_!!_#|,g
s, at INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
s, at mkdir_p@,|#_!!_#|/bin/mkdir -p,g
s, at AWK@,|#_!!_#|gawk,g
s, at SET_MAKE@,|#_!!_#|,g
s, at am__leading_dot@,|#_!!_#|.,g
-s, at AMTAR@,|#_!!_#|${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run tar,g
+s, at AMTAR@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run tar,g
s, at am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
s, at am__untar@,|#_!!_#|${AMTAR} xf -,g
s, at CC@,|#_!!_#|gcc,g
@@ -938,15 +937,15 @@
s/$/ /
s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_NAME\)[ (].*,\1define\2 "tuxtype" ,
s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_TARNAME\)[ (].*,\1define\2 "tuxtype" ,
-s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_VERSION\)[ (].*,\1define\2 "1.5.9" ,
-s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_STRING\)[ (].*,\1define\2 "tuxtype 1.5.9" ,
+s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_VERSION\)[ (].*,\1define\2 "1.5.10" ,
+s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_STRING\)[ (].*,\1define\2 "tuxtype 1.5.10" ,
s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_BUGREPORT\)[ (].*,\1define\2 "tuxmath-devel at lists.sourceforge.net" ,
s,^\([ #]*\)[^ ]*\([ ]*PACKAGE\)[ (].*,\1define\2 "tuxtype" ,
-s,^\([ #]*\)[^ ]*\([ ]*VERSION\)[ (].*,\1define\2 "1.5.9" ,
+s,^\([ #]*\)[^ ]*\([ ]*VERSION\)[ (].*,\1define\2 "1.5.10" ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBSDL_MIXER\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBSDL_TTF\)[ (].*,\1define\2 1 ,
-s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBSDL_PANGO\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBSDL_IMAGE\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBSDL_PANGO\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*STDC_HEADERS\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_SYS_TYPES_H\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_SYS_STAT_H\)[ (].*,\1define\2 1 ,
Modified: tuxtype/branches/tuxtype-indic/configure
===================================================================
--- tuxtype/branches/tuxtype-indic/configure 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/configure 2007-08-31 19:29:09 UTC (rev 219)
@@ -5362,7 +5362,7 @@
# Sam's Install Kludge-work
CPPFLAGS="$CPPFLAGS -DDATA_PREFIX=\\\"\$(prefix)\\\""
-ac_config_files="$ac_config_files Makefile tuxtype/Makefile tuxtype/data/Makefile tuxtype/data/fonts/Makefile tuxtype/data/images/Makefile tuxtype/data/images/backgrounds/Makefile tuxtype/data/images/cities/Makefile tuxtype/data/images/comets/Makefile tuxtype/data/images/hands/Makefile tuxtype/data/images/keyboard/Makefile tuxtype/data/images/menu/Makefile tuxtype/data/images/status/Makefile tuxtype/data/images/tux/Makefile tuxtype/data/scripts/Makefile tuxtype/data/sounds/Makefile tuxtype/data/themes/Makefile tuxtype/data/themes/armenian/Makefile tuxtype/data/themes/armenian/images/Makefile tuxtype/data/themes/bokmal/Makefile tuxtype/data/themes/bokmal/words/Makefile tuxtype/data/themes/bokmal/images/Makefile tuxtype/data/themes/bokmal/images/status/Makefile tuxtype/data/themes/brazilian-portuguese/Makefile tuxtype/data/themes/brazilian-portuguese/images/Makefile tuxtype/data/themes/brazilian-portuguese/words/Makefile tuxtype/data/themes/catalan/Makefile tuxtype/data/themes/catalan/words/Makefile tuxtype/data/themes/dansk/Makefile tuxtype/data/themes/dansk/sounds/Makefile tuxtype/data/themes/dansk/words/Makefile tuxtype/data/themes/deutsch/Makefile tuxtype/data/themes/deutsch/words/Makefile tuxtype/data/themes/espanol/Makefile tuxtype/data/themes/espanol/images/Makefile tuxtype/data/themes/espanol/words/Makefile tuxtype/data/themes/euskara/Makefile tuxtype/data/themes/euskara/images/Makefile tuxtype/data/themes/euskara/words/Makefile tuxtype/data/themes/french/Makefile tuxtype/data/themes/french/words/Makefile tuxtype/data/themes/greek/Makefile tuxtype/data/themes/greek/words/Makefile tuxtype/data/themes/italian/Makefile tuxtype/data/themes/italian/words/Makefile tuxtype/data/themes/jamaican/Makefile tuxtype/data/themes/jamaican/images/Makefile tuxtype/data/themes/jamaican/words/Makefile tuxtype/data/themes/lithuanian/Makefile tuxtype/data/themes/lithuanian/images/Makefile tuxtype/data/themes/lithuanian/images/status/Makefile tuxtype/data/themes/lithuanian/sounds/Makefile tuxtype/data/themes/lithuanian/words/Makefile tuxtype/data/themes/malayalam/Makefile tuxtype/data/themes/malayalam/images/Makefile tuxtype/data/themes/malayalam/images/keyboard/Makefile tuxtype/data/themes/malayalam/images/status/Makefile tuxtype/data/themes/malayalam/words/Makefile tuxtype/data/themes/nederlands/Makefile tuxtype/data/themes/nederlands/words/Makefile tuxtype/data/themes/nynorsk/Makefile tuxtype/data/themes/nynorsk/images/Makefile tuxtype/data/themes/nynorsk/images/status/Makefile tuxtype/data/themes/nynorsk/words/Makefile tuxtype/data/themes/russian/Makefile tuxtype/data/themes/russian/images/Makefile tuxtype/data/themes/russian/images/status/Makefile tuxtype/data/themes/russian/words/Makefile tuxtype/data/themes/svenska/Makefile tuxtype/data/themes/svenska/words/Makefile tuxtype/data/themes/swahili/Makefile tuxtype/data/themes/swahili/words/Makefile tuxtype/data/words/Makefile tuxtype/docs/Makefile tuxtype/docs/en/Makefile tuxtype.spec"
+ac_config_files="$ac_config_files Makefile tuxtype/Makefile tuxtype/data/Makefile tuxtype/data/fonts/Makefile tuxtype/data/images/Makefile tuxtype/data/images/backgrounds/Makefile tuxtype/data/images/cities/Makefile tuxtype/data/images/comets/Makefile tuxtype/data/images/hands/Makefile tuxtype/data/images/keyboard/Makefile tuxtype/data/images/menu/Makefile tuxtype/data/images/status/Makefile tuxtype/data/images/tux/Makefile tuxtype/data/scripts/Makefile tuxtype/data/sounds/Makefile tuxtype/data/themes/Makefile tuxtype/data/themes/armenian/Makefile tuxtype/data/themes/armenian/images/Makefile tuxtype/data/themes/bokmal/Makefile tuxtype/data/themes/bokmal/words/Makefile tuxtype/data/themes/bokmal/images/Makefile tuxtype/data/themes/bokmal/images/status/Makefile tuxtype/data/themes/brazilian-portuguese/Makefile tuxtype/data/themes/brazilian-portuguese/images/Makefile tuxtype/data/themes/brazilian-portuguese/words/Makefile tuxtype/data/themes/catalan/Makefile tuxtype/data/themes/catalan/words/Makefile tuxtype/data/themes/dansk/Makefile tuxtype/data/themes/dansk/sounds/Makefile tuxtype/data/themes/dansk/words/Makefile tuxtype/data/themes/deutsch/Makefile tuxtype/data/themes/deutsch/words/Makefile tuxtype/data/themes/espanol/Makefile tuxtype/data/themes/espanol/images/Makefile tuxtype/data/themes/espanol/words/Makefile tuxtype/data/themes/euskara/Makefile tuxtype/data/themes/euskara/images/Makefile tuxtype/data/themes/euskara/words/Makefile tuxtype/data/themes/french/Makefile tuxtype/data/themes/french/words/Makefile tuxtype/data/themes/greek/Makefile tuxtype/data/themes/greek/words/Makefile tuxtype/data/themes/italian/Makefile tuxtype/data/themes/italian/words/Makefile tuxtype/data/themes/jamaican/Makefile tuxtype/data/themes/jamaican/images/Makefile tuxtype/data/themes/jamaican/words/Makefile tuxtype/data/themes/lithuanian/Makefile tuxtype/data/themes/lithuanian/images/Makefile tuxtype/data/themes/lithuanian/images/status/Makefile tuxtype/data/themes/lithuanian/sounds/Makefile tuxtype/data/themes/lithuanian/words/Makefile tuxtype/data/themes/malayalam/Makefile tuxtype/data/themes/malayalam/images/Makefile tuxtype/data/themes/malayalam/images/keyboard/Makefile tuxtype/data/themes/malayalam/images/status/Makefile tuxtype/data/themes/malayalam/words/Makefile tuxtype/data/themes/malayalam/scripts/Makefile tuxtype/data/themes/nederlands/Makefile tuxtype/data/themes/nederlands/words/Makefile tuxtype/data/themes/nynorsk/Makefile tuxtype/data/themes/nynorsk/images/Makefile tuxtype/data/themes/nynorsk/images/status/Makefile tuxtype/data/themes/nynorsk/words/Makefile tuxtype/data/themes/russian/Makefile tuxtype/data/themes/russian/images/Makefile tuxtype/data/themes/russian/images/status/Makefile tuxtype/data/themes/russian/words/Makefile tuxtype/data/themes/svenska/Makefile tuxtype/data/themes/svenska/words/Makefile tuxtype/data/themes/swahili/Makefile tuxtype/data/themes/swahili/words/Makefile tuxtype/data/words/Makefile tuxtype/docs/Makefile tuxtype/docs/en/Makefile tuxtype.spec"
# Support for building NSIS Win32 installer (adapted from TuxMath NSIS):
@@ -6087,9 +6087,10 @@
"tuxtype/data/themes/lithuanian/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/words/Makefile" ;;
"tuxtype/data/themes/malayalam/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/Makefile" ;;
"tuxtype/data/themes/malayalam/images/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/Makefile" ;;
+ "tuxtype/data/themes/malayalam/images/keyboard/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/keyboard/Makefile" ;;
"tuxtype/data/themes/malayalam/images/status/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/status/Makefile" ;;
- "tuxtype/data/themes/malayalam/images/keyboard/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/keyboard/Makefile" ;;
"tuxtype/data/themes/malayalam/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/words/Makefile" ;;
+ "tuxtype/data/themes/malayalam/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/scripts/Makefile" ;;
"tuxtype/data/themes/nederlands/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nederlands/Makefile" ;;
"tuxtype/data/themes/nederlands/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nederlands/words/Makefile" ;;
"tuxtype/data/themes/nynorsk/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nynorsk/Makefile" ;;
Modified: tuxtype/branches/tuxtype-indic/configure.ac
===================================================================
--- tuxtype/branches/tuxtype-indic/configure.ac 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/configure.ac 2007-08-31 19:29:09 UTC (rev 219)
@@ -144,6 +144,7 @@
tuxtype/data/themes/malayalam/images/keyboard/Makefile
tuxtype/data/themes/malayalam/images/status/Makefile
tuxtype/data/themes/malayalam/words/Makefile
+tuxtype/data/themes/malayalam/scripts/Makefile
tuxtype/data/themes/nederlands/Makefile
tuxtype/data/themes/nederlands/words/Makefile
tuxtype/data/themes/nynorsk/Makefile
Modified: tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c 2007-08-31 19:29:09 UTC (rev 219)
@@ -63,8 +63,6 @@
/* */
/*****************************************************/
-
-
void LoadKeyboard( void ) {
unsigned char fn[FNLEN];
int l;
@@ -91,7 +89,7 @@
/* Convert to wcs from UTF-8, if needed; */
mbstowcs(wide_str, str, strlen(str) + 1);
- if (wcslen(wide_str) > 3) {
+ if (wcslen(wide_str) >= 3) {
/* format is: FINGER(s)|Char(s) Upper/Lower */
@@ -101,7 +99,7 @@
i++; // pass the '|'
j = i;
- ALPHABET[(int)wide_str[j]] = 1; // first character is default
+ //ALPHABET[(int)wide_str[j]] = 1; // first character is default
for (i++; i<wcslen(wide_str); i++)
wide_str[i] = wide_str[j];
@@ -119,11 +117,11 @@
fclose(f);
- DEBUGCODE
+ /*DEBUGCODE
{
fprintf(stderr, "printing keymap for %s\n", fn);
print_keymap();
- }
+ }*/
return;
}
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/0.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/1.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/2.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/3.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/4.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/5.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/6.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/7.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/8.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/9.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/hands.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Lesson_1.xml
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Lesson_1.xml 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Lesson_1.xml 2007-08-31 19:29:09 UTC (rev 219)
@@ -12,7 +12,7 @@
<img src="/keyboard/keyboard-us.png" x="30" y="200"/>
<text align="center">In this exercise we practice the home row keys.</text>
<text align="center">asdfjkl;asdfjkl;asdfjkl;</text>
- <text align="center">To start practicing hit the p key</text>
+ <text align="center">To start practicing hit the space key</text>
<text color="#000000" x="101" y="273">A</text>
<text color="#000000" x="141" y="273">S</text>
<text color="#000000" x="181" y="273">D</text>
@@ -49,7 +49,7 @@
<text align="center">but, a little bit differently!</text>
<text align="center">See how fast you are at this one!</text>
<text align="center">lad lass dad sad fad gas had jag ask;</text>
- <text align="center">To start practicing hit the p key</text>
+ <text align="center">To start practicing hit the space key</text>
<text color="#000000" x="101" y="273">A</text>
<text color="#000000" x="141" y="273">S</text>
<text color="#000000" x="181" y="273">D</text>
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.am
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.am 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.am 2007-08-31 19:29:09 UTC (rev 219)
@@ -1,6 +1,7 @@
SUBDIRS = \
images\
+scripts\
words
EXTRA_DIST = keyboard.lst lang.po phrases.txt
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.in 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.in 2007-08-31 19:29:09 UTC (rev 219)
@@ -163,6 +163,7 @@
top_srcdir = @top_srcdir@
SUBDIRS = \
images\
+scripts\
words
EXTRA_DIST = keyboard.lst lang.po phrases.txt
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/keyboard/key.png
===================================================================
(Binary files differ)
Modified: tuxtype/branches/tuxtype-indic/tuxtype/globals.h
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/globals.h 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/tuxtype/globals.h 2007-08-31 19:29:09 UTC (rev 219)
@@ -169,7 +169,7 @@
extern wchar_t ALPHABET[256];
-extern unsigned char FINGER[256][10];
+extern unsigned char FINGER[20000][10];
extern int ALPHABET_SIZE;
//global vars
Modified: tuxtype/branches/tuxtype-indic/tuxtype/practice.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/practice.c 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/tuxtype/practice.c 2007-08-31 19:29:09 UTC (rev 219)
@@ -60,8 +60,7 @@
*/
SDL_Surface *tmp;
SDL_Surface *clear_text;
- wchar_t wphrase[128];
-
+ wchar_t wphrase[128];
Uint32 start=0,a=0;
int quit=0,
i=0,
@@ -76,22 +75,22 @@
totaltime[FNLEN];
practice_load_media();
-
clear_text = SDL_CreateRGBSurface(SDL_SWSURFACE, 700, 50, 32, rmask, gmask, bmask, amask);
- SDL_FillRect(clear_text, NULL, 0xff000000);
-
+ SDL_FillRect(clear_text, NULL, 0xffff6000);
+ //SDL_FillRect(clear_text, NULL, SDL_MapRGB(NULL, 0x1B, 0x65, 0xE0));
SDL_BlitSurface(bkg, NULL, screen, NULL);
SDL_BlitSurface(hands, NULL, screen, &hand_loc);
SDL_Flip(screen);
convert_from_UTF8(wphrase, pphrase);
+ wp = get_phrase(wphrase);
- wp = get_phrase(wphrase);
if (!strncmp(phrase[0], "", 1))
strncpy(pphrase, phrase[0], 80);
-
-/* dst.x = 320 - (letters[65]->w/2); dst.y = 100; dst.w = letters[65]->w; dst.h = letters[65]->h;
+ DEBUGCODE { printf("wrap point is: %d\n",wp); }
+/*
+ dst.x = 320 - (letters[65]->w/2); dst.y = 100; dst.w = letters[65]->w; dst.h = letters[65]->h;
dst2.x = 50; dst2.y = 400; dst2.w = letters[65]->w; dst2.h = letters[65]->h;
dst3.x = 50; dst3.y = 400; dst3.w = 160; dst3.h = 50;
dst4.x = 480; dst4.y = 400; dst4.w = 240; dst4.h = 50;
@@ -99,7 +98,14 @@
dst.x = 40;
*/
-
+/* dst.x = 320 - 3; dst.y = 100; dst.w = 6; dst.h = 6;
+ dst2.x = 50; dst2.y = 400; dst2.w = 6; dst2.h = 6;
+ dst3.x = 50; dst3.y = 400; dst3.w = 160; dst3.h = 50;
+ dst4.x = 480; dst4.y = 400; dst4.w = 240; dst4.h = 50;
+ dst5.x = 480; dst5.y = 400; dst5.w = 240; dst5.h = 50;
+ dst.x = 40;
+DEBUGCODE { printf("sadsadsadsadsad2\n"); }
+*/
dst.x = 320 - 10; dst.y = 100; dst.w = 21; dst.h = 21;
dst2.x = 50; dst2.y = 400; dst2.w = 21; dst2.h = 21;
dst3.x = 50; dst3.y = 400; dst3.w = 160; dst3.h = 50;
@@ -111,8 +117,6 @@
clear_dst.w = 700;
clear_dst.h=40;
SDL_BlitSurface(clear_text, NULL, screen, &clear_dst);
-
-
start = SDL_GetTicks();
do {
@@ -126,7 +130,6 @@
if (SDL_GetTicks() - start > 500) {
for (i=0; i<10; i++)
if (FINGER[(int)wphrase[c]][i]){
-
SDL_BlitSurface(hand[i], NULL, screen, &hand_loc);
}
state = 2;
@@ -144,16 +147,13 @@
case 4:
for (i=0; i<10; i++)
if (FINGER[(int)wphrase[c]][i])
-
SDL_BlitSurface(hand[i], NULL, screen, &hand_loc);
state = 11;
break;
default:
state -= 2; // this is to make the flashing slower
}
-
next_letter(wphrase, c);
-
while (SDL_PollEvent(&event)) {
if (event.type == SDL_KEYDOWN) {
a=SDL_GetTicks();
Modified: tuxtype/branches/tuxtype-indic/tuxtype/scripting.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/scripting.c 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/tuxtype/scripting.c 2007-08-31 19:29:09 UTC (rev 219)
@@ -75,15 +75,15 @@
int stop = 0;
int loc = 0;
int old_loc = 1;
- int i;
+ int i,n;
int c = 0;
char fn[FNLEN];
unsigned char wordlistFile[200][200];
unsigned char wordPath[FNLEN];
- DIR *wordsDir;
- struct dirent *wordsFile;
+ //DIR *wordsDir;
+ struct dirent **wordsFile;
// FILE *tempFile;
pointer = LoadImage( "right.png", IMG_ALPHA );
@@ -105,48 +105,34 @@
}
spot.x=60;
spot.y=20;
-
-
- /* create a list of all the .txt files */
-
- wordsDir = opendir( wordPath );
+/**********************************/
font = LoadFont( ttf_font, 14 );
- do {
- wordsFile = readdir(wordsDir);
- if (!wordsFile)
- break;
-
+ n=scandir(wordPath, &wordsFile, 0, alphasort);
+ for(i=0;i<n;i++)
+ {
/* must have at least .txt at the end */
- if (strlen(wordsFile->d_name) < 5)
+ if (strlen(wordsFile[i]->d_name) < 5)
continue;
- if (strcmp(&wordsFile->d_name[strlen(wordsFile->d_name)-4],".xml"))
+ if (strcmp(&wordsFile[i]->d_name[strlen(wordsFile[i]->d_name)-4],".xml"))
continue;
- sprintf( wordlistFile[c], "%s", wordsFile->d_name );
+ sprintf( wordlistFile[c], "%s", wordsFile[i]->d_name );
- filenames[c] = TTF_RenderUTF8_Blended( font, wordsFile->d_name, white);
+ filenames[c] = TTF_RenderUTF8_Blended( font, wordsFile[i]->d_name, white);
+ //filenames[c]=create_surface_wchar(wordsFile->d_name,font,white,14);
+
SDL_BlitSurface( filenames[c], NULL, screen, &spot );
SDL_FreeSurface(filenames[c]);
+ free(wordsFile[i]);
c++;
spot.y+=18;
+ }
+ free(wordsFile);
+/**********************/
- /* load the name for the wordlist from the file ... (1st line) */
-/* tempFile = fopen( wordlistFile[lists], "r" );
- if (tempFile==NULL) continue;
- fscanf( tempFile, "%[^\n]\n", wordlistName[lists] );
-*/
- /* check to see if it has a \r at the end of it (dos format!) */
-/* if (wordlistName[lists][ strlen(wordlistName[lists])-1 ] == '\r')
- wordlistName[lists][ strlen(wordlistName[lists])-1 ] = '\0';
- lists++;
-
- fclose(tempFile);*/
-
- } while (1);
-
TTF_CloseFont(font);
- closedir( wordsDir );
+ //closedir( wordsDir );
SDL_Flip( screen );
left = LoadImage("left.png", IMG_ALPHA);
@@ -210,7 +196,7 @@
case SDL_KEYDOWN:
if (event.key.keysym.sym == SDLK_ESCAPE) { stop = 2; break; }
if (event.key.keysym.sym == SDLK_RETURN) {
- sprintf( fn, "%s/scripts/%s", realPath[1], wordlistFile[loc]);
+ sprintf( fn, "%s/%s", wordPath, wordlistFile[loc]);
stop = 1;
break;
}
@@ -234,6 +220,7 @@
if (loc+1< c)
loc++;
}
+
}
if (stop == 2) {
@@ -241,8 +228,10 @@
SDL_FreeSurface(left);
SDL_FreeSurface(right);
SDL_FreeSurface(bkg);
- return;
+ return;
+
}
+
if (old_loc != loc) {
int start;
@@ -763,7 +752,9 @@
shown += toshow + 1;
//printf("Rendering %s\n", tmp);
- img = TTF_RenderUTF8_Blended( myFont, tmp, *col );
+ //img = TTF_RenderUTF8_Blended( myFont, tmp, *col );
+ //img=create_surface_wchar(tmp,myFont,*col,14);
+ img=BlackOutline(tmp ,myFont, col);
if (img) {
@@ -862,7 +853,7 @@
switch (event.key.keysym.sym) {
case SDLK_ESCAPE:
curPage = NULL; done=1; break; // quit
- case SDLK_p:
+ case SDLK_SPACE:
curPage = curPage->next; done=1; break;
default: break;
};
Modified: tuxtype/branches/tuxtype-indic/tuxtype/theme.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/theme.c 2007-08-30 04:17:54 UTC (rev 218)
+++ tuxtype/branches/tuxtype-indic/tuxtype/theme.c 2007-08-31 19:29:09 UTC (rev 219)
@@ -30,7 +30,7 @@
SDL_Surface *letters[255] = { NULL };
wchar_t ALPHABET[256];
-unsigned char FINGER[256][10];
+unsigned char FINGER[20000][10];
int ALPHABET_SIZE;
unsigned char realPath[2][FNLEN];
char themeName[FNLEN];
Added: tuxtype/branches/tuxtype-indic/tuxtype.spec
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype.spec (rev 0)
+++ tuxtype/branches/tuxtype-indic/tuxtype.spec 2007-08-31 19:29:09 UTC (rev 219)
@@ -0,0 +1,101 @@
+# Spec-file for TuxType version 1.5.10
+
+%define name tuxtype
+%define version 1.5.10
+%define release 1
+
+Summary: An educational typing tutor game starring Tux
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Source: http://www.geekcomix.com/dm/tuxtype/%{name}-%{version}.tar.gz
+URL: http://www.geekcomix.com/dm/tuxtype/
+License: GPL
+Group: Games/Educational
+Distribution: Digital Monkey Software <http://www.geekcomix.com/dm/>
+Vendor: Digital Monkey Software <http://www.geekcomix.com/dm/>
+Packager: Calvin Arndt <calarndt at yahoo.com>
+BuildRoot: %{tmp}
+Prefix: $prefix
+
+%description
+Tux Typing is an educational typing tutor game starring Tux, the Linux
+penguin. It is graphical and requires SDL to run. This is a stable
+release.
+
+%prep
+
+%setup -q -n %{name}-%{version}
+
+%build
+
+if test x%{prefix} = x; then
+./configure --prefix="/usr/local"
+else
+./configure --prefix=%{prefix}
+fi
+
+make
+
+%install
+
+if test x%{prefix} = x; then
+
+make prefix=$RPM_BUILD_ROOT/usr/local install
+
+else
+
+make prefix=$RPM_BUILD_ROOT%{prefix} install
+
+fi
+
+
+%files
+%docdir %{prefix}/doc/tuxtype
+/*
+
+%clean
+
+rm -rf $RPM_BUILD_DIR/%{name}-%{version}
+rm -rf $RPM_BUILD_ROOT%{prefix}
+
+%changelog
+* Wed Aug 01 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Tweaked gameplay & menu speeds. Prep for 1.0 release
+
+* Fri Jul 27 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Fixed word cascade LinuxPPC/Win32 crashing bug
+
+* Sun Jul 15 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Added alpha blit option for fast word emphasis. Prepping for 1.0pre1 rel.
+
+* Fri Jul 13 2001 Jesse Andrews <jdandr2 at pop.uky.edu>
+Fixed clipping blit bug as well as menu glitches
+
+* Sat Jul 07 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Added preliminary theme support
+
+* Tue Jun 20 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Added keyboard support to main menu
+
+* Sat Jun 16 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Fixed tutorial screen crashing bug. Other minor work. Prepping for 0.9 rel.
+
+* Fri Jun 15 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Better Kdevelop/SDL integration to fix non-POSIX OS support (first Win32 release).
+
+* Tue Jun 12 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Further Tutorial stabilization work.
+
+* Sat Jun 09 2001 Jesse Andrews <jdandr2 at sheffield.cslab.uky.edu>
+Fixed several small problems with Tutorial/Main screen bug.
+
+* Sat May 19 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Fixed GIF->PNG and "yellow outline" in gameplay bugs.
+
+* Mon May 14 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+Packaged up the 0.8 release.
+
+* Fri May 04 2001 Sam "Criswell" Hart <criswell at geekcomix.com>
+RPM ChangeLog began. For previous changes, see ChangeLog.old
+
More information about the Tux4kids-commits
mailing list