1 diff -Naur tuxcom.ori/Makefile.am tuxcom/Makefile.am
2 --- tuxcom.ori/Makefile.am 2009-01-06 00:12:19.000000000 +0100
3 +++ tuxcom/Makefile.am 2008-12-28 18:33:12.000000000 +0100
5 +INCLUDES = -I$(top_srcdir)/include
9 - -I$(top_srcdir)/include
10 +SUBDIRS = font python
12 -noinst_LTLIBRARIES = tuxcom.la
13 +bin_PROGRAMS = tuxcom
15 -#tuxcom_la_CFLAGS = -DDREAMBOX
16 +tuxcom_SOURCES = tuxcom.c
18 -tuxcom_la_SOURCES = tuxcom.c
19 +tuxcom_LDADD = @FREETYPE_LIBS@
24 +install_DATA = tuxcom.cfg
26 -tuxcom_la_LDFLAGS = -rpath $(PLUGINDIR) -module -avoid-version
27 +AM_CFLAGS=$(CFLAGS) @FREETYPE_CFLAGS@
30 - install -d $(DESTDIR)$(PLUGINDIR)
31 - install -d $(DESTDIR)$(CONFIGDIR)
32 - install -d $(DESTDIR)$(CONFIGDIR)/tuxcom
33 - $(LIBTOOL) --mode=install install tuxcom.la $(DESTDIR)$(PLUGINDIR)
34 - install -m 0644 $(srcdir)/tuxcom.cfg $(DESTDIR)$(PLUGINDIR)
35 - install -m 0755 $(srcdir)/mp3 $(DESTDIR)$(CONFIGDIR)/tuxcom
36 +installdir = $(CONFIGDIR)/tuxcom
37 diff -Naur tuxcom.ori/acinclude.m4 tuxcom/acinclude.m4
38 --- tuxcom.ori/acinclude.m4 1970-01-01 01:00:00.000000000 +0100
39 +++ tuxcom/acinclude.m4 2008-12-28 18:33:11.000000000 +0100
41 +AC_DEFUN(TUXBOX_APPS,[
42 +AM_CONFIG_HEADER(config.h)
45 +INSTALL="$INSTALL -p"
51 + [ --with-target=TARGET target for compilation [[native,cdk]]],
52 + [TARGET="$withval"],[TARGET="native"])
54 +AC_ARG_WITH(targetprefix,
55 + [ --with-targetprefix=PATH prefix relative to target root (only applicable in cdk mode)],
56 + [targetprefix="$withval"],[targetprefix="NONE"])
59 + [ --without-debug disable debugging code],
60 + [DEBUG="$withval"],[DEBUG="yes"])
62 +if test "$DEBUG" = "yes"; then
63 + DEBUG_CFLAGS="-g3 -ggdb"
64 + AC_DEFINE(DEBUG,1,[Enable debug messages])
67 +AC_MSG_CHECKING(target)
69 +if test "$TARGET" = "native"; then
70 + AC_MSG_RESULT(native)
72 + if test "$CFLAGS" = "" -a "$CXXFLAGS" = ""; then
73 + CFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS"
74 + CXXFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS"
76 + if test "$prefix" = "NONE"; then
79 + targetprefix=$prefix
80 +elif test "$TARGET" = "cdk"; then
83 + if test "$CC" = "" -a "$CXX" = ""; then
84 + CC=powerpc-tuxbox-linux-gnu-gcc CXX=powerpc-tuxbox-linux-gnu-g++
86 + if test "$CFLAGS" = "" -a "$CXXFLAGS" = ""; then
87 + CFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS"
88 + CXXFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS"
90 + if test "$prefix" = "NONE"; then
91 + AC_MSG_ERROR(invalid prefix, you need to specify one in cdk mode)
93 + if test "$targetprefix" = "NONE"; then
96 + if test "$host_alias" = ""; then
98 + host_alias=powerpc-tuxbox-linux-gnu
101 + AC_MSG_RESULT(none)
102 + AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]);
109 + return $(perl -e "if(\"$1\"=~m#^/usr/(local/)?bin#){print \"0\"}else{print \"1\";}")
114 +AC_DEFUN(TUXBOX_APPS_DIRECTORY_ONE,[
115 +AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[
117 + if test "$TARGET" = "cdk"; then
118 + $2=`eval echo "${targetprefix}$withval"`
124 + if test "$TARGET" = "cdk"; then
125 + _$2=`eval echo "${target$3}$5"`
127 + _$2=`eval echo "${$3}$5"`
131 +dnl automake <= 1.6 don't support this
133 +AC_DEFINE_UNQUOTED($2,"$_$2",$7)
136 +AC_DEFUN(TUXBOX_APPS_DIRECTORY,[
137 +AC_REQUIRE([TUXBOX_APPS])
139 +if test "$TARGET" = "cdk"; then
140 + datadir="\${prefix}/share"
141 + tuxboxdatadir="\${prefix}/share/tuxbox"
142 + zoneinfodir="\${datadir}/zoneinfo"
143 + sysconfdir="\${prefix}/etc"
144 + localstatedir="\${prefix}/var"
145 + localedir="\${prefix}/var"
146 + libdir="\${prefix}/lib"
147 + targetdatadir="\${targetprefix}/share"
148 + targetsysconfdir="\${targetprefix}/etc"
149 + targetlocalstatedir="\${targetprefix}/var"
150 + targetlibdir="\${targetprefix}/lib"
153 +TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,sysconfdir,/etc,,
154 + [--with-configdir=PATH ],[where to find the config files])
156 +TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,,
157 + [--with-datadir=PATH ],[where to find data])
159 +TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share,/locale,
160 + [--with-localedir=PATH ],[where to find locales])
162 +TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
163 + [--with-fontdir=PATH ],[where to find the fonts])
165 +TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
166 + [--with-gamesdir=PATH ],[where games data is stored])
168 +TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,,
169 + [--with-libdir=PATH ],[where to find the internal libs])
171 +TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
172 + [--with-plugindir=PATH ],[where to find the plugins])
174 +TUXBOX_APPS_DIRECTORY_ONE(tuxboxdatadir,TUXBOXDATADIR,datadir,/share,,
175 + [--with-tuxboxdatadir=PATH],[where to find tuxbox data])
177 +TUXBOX_APPS_DIRECTORY_ONE(zoneinfodir,ZONEINFODIR,datadir,/share,/zoneinfo,
178 + [--with-zoneinfodir=PATH ],[where to find zoneinfo db])
181 +dnl automake <= 1.6 needs this specifications
184 +AC_SUBST(ZONEINFODIR)
190 +AC_SUBST(TUXBOXDATADIR)
193 +AC_DEFUN(TUXBOX_APPS_ENDIAN,[
194 +AC_CHECK_HEADERS(endian.h)
198 +AC_DEFUN(TUXBOX_APPS_DRIVER,[
199 +#AC_ARG_WITH(driver,
200 +# [ --with-driver=PATH path for driver sources [[NONE]]],
201 +# [DRIVER="$withval"],[DRIVER=""])
203 +#if test -d "$DRIVER/include"; then
204 +# AC_DEFINE(HAVE_DBOX2_DRIVER,1,[Define to 1 if you have the dbox2 driver sources])
206 +# AC_MSG_ERROR([can't find driver sources])
211 +#CPPFLAGS="$CPPFLAGS -I$DRIVER/include"
214 +AC_DEFUN([TUXBOX_APPS_DVB],[
215 +AC_ARG_WITH(dvbincludes,
216 + [ --with-dvbincludes=PATH path for dvb includes [[NONE]]],
217 + [DVBINCLUDES="$withval"],[DVBINCLUDES=""])
219 +if test "$DVBINCLUDES"; then
220 + CPPFLAGS="$CPPFLAGS -I$DVBINCLUDES"
223 +AC_CHECK_HEADERS(ost/dmx.h,[
225 + AC_MSG_NOTICE([found dvb version 1])
228 +if test -z "$DVB_API_VERSION"; then
229 +AC_CHECK_HEADERS(linux/dvb/version.h,[
230 + AC_LANG_PREPROC_REQUIRE()
231 + AC_REQUIRE([AC_PROG_EGREP])
232 + AC_LANG_CONFTEST([AC_LANG_SOURCE([[
233 +#include <linux/dvb/version.h>
234 +version DVB_API_VERSION
236 + DVB_API_VERSION=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP "^version" | sed "s,version\ ,,"`
239 + AC_MSG_NOTICE([found dvb version $DVB_API_VERSION])
243 +if test "$DVB_API_VERSION"; then
244 + AC_DEFINE(HAVE_DVB,1,[Define to 1 if you have the dvb includes])
245 + AC_DEFINE_UNQUOTED(HAVE_DVB_API_VERSION,$DVB_API_VERSION,[Define to the version of the dvb api])
247 + AC_MSG_ERROR([can't find dvb headers])
251 +AC_DEFUN(_TUXBOX_APPS_LIB_CONFIG,[
252 +AC_PATH_PROG($1_CONFIG,$2,no)
253 +if test "$$1_CONFIG" != "no"; then
254 + if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then
255 + AC_MSG_$3([could not find a suitable version of $2]);
257 + $1_CFLAGS=$($$1_CONFIG --cflags)
258 + $1_LIBS=$($$1_CONFIG --libs)
266 +AC_DEFUN(TUXBOX_APPS_LIB_CONFIG,[
267 +_TUXBOX_APPS_LIB_CONFIG($1,$2,ERROR)
268 +if test "$$1_CONFIG" = "no"; then
269 + AC_MSG_ERROR([could not find $2]);
273 +AC_DEFUN(TUXBOX_APPS_LIB_CONFIG_CHECK,[
274 +_TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
277 +AC_DEFUN(TUXBOX_APPS_PKGCONFIG,[
278 +AC_PATH_PROG(PKG_CONFIG, pkg-config,no)
279 +if test "$PKG_CONFIG" = "no" ; then
280 + AC_MSG_ERROR([could not find pkg-config]);
284 +AC_DEFUN(_TUXBOX_APPS_LIB_PKGCONFIG,[
285 +PKG_CHECK_MODULES($1,$2)
290 +AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG,[
291 +_TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
292 +if test -z "$$1_CFLAGS" ; then
293 + AC_MSG_ERROR([could not find package $2]);
297 +AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG_CHECK,[
298 +_TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
301 +AC_DEFUN(_TUXBOX_APPS_LIB_SYMBOL,[
302 +AC_CHECK_LIB($2,$3,HAVE_$1="yes",HAVE_$1="no")
303 +if test "$HAVE_$1" = "yes"; then
310 +AC_DEFUN(TUXBOX_APPS_LIB_SYMBOL,[
311 +_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,ERROR)
312 +if test "$HAVE_$1" = "no"; then
313 + AC_MSG_ERROR([could not find $2]);
317 +AC_DEFUN(TUXBOX_APPS_LIB_CONFIG_SYMBOL,[
318 +_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,WARN)
321 +AC_DEFUN(TUXBOX_APPS_GETTEXT,[
322 +AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
323 + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
324 + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
326 +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
328 +AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
329 + [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
330 + (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
333 +AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,[$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1],:)
335 +AC_MSG_CHECKING([whether NLS is requested])
337 + [ --disable-nls do not use Native Language Support],
338 + USE_NLS=$enableval, USE_NLS=yes)
339 +AC_MSG_RESULT($USE_NLS)
342 +if test "$USE_NLS" = "yes"; then
343 + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,[
345 + #include <libintl.h>
346 + #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
347 + #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
349 + extern int _nl_msg_cat_cntr;
350 + extern int *_nl_domain_bindings;
352 + bindtextdomain ("", "");
353 + return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings;
354 + ], gt_cv_func_gnugettext_libc=yes, gt_cv_func_gnugettext_libc=no
358 + if test "$gt_cv_func_gnugettext_libc" = "yes"; then
359 + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.])
360 + gt_use_preinstalled_gnugettext=yes
366 +if test -f "$srcdir/po/LINGUAS"; then
367 + ALL_LINGUAS=$(sed -e "/^#/d" "$srcdir/po/LINGUAS")
374 +for lang in $ALL_LINGUAS; do
375 + POFILES="$POFILES $srcdirpre$lang.po"
376 + GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
377 + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
378 + DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
381 +if test -n "$ALL_LINGUAS"; then
382 + for presentlang in $ALL_LINGUAS; do
384 + if test -n "$LINGUAS"; then
385 + desiredlanguages="$LINGUAS"
387 + desiredlanguages="$ALL_LINGUAS"
389 + for desiredlang in $desiredlanguages; do
390 + case "$desiredlang" in
391 + "$presentlang"*) useit=yes;;
394 + if test $useit = yes; then
395 + INST_LINGUAS="$INST_LINGUAS $presentlang"
400 +if test -n "$INST_LINGUAS"; then
401 + for lang in $INST_LINGUAS; do
402 + CATALOGS="$CATALOGS $lang.gmo"
407 +AC_SUBST(UPDATEPOFILES)
408 +AC_SUBST(DUMMYPOFILES)
412 +dnl backward compatiblity
413 +AC_DEFUN([AC_GNU_SOURCE],
414 +[AH_VERBATIM([_GNU_SOURCE],
415 +[/* Enable GNU extensions on systems that have them. */
419 +AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
420 +AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
421 +AC_DEFINE([_GNU_SOURCE])
424 +AC_DEFUN([AC_PROG_EGREP],
425 +[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
426 + [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
427 + then ac_cv_prog_egrep='grep -E'
428 + else ac_cv_prog_egrep='egrep'
430 + EGREP=$ac_cv_prog_egrep
434 +AC_DEFUN([AC_PYTHON_DEVEL],[
436 + # should allow for checking of python version here...
438 + AC_REQUIRE([AM_PATH_PYTHON])
440 + # Check for Python include path
441 + AC_MSG_CHECKING([for Python include path])
442 + python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
443 + for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do
444 + python_path=`find $i -type f -name Python.h -print | sed "1q"`
445 + if test -n "$python_path" ; then
449 + python_path=`echo $python_path | sed "s,/Python.h$,,"`
450 + AC_MSG_RESULT([$python_path])
451 + if test -z "$python_path" ; then
452 + AC_MSG_ERROR([cannot find Python include path])
454 + AC_SUBST([PYTHON_CPPFLAGS],[-I$python_path])
456 + # Check for Python library path
457 + AC_MSG_CHECKING([for Python library path])
458 + python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
459 + for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
460 + python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
461 + if test -n "$python_path" ; then
465 + python_path=`echo $python_path | sed "s,/libpython.*$,,"`
466 + AC_MSG_RESULT([$python_path])
467 + if test -z "$python_path" ; then
468 + AC_MSG_ERROR([cannot find Python library path])
470 + AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"])
472 + python_site=`echo $python_path | sed "s/config/site-packages/"`
473 + AC_SUBST([PYTHON_SITE_PKG],[$python_site])
475 diff -Naur tuxcom.ori/configure.ac tuxcom/configure.ac
476 --- tuxcom.ori/configure.ac 1970-01-01 01:00:00.000000000 +0100
477 +++ tuxcom/configure.ac 2008-12-28 18:33:12.000000000 +0100
480 +# Process this file with autoconf to produce a configure script.
482 +AC_INIT(tuxbox-tuxcom-32bpp,1.13)
483 +AM_INIT_AUTOMAKE(tuxbox-tuxcom-32bpp,1.13)
486 +TUXBOX_APPS_DIRECTORY
489 +# Checks for programs.
493 +TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
496 +AC_OUTPUT(font/Makefile)
497 +AC_OUTPUT(python/Makefile)
498 diff -Naur tuxcom_cvs/font/Makefile.am tuxcom/font/Makefile.am
499 --- tuxcom_cvs/font/Makefile.am 1970-01-01 01:00:00.000000000 +0100
500 +++ tuxcom/font/Makefile.am 2008-11-03 13:56:11.917916738 +0100
502 +installdir = $(FONTDIR)