[Tux4kids-commits] r1458 - in branches/commonification: tux4kids-common/trunk tuxmath/trunk
David Bruce
dbruce-guest at alioth.debian.org
Fri Aug 21 20:14:34 UTC 2009
Author: dbruce-guest
Date: 2009-08-21 20:14:33 +0000 (Fri, 21 Aug 2009)
New Revision: 1458
Modified:
branches/commonification/tux4kids-common/trunk/Makefile.am
branches/commonification/tux4kids-common/trunk/configure.ac
branches/commonification/tuxmath/trunk/config.guess
branches/commonification/tuxmath/trunk/config.sub
Log:
autoconfiscation
Modified: branches/commonification/tux4kids-common/trunk/Makefile.am
===================================================================
--- branches/commonification/tux4kids-common/trunk/Makefile.am 2009-08-20 23:18:19 UTC (rev 1457)
+++ branches/commonification/tux4kids-common/trunk/Makefile.am 2009-08-21 20:14:33 UTC (rev 1458)
@@ -1,5 +1,11 @@
## Top-level Makefile.am for tux4kids-common
## Process with Automake to create Makefile.in
-SUBDIRS = src
+SUBDIRS = data \
+ po \
+ t4kcommon
+
+EXTRA_DIST = CMakeLists.txt
+
+ACLOCAL_AMFLAGS = -I m4
Modified: branches/commonification/tux4kids-common/trunk/configure.ac
===================================================================
--- branches/commonification/tux4kids-common/trunk/configure.ac 2009-08-20 23:18:19 UTC (rev 1457)
+++ branches/commonification/tux4kids-common/trunk/configure.ac 2009-08-21 20:14:33 UTC (rev 1458)
@@ -1,30 +1,201 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
+AC_INIT([Tux4Kids-Common],[0.0.1],[tuxmath-devel at lists.sourceforge.net],[t4kcommon])
+AC_CONFIG_SRCDIR([t4kcommon/t4k-audio.c])
+
AC_PREREQ([2.63])
-AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS])
+AC_CANONICAL_HOST
+AC_CANONICAL_BUILD
+AC_CANONICAL_TARGET
+
+AM_INIT_AUTOMAKE(foreign)
AC_CONFIG_SRCDIR([config.h.in])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE
+NAME_VERSION=$PACKAGE-$VERSION
+AC_DEFINE_UNQUOTED([PROGRAM_NAME], "$PACKAGE", [Tux4Kids-Common])
+
+AC_SUBST(NAME_VERSION)
+
+# Needed for gettext:
+AC_GNU_SOURCE
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+#AM_GNU_GETTEXT
+#AM_GNU_GETTEXT_INTL_SUBDIR
+
+
+# ----------------------------------------------------------------------
# Checks for programs.
+# ----------------------------------------------------------------------
+
+AC_PROG_CXX
AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_AWK
+AC_PROG_CPP
+AC_PROG_MKDIR_P
AC_PROG_RANLIB
+AC_PROG_YACC
+
+# -----------------------------------------------------------------------
# Checks for libraries.
+# -----------------------------------------------------------------------
+# Check for SDL
+SDL_VERSION=1.2.0
+
+AM_PATH_SDL($SDL_VERSION, :,
+ AC_MSG_ERROR([SDL version $SDL_VERSION not found! http://www.libsdl.org])
+)
+
+CFLAGS="$CFLAGS $SDL_CFLAGS"
+
+
+# Check platform - see if WinMain needed:
+AC_MSG_CHECKING([for native Win32])
+case "$host" in
+ *-*-mingw*)
+ native_win32=yes
+ ;;
+ *)
+ native_win32=no
+ ;;
+esac
+AC_MSG_RESULT([$native_win32])
+
+AM_CONDITIONAL(BUILD_MINGW32, test $native_win32 = yes)
+
+if test $native_win32 = yes; then
+ LIBS="$LIBS -lmingw32 -lSDLmain -lSDL"
+else
+ LIBS="$LIBS $SDL_LIBS"
+fi
+
+
+
+dnl Check for SDL_image:
+AC_CHECK_LIB([SDL_image],
+ [IMG_Load],
+ ,
+ [AC_MSG_ERROR([SDL_image not found! http://www.libsdl.org/projects/SDL_image])])
+
+dnl Check for SDL_mixer:.
+AC_CHECK_LIB([SDL_mixer],
+ [Mix_OpenAudio],
+ ,
+ [AC_MSG_ERROR([SDL_mixer not found! http://www.libsdl.org/projects/SDL_mixer])])
+
+dnl SDL_Pango is enabled by default.
+dnl If SDL_Pango disabled at configure time, or if we can't find it,
+dnl we look for SDL_ttf:
+
+AC_ARG_WITH([sdlpango],
+ [AS_HELP_STRING([--without-sdlpango],[don't use SDL_Pango even if available])],
+ [with_sdlpango=no],
+ [with_sdlpango=yes])
+
+if test "x$with_sdlpango" != xno; then
+AC_CHECK_LIB([SDL_Pango],
+ [SDLPango_Init],
+ ,
+ [with_sdlpango=no;
+ AC_MSG_FAILURE([SDL_Pango test failed (--without-sdlpango to disable)])])
+fi
+
+if [test "x$with_sdlpango" = xno]; then
+AC_CHECK_LIB([SDL_ttf],
+ [TTF_Init],
+ ,
+ [AC_MSG_ERROR([SDL_ttf not found! http://www.libsdl.org/projects/SDL_ttf])])
+fi
+
+dnl Check for libRSVG and cairo. SVG support is enabled by default
+
+AC_ARG_WITH([rsvg],
+ [AS_HELP_STRING([--without-rsvg],[don't use libRSVG even if available])],
+ [with_rsvg=no],
+ [with_rsvg=yes])
+
+if test "x$with_rsvg" = xyes; then
+ RSVG_CFLAGS=""
+ RSVG_LIBS=""
+ PKG_CHECK_MODULES([RSVG],
+ [librsvg-2.0 >= 2.18],
+ ,
+ [AC_MSG_FAILURE([libRSVG test failed (--without-rsvg to disable svg support)])])
+ CFLAGS="$CFLAGS $RSVG_CFLAGS"
+ LIBS="$LIBS $RSVG_LIBS"
+fi
+
+if test "x$with_rsvg" = xyes; then
+ CAIRO_CFLAGS=""
+ CAIRO_LIBS=""
+ PKG_CHECK_MODULES([CAIRO],
+ [cairo >= 1.4.10],
+ ,
+ [AC_MSG_FAILURE([cairo test failed (--without-rsvg to disable svg support)])])
+ CFLAGS="$CFLAGS $CAIRO_CFLAGS"
+ LIBS="$LIBS $CAIRO_LIBS"
+ AC_DEFINE([HAVE_RSVG],[1],[Define to 1 if you have the `libRSVG` library])
+fi
+
+
+
+# --------------------------------------------------------------------------------------
# Checks for header files.
-AC_CHECK_HEADERS([stdlib.h string.h])
+# --------------------------------------------------------------------------------------
+AC_FUNC_ALLOCA
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_CHECK_HEADERS([argz.h error.h errno.h fcntl.h float.h iconv.h inttypes.h langinfo.h libgen.h libintl.h limits.h locale.h malloc.h math.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h wchar.h])
+
+
+# --------------------------------------------------------------------------------------------
# Checks for typedefs, structures, and compiler characteristics.
+# --------------------------------------------------------------------------------------------
+
AC_HEADER_STDBOOL
+AC_C_CONST
+AC_C_INLINE
AC_C_RESTRICT
+AC_TYPE_MODE_T
+AC_TYPE_SIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT8_T
+AC_C_VOLATILE
+AC_CHECK_TYPES([ptrdiff_t])
+
+
+# -------------------------------------------------------------------------------------------
# Checks for library functions.
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([floor strchr strdup strrchr])
+# -------------------------------------------------------------------------------------------
+
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_ERROR_AT_LINE
+#AC_FUNC_MALLOC
+AC_FUNC_MMAP
+#AC_FUNC_REALLOC
+AC_FUNC_STAT
+AC_FUNC_STRCOLL
+AC_FUNC_STRTOD
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify atexit basename bcopy floor getcwd localeconv localtime_r memmove mempcpy memset mkdir munmap nl_langinfo scandir setlocale sqrt stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strrchr strstr strtoul])
+
+
+
AC_CONFIG_FILES([Makefile
- src/Makefile])
+ data/Makefile
+ data/images/Makefile
+ data/images/menu/Makefile
+ po/Makefile.in
+ t4kcommon/Makefile])
AC_OUTPUT
Modified: branches/commonification/tuxmath/trunk/config.guess
===================================================================
--- branches/commonification/tuxmath/trunk/config.guess 2009-08-20 23:18:19 UTC (rev 1457)
+++ branches/commonification/tuxmath/trunk/config.guess 2009-08-21 20:14:33 UTC (rev 1458)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-04-27'
+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
@@ -324,9 +324,6 @@
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
- s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -334,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
@@ -812,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)
@@ -951,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
@@ -1004,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.
@@ -1118,11 +1102,8 @@
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
- # Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
- # this is a cross-build.
- echo i586-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
@@ -1160,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 ;;
@@ -1245,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 ;;
@@ -1356,9 +1324,6 @@
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
- i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
- exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
Modified: branches/commonification/tuxmath/trunk/config.sub
===================================================================
--- branches/commonification/tuxmath/trunk/config.sub 2009-08-20 23:18:19 UTC (rev 1457)
+++ branches/commonification/tuxmath/trunk/config.sub 2009-08-21 20:14:33 UTC (rev 1458)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-04-17'
+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 \
@@ -272,7 +268,6 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
- | moxie \
| mt \
| msp430 \
| nios | nios2 \
@@ -282,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 \
@@ -291,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)
@@ -334,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-* \
@@ -366,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*)
@@ -447,10 +439,6 @@
basic_machine=m68k-apollo
os=-bsd
;;
- aros)
- basic_machine=i386-pc
- os=-aros
- ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -471,10 +459,6 @@
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -542,10 +526,6 @@
basic_machine=m88k-motorola
os=-sysv3
;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
@@ -1148,10 +1128,6 @@
basic_machine=z8k-unknown
os=-sim
;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -1190,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)
@@ -1262,9 +1238,8 @@
-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* | -aros* \
+ | -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1273,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* \
@@ -1413,9 +1388,6 @@
-zvmoe)
os=-zvmoe
;;
- -dicos*)
- os=-dicos
- ;;
-none)
;;
*)
More information about the Tux4kids-commits
mailing list