Hello.
I needed to make two simple fixes to build tuxzap in NEWSTRUCT in a
current Linux environment:
1. Nested autoconf macros should be put into parentheses. Otherwise
the parameter list gets flattened.
2. ISO C++ does not allow redefinition of standard parameters.
Current compilers like gcc 3.2 do not allow that for the same
reason.
And now for the patch:
Index: configure.in
===================================================================
RCS file: /cvs/linuxtv/DVB/apps/tuxzap/configure.in,v
retrieving revision 1.12.2.2
diff -u -r1.12.2.2 configure.in
--- configure.in 26 Jun 2002 16:35:10 -0000 1.12.2.2
+++ configure.in 7 Oct 2002 11:55:00 -0000
@@ -84,10 +84,10 @@
CDK_LIBS="$CDK_LIBS -lcdk"
N_APPS="$N_APPS $CDVB_APPS"
INCLUDES="$INCLUDES /usr/local/include" ,
- AC_CHECK_HEADER(/usr/local/include/cdk/cdk.h,
+ [AC_CHECK_HEADER(/usr/local/include/cdk/cdk.h,
CDK_LIBS="$CDK_LIBS -lcdk"
INCLUDES="$INCLUDES /usr/local/include",
- echo "ATTENTION: you need cdk for ntuxzap"))
+ echo "ATTENTION: you need cdk for ntuxzap")])
AC_SUBST(CDK_LIBS)
AC_SUBST(N_APPS)
@@ -96,10 +96,10 @@
A52_LIBS="$A52_LIBS -la52 -lm"
LIBA52_CFLAGS="-DHAVE_LIBA52 $LIBA52_CFLAGS"
INCLUDES="$INCLUDES /usr/local/include" ,
- AC_CHECK_HEADER(/usr/local/include/a52dec/a52.h,
+ [AC_CHECK_HEADER(/usr/local/include/a52dec/a52.h,
A52_LIBS="$A52_LIBS -la52 -lm"
LIBA52_CFLAGS="-DHAVE_LIBA52 $LIBA52_CFLAGS"
- INCLUDES="$INCLUDES /usr/local/include",))
+ INCLUDES="$INCLUDES /usr/local/include",)])
AC_SUBST(A52_LIBS)
AC_SUBST(LIBA52_CFLAGS)
@@ -108,10 +108,10 @@
MAD_LIBS="$MAD_LIBS -lmad"
LIBMAD_CFLAGS="-DHAVE_LIBMAD $LIBMAD_CFLAGS"
INCLUDES="$INCLUDES /usr/local/include" ,
- AC_CHECK_HEADER(/usr/local/include/mad.h,
+ [AC_CHECK_HEADER(/usr/local/include/mad.h,
MAD_LIBS="$MAD_LIBS -lmad"
LIBMAD_CFLAGS="-DHAVE_LIBMAD $LIBMAD_CFLAGS"
- INCLUDES="$INCLUDES /usr/local/include",))
+ INCLUDES="$INCLUDES /usr/local/include",)])
AC_SUBST(MAD_LIBS)
AC_SUBST(LIBMAD_CFLAGS)
Index: src/audio.cc
===================================================================
RCS file: /cvs/linuxtv/DVB/apps/tuxzap/src/audio.cc,v
retrieving revision 1.6
diff -u -r1.6 audio.cc
--- src/audio.cc 17 Nov 2001 10:12:38 -0000 1.6
+++ src/audio.cc 7 Oct 2002 11:55:00 -0000
@@ -134,7 +134,7 @@
}
-void set_master_vol(int l, int r=-1){
+void set_master_vol(int l, int r){
if (devmask & 1) {
mixer_device=open("/dev/mixer", O_RDWR, 0);
@@ -147,7 +147,7 @@
}
}
-void get_master_vol(int &l, int lr=AU_LEFT){
+void get_master_vol(int &l, int lr){
if (devmask & 1) {
if (lr==AU_LEFT) l=volume_list[0].l;
Robert
--
Robert Schiele Tel.: +49-621-181-2517
Dipl.-Wirtsch.informatiker mailto:rschiele@uni-mannheim.de
Attachment:
pgp00000.pgp
Description: PGP signature