Skip to content

V
vlc-2-2
Commit 3d727062 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

Change --enable-debug into --enable-trace. Same with DEBUG_*. 

--enable-debug still exists, but only activates -g and additional
safety checks.

I hope I didn't break anything :))
parent 092858e0
Show whitespace changes
Inline Side-by-side
Showing with 359 additions and 312 deletions
Makefile.opts.in
View file @ 3d727062
...@@ -34,6 +34,7 @@ ARCH = @ARCH@ ...@@ -34,6 +34,7 @@ ARCH = @ARCH@
# #
DEBUG = @DEBUG@ DEBUG = @DEBUG@
STATS = @STATS@ STATS = @STATS@
TRACE = @TRACE@
OPTIMS = @OPTIMS@ OPTIMS = @OPTIMS@
GETOPT = @GETOPT@ GETOPT = @GETOPT@
...@@ -89,8 +90,12 @@ ifeq ($(DEBUG),1) ...@@ -89,8 +90,12 @@ ifeq ($(DEBUG),1)
PROGRAM_OPTIONS += DEBUG PROGRAM_OPTIONS += DEBUG
DEFINE += -DDEBUG DEFINE += -DDEBUG
endif endif
ifeq ($(TRACE),1)
PROGRAM_OPTIONS += TRACE
DEFINE += -DTRACE
endif
ifeq ($(STATS),1) ifeq ($(STATS),1)
PROGRAM_OPTIONS += DEBUG PROGRAM_OPTIONS += STATS
DEFINE += -DSTATS DEFINE += -DSTATS
endif endif
...@@ -161,7 +166,9 @@ endif ...@@ -161,7 +166,9 @@ endif
ifeq ($(OPTIMS),1) ifeq ($(OPTIMS),1)
CFLAGS += -O3 CFLAGS += -O3
CFLAGS += -ffast-math -funroll-loops CFLAGS += -ffast-math -funroll-loops
ifneq ($(DEBUG),1)
CFLAGS += -fomit-frame-pointer CFLAGS += -fomit-frame-pointer
endif
# Optimizations for x86 familiy # Optimizations for x86 familiy
ifneq (,$(findstring 86,$(ARCH))) ifneq (,$(findstring 86,$(ARCH)))
...@@ -219,9 +226,9 @@ endif ...@@ -219,9 +226,9 @@ endif
endif endif
# #
# Debugging and profiling support (unless optimisations are active) # Debugging and profiling support
# #
ifneq ($(OPTIMS),1) ifeq ($(TRACE),1)
CFLAGS += -g CFLAGS += -g
endif endif
configure
View file @ 3d727062
...@@ -29,6 +29,8 @@ ac_help="$ac_help ...@@ -29,6 +29,8 @@ ac_help="$ac_help
--enable-debug Enable debug mode (default disabled)" --enable-debug Enable debug mode (default disabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-stats Enable printing of statistics (default disabled)" --enable-stats Enable printing of statistics (default disabled)"
ac_help="$ac_help
--enable-trace Enable trace mode (default disabled)"
ac_help="$ac_help ac_help="$ac_help
--disable-optimizations Disable compiler optimizations (default enabled)" --disable-optimizations Disable compiler optimizations (default enabled)"
ac_help="$ac_help ac_help="$ac_help
...@@ -601,7 +603,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } ...@@ -601,7 +603,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi fi
echo $ac_n "checking host system type""... $ac_c" 1>&6 echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:605: checking host system type" >&5 echo "configure:607: checking host system type" >&5
host_alias=$host host_alias=$host
case "$host_alias" in case "$host_alias" in
...@@ -628,7 +630,7 @@ VLC_CODENAME=Ourumov ...@@ -628,7 +630,7 @@ VLC_CODENAME=Ourumov
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:632: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:634: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -657,7 +659,7 @@ fi ...@@ -657,7 +659,7 @@ fi
# Extract the first word of "gcc", so it can be a program name with args. # Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2 set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:661: checking for $ac_word" >&5 echo "configure:663: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -687,7 +689,7 @@ if test -z "$CC"; then ...@@ -687,7 +689,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args. # Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2 set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:691: checking for $ac_word" >&5 echo "configure:693: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -738,7 +740,7 @@ fi ...@@ -738,7 +740,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args. # Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2 set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:742: checking for $ac_word" >&5 echo "configure:744: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -770,7 +772,7 @@ fi ...@@ -770,7 +772,7 @@ fi
fi fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:774: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 echo "configure:776: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
...@@ -781,12 +783,12 @@ cross_compiling=$ac_cv_prog_cc_cross ...@@ -781,12 +783,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 785 "configure" #line 787 "configure"
#include "confdefs.h" #include "confdefs.h"
main(){return(0);} main(){return(0);}
EOF EOF
if { (eval echo configure:790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler. # If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then if (./conftest; exit) 2>/dev/null; then
...@@ -812,12 +814,12 @@ if test $ac_cv_prog_cc_works = no; then ...@@ -812,12 +814,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:816: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "configure:818: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:821: checking whether we are using GNU C" >&5 echo "configure:823: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -826,7 +828,7 @@ else ...@@ -826,7 +828,7 @@ else
yes; yes;
#endif #endif
EOF EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes ac_cv_prog_gcc=yes
else else
ac_cv_prog_gcc=no ac_cv_prog_gcc=no
...@@ -845,7 +847,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ...@@ -845,7 +847,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS= CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:849: checking whether ${CC-cc} accepts -g" >&5 echo "configure:851: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -877,7 +879,7 @@ else ...@@ -877,7 +879,7 @@ else
fi fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:881: checking how to run the C preprocessor" >&5 echo "configure:883: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory. # On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then if test -n "$CPP" && test -d "$CPP"; then
CPP= CPP=
...@@ -892,13 +894,13 @@ else ...@@ -892,13 +894,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser, # On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. # not just through cpp.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 896 "configure" #line 898 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -909,13 +911,13 @@ else ...@@ -909,13 +911,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp" CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 913 "configure" #line 915 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -926,13 +928,13 @@ else ...@@ -926,13 +928,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -nologo -E" CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 930 "configure" #line 932 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -969,7 +971,7 @@ echo "$ac_t""$CPP" 1>&6 ...@@ -969,7 +971,7 @@ echo "$ac_t""$CPP" 1>&6
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:973: checking for a BSD compatible install" >&5 echo "configure:975: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1023,18 +1025,18 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ...@@ -1023,18 +1025,18 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking for working const""... $ac_c" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:1027: checking for working const" >&5 echo "configure:1029: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1032 "configure" #line 1034 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
/* Ultrix mips cc rejects this. */ /* Ultrix mips cc rejects this. */
typedef int charset[2]; const charset x; typedef int charset[2]; const charset x = {0,0};
/* SunOS 4.1.1 cc rejects this. */ /* SunOS 4.1.1 cc rejects this. */
char const *const *ccp; char const *const *ccp;
char **p; char **p;
...@@ -1077,7 +1079,7 @@ ccp = (char const *const *) p; ...@@ -1077,7 +1079,7 @@ ccp = (char const *const *) p;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_c_const=yes ac_cv_c_const=yes
else else
...@@ -1098,14 +1100,14 @@ EOF ...@@ -1098,14 +1100,14 @@ EOF
fi fi
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
echo "configure:1102: checking whether byte ordering is bigendian" >&5 echo "configure:1104: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
ac_cv_c_bigendian=unknown ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro. # See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1109 "configure" #line 1111 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
...@@ -1116,11 +1118,11 @@ int main() { ...@@ -1116,11 +1118,11 @@ int main() {
#endif #endif
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not. # It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1124 "configure" #line 1126 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
...@@ -1131,7 +1133,7 @@ int main() { ...@@ -1131,7 +1133,7 @@ int main() {
#endif #endif
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_c_bigendian=yes ac_cv_c_bigendian=yes
else else
...@@ -1151,7 +1153,7 @@ if test "$cross_compiling" = yes; then ...@@ -1151,7 +1153,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1155 "configure" #line 1157 "configure"
#include "confdefs.h" #include "confdefs.h"
main () { main () {
/* Are we little or big endian? From Harbison&Steele. */ /* Are we little or big endian? From Harbison&Steele. */
...@@ -1164,7 +1166,7 @@ main () { ...@@ -1164,7 +1166,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1); exit (u.c[sizeof (long) - 1] == 1);
} }
EOF EOF
if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_c_bigendian=no ac_cv_c_bigendian=no
else else
...@@ -1191,12 +1193,12 @@ fi ...@@ -1191,12 +1193,12 @@ fi
for ac_func in gettimeofday select strerror strtod strtol for ac_func in gettimeofday select strerror strtod strtol
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1195: checking for $ac_func" >&5 echo "configure:1197: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1200 "configure" #line 1202 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -1219,7 +1221,7 @@ $ac_func(); ...@@ -1219,7 +1221,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -1246,12 +1248,12 @@ done ...@@ -1246,12 +1248,12 @@ done
for ac_func in setenv putenv for ac_func in setenv putenv
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1250: checking for $ac_func" >&5 echo "configure:1252: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1255 "configure" #line 1257 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -1274,7 +1276,7 @@ $ac_func(); ...@@ -1274,7 +1276,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -1299,12 +1301,12 @@ fi ...@@ -1299,12 +1301,12 @@ fi
done done
echo $ac_n "checking for connect""... $ac_c" 1>&6 echo $ac_n "checking for connect""... $ac_c" 1>&6
echo "configure:1303: checking for connect" >&5 echo "configure:1305: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1308 "configure" #line 1310 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */ which can conflict with char connect(); below. */
...@@ -1327,7 +1329,7 @@ connect(); ...@@ -1327,7 +1329,7 @@ connect();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_connect=yes" eval "ac_cv_func_connect=yes"
else else
...@@ -1345,7 +1347,7 @@ if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then ...@@ -1345,7 +1347,7 @@ if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
echo "configure:1349: checking for connect in -lsocket" >&5 echo "configure:1351: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1353,7 +1355,7 @@ else ...@@ -1353,7 +1355,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS" LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1357 "configure" #line 1359 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -1364,7 +1366,7 @@ int main() { ...@@ -1364,7 +1366,7 @@ int main() {
connect() connect()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -1387,12 +1389,12 @@ fi ...@@ -1387,12 +1389,12 @@ fi
fi fi
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
echo "configure:1391: checking for gethostbyname" >&5 echo "configure:1393: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1396 "configure" #line 1398 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */ which can conflict with char gethostbyname(); below. */
...@@ -1415,7 +1417,7 @@ gethostbyname(); ...@@ -1415,7 +1417,7 @@ gethostbyname();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes" eval "ac_cv_func_gethostbyname=yes"
else else
...@@ -1433,7 +1435,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then ...@@ -1433,7 +1435,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
echo "configure:1437: checking for gethostbyname in -lnsl" >&5 echo "configure:1439: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1441,7 +1443,7 @@ else ...@@ -1441,7 +1443,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS" LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1445 "configure" #line 1447 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -1452,7 +1454,7 @@ int main() { ...@@ -1452,7 +1454,7 @@ int main() {
gethostbyname() gethostbyname()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -1475,12 +1477,12 @@ fi ...@@ -1475,12 +1477,12 @@ fi
fi fi
echo $ac_n "checking for nanosleep""... $ac_c" 1>&6 echo $ac_n "checking for nanosleep""... $ac_c" 1>&6
echo "configure:1479: checking for nanosleep" >&5 echo "configure:1481: checking for nanosleep" >&5
if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1484 "configure" #line 1486 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char nanosleep(); below. */ which can conflict with char nanosleep(); below. */
...@@ -1503,7 +1505,7 @@ nanosleep(); ...@@ -1503,7 +1505,7 @@ nanosleep();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_nanosleep=yes" eval "ac_cv_func_nanosleep=yes"
else else
...@@ -1521,7 +1523,7 @@ if eval "test \"`echo '$ac_cv_func_'nanosleep`\" = yes"; then ...@@ -1521,7 +1523,7 @@ if eval "test \"`echo '$ac_cv_func_'nanosleep`\" = yes"; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
echo "configure:1525: checking for nanosleep in -lrt" >&5 echo "configure:1527: checking for nanosleep in -lrt" >&5
ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1529,7 +1531,7 @@ else ...@@ -1529,7 +1531,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lrt $LIBS" LIBS="-lrt $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1533 "configure" #line 1535 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -1540,7 +1542,7 @@ int main() { ...@@ -1540,7 +1542,7 @@ int main() {
nanosleep() nanosleep()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -1559,7 +1561,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ...@@ -1559,7 +1561,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
echo "configure:1563: checking for nanosleep in -lposix4" >&5 echo "configure:1565: checking for nanosleep in -lposix4" >&5
ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1567,7 +1569,7 @@ else ...@@ -1567,7 +1569,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS" LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1571 "configure" #line 1573 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -1578,7 +1580,7 @@ int main() { ...@@ -1578,7 +1580,7 @@ int main() {
nanosleep() nanosleep()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -1605,12 +1607,12 @@ fi ...@@ -1605,12 +1607,12 @@ fi
for ac_func in usleep for ac_func in usleep
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1609: checking for $ac_func" >&5 echo "configure:1611: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1614 "configure" #line 1616 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -1633,7 +1635,7 @@ $ac_func(); ...@@ -1633,7 +1635,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -1658,12 +1660,12 @@ fi ...@@ -1658,12 +1660,12 @@ fi
done done
echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
echo "configure:1662: checking for inet_aton" >&5 echo "configure:1664: checking for inet_aton" >&5
if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1667 "configure" #line 1669 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char inet_aton(); below. */ which can conflict with char inet_aton(); below. */
...@@ -1686,7 +1688,7 @@ inet_aton(); ...@@ -1686,7 +1688,7 @@ inet_aton();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_inet_aton=yes" eval "ac_cv_func_inet_aton=yes"
else else
...@@ -1704,7 +1706,7 @@ if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then ...@@ -1704,7 +1706,7 @@ if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
echo "configure:1708: checking for inet_aton in -lresolv" >&5 echo "configure:1710: checking for inet_aton in -lresolv" >&5
ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1712,7 +1714,7 @@ else ...@@ -1712,7 +1714,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS" LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1716 "configure" #line 1718 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -1723,7 +1725,7 @@ int main() { ...@@ -1723,7 +1725,7 @@ int main() {
inet_aton() inet_aton()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -1748,12 +1750,12 @@ fi ...@@ -1748,12 +1750,12 @@ fi
for ac_func in vasprintf for ac_func in vasprintf
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1752: checking for $ac_func" >&5 echo "configure:1754: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1757 "configure" #line 1759 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -1776,7 +1778,7 @@ $ac_func(); ...@@ -1776,7 +1778,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -1802,12 +1804,12 @@ done ...@@ -1802,12 +1804,12 @@ done
echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
echo "configure:1806: checking for getopt_long" >&5 echo "configure:1808: checking for getopt_long" >&5
if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1811 "configure" #line 1813 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getopt_long(); below. */ which can conflict with char getopt_long(); below. */
...@@ -1830,7 +1832,7 @@ getopt_long(); ...@@ -1830,7 +1832,7 @@ getopt_long();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_getopt_long=yes" eval "ac_cv_func_getopt_long=yes"
else else
...@@ -1852,7 +1854,7 @@ else ...@@ -1852,7 +1854,7 @@ else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
# FreeBSD has a gnugetopt library for this: # FreeBSD has a gnugetopt library for this:
echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6 echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6
echo "configure:1856: checking for getopt_long in -lgnugetopt" >&5 echo "configure:1858: checking for getopt_long in -lgnugetopt" >&5
ac_lib_var=`echo gnugetopt'_'getopt_long | sed 'y%./+-%__p_%'` ac_lib_var=`echo gnugetopt'_'getopt_long | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1860,7 +1862,7 @@ else ...@@ -1860,7 +1862,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lgnugetopt $LIBS" LIBS="-lgnugetopt $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1864 "configure" #line 1866 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -1871,7 +1873,7 @@ int main() { ...@@ -1871,7 +1873,7 @@ int main() {
getopt_long() getopt_long()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -1903,17 +1905,17 @@ for ac_hdr in unistd.h ...@@ -1903,17 +1905,17 @@ for ac_hdr in unistd.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1907: checking for $ac_hdr" >&5 echo "configure:1909: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1912 "configure" #line 1914 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -1942,12 +1944,12 @@ done ...@@ -1942,12 +1944,12 @@ done
for ac_func in getpagesize for ac_func in getpagesize
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1946: checking for $ac_func" >&5 echo "configure:1948: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1951 "configure" #line 1953 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -1970,7 +1972,7 @@ $ac_func(); ...@@ -1970,7 +1972,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -1995,7 +1997,7 @@ fi ...@@ -1995,7 +1997,7 @@ fi
done done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
echo "configure:1999: checking for working mmap" >&5 echo "configure:2001: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2003,7 +2005,7 @@ else ...@@ -2003,7 +2005,7 @@ else
ac_cv_func_mmap_fixed_mapped=no ac_cv_func_mmap_fixed_mapped=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2007 "configure" #line 2009 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test. /* Thanks to Mike Haertel and Jim Avera for this test.
...@@ -2030,12 +2032,15 @@ else ...@@ -2030,12 +2032,15 @@ else
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <stdlib.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
/* This mess was copied from the GNU getpagesize.h. */ /* This mess was copied from the GNU getpagesize.h. */
#ifndef HAVE_GETPAGESIZE #ifndef HAVE_GETPAGESIZE
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif
/* Assume that all systems that can run configure have sys/param.h. */ /* Assume that all systems that can run configure have sys/param.h. */
# ifndef HAVE_SYS_PARAM_H # ifndef HAVE_SYS_PARAM_H
...@@ -2090,7 +2095,7 @@ main() ...@@ -2090,7 +2095,7 @@ main()
/* /*
* First, make a file with some known garbage in it. * First, make a file with some known garbage in it.
*/ */
data = malloc(pagesize); data = (char*)malloc(pagesize);
if (!data) if (!data)
exit(1); exit(1);
for (i = 0; i < pagesize; ++i) for (i = 0; i < pagesize; ++i)
...@@ -2111,7 +2116,7 @@ main() ...@@ -2111,7 +2116,7 @@ main()
fd = open("conftestmmap", O_RDWR); fd = open("conftestmmap", O_RDWR);
if (fd < 0) if (fd < 0)
exit(1); exit(1);
data2 = malloc(2 * pagesize); data2 = (char*)malloc(2 * pagesize);
if (!data2) if (!data2)
exit(1); exit(1);
data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
...@@ -2129,7 +2134,7 @@ main() ...@@ -2129,7 +2134,7 @@ main()
*/ */
for (i = 0; i < pagesize; ++i) for (i = 0; i < pagesize; ++i)
*(data2 + i) = *(data2 + i) + 1; *(data2 + i) = *(data2 + i) + 1;
data3 = malloc(pagesize); data3 = (char*)malloc(pagesize);
if (!data3) if (!data3)
exit(1); exit(1);
if (read(fd, data3, pagesize) != pagesize) if (read(fd, data3, pagesize) != pagesize)
...@@ -2143,7 +2148,7 @@ main() ...@@ -2143,7 +2148,7 @@ main()
} }
EOF EOF
if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_fixed_mapped=yes
else else
...@@ -2166,12 +2171,12 @@ EOF ...@@ -2166,12 +2171,12 @@ EOF
fi fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:2170: checking return type of signal handlers" >&5 echo "configure:2175: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2175 "configure" #line 2180 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <signal.h> #include <signal.h>
...@@ -2188,7 +2193,7 @@ int main() { ...@@ -2188,7 +2193,7 @@ int main() {
int i; int i;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_type_signal=void ac_cv_type_signal=void
else else
...@@ -2207,7 +2212,7 @@ EOF ...@@ -2207,7 +2212,7 @@ EOF
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:2211: checking for dlopen in -ldl" >&5 echo "configure:2216: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -2215,7 +2220,7 @@ else ...@@ -2215,7 +2220,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS" LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2219 "configure" #line 2224 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -2226,7 +2231,7 @@ int main() { ...@@ -2226,7 +2231,7 @@ int main() {
dlopen() dlopen()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -2247,7 +2252,7 @@ else ...@@ -2247,7 +2252,7 @@ else
fi fi
echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
echo "configure:2251: checking for pow in -lm" >&5 echo "configure:2256: checking for pow in -lm" >&5
ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -2255,7 +2260,7 @@ else ...@@ -2255,7 +2260,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS" LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2259 "configure" #line 2264 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -2266,7 +2271,7 @@ int main() { ...@@ -2266,7 +2271,7 @@ int main() {
pow() pow()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -2287,9 +2292,9 @@ else ...@@ -2287,9 +2292,9 @@ else
fi fi
echo $ac_n "checking for old style FreeBSD -pthread flag""... $ac_c" 1>&6 echo $ac_n "checking for old style FreeBSD -pthread flag""... $ac_c" 1>&6
echo "configure:2291: checking for old style FreeBSD -pthread flag" >&5 echo "configure:2296: checking for old style FreeBSD -pthread flag" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2293 "configure" #line 2298 "configure"
#include "confdefs.h" #include "confdefs.h"
#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001 #if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001
yes yes
...@@ -2305,7 +2310,7 @@ else ...@@ -2305,7 +2310,7 @@ else
rm -rf conftest* rm -rf conftest*
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
echo "configure:2309: checking for pthread_create in -lpthread" >&5 echo "configure:2314: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -2313,7 +2318,7 @@ else ...@@ -2313,7 +2318,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS" LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2317 "configure" #line 2322 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -2324,7 +2329,7 @@ int main() { ...@@ -2324,7 +2329,7 @@ int main() {
pthread_create() pthread_create()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -2348,7 +2353,7 @@ fi ...@@ -2348,7 +2353,7 @@ fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking for thread_create in -lthreads""... $ac_c" 1>&6 echo $ac_n "checking for thread_create in -lthreads""... $ac_c" 1>&6
echo "configure:2352: checking for thread_create in -lthreads" >&5 echo "configure:2357: checking for thread_create in -lthreads" >&5
ac_lib_var=`echo threads'_'thread_create | sed 'y%./+-%__p_%'` ac_lib_var=`echo threads'_'thread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -2356,7 +2361,7 @@ else ...@@ -2356,7 +2361,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lthreads $LIBS" LIBS="-lthreads $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2360 "configure" #line 2365 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -2367,7 +2372,7 @@ int main() { ...@@ -2367,7 +2372,7 @@ int main() {
thread_create() thread_create()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -2393,17 +2398,17 @@ for ac_hdr in stddef.h ...@@ -2393,17 +2398,17 @@ for ac_hdr in stddef.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2397: checking for $ac_hdr" >&5 echo "configure:2402: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2402 "configure" #line 2407 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2433,17 +2438,17 @@ for ac_hdr in getopt.h ...@@ -2433,17 +2438,17 @@ for ac_hdr in getopt.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2437: checking for $ac_hdr" >&5 echo "configure:2442: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2442 "configure" #line 2447 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2473,17 +2478,17 @@ for ac_hdr in sys/sockio.h ...@@ -2473,17 +2478,17 @@ for ac_hdr in sys/sockio.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2477: checking for $ac_hdr" >&5 echo "configure:2482: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2482 "configure" #line 2487 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2513,17 +2518,17 @@ for ac_hdr in fcntl.h sys/time.h unistd.h ...@@ -2513,17 +2518,17 @@ for ac_hdr in fcntl.h sys/time.h unistd.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2517: checking for $ac_hdr" >&5 echo "configure:2522: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2522 "configure" #line 2527 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2553,17 +2558,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h ...@@ -2553,17 +2558,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2557: checking for $ac_hdr" >&5 echo "configure:2562: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2562 "configure" #line 2567 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2593,17 +2598,17 @@ for ac_hdr in dlfcn.h image.h ...@@ -2593,17 +2598,17 @@ for ac_hdr in dlfcn.h image.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2597: checking for $ac_hdr" >&5 echo "configure:2602: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2602 "configure" #line 2607 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2633,17 +2638,17 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h ...@@ -2633,17 +2638,17 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2637: checking for $ac_hdr" >&5 echo "configure:2642: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2642 "configure" #line 2647 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2673,17 +2678,17 @@ for ac_hdr in machine/param.h ...@@ -2673,17 +2678,17 @@ for ac_hdr in machine/param.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2677: checking for $ac_hdr" >&5 echo "configure:2682: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2682 "configure" #line 2687 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2714,17 +2719,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h ...@@ -2714,17 +2719,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2718: checking for $ac_hdr" >&5 echo "configure:2723: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2723 "configure" #line 2728 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2755,9 +2760,9 @@ save_CFLAGS=$CFLAGS ...@@ -2755,9 +2760,9 @@ save_CFLAGS=$CFLAGS
CFLAGS="${CFLAGS} -Wall -Werror" CFLAGS="${CFLAGS} -Wall -Werror"
echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6
echo "configure:2759: checking for ntohl in sys/param.h" >&5 echo "configure:2764: checking for ntohl in sys/param.h" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2761 "configure" #line 2766 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/param.h> #include <sys/param.h>
void foo() { int meuh; ntohl(meuh); } void foo() { int meuh; ntohl(meuh); }
...@@ -2765,7 +2770,7 @@ int main() { ...@@ -2765,7 +2770,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define NTOHL_IN_SYS_PARAM_H 1 #define NTOHL_IN_SYS_PARAM_H 1
...@@ -2782,16 +2787,16 @@ rm -f conftest* ...@@ -2782,16 +2787,16 @@ rm -f conftest*
CFLAGS="${CFLAGS} -rdynamic -Wall -Werror" CFLAGS="${CFLAGS} -rdynamic -Wall -Werror"
echo $ac_n "checking if \$CC groks -rdynamic without complaining too much""... $ac_c" 1>&6 echo $ac_n "checking if \$CC groks -rdynamic without complaining too much""... $ac_c" 1>&6
echo "configure:2786: checking if \$CC groks -rdynamic without complaining too much" >&5 echo "configure:2791: checking if \$CC groks -rdynamic without complaining too much" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2788 "configure" #line 2793 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
LCFLAGS="${LCFLAGS} -rdynamic" LCFLAGS="${LCFLAGS} -rdynamic"
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
...@@ -2806,9 +2811,9 @@ rm -f conftest* ...@@ -2806,9 +2811,9 @@ rm -f conftest*
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6 echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6
echo "configure:2810: checking for boolean_t in sys/types.h" >&5 echo "configure:2815: checking for boolean_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2812 "configure" #line 2817 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
void quux() { boolean_t foo; } void quux() { boolean_t foo; }
...@@ -2816,7 +2821,7 @@ int main() { ...@@ -2816,7 +2821,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define BOOLEAN_T_IN_SYS_TYPES_H 1 #define BOOLEAN_T_IN_SYS_TYPES_H 1
...@@ -2831,9 +2836,9 @@ else ...@@ -2831,9 +2836,9 @@ else
fi fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6 echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6
echo "configure:2835: checking for boolean_t in pthread.h" >&5 echo "configure:2840: checking for boolean_t in pthread.h" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2837 "configure" #line 2842 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <pthread.h> #include <pthread.h>
void quux() { boolean_t foo; } void quux() { boolean_t foo; }
...@@ -2841,7 +2846,7 @@ int main() { ...@@ -2841,7 +2846,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define BOOLEAN_T_IN_PTHREAD_H 1 #define BOOLEAN_T_IN_PTHREAD_H 1
...@@ -2857,18 +2862,18 @@ fi ...@@ -2857,18 +2862,18 @@ fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking for working const""... $ac_c" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:2861: checking for working const" >&5 echo "configure:2866: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2866 "configure" #line 2871 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
/* Ultrix mips cc rejects this. */ /* Ultrix mips cc rejects this. */
typedef int charset[2]; const charset x; typedef int charset[2]; const charset x = {0,0};
/* SunOS 4.1.1 cc rejects this. */ /* SunOS 4.1.1 cc rejects this. */
char const *const *ccp; char const *const *ccp;
char **p; char **p;
...@@ -2911,7 +2916,7 @@ ccp = (char const *const *) p; ...@@ -2911,7 +2916,7 @@ ccp = (char const *const *) p;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_c_const=yes ac_cv_c_const=yes
else else
...@@ -2932,12 +2937,12 @@ EOF ...@@ -2932,12 +2937,12 @@ EOF
fi fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:2936: checking for ANSI C header files" >&5 echo "configure:2941: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2941 "configure" #line 2946 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
...@@ -2945,7 +2950,7 @@ else ...@@ -2945,7 +2950,7 @@ else
#include <float.h> #include <float.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2962,7 +2967,7 @@ rm -f conftest* ...@@ -2962,7 +2967,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2966 "configure" #line 2971 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <string.h> #include <string.h>
EOF EOF
...@@ -2980,7 +2985,7 @@ fi ...@@ -2980,7 +2985,7 @@ fi
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2984 "configure" #line 2989 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
...@@ -3001,7 +3006,7 @@ if test "$cross_compiling" = yes; then ...@@ -3001,7 +3006,7 @@ if test "$cross_compiling" = yes; then
: :
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3005 "configure" #line 3010 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
...@@ -3012,7 +3017,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); ...@@ -3012,7 +3017,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); } exit (0); }
EOF EOF
if { (eval echo configure:3016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
...@@ -3036,12 +3041,12 @@ EOF ...@@ -3036,12 +3041,12 @@ EOF
fi fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6 echo $ac_n "checking for size_t""... $ac_c" 1>&6
echo "configure:3040: checking for size_t" >&5 echo "configure:3045: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3045 "configure" #line 3050 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#if STDC_HEADERS #if STDC_HEADERS
...@@ -3069,12 +3074,12 @@ EOF ...@@ -3069,12 +3074,12 @@ EOF
fi fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
echo "configure:3073: checking whether time.h and sys/time.h may both be included" >&5 echo "configure:3078: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3078 "configure" #line 3083 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
...@@ -3083,7 +3088,7 @@ int main() { ...@@ -3083,7 +3088,7 @@ int main() {
struct tm *tp; struct tm *tp;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_header_time=yes ac_cv_header_time=yes
else else
...@@ -3117,17 +3122,17 @@ for ac_hdr in sys/ioctl.h ...@@ -3117,17 +3122,17 @@ for ac_hdr in sys/ioctl.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3121: checking for $ac_hdr" >&5 echo "configure:3126: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3126 "configure" #line 3131 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3153,17 +3158,17 @@ EOF ...@@ -3153,17 +3158,17 @@ EOF
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3157: checking for $ac_hdr" >&5 echo "configure:3162: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3162 "configure" #line 3167 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3190,7 +3195,7 @@ fi ...@@ -3190,7 +3195,7 @@ fi
done done
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3194 "configure" #line 3199 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <linux/cdrom.h> #include <linux/cdrom.h>
EOF EOF
...@@ -3298,6 +3303,13 @@ if test "${enable_stats+set}" = set; then ...@@ -3298,6 +3303,13 @@ if test "${enable_stats+set}" = set; then
fi fi
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
enableval="$enable_trace"
if test x$enableval = xyes; then TRACE=1; fi
fi
# Check whether --enable-optimizations or --disable-optimizations was given. # Check whether --enable-optimizations or --disable-optimizations was given.
if test "${enable_optimizations+set}" = set; then if test "${enable_optimizations+set}" = set; then
enableval="$enable_optimizations" enableval="$enable_optimizations"
...@@ -3334,7 +3346,7 @@ if test "${enable_esd+set}" = set; then ...@@ -3334,7 +3346,7 @@ if test "${enable_esd+set}" = set; then
# Extract the first word of "esd-config", so it can be a program name with args. # Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2 set dummy esd-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3338: checking for $ac_word" >&5 echo "configure:3350: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3399,17 +3411,17 @@ else ...@@ -3399,17 +3411,17 @@ else
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3403: checking for $ac_hdr" >&5 echo "configure:3415: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3408 "configure" #line 3420 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3480,17 +3492,17 @@ if test "${with_sdl+set}" = set; then ...@@ -3480,17 +3492,17 @@ if test "${with_sdl+set}" = set; then
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3484: checking for $ac_hdr" >&5 echo "configure:3496: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3489 "configure" #line 3501 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3528,17 +3540,17 @@ fi ...@@ -3528,17 +3540,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3532: checking for $ac_hdr" >&5 echo "configure:3544: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3537 "configure" #line 3549 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3632,7 +3644,7 @@ if test x$enable_gtk != xno; then ...@@ -3632,7 +3644,7 @@ if test x$enable_gtk != xno; then
# Extract the first word of "gtk-config", so it can be a program name with args. # Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2 set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3636: checking for $ac_word" >&5 echo "configure:3648: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3692,17 +3704,17 @@ if test x$enable_x11 != xno; then ...@@ -3692,17 +3704,17 @@ if test x$enable_x11 != xno; then
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3696: checking for $ac_hdr" >&5 echo "configure:3708: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3701 "configure" #line 3713 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3754,17 +3766,17 @@ if test x$enable_xvideo != xno; then ...@@ -3754,17 +3766,17 @@ if test x$enable_xvideo != xno; then
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3758: checking for $ac_hdr" >&5 echo "configure:3770: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3763 "configure" #line 3775 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3802,17 +3814,17 @@ if test "${enable_alsa+set}" = set; then ...@@ -3802,17 +3814,17 @@ if test "${enable_alsa+set}" = set; then
enableval="$enable_alsa" enableval="$enable_alsa"
if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'` if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6 echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
echo "configure:3806: checking for sys/asoundlib.h" >&5 echo "configure:3818: checking for sys/asoundlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3811 "configure" #line 3823 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3829,7 +3841,7 @@ fi ...@@ -3829,7 +3841,7 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
echo "configure:3833: checking for main in -lasound" >&5 echo "configure:3845: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -3837,14 +3849,14 @@ else ...@@ -3837,14 +3849,14 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS" LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3841 "configure" #line 3853 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -3912,6 +3924,7 @@ fi ...@@ -3912,6 +3924,7 @@ fi
trap '' 1 2 15 trap '' 1 2 15
...@@ -4072,6 +4085,7 @@ s%@DEFINE@%$DEFINE%g ...@@ -4072,6 +4085,7 @@ s%@DEFINE@%$DEFINE%g
s%@INCLUDE@%$INCLUDE%g s%@INCLUDE@%$INCLUDE%g
s%@DEBUG@%$DEBUG%g s%@DEBUG@%$DEBUG%g
s%@STATS@%$STATS%g s%@STATS@%$STATS%g
s%@TRACE@%$TRACE%g
s%@OPTIMS@%$OPTIMS%g s%@OPTIMS@%$OPTIMS%g
s%@CSS@%$CSS%g s%@CSS@%$CSS%g
s%@LCFLAGS@%$LCFLAGS%g s%@LCFLAGS@%$LCFLAGS%g
...@@ -4323,6 +4337,7 @@ system : ${SYS} ...@@ -4323,6 +4337,7 @@ system : ${SYS}
architecture : ${ARCH} architecture : ${ARCH}
debug mode : ${DEBUG} debug mode : ${DEBUG}
statistics : ${STATS} statistics : ${STATS}
trace mode : ${TRACE}
optimizations : ${OPTIMS} optimizations : ${OPTIMS}
CSS decryption : ${CSS} CSS decryption : ${CSS}
need builtin getopt : ${GETOPT} need builtin getopt : ${GETOPT}
......
configure.in
View file @ 3d727062
...@@ -202,6 +202,13 @@ AC_ARG_ENABLE(stats, ...@@ -202,6 +202,13 @@ AC_ARG_ENABLE(stats,
[ --enable-stats Enable printing of statistics (default disabled)], [ --enable-stats Enable printing of statistics (default disabled)],
[ if test x$enableval = xyes; then STATS=1; fi ]) [ if test x$enableval = xyes; then STATS=1; fi ])
dnl
dnl Trace mode
dnl
AC_ARG_ENABLE(trace,
[ --enable-trace Enable trace mode (default disabled)],
[ if test x$enableval = xyes; then TRACE=1; fi ])
dnl dnl
dnl Enable/disable optimizations dnl Enable/disable optimizations
dnl dnl
...@@ -458,6 +465,7 @@ AC_SUBST(DEFINE) ...@@ -458,6 +465,7 @@ AC_SUBST(DEFINE)
AC_SUBST(INCLUDE) AC_SUBST(INCLUDE)
AC_SUBST(DEBUG) AC_SUBST(DEBUG)
AC_SUBST(STATS) AC_SUBST(STATS)
AC_SUBST(TRACE)
AC_SUBST(OPTIMS) AC_SUBST(OPTIMS)
AC_SUBST(CSS) AC_SUBST(CSS)
...@@ -495,6 +503,7 @@ system : ${SYS} ...@@ -495,6 +503,7 @@ system : ${SYS}
architecture : ${ARCH} architecture : ${ARCH}
debug mode : ${DEBUG} debug mode : ${DEBUG}
statistics : ${STATS} statistics : ${STATS}
trace mode : ${TRACE}
optimizations : ${OPTIMS} optimizations : ${OPTIMS}
CSS decryption : ${CSS} CSS decryption : ${CSS}
need builtin getopt : ${GETOPT} need builtin getopt : ${GETOPT}
......
include/config.h.in
View file @ 3d727062
...@@ -66,23 +66,23 @@ ...@@ -66,23 +66,23 @@
/***************************************************************************** /*****************************************************************************
* Debugging options - define or undefine symbols * Debugging options - define or undefine symbols
*****************************************************************************/ *****************************************************************************/
#ifdef DEBUG #ifdef TRACE
/* General debugging support, which depends of the DEBUG define, is determined /* General trace support, which depends of the TRACE define, is determined
* in the Makefile */ * in the Makefile */
/* Modules specific debugging - this will produce a lot of output, but can be /* Modules specific debugging - this will produce a lot of output, but can be
* useful to track a bug */ * useful to track a bug */
//#define DEBUG_INTF //#define TRACE_INTF
//#define DEBUG_INPUT //#define TRACE_INPUT
//#define DEBUG_AUDIO //#define TRACE_AUDIO
#define DEBUG_VOUT #define TRACE_VOUT
#define DEBUG_VPAR #define TRACE_VPAR
/* Debugging log file - if defined, a file can be used to store all messages. If /* Trace log file - if defined, a file can be used to store all messages. If
* DEBUG_LOG_ONLY is defined, debug messages will only be printed to the log and * TRACE_LOG_ONLY is defined, debug messages will only be printed to the log and
* will not appear on the screen */ * will not appear on the screen */
#define DEBUG_LOG "vlc-debug.log" #define TRACE_LOG "vlc-trace.log"
#define DEBUG_LOG_ONLY #define TRACE_LOG_ONLY
#endif #endif
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
* when debugging, since it allows messages which would not be printed * when debugging, since it allows messages which would not be printed
* due to a crash to be printed anyway */ * due to a crash to be printed anyway */
#ifndef DEBUG #ifndef DEBUG
//#define INTF_MSG_QUEUE #define INTF_MSG_QUEUE
#endif #endif
/* Format of the header for debug messages. The arguments following this header /* Format of the header for debug messages. The arguments following this header
......
include/intf_msg.h
View file @ 3d727062
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* interface, such as message output. See config.h for output configuration. * interface, such as message output. See config.h for output configuration.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_msg.h,v 1.11 2001/03/21 13:42:33 sam Exp $ * $Id: intf_msg.h,v 1.12 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
* compiler extensions and print the file, the function and the line number * compiler extensions and print the file, the function and the line number
* from which they have been called. They call _intf_DbgMsg*() functions after * from which they have been called. They call _intf_DbgMsg*() functions after
* having added debugging informations. * having added debugging informations.
* Outside DEBUG mode, intf_DbgMsg* functions do nothing. * Outside trace mode, intf_DbgMsg* functions do nothing.
*****************************************************************************/ *****************************************************************************/
#ifdef DEBUG #ifdef TRACE
/* DEBUG mode */ /* TRACE mode */
void _intf_DbgMsg ( char *psz_file, char *psz_function, int i_line, void _intf_DbgMsg ( char *psz_file, char *psz_function, int i_line,
char *psz_format, ... ); char *psz_format, ... );
void _intf_DbgMsgImm ( char *psz_file, char *psz_function, int i_line, void _intf_DbgMsgImm ( char *psz_file, char *psz_function, int i_line,
...@@ -47,7 +47,7 @@ void _intf_DbgMsgImm ( char *psz_file, char *psz_function, int i_line, ...@@ -47,7 +47,7 @@ void _intf_DbgMsgImm ( char *psz_file, char *psz_function, int i_line,
#else #else
/* Non-DEBUG mode */ /* Non-TRACE mode */
#define intf_DbgMsg( format, args... ) #define intf_DbgMsg( format, args... )
#define intf_DbgMsgImm( format, args...) #define intf_DbgMsgImm( format, args...)
......
plugins/dvd/input_dvd.c
View file @ 3d727062
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* -dvd_udf to find files * -dvd_udf to find files
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.49 2001/04/22 00:08:25 stef Exp $ * $Id: input_dvd.c,v 1.50 2001/04/27 19:29:11 massiot Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -742,7 +742,6 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area ) ...@@ -742,7 +742,6 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
for( i = 1 ; i <= vts.manager_inf.i_audio_nb ; i++ ) for( i = 1 ; i <= vts.manager_inf.i_audio_nb ; i++ )
{ {
#ifdef DEBUG
intf_WarnMsg( 1, "Audio %d: %x %x %x %x %x %x %x %x %x %x %x %x", i, intf_WarnMsg( 1, "Audio %d: %x %x %x %x %x %x %x %x %x %x %x %x", i,
vts.manager_inf.p_audio_attr[i-1].i_num_channels, vts.manager_inf.p_audio_attr[i-1].i_num_channels,
vts.manager_inf.p_audio_attr[i-1].i_coding_mode, vts.manager_inf.p_audio_attr[i-1].i_coding_mode,
...@@ -756,7 +755,6 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area ) ...@@ -756,7 +755,6 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
vts.manager_inf.p_audio_attr[i-1].i_sample_freq, vts.manager_inf.p_audio_attr[i-1].i_sample_freq,
vts.manager_inf.p_audio_attr[i-1].i_lang_code, vts.manager_inf.p_audio_attr[i-1].i_lang_code,
vts.manager_inf.p_audio_attr[i-1].i_caption ); vts.manager_inf.p_audio_attr[i-1].i_caption );
#endif
switch( vts.manager_inf.p_audio_attr[i-1].i_coding_mode ) switch( vts.manager_inf.p_audio_attr[i-1].i_coding_mode )
{ {
......
plugins/mpeg/input_ps.c
View file @ 3d727062
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_ps.c: PS demux and packet management * input_ps.c: PS demux and packet management
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input_ps.c,v 1.17 2001/04/22 00:08:26 stef Exp $ * $Id: input_ps.c,v 1.18 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr> * Cyril Deguet <asmax@via.ecp.fr>
...@@ -547,11 +547,14 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -547,11 +547,14 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
data_packet_t * p_data; data_packet_t * p_data;
long l_index; long l_index;
#ifdef DEBUG
if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL ) if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL )
{ {
intf_ErrMsg( "PPacket cache not initialized" ); intf_ErrMsg( "PPacket cache not initialized" );
return NULL; return NULL;
} }
#endif
/* Safety check */ /* Safety check */
if( l_size > INPUT_MAX_PACKET_SIZE ) if( l_size > INPUT_MAX_PACKET_SIZE )
{ {
...@@ -565,10 +568,12 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -565,10 +568,12 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
/* Allocates a new packet */ /* Allocates a new packet */
if ( (p_data = malloc( sizeof(data_packet_t) )) == NULL ) if ( (p_data = malloc( sizeof(data_packet_t) )) == NULL )
{ {
intf_DbgMsg( "Out of memory" ); intf_ErrMsg( "Out of memory" );
return NULL; return NULL;
} }
intf_WarnMsg( 1, "PS input: data packet allocated" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: data packet allocated" );
#endif
} }
else else
{ {
...@@ -576,7 +581,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -576,7 +581,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
if( (p_data = p_cache->data.p_stack[ -- p_cache->data.l_index ]) if( (p_data = p_cache->data.p_stack[ -- p_cache->data.l_index ])
== NULL ) == NULL )
{ {
intf_DbgMsg( "NULL packet in the data cache" ); intf_ErrMsg( "NULL packet in the data cache" );
return NULL; return NULL;
} }
} }
...@@ -595,7 +600,9 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -595,7 +600,9 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
free( p_data ); free( p_data );
return NULL; return NULL;
} }
intf_WarnMsg( 1, "PS input: small buffer allocated" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: small buffer allocated" );
#endif
p_data->l_size = l_size; p_data->l_size = l_size;
} }
else else
...@@ -605,7 +612,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -605,7 +612,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
if( (p_data->p_buffer = p_cache->small.p_stack[l_index].p_data) if( (p_data->p_buffer = p_cache->small.p_stack[l_index].p_data)
== NULL ) == NULL )
{ {
intf_DbgMsg( "NULL packet in the small buffer cache" ); intf_ErrMsg( "NULL packet in the small buffer cache" );
free( p_data ); free( p_data );
return NULL; return NULL;
} }
...@@ -632,11 +639,13 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -632,11 +639,13 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
/* Allocates a new packet */ /* Allocates a new packet */
if ( (p_data->p_buffer = malloc( l_size )) == NULL ) if ( (p_data->p_buffer = malloc( l_size )) == NULL )
{ {
intf_DbgMsg( "Out of memory" ); intf_ErrMsg( "Out of memory" );
free( p_data ); free( p_data );
return NULL; return NULL;
} }
intf_WarnMsg( 1, "PS input: large buffer allocated" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: large buffer allocated" );
#endif
p_data->l_size = l_size; p_data->l_size = l_size;
} }
else else
...@@ -646,7 +655,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -646,7 +655,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
if( (p_data->p_buffer = p_cache->large.p_stack[l_index].p_data) if( (p_data->p_buffer = p_cache->large.p_stack[l_index].p_data)
== NULL ) == NULL )
{ {
intf_DbgMsg( "NULL packet in the small buffer cache" ); intf_ErrMsg( "NULL packet in the small buffer cache" );
free( p_data ); free( p_data );
return NULL; return NULL;
} }
...@@ -683,11 +692,14 @@ static pes_packet_t * NewPES( void * p_packet_cache ) ...@@ -683,11 +692,14 @@ static pes_packet_t * NewPES( void * p_packet_cache )
packet_cache_t * p_cache; packet_cache_t * p_cache;
pes_packet_t * p_pes; pes_packet_t * p_pes;
#ifdef DEBUG
if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL ) if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL )
{ {
intf_ErrMsg( "Packet cache not initialized" ); intf_ErrMsg( "Packet cache not initialized" );
return NULL; return NULL;
} }
#endif
/* Checks whether the PES cache is empty */ /* Checks whether the PES cache is empty */
if( p_cache->pes.l_index == 0 ) if( p_cache->pes.l_index == 0 )
{ {
...@@ -697,7 +709,9 @@ static pes_packet_t * NewPES( void * p_packet_cache ) ...@@ -697,7 +709,9 @@ static pes_packet_t * NewPES( void * p_packet_cache )
intf_DbgMsg( "Out of memory" ); intf_DbgMsg( "Out of memory" );
return NULL; return NULL;
} }
intf_WarnMsg( 1, "PS input: PES packet allocated" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: PES packet allocated" );
#endif
} }
else else
{ {
...@@ -705,7 +719,7 @@ static pes_packet_t * NewPES( void * p_packet_cache ) ...@@ -705,7 +719,7 @@ static pes_packet_t * NewPES( void * p_packet_cache )
if( (p_pes = p_cache->pes.p_stack[ -- p_cache->pes.l_index ]) if( (p_pes = p_cache->pes.p_stack[ -- p_cache->pes.l_index ])
== NULL ) == NULL )
{ {
intf_DbgMsg( "NULL packet in the data cache" ); intf_ErrMsg( "NULL packet in the data cache" );
return NULL; return NULL;
} }
} }
...@@ -727,11 +741,13 @@ static void DeletePacket( void * p_packet_cache, ...@@ -727,11 +741,13 @@ static void DeletePacket( void * p_packet_cache,
{ {
packet_cache_t * p_cache; packet_cache_t * p_cache;
#ifdef DEBUG
if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL ) if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL )
{ {
intf_ErrMsg( "Packet cache not initialized" ); intf_ErrMsg( "Packet cache not initialized" );
return; return;
} }
#endif
ASSERT( p_data ); ASSERT( p_data );
...@@ -755,7 +771,9 @@ static void DeletePacket( void * p_packet_cache, ...@@ -755,7 +771,9 @@ static void DeletePacket( void * p_packet_cache,
{ {
ASSERT( p_data->p_buffer ); ASSERT( p_data->p_buffer );
free( p_data->p_buffer ); free( p_data->p_buffer );
intf_WarnMsg( 1, "PS input: small buffer freed" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: small buffer freed" );
#endif
} }
} }
else else
...@@ -772,7 +790,9 @@ static void DeletePacket( void * p_packet_cache, ...@@ -772,7 +790,9 @@ static void DeletePacket( void * p_packet_cache,
{ {
ASSERT( p_data->p_buffer ); ASSERT( p_data->p_buffer );
free( p_data->p_buffer ); free( p_data->p_buffer );
intf_WarnMsg( 1, "PS input: large buffer freed" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: large buffer freed" );
#endif
} }
} }
} }
...@@ -781,7 +801,9 @@ static void DeletePacket( void * p_packet_cache, ...@@ -781,7 +801,9 @@ static void DeletePacket( void * p_packet_cache,
/* Cache full: the packet must be freed */ /* Cache full: the packet must be freed */
free( p_data->p_buffer ); free( p_data->p_buffer );
free( p_data ); free( p_data );
intf_WarnMsg( 1, "PS input: data packet freed" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: data packet freed" );
#endif
} }
} }
...@@ -795,11 +817,13 @@ static void DeletePES( void * p_packet_cache, pes_packet_t * p_pes ) ...@@ -795,11 +817,13 @@ static void DeletePES( void * p_packet_cache, pes_packet_t * p_pes )
data_packet_t * p_data; data_packet_t * p_data;
data_packet_t * p_next; data_packet_t * p_next;
#ifdef DEBUG
if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL ) if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL )
{ {
intf_ErrMsg( "Packet cache not initialized" ); intf_ErrMsg( "Packet cache not initialized" );
return; return;
} }
#endif
ASSERT( p_pes); ASSERT( p_pes);
...@@ -822,7 +846,9 @@ static void DeletePES( void * p_packet_cache, pes_packet_t * p_pes ) ...@@ -822,7 +846,9 @@ static void DeletePES( void * p_packet_cache, pes_packet_t * p_pes )
{ {
/* Cache full: the packet must be freed */ /* Cache full: the packet must be freed */
free( p_pes ); free( p_pes );
intf_WarnMsg( 1, "PS input: PES packet freed" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: PES packet freed" );
#endif
} }
} }
plugins/x11/vout_x11.c
View file @ 3d727062
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_x11.c: X11 video output display method * vout_x11.c: X11 video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout_x11.c,v 1.20 2001/04/21 22:49:24 sam Exp $ * $Id: vout_x11.c,v 1.21 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -532,13 +532,11 @@ static int vout_Manage( vout_thread_t *p_vout ) ...@@ -532,13 +532,11 @@ static int vout_Manage( vout_thread_t *p_vout )
X11TogglePointer( p_vout ); X11TogglePointer( p_vout );
} }
} }
#ifdef DEBUG
/* Other event */ /* Other event */
else else
{ {
intf_DbgMsg( "vout: unhandled event %d received", xevent.type ); intf_WarnMsg( 1, "vout: unhandled event %d received", xevent.type );
} }
#endif
} }
/* ClientMessage event - only WM_PROTOCOLS with WM_DELETE_WINDOW data /* ClientMessage event - only WM_PROTOCOLS with WM_DELETE_WINDOW data
......
plugins/x11/vout_xvideo.c
View file @ 3d727062
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_xvideo.c: Xvideo video output display method * vout_xvideo.c: Xvideo video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* $Id: vout_xvideo.c,v 1.11 2001/04/26 03:55:44 sam Exp $ * $Id: vout_xvideo.c,v 1.12 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Shane Harper <shanegh@optusnet.com.au> * Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr> * Vincent Seguin <seguin@via.ecp.fr>
...@@ -483,14 +483,12 @@ static int vout_Manage( vout_thread_t *p_vout ) ...@@ -483,14 +483,12 @@ static int vout_Manage( vout_thread_t *p_vout )
p_vout->p_sys->b_mouse_pointer_visible = 1; p_vout->p_sys->b_mouse_pointer_visible = 1;
XVideoSetMousePointer( p_vout ); XVideoSetMousePointer( p_vout );
} }
#ifdef DEBUG
/* Other event */ /* Other event */
else else
{ {
intf_DbgMsg( "%p -> unhandled event type %d received", intf_WarnMsg( 1, "%p -> unhandled event type %d received",
p_vout, xevent.type ); p_vout, xevent.type );
} }
#endif
} }
/* Handle events for YUV video output sub-window */ /* Handle events for YUV video output sub-window */
......
src/input/input_programs.c
View file @ 3d727062
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: input_programs.c,v 1.50 2001/04/22 00:08:26 stef Exp $ * $Id: input_programs.c,v 1.51 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -613,7 +613,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -613,7 +613,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
return -1; return -1;
} }
#ifdef DEBUG_INPUT #ifdef TRACE_INPUT
intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id ); intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id );
#endif #endif
...@@ -711,7 +711,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -711,7 +711,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
return -1; return -1;
} }
#ifdef DEBUG_INPUT #ifdef TRACE_INPUT
intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id ); intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id );
#endif #endif
...@@ -744,7 +744,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -744,7 +744,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
if( p_input->stream.pp_selected_es == NULL ) if( p_input->stream.pp_selected_es == NULL )
{ {
#ifdef DEBUG_INPUT #ifdef TRACE_INPUT
intf_DbgMsg( "No more selected ES in input_UnselectES" ); intf_DbgMsg( "No more selected ES in input_UnselectES" );
#endif #endif
return( 1 ); return( 1 );
......
src/interface/intf_msg.c
View file @ 3d727062
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* interface, such as message output. See config.h for output configuration. * interface, such as message output. See config.h for output configuration.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: intf_msg.c,v 1.30 2001/04/25 09:31:14 sam Exp $ * $Id: intf_msg.c,v 1.31 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
* intf_msg_item_t * intf_msg_item_t
***************************************************************************** *****************************************************************************
* Store a single message. Messages have a maximal size of INTF_MSG_MSGSIZE. * Store a single message. Messages have a maximal size of INTF_MSG_MSGSIZE.
* If DEBUG is defined, messages have a date field and debug messages are * If TRACE is defined, messages have a date field and debug messages are
* printed with a date to allow more precise profiling. * printed with a date to allow more precise profiling.
*****************************************************************************/ *****************************************************************************/
typedef struct typedef struct
...@@ -59,8 +59,8 @@ typedef struct ...@@ -59,8 +59,8 @@ typedef struct
int i_type; /* message type, see below */ int i_type; /* message type, see below */
char * psz_msg; /* the message itself */ char * psz_msg; /* the message itself */
#ifdef DEBUG #ifdef TRACE
/* Debugging informations - in DEBUG mode, debug messages have calling /* Debugging informations - in TRACE mode, debug messages have calling
* location informations printed */ * location informations printed */
mtime_t date; /* date of the message */ mtime_t date; /* date of the message */
char * psz_file; /* file in which the function was called */ char * psz_file; /* file in which the function was called */
...@@ -92,12 +92,12 @@ typedef struct intf_msg_s ...@@ -92,12 +92,12 @@ typedef struct intf_msg_s
intf_msg_item_t msg[INTF_MSG_QSIZE]; /* message queue */ intf_msg_item_t msg[INTF_MSG_QSIZE]; /* message queue */
#endif #endif
#ifdef DEBUG_LOG #ifdef TRACE_LOG
/* Log file */ /* Log file */
FILE * p_log_file; /* log file */ FILE * p_log_file; /* log file */
#endif #endif
#if !defined(INTF_MSG_QUEUE) && !defined(DEBUG_LOG) #if !defined(INTF_MSG_QUEUE) && !defined(TRACE_LOG)
/* If neither messages queue, neither log file is used, then the structure /* If neither messages queue, neither log file is used, then the structure
* is empty. However, empty structures are not allowed in C. Therefore, a * is empty. However, empty structures are not allowed in C. Therefore, a
* dummy integer is used to fill it. */ * dummy integer is used to fill it. */
...@@ -112,7 +112,7 @@ typedef struct intf_msg_s ...@@ -112,7 +112,7 @@ typedef struct intf_msg_s
static void QueueMsg ( intf_msg_t *p_msg, int i_type, static void QueueMsg ( intf_msg_t *p_msg, int i_type,
char *psz_format, va_list ap ); char *psz_format, va_list ap );
static void PrintMsg ( intf_msg_item_t *p_msg ); static void PrintMsg ( intf_msg_item_t *p_msg );
#ifdef DEBUG #ifdef TRACE
static void QueueDbgMsg ( intf_msg_t *p_msg, char *psz_file, static void QueueDbgMsg ( intf_msg_t *p_msg, char *psz_file,
char *psz_function, int i_line, char *psz_function, int i_line,
char *psz_format, va_list ap ); char *psz_format, va_list ap );
...@@ -147,11 +147,11 @@ p_intf_msg_t intf_MsgCreate( void ) ...@@ -147,11 +147,11 @@ p_intf_msg_t intf_MsgCreate( void )
#endif #endif
#ifdef DEBUG_LOG #ifdef TRACE_LOG
/* Log file initialization - on failure, file pointer will be null, /* Log file initialization - on failure, file pointer will be null,
* and no log will be issued, but this is not considered as an * and no log will be issued, but this is not considered as an
* error */ * error */
p_msg->p_log_file = fopen( DEBUG_LOG, "w" ); p_msg->p_log_file = fopen( TRACE_LOG, "w" );
#endif #endif
} }
return( p_msg ); return( p_msg );
...@@ -168,7 +168,7 @@ void intf_MsgDestroy( void ) ...@@ -168,7 +168,7 @@ void intf_MsgDestroy( void )
{ {
intf_FlushMsg(); /* print all remaining messages */ intf_FlushMsg(); /* print all remaining messages */
#ifdef DEBUG_LOG #ifdef TRACE_LOG
/* Close log file if any */ /* Close log file if any */
if( p_main->p_msg->p_log_file != NULL ) if( p_main->p_msg->p_log_file != NULL )
{ {
...@@ -258,11 +258,11 @@ void intf_IntfMsg(char *psz_format, ...) ...@@ -258,11 +258,11 @@ void intf_IntfMsg(char *psz_format, ...)
* _intf_DbgMsg: print a debugging message (ok ?) * _intf_DbgMsg: print a debugging message (ok ?)
***************************************************************************** *****************************************************************************
* This function prints a debugging message. Compared to other intf_*Msg * This function prints a debugging message. Compared to other intf_*Msg
* functions, it is only defined if DEBUG is defined and require a file name, * functions, it is only defined if TRACE is defined and require a file name,
* a function name and a line number as additionnal debugging informations. It * a function name and a line number as additionnal debugging informations. It
* also prints a debugging header for each received line. * also prints a debugging header for each received line.
*****************************************************************************/ *****************************************************************************/
#ifdef DEBUG #ifdef TRACE
void _intf_DbgMsg( char *psz_file, char *psz_function, int i_line, void _intf_DbgMsg( char *psz_file, char *psz_function, int i_line,
char *psz_format, ...) char *psz_format, ...)
{ {
...@@ -335,7 +335,7 @@ void intf_WarnMsgImm( int i_level, char *psz_format, ... ) ...@@ -335,7 +335,7 @@ void intf_WarnMsgImm( int i_level, char *psz_format, ... )
* message immediately. It should only be called through the macro * message immediately. It should only be called through the macro
* intf_DbgMsgImm(). * intf_DbgMsgImm().
*****************************************************************************/ *****************************************************************************/
#ifdef DEBUG #ifdef TRACE
void _intf_DbgMsgImm( char *psz_file, char *psz_function, int i_line, void _intf_DbgMsgImm( char *psz_file, char *psz_function, int i_line,
char *psz_format, ...) char *psz_format, ...)
{ {
...@@ -461,7 +461,7 @@ static void QueueMsg( intf_msg_t *p_msg, int i_type, char *psz_format, va_list a ...@@ -461,7 +461,7 @@ static void QueueMsg( intf_msg_t *p_msg, int i_type, char *psz_format, va_list a
*/ */
p_msg_item->i_type = i_type; p_msg_item->i_type = i_type;
p_msg_item->psz_msg = psz_str; p_msg_item->psz_msg = psz_str;
#ifdef DEBUG #ifdef TRACE
p_msg_item->date = mdate(); p_msg_item->date = mdate();
#endif #endif
...@@ -477,9 +477,9 @@ static void QueueMsg( intf_msg_t *p_msg, int i_type, char *psz_format, va_list a ...@@ -477,9 +477,9 @@ static void QueueMsg( intf_msg_t *p_msg, int i_type, char *psz_format, va_list a
* QueueDbgMsg: add a message to a queue with debugging informations * QueueDbgMsg: add a message to a queue with debugging informations
***************************************************************************** *****************************************************************************
* This function is the same as QueueMsg, except that it is only defined when * This function is the same as QueueMsg, except that it is only defined when
* DEBUG is define, and require additionnal debugging informations. * TRACE is define, and require additionnal debugging informations.
*****************************************************************************/ *****************************************************************************/
#ifdef DEBUG #ifdef TRACE
static void QueueDbgMsg(intf_msg_t *p_msg, char *psz_file, char *psz_function, static void QueueDbgMsg(intf_msg_t *p_msg, char *psz_file, char *psz_function,
int i_line, char *psz_format, va_list ap) int i_line, char *psz_format, va_list ap)
{ {
...@@ -566,11 +566,11 @@ static void FlushLockedMsg ( intf_msg_t *p_msg ) ...@@ -566,11 +566,11 @@ static void FlushLockedMsg ( intf_msg_t *p_msg )
* PrintMsg: print a message (ok ?) * PrintMsg: print a message (ok ?)
***************************************************************************** *****************************************************************************
* Print a single message. The message data is not freed. This function exists * Print a single message. The message data is not freed. This function exists
* in two version. The DEBUG version prints a date with each message, and is * in two version. The TRACE version prints a date with each message, and is
* able to log messages (if DEBUG_LOG is defined). * able to log messages (if TRACE_LOG is defined).
* The normal one just prints messages to the screen. * The normal one just prints messages to the screen.
*****************************************************************************/ *****************************************************************************/
#ifdef DEBUG #ifdef TRACE
static void PrintMsg( intf_msg_item_t *p_msg ) static void PrintMsg( intf_msg_item_t *p_msg )
{ {
...@@ -626,7 +626,7 @@ static void PrintMsg( intf_msg_item_t *p_msg ) ...@@ -626,7 +626,7 @@ static void PrintMsg( intf_msg_item_t *p_msg )
break; break;
case INTF_MSG_ERR: /* error messages */ case INTF_MSG_ERR: /* error messages */
case INTF_MSG_WARN: case INTF_MSG_WARN:
#ifndef DEBUG_LOG_ONLY #ifndef TRACE_LOG_ONLY
case INTF_MSG_DBG: /* debugging messages */ case INTF_MSG_DBG: /* debugging messages */
#endif #endif
fprintf( stderr, "%s\n", psz_msg ); fprintf( stderr, "%s\n", psz_msg );
...@@ -636,7 +636,7 @@ static void PrintMsg( intf_msg_item_t *p_msg ) ...@@ -636,7 +636,7 @@ static void PrintMsg( intf_msg_item_t *p_msg )
break; break;
} }
#ifdef DEBUG_LOG #ifdef TRACE_LOG
/* Append all messages to log file */ /* Append all messages to log file */
if( p_main->p_msg->p_log_file != NULL ) if( p_main->p_msg->p_log_file != NULL )
{ {
......
src/misc/rsc_files.c
View file @ 3d727062
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* can be anything, including pictures, audio streams, and so on. * can be anything, including pictures, audio streams, and so on.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: rsc_files.c,v 1.9 2001/03/21 13:42:34 sam Exp $ * $Id: rsc_files.c,v 1.10 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -204,13 +204,11 @@ int UpdateResourceFile( resource_file_t *p_file ) ...@@ -204,13 +204,11 @@ int UpdateResourceFile( resource_file_t *p_file )
byte_t p_buffer[50]; /* buffer */ byte_t p_buffer[50]; /* buffer */
int i_index; /* resource index */ int i_index; /* resource index */
#ifdef DEBUG
if( p_file->b_read_only ) if( p_file->b_read_only )
{ {
intf_DbgMsg("rsc debug 103-1: can't update a read-only file"); intf_ErrMsg("rsc debug 103-1: can't update a read-only file");
return( -1 ); return( -1 );
} }
#endif
/* Seek beginning of file */ /* Seek beginning of file */
if( lseek( p_file->i_file, 0, SEEK_SET ) ) if( lseek( p_file->i_file, 0, SEEK_SET ) )
...@@ -375,13 +373,11 @@ int vlc_WriteResource( resource_file_t *p_file, char *psz_name, int i_type, ...@@ -375,13 +373,11 @@ int vlc_WriteResource( resource_file_t *p_file, char *psz_name, int i_type,
int i_tmp_index; /* temporary resource index */ int i_tmp_index; /* temporary resource index */
u64 i_offset; /* offset */ u64 i_offset; /* offset */
#ifdef DEBUG
if( p_file->b_read_only ) if( p_file->b_read_only )
{ {
intf_DbgMsg("rsc debug 107-1: can not write to a read-only resource file"); intf_ErrMsg("rsc debug 107-1: can not write to a read-only resource file");
return( -1 ); return( -1 );
} }
#endif
/* Look for an empty place in the resources table */ /* Look for an empty place in the resources table */
i_index = -1; i_index = -1;
......
src/video_output/video_output.c
View file @ 3d727062
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread. * thread, and destroy a previously oppened video output thread.
***************************************************************************** *****************************************************************************
* Copyright (C) 2000 VideoLAN * Copyright (C) 2000 VideoLAN
* $Id: video_output.c,v 1.120 2001/04/25 20:54:07 massiot Exp $ * $Id: video_output.c,v 1.121 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -312,7 +312,7 @@ void vout_DestroyThread( vout_thread_t *p_vout, int *pi_status ) ...@@ -312,7 +312,7 @@ void vout_DestroyThread( vout_thread_t *p_vout, int *pi_status )
*****************************************************************************/ *****************************************************************************/
void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic ) void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
{ {
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
char psz_begin_date[MSTRTIME_MAX_SIZE]; /* buffer for date string */ char psz_begin_date[MSTRTIME_MAX_SIZE]; /* buffer for date string */
char psz_end_date[MSTRTIME_MAX_SIZE]; /* buffer for date string */ char psz_end_date[MSTRTIME_MAX_SIZE]; /* buffer for date string */
#endif #endif
...@@ -321,7 +321,7 @@ void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic ) ...@@ -321,7 +321,7 @@ void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
/* Check if status is valid */ /* Check if status is valid */
if( p_subpic->i_status != RESERVED_SUBPICTURE ) if( p_subpic->i_status != RESERVED_SUBPICTURE )
{ {
intf_DbgMsg("error: subpicture %p has invalid status %d", p_subpic, intf_ErrMsg("error: subpicture %p has invalid status %d", p_subpic,
p_subpic->i_status ); p_subpic->i_status );
} }
#endif #endif
...@@ -329,7 +329,7 @@ void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic ) ...@@ -329,7 +329,7 @@ void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
/* Remove reservation flag */ /* Remove reservation flag */
p_subpic->i_status = READY_SUBPICTURE; p_subpic->i_status = READY_SUBPICTURE;
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
/* Send subpicture information */ /* Send subpicture information */
intf_DbgMsg("subpicture %p: type=%d, begin date=%s, end date=%s", intf_DbgMsg("subpicture %p: type=%d, begin date=%s, end date=%s",
p_subpic, p_subpic->i_type, p_subpic, p_subpic->i_type,
...@@ -372,7 +372,7 @@ subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type, ...@@ -372,7 +372,7 @@ subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type,
* the best possible case, since no memory allocation needs * the best possible case, since no memory allocation needs
* to be done */ * to be done */
p_vout->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE; p_vout->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE;
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("subpicture %p (in destroyed subpicture slot)", intf_DbgMsg("subpicture %p (in destroyed subpicture slot)",
&p_vout->p_subpicture[i_subpic] ); &p_vout->p_subpicture[i_subpic] );
#endif #endif
...@@ -419,7 +419,7 @@ subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type, ...@@ -419,7 +419,7 @@ subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type,
break; break;
#ifdef DEBUG #ifdef DEBUG
default: default:
intf_DbgMsg("error: unknown subpicture type %d", i_type ); intf_ErrMsg("error: unknown subpicture type %d", i_type );
p_free_subpic->p_data = NULL; p_free_subpic->p_data = NULL;
break; break;
#endif #endif
...@@ -448,7 +448,7 @@ subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type, ...@@ -448,7 +448,7 @@ subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type,
strerror( ENOMEM ) ); strerror( ENOMEM ) );
} }
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("subpicture %p (in free subpicture slot)", p_free_subpic ); intf_DbgMsg("subpicture %p (in free subpicture slot)", p_free_subpic );
#endif #endif
vlc_mutex_unlock( &p_vout->subpicture_lock ); vlc_mutex_unlock( &p_vout->subpicture_lock );
...@@ -475,14 +475,14 @@ void vout_DestroySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic ) ...@@ -475,14 +475,14 @@ void vout_DestroySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
/* Check if status is valid */ /* Check if status is valid */
if( p_subpic->i_status != RESERVED_SUBPICTURE ) if( p_subpic->i_status != RESERVED_SUBPICTURE )
{ {
intf_DbgMsg("error: subpicture %p has invalid status %d", intf_ErrMsg("error: subpicture %p has invalid status %d",
p_subpic, p_subpic->i_status ); p_subpic, p_subpic->i_status );
} }
#endif #endif
p_subpic->i_status = DESTROYED_SUBPICTURE; p_subpic->i_status = DESTROYED_SUBPICTURE;
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("subpicture %p", p_subpic); intf_DbgMsg("subpicture %p", p_subpic);
#endif #endif
} }
...@@ -507,12 +507,12 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -507,12 +507,12 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
break; break;
#ifdef DEBUG #ifdef DEBUG
default: default:
intf_DbgMsg("error: picture %p has invalid status %d", p_pic, p_pic->i_status ); intf_ErrMsg("error: picture %p has invalid status %d", p_pic, p_pic->i_status );
break; break;
#endif #endif
} }
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("picture %p", p_pic); intf_DbgMsg("picture %p", p_pic);
#endif #endif
vlc_mutex_unlock( &p_vout->picture_lock ); vlc_mutex_unlock( &p_vout->picture_lock );
...@@ -527,7 +527,7 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -527,7 +527,7 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
*****************************************************************************/ *****************************************************************************/
void vout_DatePicture( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date ) void vout_DatePicture( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date )
{ {
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
char psz_date[MSTRTIME_MAX_SIZE]; /* date */ char psz_date[MSTRTIME_MAX_SIZE]; /* date */
#endif #endif
...@@ -543,12 +543,12 @@ void vout_DatePicture( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date ) ...@@ -543,12 +543,12 @@ void vout_DatePicture( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date )
break; break;
#ifdef DEBUG #ifdef DEBUG
default: default:
intf_DbgMsg("error: picture %p has invalid status %d", p_pic, p_pic->i_status ); intf_ErrMsg("error: picture %p has invalid status %d", p_pic, p_pic->i_status );
break; break;
#endif #endif
} }
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("picture %p, display date: %s", p_pic, mstrtime( psz_date, p_pic->date) ); intf_DbgMsg("picture %p, display date: %s", p_pic, mstrtime( psz_date, p_pic->date) );
#endif #endif
vlc_mutex_unlock( &p_vout->picture_lock ); vlc_mutex_unlock( &p_vout->picture_lock );
...@@ -592,7 +592,7 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type, ...@@ -592,7 +592,7 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type,
* memory allocation needs to be done */ * memory allocation needs to be done */
p_vout->p_picture[i_picture].i_status = RESERVED_PICTURE; p_vout->p_picture[i_picture].i_status = RESERVED_PICTURE;
p_vout->i_pictures++; p_vout->i_pictures++;
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("picture %p (in destroyed picture slot)", intf_DbgMsg("picture %p (in destroyed picture slot)",
&p_vout->p_picture[i_picture] ); &p_vout->p_picture[i_picture] );
#endif #endif
...@@ -654,7 +654,7 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type, ...@@ -654,7 +654,7 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type,
break; break;
#ifdef DEBUG #ifdef DEBUG
default: default:
intf_DbgMsg("error: unknown picture type %d", i_type ); intf_ErrMsg("error: unknown picture type %d", i_type );
p_free_picture->p_data = NULL; p_free_picture->p_data = NULL;
break; break;
#endif #endif
...@@ -690,7 +690,7 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type, ...@@ -690,7 +690,7 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type,
strerror( ENOMEM ) ); strerror( ENOMEM ) );
} }
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("picture %p (in free picture slot)", p_free_picture ); intf_DbgMsg("picture %p (in free picture slot)", p_free_picture );
#endif #endif
vlc_mutex_unlock( &p_vout->picture_lock ); vlc_mutex_unlock( &p_vout->picture_lock );
...@@ -724,14 +724,14 @@ void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -724,14 +724,14 @@ void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
(p_pic->i_status != RESERVED_DATED_PICTURE) && (p_pic->i_status != RESERVED_DATED_PICTURE) &&
(p_pic->i_status != RESERVED_DISP_PICTURE) ) (p_pic->i_status != RESERVED_DISP_PICTURE) )
{ {
intf_DbgMsg("error: picture %p has invalid status %d", p_pic, p_pic->i_status ); intf_ErrMsg("error: picture %p has invalid status %d", p_pic, p_pic->i_status );
} }
#endif #endif
p_pic->i_status = DESTROYED_PICTURE; p_pic->i_status = DESTROYED_PICTURE;
p_vout->i_pictures--; p_vout->i_pictures--;
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("picture %p", p_pic); intf_DbgMsg("picture %p", p_pic);
#endif #endif
...@@ -752,7 +752,7 @@ void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -752,7 +752,7 @@ void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
vlc_mutex_lock( &p_vout->picture_lock ); vlc_mutex_lock( &p_vout->picture_lock );
p_pic->i_refcount++; p_pic->i_refcount++;
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("picture %p refcount=%d", p_pic, p_pic->i_refcount ); intf_DbgMsg("picture %p refcount=%d", p_pic, p_pic->i_refcount );
#endif #endif
...@@ -769,7 +769,7 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -769,7 +769,7 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
vlc_mutex_lock( &p_vout->picture_lock ); vlc_mutex_lock( &p_vout->picture_lock );
p_pic->i_refcount--; p_pic->i_refcount--;
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
if( p_pic->i_refcount < 0 ) if( p_pic->i_refcount < 0 )
{ {
intf_DbgMsg("error: refcount < 0"); intf_DbgMsg("error: refcount < 0");
...@@ -783,7 +783,7 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -783,7 +783,7 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
p_vout->i_pictures--; p_vout->i_pictures--;
} }
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("picture %p refcount=%d", p_pic, p_pic->i_refcount ); intf_DbgMsg("picture %p refcount=%d", p_pic, p_pic->i_refcount );
#endif #endif
...@@ -1168,7 +1168,7 @@ static void RunThread( vout_thread_t *p_vout) ...@@ -1168,7 +1168,7 @@ static void RunThread( vout_thread_t *p_vout)
/* On awakening, take back lock and send immediately picture to display, /* On awakening, take back lock and send immediately picture to display,
* then swap buffers */ * then swap buffers */
vlc_mutex_lock( &p_vout->change_lock ); vlc_mutex_lock( &p_vout->change_lock );
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg( "picture %p, subpicture %p in buffer %d, display=%d", p_pic, p_subpic, intf_DbgMsg( "picture %p, subpicture %p in buffer %d, display=%d", p_pic, p_subpic,
p_vout->i_buffer_index, b_display /* && !(p_vout->i_changes & VOUT_NODISPLAY_CHANGE) */ ); p_vout->i_buffer_index, b_display /* && !(p_vout->i_changes & VOUT_NODISPLAY_CHANGE) */ );
#endif #endif
...@@ -1411,7 +1411,7 @@ static void SetBufferArea( vout_thread_t *p_vout, int i_x, int i_y, int i_w, int ...@@ -1411,7 +1411,7 @@ static void SetBufferArea( vout_thread_t *p_vout, int i_x, int i_y, int i_w, int
} }
else else
{ {
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("area overflow"); intf_DbgMsg("area overflow");
#endif #endif
p_buffer->pi_area_end[VOUT_MAX_AREAS - 1] = i_h; p_buffer->pi_area_end[VOUT_MAX_AREAS - 1] = i_h;
...@@ -1435,7 +1435,7 @@ static void SetBufferArea( vout_thread_t *p_vout, int i_x, int i_y, int i_w, int ...@@ -1435,7 +1435,7 @@ static void SetBufferArea( vout_thread_t *p_vout, int i_x, int i_y, int i_w, int
* move all old areas down */ * move all old areas down */
if( p_buffer->i_areas == VOUT_MAX_AREAS ) if( p_buffer->i_areas == VOUT_MAX_AREAS )
{ {
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("areas overflow"); intf_DbgMsg("areas overflow");
#endif #endif
p_buffer->pi_area_end[VOUT_MAX_AREAS - 2] = p_buffer->pi_area_end[VOUT_MAX_AREAS - 1]; p_buffer->pi_area_end[VOUT_MAX_AREAS - 2] = p_buffer->pi_area_end[VOUT_MAX_AREAS - 1];
...@@ -1610,7 +1610,7 @@ static void SetBufferPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1610,7 +1610,7 @@ static void SetBufferPicture( vout_thread_t *p_vout, picture_t *p_pic )
*/ */
for( i_area = 0; i_area < p_buffer->i_areas; i_area++ ) for( i_area = 0; i_area < p_buffer->i_areas; i_area++ )
{ {
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
intf_DbgMsg("clearing picture %p area in buffer %d: %d-%d", p_pic, intf_DbgMsg("clearing picture %p area in buffer %d: %d-%d", p_pic,
p_vout->i_buffer_index, p_buffer->pi_area_begin[i_area], p_buffer->pi_area_end[i_area] ); p_vout->i_buffer_index, p_buffer->pi_area_begin[i_area], p_buffer->pi_area_end[i_area] );
#endif #endif
...@@ -1658,7 +1658,7 @@ static void SetBufferPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1658,7 +1658,7 @@ static void SetBufferPicture( vout_thread_t *p_vout, picture_t *p_pic )
*****************************************************************************/ *****************************************************************************/
static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic ) static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic )
{ {
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
char psz_date[MSTRTIME_MAX_SIZE]; /* picture date */ char psz_date[MSTRTIME_MAX_SIZE]; /* picture date */
mtime_t render_time; /* picture rendering time */ mtime_t render_time; /* picture rendering time */
#endif #endif
...@@ -1670,7 +1670,7 @@ static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1670,7 +1670,7 @@ static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic )
p_pic_data = p_buffer->p_data + p_pic_data = p_buffer->p_data +
p_buffer->i_pic_x * p_vout->i_bytes_per_pixel + p_buffer->i_pic_x * p_vout->i_bytes_per_pixel +
p_buffer->i_pic_y * p_vout->i_bytes_per_line; p_buffer->i_pic_y * p_vout->i_bytes_per_line;
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
render_time = mdate(); render_time = mdate();
#endif #endif
...@@ -1707,12 +1707,12 @@ static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1707,12 +1707,12 @@ static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic )
break; break;
#ifdef DEBUG #ifdef DEBUG
default: default:
intf_DbgMsg("error: unknown picture type %d", p_pic->i_type ); intf_ErrMsg("error: unknown picture type %d", p_pic->i_type );
break; break;
#endif #endif
} }
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
/* Print picture date and rendering time */ /* Print picture date and rendering time */
intf_DbgMsg("picture %p rendered in buffer %d (%ld us), display date: %s", p_pic, intf_DbgMsg("picture %p rendered in buffer %d (%ld us), display date: %s", p_pic,
p_vout->i_buffer_index, (long) (mdate() - render_time), p_vout->i_buffer_index, (long) (mdate() - render_time),
...@@ -1974,7 +1974,7 @@ static void RenderSubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic ) ...@@ -1974,7 +1974,7 @@ static void RenderSubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
#ifdef DEBUG #ifdef DEBUG
default: default:
intf_DbgMsg( "error: unknown subpicture %p type %d", intf_ErrMsg( "error: unknown subpicture %p type %d",
p_subpic, p_subpic->i_type ); p_subpic, p_subpic->i_type );
#endif #endif
} }
...@@ -2039,7 +2039,7 @@ static void RenderInterface( vout_thread_t *p_vout ) ...@@ -2039,7 +2039,7 @@ static void RenderInterface( vout_thread_t *p_vout )
*****************************************************************************/ *****************************************************************************/
static int Manage( vout_thread_t *p_vout ) static int Manage( vout_thread_t *p_vout )
{ {
#ifdef DEBUG_VOUT #ifdef TRACE_VOUT
if( p_vout->i_changes ) if( p_vout->i_changes )
{ {
intf_DbgMsg("changes: 0x%x (no display: 0x%x)", p_vout->i_changes, intf_DbgMsg("changes: 0x%x (no display: 0x%x)", p_vout->i_changes,
......
src/video_output/video_text.c
View file @ 3d727062
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video_text.c : text manipulation functions * video_text.c : text manipulation functions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: video_text.c,v 1.24 2001/04/25 09:31:14 sam Exp $ * $Id: video_text.c,v 1.25 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -415,7 +415,7 @@ void vout_TextSize( vout_font_t *p_font, int i_style, const char *psz_text, int ...@@ -415,7 +415,7 @@ void vout_TextSize( vout_font_t *p_font, int i_style, const char *psz_text, int
break; break;
#ifdef DEBUG #ifdef DEBUG
default: default:
intf_DbgMsg("error: unknown font type %d", p_font->i_type ); intf_ErrMsg("error: unknown font type %d", p_font->i_type );
break; break;
#endif #endif
} }
...@@ -530,7 +530,7 @@ void vout_Print( vout_font_t *p_font, byte_t *p_pic, int i_bytes_per_pixel, int ...@@ -530,7 +530,7 @@ void vout_Print( vout_font_t *p_font, byte_t *p_pic, int i_bytes_per_pixel, int
break; break;
#ifdef DEBUG #ifdef DEBUG
default: default:
intf_DbgMsg("error: unknown font type %d", p_font->i_type ); intf_ErrMsg("error: unknown font type %d", p_font->i_type );
break; break;
#endif #endif
} }
......
src/video_parser/vpar_synchro.c
View file @ 3d727062
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vpar_synchro.c : frame dropping routines * vpar_synchro.c : frame dropping routines
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_synchro.c,v 1.87 2001/04/06 09:15:48 sam Exp $ * $Id: vpar_synchro.c,v 1.88 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr> * Samuel Hocevar <sam@via.ecp.fr>
...@@ -224,7 +224,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type, ...@@ -224,7 +224,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
mtime_t now, period, tau_yuv; mtime_t now, period, tau_yuv;
mtime_t pts = 0; mtime_t pts = 0;
boolean_t b_decode = 0; boolean_t b_decode = 0;
#ifdef DEBUG_VPAR #ifdef TRACE_VPAR
char p_date[MSTRTIME_MAX_SIZE]; char p_date[MSTRTIME_MAX_SIZE];
#endif #endif
...@@ -321,7 +321,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type, ...@@ -321,7 +321,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
#ifdef VDEC_SMP #ifdef VDEC_SMP
vlc_mutex_unlock( &p_vpar->synchro.fifo_lock ); vlc_mutex_unlock( &p_vpar->synchro.fifo_lock );
#endif #endif
#ifdef DEBUG_VPAR #ifdef TRACE_VPAR
intf_DbgMsg("vpar synchro debug: %s picture scheduled for %s, %s (%lld)", intf_DbgMsg("vpar synchro debug: %s picture scheduled for %s, %s (%lld)",
i_coding_type == B_CODING_TYPE ? "B" : i_coding_type == B_CODING_TYPE ? "B" :
(i_coding_type == P_CODING_TYPE ? "P" : "I"), (i_coding_type == P_CODING_TYPE ? "P" : "I"),
...@@ -414,7 +414,7 @@ void vpar_SynchroEnd( vpar_thread_t * p_vpar, int i_garbage ) ...@@ -414,7 +414,7 @@ void vpar_SynchroEnd( vpar_thread_t * p_vpar, int i_garbage )
} }
} }
#ifdef DEBUG_VPAR #ifdef TRACE_VPAR
intf_DbgMsg("vpar synchro debug: finished decoding %s (%lld)", intf_DbgMsg("vpar synchro debug: finished decoding %s (%lld)",
i_coding_type == B_CODING_TYPE ? "B" : i_coding_type == B_CODING_TYPE ? "B" :
(i_coding_type == P_CODING_TYPE ? "P" : "I"), tau); (i_coding_type == P_CODING_TYPE ? "P" : "I"), tau);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment