aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:41 (GMT)
committerGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:41 (GMT)
commitd58cbc3c5392e7bacd75c61bfbf9e2bcd2850ae9 (patch)
tree365c612056dc212c8bc7faf636c04aea02d2b7fc
parent291d7b864be127f1fe78138b5fe476387d18f1ba (diff)
v3.92
-rw-r--r--Makefile.in33
-rw-r--r--common/commands.c2
-rwxr-xr-xconfigure1480
-rw-r--r--configure.ac5
-rw-r--r--console/scantv.c2
-rw-r--r--console/ttv.c3
-rw-r--r--console/vbi-tty.c1
-rw-r--r--console/webcam.c4
-rw-r--r--debian/alevtd.files2
-rw-r--r--debian/changelog484
-rw-r--r--debian/control124
-rw-r--r--debian/copyright21
-rw-r--r--debian/fbtv.files3
-rw-r--r--debian/fbtv.menu2
-rw-r--r--debian/pia.files2
-rw-r--r--debian/po/POTFILES.in1
-rw-r--r--debian/po/da.po123
-rw-r--r--debian/po/de.po121
-rw-r--r--debian/po/es.po125
-rw-r--r--debian/po/fr.po121
-rw-r--r--debian/po/jp.po114
-rw-r--r--debian/po/templates.pot106
-rw-r--r--debian/radio.files2
-rw-r--r--debian/radio.menu2
-rw-r--r--debian/rules59
-rw-r--r--debian/scantv.files3
-rw-r--r--debian/streamer.files3
-rw-r--r--debian/ttv.files3
-rw-r--r--debian/ttv.menu2
-rw-r--r--debian/v4l-conf.files3
-rw-r--r--debian/webcam.files2
-rw-r--r--debian/xawtv-plugin-qt.files1
-rw-r--r--debian/xawtv-plugins.files2
-rw-r--r--debian/xawtv-tools.files8
-rw-r--r--debian/xawtv.config52
-rw-r--r--debian/xawtv.files22
-rw-r--r--debian/xawtv.menu2
-rw-r--r--debian/xawtv.postinst59
-rw-r--r--debian/xawtv.postrm4
-rw-r--r--debian/xawtv.reset9
-rw-r--r--debian/xawtv.templates42
-rw-r--r--libng/devices.c2
-rw-r--r--xawtv.spec2
43 files changed, 1068 insertions, 2095 deletions
diff --git a/Makefile.in b/Makefile.in
index 3f7a2ce..389a39c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -157,38 +157,7 @@ include $(srcdir)/x11/Subdir.mk
#########################################################
# just for me, some maintaining jobs. Don't use them
-PRESULT := /work/pbuilder/result
-
-PACKAGE := xawtv
-DEBARCH := $(shell uname -m | sed \
- -e 's/i.86/i386/' \
- -e 's/ppc/powerpc/')
-DEBVER = $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*:\|\)//p')
-DSC := $(PACKAGE)_$(VERSION).dsc
-CHANGES := $(PACKAGE)_$(VERSION)_$(DEBARCH).changes
-
-
-dsc source ../$(DSC): clean
- test "$(VERSION)" = "$(DEBVER)"
- dpkg-buildpackage -S -us -uc -rfakeroot
-
-debs pbuild $(PRESULT)/$(CHANGES): ../$(DSC)
- sudo /usr/sbin/pbuilder build ../$(DSC)
- -lintian -i $(PRESULT)/$(CHANGES)
-
-release: $(PRESULT)/$(CHANGES)
- debsign $(PRESULT)/$(CHANGES)
-
-
tarball: distclean
- (cd ..; tar cvzf xawtv_$(VERSION).tar.gz \
- xawtv-$(VERSION))
-
-rpm: tarball
- rpm -ta ../xawtv_$(VERSION).tar.gz
-
-snapshot snap: distclean
- (cd ..; tar cvzf $(HOME)/snapshot/xawtv-`date +%Y%m%d`.tar.gz \
+ (cd ..; tar cvzf xawtv-$(VERSION).tar.gz \
xawtv-$(VERSION))
- $(MAKE) -C $(HOME)/snapshot
diff --git a/common/commands.c b/common/commands.c
index bf633a9..883452b 100644
--- a/common/commands.c
+++ b/common/commands.c
@@ -464,7 +464,7 @@ attr_init(void)
struct ng_attribute *attr;
int val;
- for (attr = attrs; attr->name != NULL; attr++) {
+ for (attr = attrs; attr != NULL && attr->name != NULL; attr++) {
if (attr->id == ATTR_ID_VOLUME ||
attr->id == ATTR_ID_MUTE)
continue;
diff --git a/configure b/configure
index 6e51be6..8fb54f3 100755
--- a/configure
+++ b/configure
@@ -1,9 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57.
+# Generated by GNU Autoconf 2.59.
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -20,9 +19,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -41,7 +41,7 @@ for as_var in \
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -218,16 +218,17 @@ rm -f conf$$ conf$$.exe conf$$.file
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
# IFS
@@ -667,7 +668,7 @@ done
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+ localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
@@ -707,10 +708,10 @@ if test -z "$srcdir"; then
# Try the directory containing this script, then its parent.
ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -810,9 +811,9 @@ _ACEOF
cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -916,12 +917,45 @@ case $srcdir in
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
cd $ac_dir
# Check for guested configure; otherwise get Cygnus style configure.
@@ -932,7 +966,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
echo
$SHELL $ac_srcdir/configure --help=recursive
elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
+ test -f $ac_srcdir/configure.in; then
echo
$ac_configure --help
else
@@ -946,8 +980,7 @@ test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -959,7 +992,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.57. Invocation command line was
+generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1036,19 +1069,19 @@ do
2)
ac_configure_args1="$ac_configure_args1 '$ac_arg'"
if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
+ ac_must_keep_next=false # Got value, back to normal.
else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
fi
ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
# Get rid of the leading space.
@@ -1082,12 +1115,12 @@ _ASBOX
case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
*ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
;;
*)
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
esac;
}
@@ -1116,7 +1149,7 @@ _ASBOX
for ac_var in $ac_subst_files
do
eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
fi
@@ -1135,7 +1168,7 @@ _ASBOX
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core core.* *.core &&
+ rm -f core *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
@@ -1215,7 +1248,7 @@ fi
# value.
ac_cache_corrupted=false
for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
eval ac_old_val="\$ac_cv_env_${ac_var}_value"
@@ -1232,13 +1265,13 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ ac_cache_corrupted=:
fi;;
esac
# Pass precious variables to config.status.
@@ -1690,7 +1723,6 @@ ac_compiler=`set X $ac_compile; echo $2`
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -1710,8 +1742,8 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
@@ -1731,23 +1763,23 @@ do
test -f "$ac_file" || continue
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
+ ;;
conftest.$ac_ext )
- # This is the source file.
- ;;
+ # This is the source file.
+ ;;
[ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
- break;;
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ # FIXME: I believe we export ac_cv_exeext for Libtool,
+ # but it would be cool to find out if it's true. Does anybody
+ # maintain Libtool? --akim.
+ export ac_cv_exeext
+ break;;
* )
- break;;
+ break;;
esac
done
else
@@ -1821,8 +1853,8 @@ for ac_file in conftest.exe conftest conftest.*; do
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
- break;;
+ export ac_cv_exeext
+ break;;
* ) break;;
esac
done
@@ -1847,7 +1879,6 @@ if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -1898,7 +1929,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -1918,11 +1948,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -1935,7 +1975,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -1951,7 +1991,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -1968,11 +2007,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -1985,7 +2034,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_prog_cc_g=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2012,7 +2061,6 @@ else
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2040,6 +2088,16 @@ static char *f (char * (*g) (char **, int), char **p, ...)
va_end (v);
return s;
}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std1 is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std1. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2066,11 +2124,21 @@ do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2083,7 +2151,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
done
rm -f conftest.$ac_ext conftest.$ac_objext
CC=$ac_save_CC
@@ -2111,19 +2179,28 @@ cat >conftest.$ac_ext <<_ACEOF
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -2131,14 +2208,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
$ac_declaration
+#include <stdlib.h>
int
main ()
{
@@ -2149,11 +2225,21 @@ exit (42);
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2166,9 +2252,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
continue
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2185,11 +2270,21 @@ exit (42);
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2201,7 +2296,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -2215,7 +2310,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2341,7 +2436,6 @@ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2361,11 +2455,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2378,7 +2482,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -2394,7 +2498,6 @@ if test "${ac_cv_prog_cxx_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2411,11 +2514,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2428,7 +2541,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_prog_cxx_g=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
@@ -2448,8 +2561,7 @@ else
fi
fi
for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -2457,14 +2569,13 @@ for ac_declaration in \
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
$ac_declaration
+#include <stdlib.h>
int
main ()
{
@@ -2475,11 +2586,21 @@ exit (42);
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2492,9 +2613,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
continue
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2511,11 +2631,21 @@ exit (42);
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2527,7 +2657,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -2570,7 +2700,6 @@ do
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2581,7 +2710,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2593,6 +2722,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2613,7 +2743,6 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2631,6 +2760,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2677,7 +2807,6 @@ do
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2688,7 +2817,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2700,6 +2829,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2720,7 +2850,6 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2738,6 +2867,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2813,6 +2943,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -2829,6 +2960,7 @@ do
case $as_dir/ in
./ | .// | /cC/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2836,20 +2968,20 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
done
done
;;
@@ -2981,7 +3113,6 @@ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3006,7 +3137,6 @@ if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3027,11 +3157,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3044,12 +3184,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3071,7 +3210,6 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3096,7 +3234,6 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3108,9 +3245,9 @@ cat >>conftest.$ac_ext <<_ACEOF
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#else
# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
#endif
@@ -3121,7 +3258,7 @@ main ()
int i;
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
+ || toupper (i) != TOUPPER (i))
exit(2);
exit (0);
}
@@ -3146,7 +3283,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
@@ -3171,7 +3308,7 @@ fi
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
+ inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -3180,7 +3317,6 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3192,11 +3328,21 @@ $ac_includes_default
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3209,7 +3355,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -3248,7 +3394,6 @@ else
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3259,11 +3404,21 @@ $ac_includes_default
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3276,7 +3431,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -3284,7 +3439,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3302,6 +3456,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -3321,33 +3476,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
;;
- no:yes )
+ no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -3358,7 +3512,7 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=$ac_header_preproc"
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -3389,21 +3543,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef $ac_func
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -3434,11 +3595,21 @@ return f != $ac_func;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3451,7 +3622,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -3475,7 +3647,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3499,11 +3670,21 @@ dlopen ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3516,7 +3697,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -3545,7 +3727,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3569,11 +3750,21 @@ pthread_create ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3586,7 +3777,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_pthread_pthread_create=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
@@ -3604,7 +3796,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lc_r $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3628,11 +3819,21 @@ pthread_create ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3645,7 +3846,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_c_r_pthread_create=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
@@ -3663,7 +3865,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lossaudio $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3681,11 +3882,21 @@ main ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3698,7 +3909,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ossaudio_main=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5
@@ -3715,7 +3927,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lncurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3739,11 +3950,21 @@ initscr ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3756,7 +3977,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ncurses_initscr=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5
@@ -3774,7 +3996,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3798,11 +4019,21 @@ initscr ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3815,7 +4046,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_curses_initscr=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5
@@ -3874,8 +4106,8 @@ _ACEOF
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
for ac_extension in a so sl; do
if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
- test -f $ac_im_libdir/libX11.$ac_extension; then
- ac_im_usrlibdir=$ac_im_libdir; break
+ test -f $ac_im_libdir/libX11.$ac_extension; then
+ ac_im_usrlibdir=$ac_im_libdir; break
fi
done
# Screen out bogus values from the imake configuration. They are
@@ -3935,7 +4167,6 @@ if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3953,6 +4184,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -3983,7 +4215,6 @@ if test "$ac_x_libraries" = no; then
ac_save_LIBS=$LIBS
LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4000,11 +4231,21 @@ XtMalloc (0)
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4029,7 +4270,8 @@ do
done
done
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
@@ -4038,7 +4280,7 @@ if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
else
# Record where we found X for the cache.
ac_cv_have_x="have_x=yes \
- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
fi
fi
@@ -4085,7 +4327,6 @@ else
echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4102,11 +4343,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4119,7 +4370,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_R_nospace=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test $ac_R_nospace = yes; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
@@ -4127,7 +4379,6 @@ echo "${ECHO_T}no" >&6
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4144,11 +4395,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4161,7 +4422,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_R_space=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test $ac_R_space = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -4187,7 +4449,6 @@ echo "${ECHO_T}neither works" >&6
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4211,11 +4472,21 @@ XOpenDisplay ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4234,7 +4505,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4258,11 +4528,21 @@ dnet_ntoa ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4275,7 +4555,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dnet_dnet_ntoa=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
@@ -4293,7 +4574,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4317,11 +4597,21 @@ dnet_ntoa ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4334,7 +4624,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
@@ -4345,7 +4636,8 @@ fi
fi
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -4362,21 +4654,28 @@ if test "${ac_cv_func_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define gethostbyname innocuous_gethostbyname
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef gethostbyname
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -4407,11 +4706,21 @@ return f != gethostbyname;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4424,7 +4733,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_gethostbyname=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
@@ -4438,7 +4748,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4462,11 +4771,21 @@ gethostbyname ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4479,7 +4798,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_nsl_gethostbyname=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
@@ -4489,7 +4809,7 @@ if test $ac_cv_lib_nsl_gethostbyname = yes; then
fi
if test $ac_cv_lib_nsl_gethostbyname = no; then
- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4497,7 +4817,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4521,11 +4840,21 @@ gethostbyname ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4538,7 +4867,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_bsd_gethostbyname=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
@@ -4563,21 +4893,28 @@ if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define connect innocuous_connect
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef connect
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -4608,11 +4945,21 @@ return f != connect;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4625,7 +4972,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_connect=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
echo "${ECHO_T}$ac_cv_func_connect" >&6
@@ -4639,7 +4987,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4663,11 +5010,21 @@ connect ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4680,7 +5037,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_socket_connect=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
@@ -4698,21 +5056,28 @@ if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define remove innocuous_remove
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef remove
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -4743,11 +5108,21 @@ return f != remove;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4760,7 +5135,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_remove=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
echo "${ECHO_T}$ac_cv_func_remove" >&6
@@ -4774,7 +5150,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4798,11 +5173,21 @@ remove ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4815,7 +5200,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_posix_remove=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
@@ -4833,21 +5219,28 @@ if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define shmat innocuous_shmat
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef shmat
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -4878,11 +5271,21 @@ return f != shmat;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4895,7 +5298,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_shmat=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
echo "${ECHO_T}$ac_cv_func_shmat" >&6
@@ -4909,7 +5313,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4933,11 +5336,21 @@ shmat ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4950,7 +5363,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ipc_shmat=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
@@ -4979,7 +5393,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5003,11 +5416,21 @@ IceConnectionNumber ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5020,7 +5443,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ICE_IceConnectionNumber=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
@@ -5083,7 +5507,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ljpeg $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5107,11 +5530,21 @@ jpeg_start_compress ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5124,7 +5557,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_jpeg_jpeg_start_compress=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_start_compress" >&5
@@ -5151,7 +5585,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lasound $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5175,11 +5608,21 @@ snd_seq_open ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5192,7 +5635,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_asound_snd_seq_open=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_seq_open" >&5
@@ -5220,7 +5664,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-llirc_client $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5244,11 +5687,21 @@ lirc_init ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5261,7 +5714,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_lirc_client_lirc_init=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_lirc_client_lirc_init" >&5
@@ -5289,7 +5743,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lzvbi $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5313,11 +5766,21 @@ vbi_capture_fd ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5330,7 +5793,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_zvbi_vbi_capture_fd=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_zvbi_vbi_capture_fd" >&5
@@ -5358,7 +5822,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-laa $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5382,11 +5845,21 @@ aa_autoinit ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5399,7 +5872,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_aa_aa_autoinit=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_aa_aa_autoinit" >&5
@@ -5429,7 +5903,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldv -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5453,11 +5926,21 @@ dv_decoder_new ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5470,7 +5953,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dv_dv_decoder_new=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dv_dv_decoder_new" >&5
@@ -5487,6 +5971,7 @@ else
echo "*** DV disabled"
fi
+dashlglib=$(glib-config --libs 2>/dev/null)
if test "$enable_quicktime" != "no"; then
echo "$as_me:$LINENO: checking for lqt_query_registry in -lquicktime" >&5
echo $ECHO_N "checking for lqt_query_registry in -lquicktime... $ECHO_C" >&6
@@ -5494,9 +5979,8 @@ if test "${ac_cv_lib_quicktime_lqt_query_registry+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lquicktime -ldl -lglib $LIBPTHREAD $LIBS"
+LIBS="-lquicktime -ldl $dashlglib $LIBPTHREAD $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5520,11 +6004,21 @@ lqt_query_registry ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5537,7 +6031,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_quicktime_lqt_query_registry=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_quicktime_lqt_query_registry" >&5
@@ -5555,7 +6050,7 @@ else
fi
QTLIBS=""
if test "$FOUND_LQT" = "yes"; then
- QTLIBS="-lquicktime -ldl -lglib -lm"
+ QTLIBS="-lquicktime -ldl $dashlglib -lm"
fi
@@ -5569,7 +6064,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXxf86dga $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5593,11 +6087,21 @@ XF86DGAQueryExtension ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5610,7 +6114,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86dga_XF86DGAQueryExtension" >&5
@@ -5633,7 +6138,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXxf86vm $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5657,11 +6161,21 @@ XF86VidModeQueryExtension ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5674,7 +6188,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5
@@ -5697,7 +6212,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXdpms $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5721,11 +6235,21 @@ DPMSQueryExtension ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5738,7 +6262,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xdpms_DPMSQueryExtension=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_Xdpms_DPMSQueryExtension" >&5
@@ -5761,7 +6286,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXext $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5785,11 +6309,21 @@ DPMSQueryExtension ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5802,7 +6336,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xext_DPMSQueryExtension=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_DPMSQueryExtension" >&5
@@ -5824,7 +6359,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXinerama $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5848,11 +6382,21 @@ XineramaQueryExtension ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5865,7 +6409,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xinerama_XineramaQueryExtension=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
@@ -5888,7 +6433,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXrender $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5912,11 +6456,21 @@ XRenderQueryExtension ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5929,7 +6483,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xrender_XRenderQueryExtension=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5
@@ -5952,7 +6507,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXrandr $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5976,11 +6530,21 @@ XRRConfigCurrentConfiguration ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5993,7 +6557,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xrandr_XRRConfigCurrentConfiguration=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRConfigCurrentConfiguration" >&5
@@ -6021,7 +6586,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXv $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6045,11 +6609,21 @@ XvQueryExtension ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6062,7 +6636,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xv_XvQueryExtension=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_Xv_XvQueryExtension" >&5
@@ -6089,7 +6664,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXm $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6113,11 +6687,21 @@ XmStringGenerate ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6130,7 +6714,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xm_XmStringGenerate=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_Xm_XmStringGenerate" >&5
@@ -6154,7 +6739,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lGL $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6178,11 +6762,21 @@ glXChooseVisual ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6195,7 +6789,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_GL_glXChooseVisual=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
@@ -6288,13 +6883,13 @@ _ACEOF
# `set' does not quote correctly, so add quotes (double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
;;
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
esac;
} |
@@ -6324,13 +6919,13 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
s/:*\$(srcdir):*/:/;
s/:*\${srcdir}:*/:/;
s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
+s/^\([^=]*=[ ]*\):*/\1/;
s/:*$//;
-s/^[^=]*=[ ]*$//;
+s/^[^=]*=[ ]*$//;
}'
fi
@@ -6341,7 +6936,7 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
# 2. Add them.
ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
@@ -6385,9 +6980,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -6406,7 +7002,7 @@ for as_var in \
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -6585,16 +7181,17 @@ rm -f conf$$ conf$$.exe conf$$.file
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
# IFS
@@ -6621,7 +7218,7 @@ _ASBOX
cat >&5 <<_CSEOF
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.57. Invocation command line was
+generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6665,9 +7262,9 @@ Usage: $0 [OPTIONS] [FILE]...
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ instantiate the configuration file FILE
--header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ instantiate the configuration header FILE
Configuration files:
$config_files
@@ -6681,11 +7278,10 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.57,
+configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
srcdir=$srcdir
@@ -6955,9 +7551,9 @@ _ACEOF
(echo ':t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
fi
ac_sed_frag=`expr $ac_sed_frag + 1`
ac_beg=$ac_end
@@ -6975,21 +7571,21 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=$ac_file.in ;;
esac
# Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -7005,10 +7601,10 @@ echo X"$ac_file" |
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -7046,12 +7642,45 @@ case $srcdir in
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
case $INSTALL in
@@ -7073,7 +7702,7 @@ echo "$as_me: creating $ac_file" >&6;}
configure_input="$ac_file. "
fi
configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
+ sed 's,.*/,,'` by configure."
# First look for the input files in the build tree, otherwise in the
# src tree.
@@ -7082,24 +7711,24 @@ echo "$as_me: creating $ac_file" >&6;}
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- echo $f;;
+ echo "$f";;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo "$f"
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
_ACEOF
@@ -7141,12 +7770,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF
# NAME is the cpp macro being defined and VALUE is the value it is being given.
#
# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='[ ].*$,\1#\2'
+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+ac_dB='[ ].*$,\1#\2'
ac_dC=' '
ac_dD=',;t'
# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_uB='$,\1#\2define\3'
ac_uC=' '
ac_uD=',;t'
@@ -7155,11 +7784,11 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=$ac_file.in ;;
esac
@@ -7173,28 +7802,29 @@ echo "$as_me: creating $ac_file" >&6;}
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- echo $f;;
+ # Do quote $f, to prevent DOS paths from being IFS'd.
+ echo "$f";;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo "$f"
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
# Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
_ACEOF
@@ -7217,9 +7847,9 @@ s/[\\&,]/\\&/g
s,[\\$`],\\&,g
t clear
: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
: end
_ACEOF
# If some macros were called several times there might be several times
@@ -7233,13 +7863,13 @@ rm -f confdef2sed.sed
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
cat >>conftest.undefs <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
_ACEOF
# Break up conftest.defines because some shells have a limit on the size
# of here documents, and old seds have small limits too (100 cmds).
echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
echo ' :' >>$CONFIG_STATUS
rm -f conftest.tail
@@ -7248,7 +7878,7 @@ do
# Write a limited-size here document to $tmp/defines.sed.
echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
@@ -7275,7 +7905,7 @@ do
# Write a limited-size here document to $tmp/undefs.sed.
echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
@@ -7309,10 +7939,10 @@ echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -7328,10 +7958,10 @@ echo X"$ac_file" |
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
diff --git a/configure.ac b/configure.ac
index 9985740..16bda91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,16 +222,17 @@ else
echo "*** DV disabled"
fi
+dashlglib=$(glib-config --libs 2>/dev/null)
if test "$enable_quicktime" != "no"; then
AC_CHECK_LIB(quicktime, lqt_query_registry,
FOUND_LQT="yes"; AC_DEFINE(HAVE_LIBQUICKTIME,1,"have libquicktime"),,
- -ldl -lglib $LIBPTHREAD)
+ -ldl $dashlglib $LIBPTHREAD)
else
echo "*** quicktime disabled"
fi
QTLIBS=""
if test "$FOUND_LQT" = "yes"; then
- QTLIBS="-lquicktime -ldl -lglib -lm"
+ QTLIBS="-lquicktime -ldl $dashlglib -lm"
fi
AC_SUBST(QTLIBS)
diff --git a/console/scantv.c b/console/scantv.c
index 0a470f6..204b4c6 100644
--- a/console/scantv.c
+++ b/console/scantv.c
@@ -225,7 +225,7 @@ main(int argc, char **argv)
do_va_cmd(2,"setfreqtab",chanlist_names[j].str);
/* vbi */
- vbi = vbi_open(ng_dev.vbi,0,0);
+ vbi = vbi_open(ng_dev.vbi,debug,0);
if (NULL == vbi) {
fprintf(stderr,"open %s: %s\n",ng_dev.vbi,strerror(errno));
exit(1);
diff --git a/console/ttv.c b/console/ttv.c
index 46ce94b..89ad6e5 100644
--- a/console/ttv.c
+++ b/console/ttv.c
@@ -1,10 +1,11 @@
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
#include <time.h>
#include <pthread.h>
-#include <X11/Intrinsic.h>
#include <aalib.h>
#include "grab-ng.h"
diff --git a/console/vbi-tty.c b/console/vbi-tty.c
index 07b09c4..04819dc 100644
--- a/console/vbi-tty.c
+++ b/console/vbi-tty.c
@@ -173,7 +173,6 @@ vbi_render_head(struct vbi_tty *tty, int pgno, int subno)
0,0,
pg.columns, 1,
0,1);
-
} else {
len = vbi_export_txt(data,nl_langinfo(CODESET),41*8,
&pg,&head,VBI_ANSICOLOR);
diff --git a/console/webcam.c b/console/webcam.c
index 8ddc107..ace70e9 100644
--- a/console/webcam.c
+++ b/console/webcam.c
@@ -415,13 +415,13 @@ add_text(char *image, int width, int height)
{
time_t t;
struct tm *tm;
- char line[MSG_MAXLEN+1],*ptr;
+ unsigned char line[MSG_MAXLEN+1],*ptr;
int i,x,y,f,len;
time(&t);
tm = localtime(&t);
len = strftime(line,MSG_MAXLEN,get_message(),tm);
- fprintf(stderr,"%s\n",line);
+ // fprintf(stderr,"%s\n",line);
for (y = 0; y < CHAR_HEIGHT; y++) {
ptr = image + 3 * width * (height-CHAR_HEIGHT-2+y) + 12;
diff --git a/debian/alevtd.files b/debian/alevtd.files
deleted file mode 100644
index 0ef949a..0000000
--- a/debian/alevtd.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/alevtd
-usr/share/man/man1/alevtd.1
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index b2b52d0..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,484 +0,0 @@
-xawtv (3.91) unstable; urgency=low
-
- * bugfix release.
- * fix dependencies (closes: #217451).
- * added Japanese po-debconf template (closes: #227811).
-
- -- Gerd Knorr <kraxel@debian.org> Thu, 29 Jan 2004 14:23:49 +0100
-
-xawtv (3.90) unstable; urgency=low
-
- * bugfix release (closes: #204990).
- * added spanish template file (closes: #215652).
- * fix webcam description (closes: #216061).
- * fix build dependencies (closes: #216164).
- * rebuild with new libquicktime likely closes: #193712.
-
- -- Gerd Knorr <kraxel@debian.org> Fri, 17 Oct 2003 12:55:22 +0200
-
-xawtv (3.88.1) unstable; urgency=low
-
- * bugfix release (closes: #214120).
- * updated debconf (closes: #198780, #199982).
-
- -- Gerd Knorr <kraxel@debian.org> Tue, 7 Oct 2003 17:26:57 +0200
-
-xawtv (3.88) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 16 Apr 2003 12:19:46 +0200
-
-xawtv (3.87) unstable; urgency=low
-
- * new release.
- * postinst fixes (closes: #179319,#188652).
- * rebuild with new, fixed libquicktime-dev (closes: #186332).
-
- -- Gerd Knorr <kraxel@debian.org> Tue, 15 Apr 2003 12:39:21 +0200
-
-xawtv (3.86) unstable; urgency=low
-
- * new release (closes: #175886, #171884, #178691, #171354)
- (closes: #178940, #179371, #175886).
- * added danish template (closes: #175424).
- * fixed radio description text (closes: #175115).
- * splitted quicktime plugin into separate sub-package.
- * rebuild seems to fix #183567 - not sure how this happened in
- the first place as shared libary dependencies are autogenerated
- by debhelper ... (closes: #183567).
- * rebuild should also fixup the vorbis mess
- (closes: #179379, #178851).
- * fixed dependencies (closes: #179372, #184956, #184959, #144403).
-
- -- Gerd Knorr <kraxel@debian.org> Tue, 18 Mar 2003 10:12:33 +0100
-
-xawtv (3.82) unstable; urgency=low
-
- * new release (closes: #173791).
-
- -- Gerd Knorr <kraxel@debian.org> Sat, 28 Dec 2002 13:38:59 +0100
-
-xawtv (3.81) unstable; urgency=low
-
- * new release (closes: #171346, #171812, #171470).
-
- -- Gerd Knorr <kraxel@debian.org> Tue, 10 Dec 2002 16:23:26 +0100
-
-xawtv (3.80) unstable; urgency=low
-
- * new release.
- * fixed build dependencies (closes: #169570).
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 27 Nov 2002 13:07:56 +0100
-
-xawtv (3.79) unstable; urgency=low
-
- * new release (closes: #168896, #168694)
-
- -- Gerd Knorr <kraxel@debian.org> Fri, 15 Nov 2002 11:02:59 +0100
-
-xawtv (3.78) unstable; urgency=low
-
- * new release (closes: #132366,#135393,#138792,#144699,#159689).
- * fixed copyright file (closes: #143371).
- * fixed control file (closes: #153046).
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 30 Oct 2002 13:04:45 +0100
-
-xawtv (3.72) unstable; urgency=low
-
- * new release (closes: #134444).
-
- -- Gerd Knorr <kraxel@debian.org> Tue, 19 Feb 2002 15:18:45 +0100
-
-xawtv (3.71) unstable; urgency=low
-
- * new release (closes: #133120).
- * fixed dependences (closes: #132619,#132987).
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 11 Feb 2002 13:21:05 +0100
-
-xawtv (3.70) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Tue, 5 Feb 2002 11:03:48 +0100
-
-xawtv (3.69) unstable; urgency=low
-
- * new release (closes: #112892)
- * various bugs are fixed in other releases but I forgot to mention them
- in the changelog (closes: #122672, #116477, #119935, #116476).
-
- -- Gerd Knorr <kraxel@debian.org> Thu, 31 Jan 2002 12:05:43 +0100
-
-xawtv (3.68) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Thu, 17 Jan 2002 19:08:55 +0100
-
-xawtv (3.67) unstable; urgency=low
-
- * new release (closes: #124275).
-
- -- Gerd Knorr <kraxel@debian.org> Fri, 14 Dec 2001 13:00:56 +0100
-
-xawtv (3.66) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 12 Dec 2001 15:51:37 +0100
-
-xawtv (3.65) unstable; urgency=low
-
- * new release (closes: #119935).
-
- -- Gerd Knorr <kraxel@debian.org> Tue, 4 Dec 2001 13:13:01 +0100
-
-xawtv (3.64) unstable; urgency=low
-
- * new release (closes: #113633,#112169).
- * fixed build dependences (closes: #115111).
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 10 Oct 2001 12:51:39 +0200
-
-xawtv (3.63) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 8 Oct 2001 15:17:11 +0200
-
-xawtv (3.62) unstable; urgency=low
-
- * new release (closes: #111105, #111267, #111296).
-
- -- Gerd Knorr <kraxel@debian.org> Fri, 14 Sep 2001 19:39:38 +0200
-
-xawtv (3.61) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Thu, 23 Aug 2001 21:32:42 +0200
-
-xawtv (3.60) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Tue, 14 Aug 2001 16:39:51 +0200
-
-xawtv (3.59) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 13 Aug 2001 20:12:52 +0200
-
-xawtv (3.58) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Thu, 2 Aug 2001 14:22:14 +0200
-
-xawtv (3.57) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 23 Jul 2001 13:44:03 +0200
-
-xawtv (3.56) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 16 Jul 2001 16:17:18 +0200
-
-xawtv (3.55) unstable; urgency=low
-
- * new release.
- * spell fix in control file (s/Replace/Replaces/, closes: #103418).
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 4 Jul 2001 09:38:14 +0200
-
-xawtv (3.54) unstable; urgency=low
-
- * new release (closes: #102096).
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 2 Jul 2001 11:36:09 +0200
-
-xawtv (3.53.1) unstable; urgency=low
-
- * fixed dependences for new scantv package (closes: #101971).
-
- -- Gerd Knorr <kraxel@debian.org> Sat, 23 Jun 2001 10:42:57 +0200
-
-xawtv (3.53) unstable; urgency=low
-
- * new release.
- * splitted scantv into a sepatate package (closes: #101353).
- * updated ttv description (closes: #101682)
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 20 Jun 2001 12:18:06 +0200
-
-xawtv (3.52) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 18 Jun 2001 10:20:03 +0200
-
-xawtv (3.51) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 11 Jun 2001 12:58:33 +0200
-
-xawtv (3.50) unstable; urgency=low
-
- * new release (closes: #99858).
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 6 Jun 2001 11:28:14 +0200
-
-xawtv (3.49) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Thu, 31 May 2001 11:45:34 +0200
-
-xawtv (3.48) unstable; urgency=low
-
- * new release (closes: #97772).
- * updated template file (closes: #92402).
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 21 May 2001 14:19:33 +0200
-
-xawtv (3.47) unstable; urgency=low
-
- * new release.
- * tweak postinst (closes: #97187).
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 16 May 2001 11:04:53 +0200
-
-xawtv (3.46) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 7 May 2001 17:30:03 +0200
-
-xawtv (3.45) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Sun, 6 May 2001 11:02:52 +0200
-
-xawtv (3.44) unstable; urgency=low
-
- * new release (closes: #87136).
- * deleted some magic from xawtv config/postinst scripts to avoid
- dependency on pciutils.
-
- -- Gerd Knorr <kraxel@debian.org> Sat, 5 May 2001 18:02:34 +0200
-
-xawtv (3.43) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Mon, 9 Apr 2001 09:03:17 +0000
-
-xawtv (3.42) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Fri, 6 Apr 2001 08:04:27 +0000
-
-xawtv (3.41) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Fri, 23 Mar 2001 22:49:04 +0100
-
-xawtv (3.40) unstable; urgency=high
-
- * new release (closes: #90003).
- * new scantv manpage (closes: #87120). Ok, that was fixed in
- 3.39 already, but I forgot to add it to the changelog...
-
- -- Gerd Knorr <kraxel@debian.org> Sun, 18 Mar 2001 17:41:56 +0100
-
-xawtv (3.39) unstable; urgency=low
-
- * new release.
- * added xbase-clients to build-depends (closes: #89522).
-
- -- Gerd Knorr <kraxel@debian.org> Tue, 13 Mar 2001 21:30:12 +0100
-
-xawtv (3.38) unstable; urgency=low
-
- * new release (closes: #88396).
- * fixed a number of lintian warnings.
-
- -- Gerd Knorr <kraxel@debian.org> Sun, 11 Mar 2001 10:18:20 +0100
-
-xawtv (3.37) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 28 Feb 2001 19:56:30 +0100
-
-xawtv (3.36) unstable; urgency=low
-
- * new release (closes: #87429).
-
- -- Gerd Knorr <kraxel@debian.org> Sun, 25 Feb 2001 16:52:43 +0100
-
-xawtv (3.35) unstable; urgency=low
-
- * new release (closes: #85648, #86065).
-
- -- Gerd Knorr <kraxel@debian.org> Thu, 15 Feb 2001 21:21:30 +0100
-
-xawtv (3.34) unstable; urgency=low
-
- * new release.
- * rm'ed libXv.so libXxf86dga.so on my system (closes: #85555).
-
- -- Gerd Knorr <kraxel@debian.org> Sun, 11 Feb 2001 10:05:25 +0100
-
-xawtv (3.33) unstable; urgency=low
-
- * new release.
- * debconf changes (only dpkg-reconfigure will overwrite a
- existing config file, a normal upgrade should never ever do
- that).
- * german translations for the template file
- (Eduard Bloch <edi@gmx.de>, closes: #83772)
- * enabled quicktime4linux support.
-
- -- Gerd Knorr <kraxel@debian.org> Sun, 28 Jan 2001 14:25:15 +0100
-
-xawtv (3.30) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@debian.org> Sun, 14 Jan 2001 09:38:03 +0100
-
-xawtv (3.29) unstable; urgency=low
-
- * new release (closes: #74458)
- * updated v4l-conf package for the new dpkg-statoverride
-
- -- Gerd Knorr <kraxel@debian.org> Sat, 13 Jan 2001 22:02:05 +0100
-
-xawtv (3.28) unstable; urgency=low
-
- * new release (closes: #80933)
-
- -- Gerd Knorr <kraxel@debian.org> Sat, 6 Jan 2001 13:09:31 +0100
-
-xawtv (3.27) unstable; urgency=low
-
- * new release.
- * xawtv postinst script fixes (closes: #80611, #80578)
-
- -- Gerd Knorr <kraxel@debian.org> Sat, 30 Dec 2000 15:07:25 +0100
-
-xawtv (3.26) unstable; urgency=low
-
- * new release
- * added debconf support
-
- -- Gerd Knorr <kraxel@debian.org> Thu, 21 Dec 2000 22:58:42 +0100
-
-xawtv (3.24) unstable; urgency=low
-
- * new release
- * updated (build) dependences to require xfree4 libraries + xutils
- (mkfontdir+bdftopcf have been moved)
- * build binary packages with Xvideo support
- [i386 only, powerpc has no xfree4 packages yet]
-
- -- Gerd Knorr <kraxel@debian.org> Sat, 4 Nov 2000 15:56:55 +0100
-
-xawtv (3.23) unstable; urgency=low
-
- * new release
- * fixed (build) dependences (closes: #69918, #74428)
-
- -- Gerd Knorr <kraxel@debian.org> Sat, 21 Oct 2000 22:41:37 +0200
-
-xawtv (3.22) unstable; urgency=low
-
- * new release
- * added liblircclient-dev to build-depends, compiled packages
- with lirc support
-
- -- Gerd Knorr <kraxel@debian.org> Sun, 1 Oct 2000 17:40:52 +0200
-
-xawtv (3.21) unstable; urgency=low
-
- * new release
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 6 Sep 2000 00:04:21 +0200
-
-xawtv (3.20) unstable; urgency=low
-
- * new release
- * packaging bug fixed: v4l-conf was not installed suid-root because
- dh_fixperm killed my suid bit...
-
- -- Gerd Knorr <kraxel@debian.org> Wed, 6 Sep 2000 00:04:11 +0200
-
-xawtv (3.19) unstable; urgency=low
-
- * new release. Starting with this release /me maintains debian package,
- i.e. xawtv is a native debian package now. Going to close a number of
- bugs...
- * closes: #48118 - not xawtv's fault, it is a driver problem.
- * closes: #52538 - This can be changed with keypad-ntsc in ~/.xawtv,
- see man-page. Don't remember which version introduces this, seems
- I forgot this one in the Changes file...
- * closes: #54906 - It's not a bug, it's a feature. xawtv uses the
- maximun size supported by the driver which is 844x576 with bttv.
- If one needs a fixed 4:3 aspect ratio, this can be set in the
- config file (>= version 3.14)
- * closes: #55956 - same as 54906 ...
- * closes: #57161, #52351 (packaging is completely different)
- * closes: #61590 - was fixed in 3.11
- * closes: #61698, #65802 - bug in the 2.2.x kernel bttv driver
- * closes: #64064 - this is newer than 3.14 :-)
-
- -- Gerd Knorr <kraxel@debian.org> Sun, 20 Aug 2000 23:47:15 +0200
-
-xawtv (3.18) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@goldbach.in-berlin.de> Wed, 16 Aug 2000 21:39:03 +0200
-
-xawtv (3.17) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@goldbach.in-berlin.de> Thu, 22 Jun 2000 23:43:00 +0200
-
-xawtv (3.16) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@goldbach.in-berlin.de> Mon, 5 Jun 2000 21:35:30 +0200
-
-xawtv (3.15) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@goldbach.in-berlin.de> Thu, 1 Jun 2000 22:58:00 +0200
-
-xawtv (3.14) unstable; urgency=low
-
- * new release.
-
- -- Gerd Knorr <kraxel@goldbach.in-berlin.de> Mon, 8 May 2000 23:13:03 +0200
-
-xawtv (3.13) unstable; urgency=low
-
- * deianized.
-
- -- Gerd Knorr <kraxel@goldbach.in-berlin.de> Sun, 16 Apr 2000 15:57:04 +0200
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 41752dc..0000000
--- a/debian/control
+++ /dev/null
@@ -1,124 +0,0 @@
-Source: xawtv
-Section: graphics
-Priority: extra
-Build-Depends: libjpeg-dev, libncurses5-dev, xlibs-dev (>= 4.0.1), liblircclient-dev, debhelper (>= 4.1.16), xutils, xbase-clients, aalib1-dev, libasound2-dev, libzvbi-dev (>= 0.2.1), libquicktime-dev, libxaw7-dev, xlibmesa-gl-dev, libxft2-dev, po-debconf, libpng-dev
-Maintainer: Gerd Knorr <kraxel@debian.org>
-Standards-Version: 3.6.1
-
-Package: xawtv
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, v4l-conf, xutils, debconf, scantv, xawtv-plugins (=${Source-Version}), pia
-Suggests: xawtv-plugin-qt (=${Source-Version}), tv-fonts
-Description: X11 TV application
- TV application for X11. Supports video4linux
- devices and the Xvideo extension.
-
-Package: pia
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, xawtv-plugins (=${Source-Version})
-Description: movie player
- This is a simple movie player. It is used by xawtv and motv to
- playback movie files which are recorded from TV.
-
-Package: fbtv
-Architecture: any
-Depends: ${shlibs:Depends}, v4l-conf, xawtv-plugins (=${Source-Version})
-Suggests: xawtv
-Description: linux console (fbcon) TV application
- TV application for the linux console, requires a
- framebuffer device (vesafb, matroxfb, atyfb, ...)
- and a video4linux driver like bttv.
-
-Package: ttv
-Architecture: any
-Depends: ${shlibs:Depends}, xawtv-plugins (=${Source-Version})
-Suggests: xawtv
-Description: tty TV application
- TV application for terminals, based on aalib.
- Uses video4linux devices as video input.
-
-Package: scantv
-Architecture: any
-Depends: ${shlibs:Depends}, xawtv-plugins (=${Source-Version})
-Replaces: xawtv (<< 3.53)
-Description: scan TV channels for stations
- This utility can scan a channel set for TV stations
- and write the ones found into a xawtv config file
- (which is also read by some other utilities like fbtv).
- It also tries to extract the station names from vbi data.
-
-Package: streamer
-Architecture: any
-Depends: ${shlibs:Depends}, xawtv-plugins (=${Source-Version})
-Suggests: xawtv
-Description: capture tool (images / movies)
- A tool to capture single/multiple images or
- record movies from a video4linux device.
-
-Package: radio
-Section: sound
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: ncurses-based radio application
- This is a ncurses-based radio application. It
- supports the video4linux API.
-
-Package: v4l-conf
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: suidmanager (<< 0.50)
-Description: tool to configure video4linux drivers
- This is a small tool to configure a video4linux
- device driver. It is required to make the video
- overlay work in fbtv and xawtv.
-
-Package: xawtv-tools
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Miscellaneous tools distributed with xawtv
- This package has a few tools you might find useful. They
- have not to do very much to do with xawtv. I've used/wrote
- them for debugging:
- * propwatch - monitors properties of X11 windows. If you
- want to know how to keep track of xawtv's
- _XAWTV_STATION property, look at this.
- * dump-mixers - dump mixer settings to stdout
- * record - console sound recorder. Has a simple input
- level meter which might be useful to trouble
- shoot sound problems.
- * showriff - display the structure of RIFF files (avi, wav).
-
-Package: xawtv-plugin-qt
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: quicktime plugin for xawtv and motv
- this plugin is needed to record quicktime movies with
- xawtv and motv.
-
-Package: xawtv-plugins
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: plugins for xawtv and motv
- A number of plugins for xawtv and motv: driver interfaces for
- hardware access (video4linux API, ...), plugins for reading/writing
- movie files and some image processing filters.
-
-Package: webcam
-Section: net
-Architecture: any
-Depends: ${shlibs:Depends}, xawtv-plugins (=${Source-Version})
-Recommends: ftp, ssh
-Description: capture and upload images
- webcam captures images from a video4linux device like
- bttv, annotates them and uploads them to a webserver
- using ftp or ssh in an endless loop.
-
-Package: alevtd
-Section: net
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: http daemon for videotext pages
- alevtd is http daemon which servers videotext pages as
- HTML.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index a30caea..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is xawtv, written and maintained by Gerd Knorr <kraxel@debian.org>
-
-The original source can always be found at:
- http://bytesex.org/xawtv/
-
-Copyright (C) 1997-2000 Gerd Knorr
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License with
- the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
- if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- Suite 330, Boston, MA 02111-1307 USA
diff --git a/debian/fbtv.files b/debian/fbtv.files
deleted file mode 100644
index ed04878..0000000
--- a/debian/fbtv.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/fbtv
-usr/share/man/man1/fbtv.1
-usr/share/man/*/man1/fbtv.1
diff --git a/debian/fbtv.menu b/debian/fbtv.menu
deleted file mode 100644
index 1f6d778..0000000
--- a/debian/fbtv.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(fbtv):needs=vc section=Apps/Viewers \
- title="fbtv" command="/usr/bin/fbtv"
diff --git a/debian/pia.files b/debian/pia.files
deleted file mode 100644
index 3bb42ac..0000000
--- a/debian/pia.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/pia
-usr/share/man/man1/pia.1
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
deleted file mode 100644
index 56dbae9..0000000
--- a/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] xawtv.templates
diff --git a/debian/po/da.po b/debian/po/da.po
deleted file mode 100644
index 151370f..0000000
--- a/debian/po/da.po
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-07 13:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../xawtv.templates:4
-msgid "Create video4linux (/dev/video*) special files?"
-msgstr "Opret video4linux (/dev/video*) specielle filer?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid "scan for TV stations?"
-msgstr "Skan efter TV stationer?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I can do a scan of all channels and put a list of the TV stations I've found "
-"into the config file."
-msgstr ""
-"Jeg kan lave en skanning efter alle kanaler og putte dem i en liste af de TV "
-"stationer jeg har fundet, ind i en konfigurations fil."
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"This requires a working bttv driver. If bttv isn't configured correctly I "
-"might not find the TV stations."
-msgstr ""
-"Dette krver en virkende bttv driver. Hvis bttv ikke er korrekt "
-"konfigureret, vil du mske ikke finde TV stationerne."
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I'll try to pick up the channel names from videotext. This will work with "
-"PAL only."
-msgstr ""
-"Jeg vil prve at finde kanal navne fra videotext. Dette vil kun virke med "
-"PAL."
-
-#. Choices
-#: ../xawtv.templates:21
-msgid "PAL, SECAM, NTSC"
-msgstr "PAL, SECAM, NTSC"
-
-#. Description
-#: ../xawtv.templates:22
-msgid "Which TV norm is used in your country?"
-msgstr "Hvilken TV norm er brugt i dit land?"
-
-#. Description
-#: ../xawtv.templates:27
-msgid "Create a default configuration for xawtv?"
-msgstr "Opret en standard konfigurations fil til xawtv?"
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"You can create a system-wide configuration file for xawtv with reasonable "
-"default values for the country you live in (which TV norm is used for "
-"example)."
-msgstr ""
-"Du kan oprette en system-bred konfigurations fil til xawtv med fornuftige "
-"standard vrdier for landet du lever i (f.eks. hvilken TV norm der bliver "
-"brugt i dit land)."
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"It is not required to have a global configuration file, but it will be more "
-"comfortable for your users if they find a working default configuration."
-msgstr ""
-"Det er ikke krvet at have en global konfigurations fil, men det vil gre "
-"det mere behageligt for dine brugere, hvis de finder en standard virkende "
-"konfiguration."
-
-#. Choices
-#: ../xawtv.templates:38
-msgid ""
-"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
-"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
-msgstr ""
-"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
-"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
-
-#. Description
-#: ../xawtv.templates:39
-msgid "Which frequency table should be used?"
-msgstr "Hvilken frekvens tabel skal bruges?"
-
-#. Description
-#: ../xawtv.templates:39
-msgid ""
-"A frequency table is just a list of TV channel names/numbers and the "
-"corresponding broadcast frequencies for these channels. Different regions "
-"use different standards here..."
-msgstr ""
-"En frekvens tabel er bare en liste af kanal navne/tal og de tilsvarende "
-"frekvenser for disse kanaler. Forskellige regioner bruger forskellige "
-"standarder her..."
diff --git a/debian/po/de.po b/debian/po/de.po
deleted file mode 100644
index d94ff4c..0000000
--- a/debian/po/de.po
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-07 13:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../xawtv.templates:4
-msgid "Create video4linux (/dev/video*) special files?"
-msgstr "Sollen Gerte-Dateien (/dev/video*) fr video4linux erstellt werden?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid "scan for TV stations?"
-msgstr "Soll nach TV-Stationen gesucht werden?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I can do a scan of all channels and put a list of the TV stations I've found "
-"into the config file."
-msgstr ""
-"Ich kann einen Suche nach Kanlen durchfhren und eine Liste der gefundenen "
-"TV-Stationen in die Konfigurationsdatei schreiben."
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"This requires a working bttv driver. If bttv isn't configured correctly I "
-"might not find the TV stations."
-msgstr ""
-"Dafr ist ein funktionierender BTTV-Treiber erforderlich. Wenn BTTV nicht "
-"richtig eingerichtet ist, werde ich keine Stationen finden knnen."
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I'll try to pick up the channel names from videotext. This will work with "
-"PAL only."
-msgstr ""
-"Ich werde versuchen, die Namen der Kanle aus dem Videotext herauszulesen. "
-"Dies funktioniert nur mit PAL."
-
-#. Choices
-#: ../xawtv.templates:21
-msgid "PAL, SECAM, NTSC"
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:22
-msgid "Which TV norm is used in your country?"
-msgstr "Welche TV-Norm benutzt man in ihrem Land?"
-
-#. Description
-#: ../xawtv.templates:27
-msgid "Create a default configuration for xawtv?"
-msgstr "Soll eine Standard-Konfiguration fr xawtv erstellt werden?"
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"You can create a system-wide configuration file for xawtv with reasonable "
-"default values for the country you live in (which TV norm is used for "
-"example)."
-msgstr ""
-"Sie knnen fr xawtv eine systemweite Konfigurationsdatei erstellen, die "
-"vernnftige Voreinstellungen fr ihr Land enthlt (z.B. welche TV-Norm "
-"benutzt wird)."
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"It is not required to have a global configuration file, but it will be more "
-"comfortable for your users if they find a working default configuration."
-msgstr ""
-"Eine globale Konfigurationsdatei ist nicht unbedingt erforderlich, aber es "
-"ist fr die Benutzer sicherlich angenehm, gleich eine funktionierende "
-"Konfiguration vorzufinden."
-
-#. Choices
-#: ../xawtv.templates:38
-msgid ""
-"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
-"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:39
-msgid "Which frequency table should be used?"
-msgstr "Welche Frequenzen-Tabelle soll benutzt werden?"
-
-#. Description
-#: ../xawtv.templates:39
-msgid ""
-"A frequency table is just a list of TV channel names/numbers and the "
-"corresponding broadcast frequencies for these channels. Different regions "
-"use different standards here..."
-msgstr ""
-"Eine Frequenzen-Tabelle ist einfach nur eine Liste der TV-Kanle (Namen oder "
-"Nummern) mit dazugehrigen Frequenzen. Verschiedene Regionen verwenden "
-"unterschiedliche Standards."
diff --git a/debian/po/es.po b/debian/po/es.po
deleted file mode 100644
index 6e17a29..0000000
--- a/debian/po/es.po
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-# Carlos Valdivia Yage <valyag@dat.etsit.upm.es>, 2003
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xawtv 3.88.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-07 13:31+0200\n"
-"PO-Revision-Date: 2003-10-12 13:50+0200\n"
-"Last-Translator: Carlos Valdivia Yage <valyag@dat.etsit.upm.es>\n"
-"Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../xawtv.templates:4
-msgid "Create video4linux (/dev/video*) special files?"
-msgstr "Crear los ficheros especiales video4linux (/dev/video*)?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid "scan for TV stations?"
-msgstr "Buscar cadenas de televisin?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I can do a scan of all channels and put a list of the TV stations I've found "
-"into the config file."
-msgstr ""
-"Puedo realizar una bsqueda de todos los canales y poner una lista de las "
-"cadenas de televisin encontradas en el fichero de configuracin."
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"This requires a working bttv driver. If bttv isn't configured correctly I "
-"might not find the TV stations."
-msgstr ""
-"Esto requiere un controlador bttv que funcione. Si bttv no se encuentra "
-"configurado correctamente puede que no encuentre las cadenas de televisin."
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I'll try to pick up the channel names from videotext. This will work with "
-"PAL only."
-msgstr ""
-"Tratar de obtener los nombres de los canales del teletexto. Esto slo "
-"funcionar con PAL."
-
-#. Choices
-#: ../xawtv.templates:21
-msgid "PAL, SECAM, NTSC"
-msgstr "PAL, SECAM, NTSC"
-
-#. Description
-#: ../xawtv.templates:22
-msgid "Which TV norm is used in your country?"
-msgstr "Qu sistema de televisin se usa en su pas?"
-
-#. Description
-#: ../xawtv.templates:27
-msgid "Create a default configuration for xawtv?"
-msgstr "Crear una configuracin predeterminada para xawtv?"
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"You can create a system-wide configuration file for xawtv with reasonable "
-"default values for the country you live in (which TV norm is used for "
-"example)."
-msgstr ""
-"Puede crear un fichero de configuracin global de xawtv con valores "
-"razonables para el pas en el que vive (como, por ejemplo, el sistema de "
-"televisin que se emplea)."
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"It is not required to have a global configuration file, but it will be more "
-"comfortable for your users if they find a working default configuration."
-msgstr ""
-"No es obligatorio tener un fichero de configuracin global, pero ser ms "
-"cmodo para sus usuarios encontrarse una configuracin por defecto que "
-"funciona."
-
-#. Choices
-#: ../xawtv.templates:38
-msgid ""
-"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
-"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
-msgstr ""
-"EEUU-bcast, EEUU-cable, EEUU-cable-hrc, Japn-bcast, Japn-cable, Europa "
-"Occidental, Europa Oriental, Italia, Nueva Zelanda, Australia, Irlanda, "
-"Francia, China-bcast"
-
-#. Description
-#: ../xawtv.templates:39
-msgid "Which frequency table should be used?"
-msgstr "Qu tabla de frecuencias se debera usar?"
-
-#. Description
-#: ../xawtv.templates:39
-msgid ""
-"A frequency table is just a list of TV channel names/numbers and the "
-"corresponding broadcast frequencies for these channels. Different regions "
-"use different standards here..."
-msgstr ""
-"Una tabla de frecuencias es slo una lista de nombres/nmeros de canales de "
-"televisin y sus correspondientes frecuencias de emisin. En diferentes "
-"regiones se utilizan diferentes estndares..."
diff --git a/debian/po/fr.po b/debian/po/fr.po
deleted file mode 100644
index d6333ea..0000000
--- a/debian/po/fr.po
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xawtv_3.88\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-25 18:42+0200\n"
-"PO-Revision-Date: 2003-07-03 08:37+0200\n"
-"Last-Translator: Michel Grentzinger <mic.grentz@online.fr>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../xawtv.templates:4
-msgid "Create video4linux (/dev/video*) special files?"
-msgstr "Crer les fichiers spciaux video4linux (/dev/video*)?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid "scan for TV stations?"
-msgstr "Rechercher des chanes de tlvision?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I can do a scan of all channels and put a list of the TV stations I've found "
-"into the config file."
-msgstr ""
-"Je peux parcourir l'ensemble des canaux et placer la liste de toutes les "
-"chanes de tlvision que j'ai trouves dans le fichier de configuration."
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"This requires a working bttv driver. If bttv isn't configured correctly I "
-"might not find the TV stations."
-msgstr ""
-"Cela ncessite un pilote fonctionnel pour bttv. Si bttv n'est pas encore "
-"configur correctement, je ne pourrai sans doute pas trouver les chanes de "
-"tlvision."
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I'll try to pick up the channel names from videotext. This will work with "
-"PAL only."
-msgstr ""
-"Je vais essayer de dterminer le nom des chanes partir du tltexte. Cela "
-"fonctionne uniquement avec la norme PAL."
-
-#. Choices
-#: ../xawtv.templates:21
-msgid "PAL, SECAM, NTSC"
-msgstr "PAL, SECAM, NTSC"
-
-#. Description
-#: ../xawtv.templates:22
-msgid "Which TV norm is used in your country?"
-msgstr "Quelle norme de diffusion tlvisuelle est employe dans votre pays?"
-
-#. Description
-#: ../xawtv.templates:27
-msgid "Create a default configuration for xawtv?"
-msgstr "Crer une configuration par dfaut pour xawtv?"
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"You can create a system-wide configuration file for xawtv with reasonable "
-"default values for the country you live in (which TV norm is used for "
-"example)."
-msgstr ""
-"Vous pouvez crer un fichier de configuration gnrique pour xawtv avec des "
-"valeurs par dfaut adaptes au pays dans lequel vous rsidez (par exemple la "
-"norme tlvisuelle employe)."
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"It is not required to have a global configuration file, but it will be more "
-"comfortable for your users if they find a working default configuration."
-msgstr ""
-"Il n'est pas ncessaire de disposer d'un fichier de configuration gnrique, "
-"mais vos utilisateurs se sentiront plus l'aise s'ils trouvent une "
-"configuration par dfaut qui fonctionne."
-
-#. Choices
-#: ../xawtv.templates:38
-msgid ""
-"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
-"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
-msgstr ""
-"us-bcast, us-cable, us-cable-hrc, japon-bcast, japon-cable, europe-ouest, "
-"europe-est, italie, nouvelle-zlande, australie, irlande, france, chine-bcast"
-
-#. Description
-#: ../xawtv.templates:39
-msgid "Which frequency table should be used?"
-msgstr "Quelle table de frquence doit tre utilise?"
-
-#. Description
-#: ../xawtv.templates:39
-msgid ""
-"A frequency table is just a list of TV channel names/numbers and the "
-"corresponding broadcast frequencies for these channels. Different regions "
-"use different standards here..."
-msgstr ""
-"Un tableau de frquences conciste simplement en une liste de numros ou de "
-"noms de chanes, associs aux frquences de diffusion correspondantes. Ici, "
-"diffrentes zones utilisent diffrents standards...."
diff --git a/debian/po/jp.po b/debian/po/jp.po
deleted file mode 100644
index 4cc094e..0000000
--- a/debian/po/jp.po
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-07 13:31+0200\n"
-"PO-Revision-Date: 2004-01-04 00:02+0900\n"
-"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
-"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../xawtv.templates:4
-msgid "Create video4linux (/dev/video*) special files?"
-msgstr "video4linux (/dev/video*) üեޤ?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid "scan for TV stations?"
-msgstr "TV ɤΰ򥹥󤷤ޤ?"
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I can do a scan of all channels and put a list of the TV stations I've found "
-"into the config file."
-msgstr "٤ƤΥͥ򥹥󤷡Ĥä TV ɤΥꥹȤեɲäǤޤ"
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"This requires a working bttv driver. If bttv isn't configured correctly I "
-"might not find the TV stations."
-msgstr "bttv ɥ饤ФưƤɬפޤޤ bttv ꤵƤʤ硢"
-"TV ɤ򸫤ĤǤʤ⤷ޤ"
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I'll try to pick up the channel names from videotext. This will work with "
-"PAL only."
-msgstr "videotext ͥ̾ФƤߤޤ"
-" PAL ǤΤưޤ (ܤǤ NTSC ѤƤΤưޤ)"
-
-#. Choices
-#: ../xawtv.templates:21
-msgid "PAL, SECAM, NTSC"
-msgstr "PAL, SECAM, NTSC"
-
-#. Description
-#: ../xawtv.templates:22
-msgid "Which TV norm is used in your country?"
-msgstr "ʤιǤϤɤ TV ʤȤäƤޤ? (ʤܤǤ NTSC ѤƤޤ)"
-"
-
-#. Description
-#: ../xawtv.templates:27
-msgid "Create a default configuration for xawtv?"
-msgstr "xawtv ɸޤ?"
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"You can create a system-wide configuration file for xawtv with reasonable "
-"default values for the country you live in (which TV norm is used for "
-"example)."
-msgstr "ʤǤǤŬڤʽ (TV ʤȤƻȤƤޤ) "
-"ܤƤ xawtv ѤΥƥ̤ǤեǤޤ"
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"It is not required to have a global configuration file, but it will be more "
-"comfortable for your users if they find a working default configuration."
-msgstr "ɸեɬפǤϤޤ󤬡桼ưɸ"
-"ĤФΤˤΩĤǤ礦"
-
-#. Choices
-#: ../xawtv.templates:38
-msgid ""
-"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
-"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
-msgstr "ꥫ(Ͼ), ꥫ(֥ƥ), ꥫ(Ʊ֥ƥ), "
-"(Ͼ), (֥ƥ), 衼å, 衼å, ꥢ, ˥塼, "
-"ȥꥢ, , ե, (Ͼ)"
-
-#. Description
-#: ../xawtv.templates:39
-msgid "Which frequency table should be used?"
-msgstr "ɤμȿơ֥Ѥޤ?"
-
-#. Description
-#: ../xawtv.templates:39
-msgid ""
-"A frequency table is just a list of TV channel names/numbers and the "
-"corresponding broadcast frequencies for these channels. Different regions "
-"use different standards here..."
-msgstr "ȿơ֥ TV ͥ̾ȥͥбȿΥꥹȤǤ"
-"ϰ褴Ȥ˰ۤʤäƤޤ"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
deleted file mode 100644
index 7476728..0000000
--- a/debian/po/templates.pot
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-07 13:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../xawtv.templates:4
-msgid "Create video4linux (/dev/video*) special files?"
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:9
-msgid "scan for TV stations?"
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I can do a scan of all channels and put a list of the TV stations I've found "
-"into the config file."
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"This requires a working bttv driver. If bttv isn't configured correctly I "
-"might not find the TV stations."
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:9
-msgid ""
-"I'll try to pick up the channel names from videotext. This will work with "
-"PAL only."
-msgstr ""
-
-#. Choices
-#: ../xawtv.templates:21
-msgid "PAL, SECAM, NTSC"
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:22
-msgid "Which TV norm is used in your country?"
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:27
-msgid "Create a default configuration for xawtv?"
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"You can create a system-wide configuration file for xawtv with reasonable "
-"default values for the country you live in (which TV norm is used for "
-"example)."
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:27
-msgid ""
-"It is not required to have a global configuration file, but it will be more "
-"comfortable for your users if they find a working default configuration."
-msgstr ""
-
-#. Choices
-#: ../xawtv.templates:38
-msgid ""
-"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
-"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:39
-msgid "Which frequency table should be used?"
-msgstr ""
-
-#. Description
-#: ../xawtv.templates:39
-msgid ""
-"A frequency table is just a list of TV channel names/numbers and the "
-"corresponding broadcast frequencies for these channels. Different regions "
-"use different standards here..."
-msgstr ""
diff --git a/debian/radio.files b/debian/radio.files
deleted file mode 100644
index 0b6c05f..0000000
--- a/debian/radio.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/radio
-usr/share/man/man1/radio.1
diff --git a/debian/radio.menu b/debian/radio.menu
deleted file mode 100644
index 2f69034..0000000
--- a/debian/radio.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(radio):needs=text section=Apps/Sound \
- title="radio" command="/usr/bin/radio"
diff --git a/debian/rules b/debian/rules
deleted file mode 100644
index 1478e5a..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-#export DH_VERBOSE=1
-export DH_COMPAT=4
-ROOT=$(shell echo `pwd`/debian/tmp)
-
-build:
- test -f config.h || ./configure \
- --disable-motif \
- --prefix=/usr \
- --mandir=/usr/share/man
- $(MAKE) $@
-
-clean::
- -$(MAKE) distclean
- dh_clean
-
-install: build
- $(MAKE) DESTDIR=$(ROOT) $@
- dh_movefiles
-
- # fix v4l-conf suid-root lintian warning
- mkdir -p debian/v4l-conf/usr/share/lintian/overrides
- echo "v4l-conf: setuid-binary" \
- > debian/v4l-conf/usr/share/lintian/overrides/v4l-conf
-
-
-binary-indep: install
- # nop
-
-binary-arch: install
- dh_installdocs README* Changes contrib/frequencies*
- dh_installdocs -p webcam scripts/webcam.cgi
-# dh_installexamples
- dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installinit
-# dh_installcron
-# dh_installmanpages
-# dh_installinfo
- dh_installdebconf -p xawtv
- dh_installchangelogs
-# dh_link
-# dh_strip
- dh_compress
- dh_fixperms -Xv4l-conf
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/scantv.files b/debian/scantv.files
deleted file mode 100644
index 779a631..0000000
--- a/debian/scantv.files
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/bin/scantv
-/usr/share/man/man1/scantv.1
-/usr/share/man/*/man1/scantv.1
diff --git a/debian/streamer.files b/debian/streamer.files
deleted file mode 100644
index 74f44ee..0000000
--- a/debian/streamer.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/streamer
-usr/share/man/man1/streamer.1
-usr/share/man/*/man1/streamer.1
diff --git a/debian/ttv.files b/debian/ttv.files
deleted file mode 100644
index f7a90c4..0000000
--- a/debian/ttv.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/ttv
-usr/share/man/man1/ttv.1
-usr/share/man/*/man1/ttv.1
diff --git a/debian/ttv.menu b/debian/ttv.menu
deleted file mode 100644
index 6a61c27..0000000
--- a/debian/ttv.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(ttv):needs=text section=Apps/Viewers \
- title="ttv" command="/usr/bin/ttv"
diff --git a/debian/v4l-conf.files b/debian/v4l-conf.files
deleted file mode 100644
index bdd5f5a..0000000
--- a/debian/v4l-conf.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/v4l-conf
-usr/share/man/man8/v4l-conf.8
-usr/share/man/*/man8/v4l-conf.8
diff --git a/debian/webcam.files b/debian/webcam.files
deleted file mode 100644
index 013bead..0000000
--- a/debian/webcam.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/webcam
-usr/share/man/man1/webcam.1
diff --git a/debian/xawtv-plugin-qt.files b/debian/xawtv-plugin-qt.files
deleted file mode 100644
index 1bf958d..0000000
--- a/debian/xawtv-plugin-qt.files
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/xawtv/*qt.so
diff --git a/debian/xawtv-plugins.files b/debian/xawtv-plugins.files
deleted file mode 100644
index 386a136..0000000
--- a/debian/xawtv-plugins.files
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/xawtv/*
-/usr/share/xawtv/*
diff --git a/debian/xawtv-tools.files b/debian/xawtv-tools.files
deleted file mode 100644
index ce03cfc..0000000
--- a/debian/xawtv-tools.files
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin/showriff
-usr/bin/propwatch
-usr/bin/dump-mixers
-usr/bin/record
-usr/share/man/man1/showriff.1
-usr/share/man/man1/propwatch.1
-usr/share/man/man1/dump-mixers.1
-usr/share/man/man1/record.1
diff --git a/debian/xawtv.config b/debian/xawtv.config
deleted file mode 100644
index 336fdb8..0000000
--- a/debian/xawtv.config
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# debconf lib
-. /usr/share/debconf/confmodule
-
-# init variables
-mode="$1"
-mkdev="true"
-mkcfg="true"
-tvnorm=""
-freqtab=""
-doscan=""
-
-# create v4l devices ?
-test -c /dev/.devfsd -o -c /dev/video0 && mkdev="false"
-if test "$mkdev" = "true"; then
- db_input medium xawtv/makedev
- db_go
- db_get xawtv/makedev
- mkdev="$RET"
-fi
-
-# build xawtv config?
-if test -s /etc/X11/xawtvrc; then
- mkcfg="false"
-fi
-if test "$mode" = "reconfigure"; then
- mkcfg="true"
-fi
-if test "$mkcfg" = "true"; then
- db_input medium xawtv/build-config
- db_go
- db_get xawtv/build-config
- mkcfg="$RET"
-fi
-
-if test "$mkcfg" = "true"; then
- # configuration
- db_input medium xawtv/tvnorm
- db_go
- db_get xawtv/tvnorm
- tvnorm="$RET"
- db_input medium xawtv/freqtab
- db_go
- db_get xawtv/freqtab
- freqtab="$RET"
- db_input medium xawtv/channel-scan
- db_go
- db_get xawtv/channel-scan
- doscan="$RET"
-fi
-
diff --git a/debian/xawtv.files b/debian/xawtv.files
deleted file mode 100644
index 078ecab..0000000
--- a/debian/xawtv.files
+++ /dev/null
@@ -1,22 +0,0 @@
-/usr/bin/xawtv
-/usr/bin/xawtv-remote
-/usr/bin/v4lctl
-/usr/bin/rootv
-/usr/bin/ntsc-cc
-/usr/bin/subtitles
-/usr/bin/v4l-info
-/usr/share/man/man1/v4lctl.1
-/usr/share/man/*/man1/v4lctl.1
-/usr/share/man/man1/xawtv.1
-/usr/share/man/*/man1/xawtv.1
-/usr/share/man/man1/rootv.1
-/usr/share/man/*/man1/rootv.1
-/usr/share/man/man1/xawtv-remote.1
-/usr/share/man/*/man1/xawtv-remote.1
-/usr/share/man/man1/ntsc-cc.1
-/usr/share/man/man1/subtitles.1
-/usr/share/man/*/man1/subtitles.1
-/usr/share/man/man1/v4l-info.1
-/usr/share/man/man5/xawtvrc.5
-/usr/share/man/*/man5/xawtvrc.5
-/etc/X11/app-defaults/Xawtv
diff --git a/debian/xawtv.menu b/debian/xawtv.menu
deleted file mode 100644
index 8ac227a..0000000
--- a/debian/xawtv.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(xawtv):needs=x11 section=Apps/Viewers \
- title="xawtv" command="/usr/bin/xawtv"
diff --git a/debian/xawtv.postinst b/debian/xawtv.postinst
deleted file mode 100644
index 5b583b1..0000000
--- a/debian/xawtv.postinst
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# debconf lib
-. /usr/share/debconf/confmodule
-
-# init variables
-mode="$1"
-mkdev="true"
-mkcfg="true"
-tvnorm=""
-freqtab=""
-doscan=""
-
-# create v4l devices ?
-test -c /dev/.devfsd -o -c /dev/video0 -o -c /dev/v4l/video0 && mkdev="false"
-if test "$mkdev" = "true"; then
- db_get xawtv/makedev
- mkdev="$RET"
-fi
-
-# build xawtv config?
-if test -s /etc/X11/xawtvrc; then
- mkcfg="false"
-fi
-if test "$mode" = "reconfigure"; then
- mkcfg="true"
-fi
-if test "$mkcfg" = "true"; then
- db_get xawtv/build-config
- mkcfg="$RET"
-fi
-
-if test "$mkcfg" = "true"; then
- # configuration
- db_get xawtv/tvnorm
- tvnorm="$RET"
- db_get xawtv/freqtab
- freqtab="$RET"
- db_get xawtv/channel-scan
- doscan="$RET"
-fi
-
-#########################################################
-db_stop
-
-# create special files
-if test "$mkdev" = "true"; then
- (cd /dev;/sbin/MAKEDEV v4l)
-fi
-
-# create default config
-if test "$mkcfg" = "true"; then
- cmd="scantv -n $tvnorm -f $freqtab -o /etc/X11/xawtvrc"
- test "$doscan" = "false" && cmd="$cmd -s"
- $cmd
-fi
-
-#########################################################
-#DEBHELPER#
diff --git a/debian/xawtv.postrm b/debian/xawtv.postrm
deleted file mode 100644
index 91e6716..0000000
--- a/debian/xawtv.postrm
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-(cd /usr/X11R6/lib/X11/fonts/misc && mkfontdir)
-#xset fp rehash || true
-#DEBHELPER#
diff --git a/debian/xawtv.reset b/debian/xawtv.reset
deleted file mode 100644
index 4af1d93..0000000
--- a/debian/xawtv.reset
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# debconf lib
-. /usr/share/debconf/confmodule
-
-questions=`grep "^Template:" xawtv.templates | cut -d" " -f2`
-for q in $questions; do
- db_reset $q
-done
diff --git a/debian/xawtv.templates b/debian/xawtv.templates
deleted file mode 100644
index 62698b0..0000000
--- a/debian/xawtv.templates
+++ /dev/null
@@ -1,42 +0,0 @@
-Template: xawtv/makedev
-Type: boolean
-Default: true
-_Description: Create video4linux (/dev/video*) special files?
-
-Template: xawtv/channel-scan
-Type: boolean
-Default: yes
-_Description: scan for TV stations?
- I can do a scan of all channels and put a list of the TV stations I've
- found into the config file.
- .
- This requires a working bttv driver. If bttv isn't configured correctly I
- might not find the TV stations.
- .
- I'll try to pick up the channel names from videotext. This will work with
- PAL only.
-
-Template: xawtv/tvnorm
-Type: select
-_Choices: PAL, SECAM, NTSC
-_Description: Which TV norm is used in your country?
-
-Template: xawtv/build-config
-Type: boolean
-Default: false
-_Description: Create a default configuration for xawtv?
- You can create a system-wide configuration file for xawtv with reasonable
- default values for the country you live in (which TV norm is used for
- example).
- .
- It is not required to have a global configuration file, but it will be
- more comfortable for your users if they find a working default
- configuration.
-
-Template: xawtv/freqtab
-Type: select
-_Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast
-_Description: Which frequency table should be used?
- A frequency table is just a list of TV channel names/numbers and the
- corresponding broadcast frequencies for these channels. Different regions
- use different standards here...
diff --git a/libng/devices.c b/libng/devices.c
index 8a86867..ed6871e 100644
--- a/libng/devices.c
+++ b/libng/devices.c
@@ -19,6 +19,8 @@ struct ng_device_config ng_dev = {
video_scan: {
"/dev/bktr0",
"/dev/bktr1",
+ "/dev/cxm0",
+ "/dev/cxm1",
NULL
},
mixer_scan: {
diff --git a/xawtv.spec b/xawtv.spec
index e50098e..e20b1a4 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -1,7 +1,7 @@
Name: xawtv
Group: Applications/Multimedia
Autoreqprov: on
-Version: 3.91
+Version: 3.92
Release: 0
License: GPL
Summary: v4l applications

Privacy Policy