diff -ur guvcview-src-1.7.1/aclocal.m4 guvcview-1.7.1-james/aclocal.m4
--- guvcview-src-1.7.1/aclocal.m4 2013-07-22 23:36:57.000000000 +0700
+++ guvcview-1.7.1-james/aclocal.m4 2013-09-26 22:37:47.211326779 +0700
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -261,10 +261,6 @@
[CATOBJEXT=.mo
DATADIRNAME=lib])
;;
- *-*-openbsd*)
- CATOBJEXT=.mo
- DATADIRNAME=share
- ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
@@ -635,7 +631,7 @@
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.11.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -651,7 +647,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.11.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1460,13 +1456,13 @@
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
+# serial 1
# AM_SILENT_RULES([DEFAULT])
# --------------------------
@@ -1481,36 +1477,6 @@
no) AM_DEFAULT_VERBOSITY=1;;
*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
esac
-dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
- [am_cv_make_support_nested_variables],
- [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
- @$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
- am_cv_make_support_nested_variables=yes
-else
- am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
- dnl Using `$V' instead of `$(V)' breaks IRIX make.
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
AM_BACKSLASH='\'
AC_SUBST([AM_BACKSLASH])dnl
@@ -1568,7 +1534,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1590,11 +1556,10 @@
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
diff -ur guvcview-src-1.7.1/configure guvcview-1.7.1-james/configure
--- guvcview-src-1.7.1/configure 2013-07-22 23:36:58.000000000 +0700
+++ guvcview-1.7.1-james/configure 2013-09-26 22:37:48.654660019 +0700
@@ -1,11 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for guvcview 1.7.1.
+# Generated by GNU Autoconf 2.65 for guvcview 1.7.1.
#
# Report bugs to .
#
#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -89,7 +91,6 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -134,31 +135,6 @@
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# Use a proper internal environment variable to ensure we don't fall
- # into an infinite loop, continuously re-executing ourselves.
- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
- _as_can_reexec=no; export _as_can_reexec;
- # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
- fi
- # We don't want this to propagate to other subprocesses.
- { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -192,8 +168,7 @@
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -238,25 +213,14 @@
if test "x$CONFIG_SHELL" != x; then :
- export CONFIG_SHELL
- # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -355,18 +319,10 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
- test -f "$1" && test -x "$1"
-} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -403,19 +359,19 @@
fi # as_fn_arith
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -488,10 +444,6 @@
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
- # already done that, so ensure we don't try to do so again and fall
- # in an infinite loop. This has already happened in practice.
- _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -526,16 +478,16 @@
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # In both cases, we have to default to `cp -p'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -547,8 +499,28 @@
as_mkdir_p=false
fi
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in #(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -561,7 +533,7 @@
exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -727,8 +699,6 @@
INSTALL_PROGRAM
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
target_alias
host_alias
build_alias
@@ -857,9 +827,8 @@
fi
case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -904,7 +873,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -930,7 +899,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1134,7 +1103,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1150,7 +1119,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1180,8 +1149,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
@@ -1189,7 +1158,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1199,7 +1168,7 @@
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
esac
@@ -1207,13 +1176,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1236,7 +1205,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1250,6 +1219,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1264,9 +1235,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1305,11 +1276,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1349,7 +1320,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1509,9 +1480,9 @@
if $ac_init_version; then
cat <<\_ACEOF
guvcview configure 1.7.1
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.65
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1555,7 +1526,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1587,7 +1558,7 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- test -x conftest$ac_exeext
+ $as_test_x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1601,7 +1572,7 @@
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -1627,7 +1598,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
+ test $ac_status = 0; } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1638,7 +1609,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -1680,7 +1651,7 @@
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -1693,7 +1664,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1748,7 +1719,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_func
@@ -1760,10 +1731,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -1799,7 +1770,7 @@
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -1822,15 +1793,17 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------------------- ##
+( cat <<\_ASBOX
+## ----------------------------------------------- ##
## Report this to http://guvcview.sourceforge.net/ ##
-## ----------------------------------------------- ##"
+## ----------------------------------------------- ##
+_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -1839,7 +1812,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_header_mongrel
@@ -1852,7 +1825,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1870,7 +1843,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_header_compile
cat >config.log <<_ACEOF
@@ -1878,7 +1851,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by guvcview $as_me 1.7.1, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -1988,9 +1961,11 @@
{
echo
- $as_echo "## ---------------- ##
+ cat <<\_ASBOX
+## ---------------- ##
## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2024,9 +1999,11 @@
)
echo
- $as_echo "## ----------------- ##
+ cat <<\_ASBOX
+## ----------------- ##
## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_vars
do
@@ -2039,9 +2016,11 @@
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ cat <<\_ASBOX
+## ------------------- ##
## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_files
do
@@ -2055,9 +2034,11 @@
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ cat <<\_ASBOX
+## ----------- ##
## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
echo
cat confdefs.h
echo
@@ -2112,12 +2093,7 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2132,11 +2108,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+ . "$ac_site_file"
fi
done
@@ -2212,7 +2184,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2235,33 +2207,6 @@
no) AM_DEFAULT_VERBOSITY=1;;
*) AM_DEFAULT_VERBOSITY=0;;
esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
- @$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
- am_cv_make_support_nested_variables=yes
-else
- am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
@@ -2269,22 +2214,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2313,7 +2252,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2333,7 +2272,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
@@ -2400,11 +2339,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2426,7 +2365,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -2436,7 +2375,7 @@
# Ok.
:
else
- as_fn_error $? "newly created file is older than distributed files!
+ as_fn_error "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2490,7 +2429,7 @@
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -2502,7 +2441,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2530,7 +2469,7 @@
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -2542,7 +2481,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2583,7 +2522,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if ${ac_cv_path_mkdir+:} false; then :
+ if test "${ac_cv_path_mkdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2593,7 +2532,7 @@
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2634,7 +2573,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -2646,7 +2585,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2674,7 +2613,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2682,7 +2621,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2716,7 +2655,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -2762,11 +2701,11 @@
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
@@ -2880,7 +2819,7 @@
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -2892,7 +2831,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2920,7 +2859,7 @@
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -2932,7 +2871,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2973,7 +2912,7 @@
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -2985,7 +2924,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3013,7 +2952,7 @@
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3026,7 +2965,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3072,7 +3011,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3084,7 +3023,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3116,7 +3055,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3128,7 +3067,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3170,8 +3109,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3285,8 +3224,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3328,8 +3268,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3386,9 +3326,9 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
@@ -3399,7 +3339,7 @@
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3439,8 +3379,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -3450,7 +3390,7 @@
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3487,7 +3427,7 @@
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3565,7 +3505,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -3574,7 +3514,8 @@
/* end confdefs.h. */
#include
#include
-struct stat;
+#include
+#include
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3663,7 +3604,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3790,7 +3731,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
+if test "${ac_cv_search_strerror+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -3824,11 +3765,11 @@
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_strerror+:} false; then :
+ if test "${ac_cv_search_strerror+set}" = set; then :
break
fi
done
-if ${ac_cv_search_strerror+:} false; then :
+if test "${ac_cv_search_strerror+set}" = set; then :
else
ac_cv_search_strerror=no
@@ -3854,7 +3795,7 @@
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3866,7 +3807,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3894,7 +3835,7 @@
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3906,7 +3847,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3947,7 +3888,7 @@
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3959,7 +3900,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3987,7 +3928,7 @@
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4000,7 +3941,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -4046,7 +3987,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4058,7 +3999,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4090,7 +4031,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4102,7 +4043,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4144,8 +4085,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4174,7 +4115,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4211,7 +4152,7 @@
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4289,7 +4230,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -4298,7 +4239,8 @@
/* end confdefs.h. */
#include
#include
-struct stat;
+#include
+#include
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4387,7 +4329,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4523,7 +4465,7 @@
CPP=
fi
if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -4553,7 +4495,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4569,11 +4511,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -4612,7 +4554,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4628,18 +4570,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -4651,7 +4593,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -4665,7 +4607,7 @@
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_GREP" || continue
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4700,7 +4642,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -4714,7 +4656,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4731,7 +4673,7 @@
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -4766,7 +4708,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -4781,7 +4723,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4952,7 +4894,7 @@
case "$am__api_version" in
1.01234)
- as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
;;
*)
;;
@@ -4969,14 +4911,14 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- as_fn_error $? "Your intltool is too old. You need intltool 0.40 or later." "$LINENO" 5
+ as_fn_error "Your intltool is too old. You need intltool 0.40 or later." "$LINENO" 5
fi
# Extract the first word of "intltool-update", so it can be a program name with args.
set dummy intltool-update; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
@@ -4990,7 +4932,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5016,7 +4958,7 @@
set dummy intltool-merge; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
@@ -5030,7 +4972,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5056,7 +4998,7 @@
set dummy intltool-extract; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
@@ -5070,7 +5012,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5093,7 +5035,7 @@
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -5217,7 +5159,7 @@
set dummy xgettext; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
@@ -5231,7 +5173,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5257,7 +5199,7 @@
set dummy msgmerge; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
@@ -5271,7 +5213,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5297,7 +5239,7 @@
set dummy msgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
@@ -5311,7 +5253,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5337,7 +5279,7 @@
set dummy gmsgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
@@ -5351,7 +5293,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5375,20 +5317,20 @@
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
@@ -5402,7 +5344,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5425,13 +5367,13 @@
if test -z "$INTLTOOL_PERL"; then
- as_fn_error $? "perl not found" "$LINENO" 5
+ as_fn_error "perl not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
if test $? -ne 0; then
- as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
else
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
@@ -5444,7 +5386,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
else
- as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
fi
fi
@@ -5472,7 +5414,7 @@
case $host in
*-*-solaris*)
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
DATADIRNAME=share
else
DATADIRNAME=lib
@@ -5501,7 +5443,8 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -5515,7 +5458,7 @@
for ac_header in locale.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = xyes; then :
+if test "x$ac_cv_header_locale_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LOCALE_H 1
_ACEOF
@@ -5527,7 +5470,7 @@
if test $ac_cv_header_locale_h = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
$as_echo_n "checking for LC_MESSAGES... " >&6; }
-if ${am_cv_val_LC_MESSAGES+:} false; then :
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5567,7 +5510,7 @@
INTLLIBS=
ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = xyes; then :
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
gt_cv_func_dgettext_libintl="no"
libintl_extra_libs=""
@@ -5576,7 +5519,7 @@
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
$as_echo_n "checking for ngettext in libc... " >&6; }
-if ${gt_cv_func_ngettext_libc+:} false; then :
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5607,7 +5550,7 @@
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
$as_echo_n "checking for dgettext in libc... " >&6; }
-if ${gt_cv_func_dgettext_libc+:} false; then :
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5640,7 +5583,7 @@
for ac_func in bind_textdomain_codeset
do :
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
@@ -5659,7 +5602,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -5693,10 +5636,10 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_ngettext+:} false; then :
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -5730,10 +5673,10 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
$as_echo_n "checking for dgettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_dgettext+:} false; then :
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -5767,7 +5710,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
gt_cv_func_dgettext_libintl=yes
fi
@@ -5783,7 +5726,7 @@
$as_echo "" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_ngettext+:} false; then :
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -5817,10 +5760,10 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_dcgettext+:} false; then :
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -5854,7 +5797,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
@@ -5879,7 +5822,7 @@
for ac_func in bind_textdomain_codeset
do :
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
@@ -5917,7 +5860,7 @@
set dummy msgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
@@ -5954,7 +5897,7 @@
for ac_func in dcgettext
do :
ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = xyes; then :
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DCGETTEXT 1
_ACEOF
@@ -5995,7 +5938,7 @@
set dummy gmsgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
@@ -6009,7 +5952,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6036,7 +5979,7 @@
set dummy xgettext; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
@@ -6087,7 +6030,7 @@
case $host in
*-*-solaris*)
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
CATOBJEXT=.gmo
DATADIRNAME=share
else
@@ -6096,10 +6039,6 @@
fi
;;
- *-*-openbsd*)
- CATOBJEXT=.mo
- DATADIRNAME=share
- ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
@@ -6233,7 +6172,7 @@
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -6247,7 +6186,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6276,7 +6215,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -6290,7 +6229,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6349,12 +6288,12 @@
pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>/dev/null`
+ pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -6366,12 +6305,12 @@
pkg_cv_DEPS_LIBS="$DEPS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>/dev/null`
+ pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -6392,14 +6331,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>&1`
+ DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>&1`
else
- DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>&1`
+ DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DEPS_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev) were not met:
+ as_fn_error "Package requirements (gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev) were not met:
$DEPS_PKG_ERRORS
@@ -6414,7 +6353,7 @@
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -6423,7 +6362,7 @@
See the pkg-config man page for more details.
To get pkg-config, see .
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details." "$LINENO" 5; }
else
DEPS_CFLAGS=$pkg_cv_DEPS_CFLAGS
DEPS_LIBS=$pkg_cv_DEPS_LIBS
@@ -6578,21 +6517,21 @@
ac_fn_c_check_header_mongrel "$LINENO" "avcodec.h" "ac_cv_header_avcodec_h" "$ac_includes_default"
-if test "x$ac_cv_header_avcodec_h" = xyes; then :
+if test "x$ac_cv_header_avcodec_h" = x""yes; then :
has_avcodec_h="yes"
fi
ac_fn_c_check_header_mongrel "$LINENO" "ffmpeg/avcodec.h" "ac_cv_header_ffmpeg_avcodec_h" "$ac_includes_default"
-if test "x$ac_cv_header_ffmpeg_avcodec_h" = xyes; then :
+if test "x$ac_cv_header_ffmpeg_avcodec_h" = x""yes; then :
has_ffmpeg_dir="yes"
fi
ac_fn_c_check_header_mongrel "$LINENO" "libavcodec/avcodec.h" "ac_cv_header_libavcodec_avcodec_h" "$ac_includes_default"
-if test "x$ac_cv_header_libavcodec_avcodec_h" = xyes; then :
+if test "x$ac_cv_header_libavcodec_avcodec_h" = x""yes; then :
has_libavcodec_dir="yes"
fi
@@ -6616,7 +6555,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
@@ -6834,7 +6773,7 @@
;; #(
*)
- as_fn_error $? "unknown endianness
+ as_fn_error "unknown endianness
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -6905,21 +6844,10 @@
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
+ test "x$cache_file" != "x/dev/null" &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
- cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
- mv -f confcache "$cache_file"$$ &&
- mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
- mv -f confcache "$cache_file" ;;
- esac
- fi
- fi
+ cat confcache >$cache_file
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -6935,7 +6863,6 @@
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -6959,19 +6886,19 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -6979,16 +6906,16 @@
if test -z "${DEBIAN_MENU_TRUE}" && test -z "${DEBIAN_MENU_FALSE}"; then
- as_fn_error $? "conditional \"DEBIAN_MENU\" was never defined.
+ as_fn_error "conditional \"DEBIAN_MENU\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${DESKTOP_TRUE}" && test -z "${DESKTOP_FALSE}"; then
- as_fn_error $? "conditional \"DESKTOP\" was never defined.
+ as_fn_error "conditional \"DESKTOP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -7089,7 +7016,6 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7135,19 +7061,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -7285,16 +7211,16 @@
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # In both cases, we have to default to `cp -p'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -7343,7 +7269,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -7354,16 +7280,28 @@
as_mkdir_p=false
fi
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
- test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in #(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -7385,7 +7323,7 @@
# values after options handling.
ac_log="
This file was extended by guvcview $as_me 1.7.1, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -7451,10 +7389,10 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
guvcview config.status 1.7.1
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -7472,16 +7410,11 @@
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -7503,7 +7436,6 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -7516,7 +7448,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
+ as_fn_error "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -7525,7 +7457,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -7545,7 +7477,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -7592,7 +7524,7 @@
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -7615,10 +7547,9 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp= ac_tmp=
+ tmp=
trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -7626,13 +7557,12 @@
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
+ test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -7649,12 +7579,12 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
@@ -7663,18 +7593,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -7682,7 +7612,7 @@
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -7730,7 +7660,7 @@
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -7762,29 +7692,21 @@
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# 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[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -7796,7 +7718,7 @@
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -7808,11 +7730,11 @@
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -7897,7 +7819,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -7910,7 +7832,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -7929,7 +7851,7 @@
for ac_f
do
case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
+ -) ac_f="$tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -7938,7 +7860,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -7964,8 +7886,8 @@
esac
case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -8101,24 +8023,23 @@
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
- rm -f "$ac_tmp/stdin"
+ rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -8127,21 +8048,21 @@
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ mv "$tmp/config.h" "$ac_file" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -8286,7 +8207,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
- as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
@@ -8314,7 +8235,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -8335,7 +8256,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff -ur guvcview-src-1.7.1/configure.ac guvcview-1.7.1-james/configure.ac
--- guvcview-src-1.7.1/configure.ac 2013-07-22 21:00:46.000000000 +0700
+++ guvcview-1.7.1-james/configure.ac 2013-09-26 22:37:33.111327692 +0700
@@ -97,7 +97,7 @@
dnl --------------------------------------------------------------------------
dnl check for dependencies
dnl --------------------------------------------------------------------------
-PKG_CHECK_MODULES(DEPS, [gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev])
+PKG_CHECK_MODULES(DEPS, [gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev])
AC_SUBST(DEPS_CFLAGS)
AC_SUBST(DEPS_LIBS)
diff -ur guvcview-src-1.7.1/data/icons/Makefile.in guvcview-1.7.1-james/data/icons/Makefile.in
--- guvcview-src-1.7.1/data/icons/Makefile.in 2013-07-22 23:36:59.000000000 +0700
+++ guvcview-1.7.1-james/data/icons/Makefile.in 2013-09-26 22:37:50.707993220 +0700
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
- esac; \
- test $$am__dry = yes; \
- }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -60,19 +43,14 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -268,11 +246,8 @@
$(am__aclocal_m4_deps):
install-iconsDATA: $(icons_DATA)
@$(NORMAL_INSTALL)
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \
- fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff -ur guvcview-src-1.7.1/data/Makefile.in guvcview-1.7.1-james/data/Makefile.in
--- guvcview-src-1.7.1/data/Makefile.in 2013-07-22 23:36:58.000000000 +0700
+++ guvcview-1.7.1-james/data/Makefile.in 2013-09-26 22:37:50.654659890 +0700
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
- esac; \
- test $$am__dry = yes; \
- }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -62,11 +45,11 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = guvcview.desktop.in guvcview.in
CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
@@ -77,11 +60,6 @@
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -324,18 +302,11 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-man1: $(dist_man_MANS)
@$(NORMAL_INSTALL)
- @list1=''; \
- list2='$(dist_man_MANS)'; \
- test -n "$(man1dir)" \
- && test -n "`echo $$list1$$list2`" \
- || exit 0; \
- echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
- { for i in $$list1; do echo "$$i"; done; \
- if test -n "$$list2"; then \
- for i in $$list2; do echo "$$i"; done \
- | sed -n '/\.1[a-z]*$$/p'; \
- fi; \
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+ @list=''; test -n "$(man1dir)" || exit 0; \
+ { for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.1[a-z]*$$/p'; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
@@ -367,11 +338,8 @@
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
+ test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
- fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -388,11 +356,8 @@
dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
install-menuDATA: $(menu_DATA)
@$(NORMAL_INSTALL)
+ test -z "$(menudir)" || $(MKDIR_P) "$(DESTDIR)$(menudir)"
@list='$(menu_DATA)'; test -n "$(menudir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(menudir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(menudir)" || exit 1; \
- fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -588,10 +553,13 @@
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- $(am__make_dryrun) \
- || test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
diff -ur guvcview-src-1.7.1/depcomp guvcview-1.7.1-james/depcomp
--- guvcview-src-1.7.1/depcomp 2013-07-22 23:36:59.000000000 +0700
+++ guvcview-1.7.1-james/depcomp 2013-09-26 22:37:50.757993216 +0700
@@ -1,10 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2011-12-04.11; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011 Free Software Foundation, Inc.
# 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
@@ -28,7 +28,7 @@
case $1 in
'')
- echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
@@ -40,8 +40,8 @@
Environment variables:
depmode Dependency tracking mode.
- source Source file read by 'PROGRAMS ARGS'.
- object Object file output by 'PROGRAMS ARGS'.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
tmpdepfile Temporary file to use when outputting dependencies.
@@ -57,12 +57,6 @@
;;
esac
-# A tabulation character.
-tab=' '
-# A newline character.
-nl='
-'
-
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
@@ -108,12 +102,6 @@
depmode=msvc7
fi
-if test "$depmode" = xlc; then
- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
- gccflag=-qmakedep=gcc,-MF
- depmode=gcc
-fi
-
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
@@ -168,14 +156,15 @@
## The second -e expression handles DOS-style file names with drive letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
+## This next piece of magic avoids the `deleted header file' problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
- tr ' ' "$nl" < "$tmpdepfile" |
-## Some versions of gcc put a space before the ':'. On the theory
+ tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
## well. hp depmode also adds that space, but also prefixes the VPATH
## to the object. Take care to not repeat it in the output.
@@ -214,15 +203,18 @@
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like '#:fec' to the end of the
+ # the IRIX cc adds comments like `#:fec' to the end of the
# dependency line.
- tr ' ' "$nl" < "$tmpdepfile" \
+ tr ' ' '
+' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr "$nl" ' ' >> "$depfile"
+ tr '
+' ' ' >> "$depfile"
echo >> "$depfile"
# The second pass generates a dummy entry for each header file.
- tr ' ' "$nl" < "$tmpdepfile" \
+ tr ' ' '
+' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> "$depfile"
else
@@ -234,17 +226,10 @@
rm -f "$tmpdepfile"
;;
-xlc)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts '$object:' at the
+ # current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -274,11 +259,12 @@
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
- # Each line is of the form 'foo.o: dependent.h'.
+ # Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
- # '$object: dependent.h' and one to simply 'dependent.h:'.
+ # `$object: dependent.h' and one to simply `dependent.h:'.
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -289,26 +275,23 @@
;;
icc)
- # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
- # However on
- # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
# ICC 7.0 will fill foo.d with something like
# foo.o: sub/foo.c
# foo.o: sub/foo.h
- # which is wrong. We want
+ # which is wrong. We want:
# sub/foo.o: sub/foo.c
# sub/foo.o: sub/foo.h
# sub/foo.c:
# sub/foo.h:
# ICC 7.1 will output
# foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using '\':
+ # and will wrap long lines using \ :
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
- # tcc 0.9.26 (FIXME still under development at the moment of writing)
- # will emit a similar output, but also prepend the continuation lines
- # with horizontal tabulation characters.
+
"$@" -MD -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
@@ -317,21 +300,15 @@
exit $stat
fi
rm -f "$depfile"
- # Each line is of the form 'foo.o: dependent.h',
- # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
# Do two passes, one to just change these to
- # '$object: dependent.h' and one to simply 'dependent.h:'.
- sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
- < "$tmpdepfile" > "$depfile"
- sed '
- s/[ '"$tab"'][ '"$tab"']*/ /g
- s/^ *//
- s/ *\\*$//
- s/^[^:]*: *//
- /^$/d
- /:$/d
- s/$/ :/
- ' < "$tmpdepfile" >> "$depfile"
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -367,7 +344,7 @@
done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add 'dependent.h:' lines.
+ # Add `dependent.h:' lines.
sed -ne '2,${
s/^ *//
s/ \\*$//
@@ -382,9 +359,9 @@
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in 'foo.d' instead, so we check for that too.
+ # dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
@@ -430,7 +407,8 @@
done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
@@ -465,11 +443,11 @@
p
}' | $cygpath_u | sort -u | sed -n '
s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
+s/\(.*\)/ \1 \\/p
s/.\(.*\) \\/\1:/
H
$ {
- s/.*/'"$tab"'/
+ s/.*/ /
G
p
}' >> "$depfile"
@@ -500,7 +478,7 @@
shift
fi
- # Remove '-o $object'.
+ # Remove `-o $object'.
IFS=" "
for arg
do
@@ -520,14 +498,15 @@
done
test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for ':'
+ # Require at least two characters before searching for `:'
# in the target name. This is to cope with DOS-style filenames:
- # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
"$@" $dashmflag |
- sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
- tr ' ' "$nl" < "$tmpdepfile" | \
+ tr ' ' '
+' < "$tmpdepfile" | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -583,7 +562,8 @@
# makedepend may prepend the VPATH from the source file name to the object.
# No need to regex-escape $object, excess matching of '.' is harmless.
sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
+ sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -603,7 +583,7 @@
shift
fi
- # Remove '-o $object'.
+ # Remove `-o $object'.
IFS=" "
for arg
do
@@ -672,8 +652,8 @@
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
- echo "$tab" >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+ echo " " >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
diff -ur guvcview-src-1.7.1/Makefile.in guvcview-1.7.1-james/Makefile.in
--- guvcview-src-1.7.1/Makefile.in 2013-07-22 23:36:59.000000000 +0700
+++ guvcview-1.7.1-james/Makefile.in 2013-09-26 22:37:50.894659874 +0700
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
- esac; \
- test $$am__dry = yes; \
- }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -65,11 +48,11 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
@@ -80,11 +63,6 @@
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -125,11 +103,9 @@
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
- || { sleep 5 && rm -rf "$(distdir)"; }; \
- else :; fi
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -356,11 +332,8 @@
-rm -f config.h stamp-h1
install-docDATA: $(doc_DATA)
@$(NORMAL_INSTALL)
+ test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
- fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -545,10 +518,13 @@
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- $(am__make_dryrun) \
- || test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -586,10 +562,6 @@
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzip: distdir
- tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__remove_distdir)
-
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
@@ -626,8 +598,6 @@
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.lz*) \
- lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -637,7 +607,7 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
@@ -815,8 +785,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-generic distclean-hdr \
+ dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+ distcheck distclean distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-docDATA install-dvi \
diff -ur guvcview-src-1.7.1/missing guvcview-1.7.1-james/missing
--- guvcview-src-1.7.1/missing 2013-07-22 23:36:58.000000000 +0700
+++ guvcview-1.7.1-james/missing 2013-09-26 22:37:50.564659896 +0700
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -84,6 +84,7 @@
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -121,6 +122,15 @@
# Not GNU programs, they don't have --version.
;;
+ tar*)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
@@ -216,7 +226,7 @@
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG=\${$#}
+ eval LASTARG="\${$#}"
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -246,7 +256,7 @@
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG=\${$#}
+ eval LASTARG="\${$#}"
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -308,6 +318,41 @@
touch $file
;;
+ tar*)
+ shift
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
diff -ur guvcview-src-1.7.1/src/audio_tab.c guvcview-1.7.1-james/src/audio_tab.c
--- guvcview-src-1.7.1/src/audio_tab.c 2013-07-22 21:00:46.000000000 +0700
+++ guvcview-1.7.1-james/src/audio_tab.c 2013-09-27 00:59:08.107444786 +0700
@@ -57,13 +57,9 @@
int line = 0;
int i = 0;
//TABLE
- table3 = gtk_grid_new();
- gtk_grid_set_column_homogeneous (GTK_GRID(table3), FALSE);
- gtk_widget_set_hexpand (table3, TRUE);
- gtk_widget_set_halign (table3, GTK_ALIGN_FILL);
-
- gtk_grid_set_row_spacing (GTK_GRID(table3), 4);
- gtk_grid_set_column_spacing (GTK_GRID (table3), 4);
+ table3 = gtk_table_new(1,3,FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (table3), 4);
+ gtk_table_set_col_spacings (GTK_TABLE (table3), 4);
gtk_container_set_border_width (GTK_CONTAINER (table3), 2);
gtk_widget_show (table3);
@@ -76,7 +72,7 @@
gtk_widget_show(scroll3);
//new grid for tab label and icon
- Tab3 = gtk_grid_new();
+ Tab3 = gtk_hbox_new(FALSE,2);
Tab3Label = gtk_label_new(_("Audio"));
gtk_widget_show (Tab3Label);
//check for files
@@ -86,8 +82,8 @@
Tab3Icon = gtk_image_new_from_file(Tab3IconPath);
g_free(Tab3IconPath);
gtk_widget_show (Tab3Icon);
- gtk_grid_attach (GTK_GRID(Tab3), Tab3Icon, 0, 0, 1, 1);
- gtk_grid_attach (GTK_GRID(Tab3), Tab3Label, 1, 0, 1, 1);
+ gtk_box_pack_start (GTK_BOX(Tab3), Tab3Icon, FALSE, FALSE,1);
+ gtk_box_pack_start (GTK_BOX(Tab3), Tab3Label, FALSE, FALSE,1);
gtk_widget_show (Tab3);
//ADD SCROLL to NOTEBOOK (TAB)
@@ -96,7 +92,8 @@
//enable sound
line++;
gwidget->SndEnable=gtk_check_button_new_with_label (_(" Sound"));
- gtk_grid_attach(GTK_GRID(table3), gwidget->SndEnable, 1, line, 1, 1);
+ gtk_table_attach(GTK_TABLE(table3), gwidget->SndEnable, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gwidget->SndEnable),
(global->Sound_enable > 0));
@@ -108,7 +105,8 @@
// VU meter on the image (OSD)
GtkWidget* vuMeterEnable=gtk_check_button_new_with_label(_(" Show VU meter"));
g_object_set_data(G_OBJECT(vuMeterEnable), "flag", GINT_TO_POINTER(OSD_METER));
- gtk_grid_attach(GTK_GRID(table3), vuMeterEnable, 1, line, 1, 1);
+ gtk_table_attach(GTK_TABLE(table3), vuMeterEnable, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vuMeterEnable),(global->osdFlags & OSD_METER)>0);
gtk_widget_show(vuMeterEnable);
@@ -121,13 +119,13 @@
gwidget->label_SndAPI = gtk_label_new(_("Audio API:"));
gtk_misc_set_alignment (GTK_MISC (gwidget->label_SndAPI), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table3), gwidget->label_SndAPI, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table3), gwidget->label_SndAPI, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (gwidget->label_SndAPI);
gwidget->SndAPI = gtk_combo_box_text_new ();
- gtk_widget_set_halign (gwidget->SndAPI, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (gwidget->SndAPI, TRUE);
- gtk_grid_attach(GTK_GRID(table3), gwidget->SndAPI, 1, line, 1, 1);
+ gtk_table_attach(GTK_TABLE(table3), gwidget->SndAPI, 1, 3, line, line+1,
+ GTK_SHRINK | GTK_FILL , 0, 0, 0);
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gwidget->SndAPI),_("PORTAUDIO"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gwidget->SndAPI),_("PULSEAUDIO"));
@@ -149,15 +147,15 @@
label_SndDevice = gtk_label_new(_("Input Device:"));
gtk_misc_set_alignment (GTK_MISC (label_SndDevice), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table3), label_SndDevice, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table3), label_SndDevice, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (label_SndDevice);
// get sound device list and info
gwidget->SndDevice = list_snd_devices (global);
- gtk_widget_set_halign (gwidget->SndDevice, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (gwidget->SndDevice, TRUE);
- gtk_grid_attach(GTK_GRID(table3), gwidget->SndDevice, 1, line, 1, 1);
+ gtk_table_attach(GTK_TABLE(table3), gwidget->SndDevice, 1, 3, line, line+1,
+ GTK_SHRINK | GTK_FILL , 0, 0, 0);
gtk_widget_show (gwidget->SndDevice);
//using default device
if(global->Sound_UseDev < 0) global->Sound_UseDev=global->Sound_DefDev;
@@ -172,7 +170,8 @@
label_SndDevice = gtk_label_new(_("Input Device:"));
gtk_misc_set_alignment (GTK_MISC (label_SndDevice), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table3), label_SndDevice, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table3), label_SndDevice, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (label_SndDevice);
@@ -188,9 +187,8 @@
}
if (global->Sound_SampRateInd>(i-1)) global->Sound_SampRateInd=0; /*out of range*/
- gtk_widget_set_halign (gwidget->SndSampleRate, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (gwidget->SndSampleRate, TRUE);
- gtk_grid_attach(GTK_GRID(table3), gwidget->SndSampleRate, 1, line, 1, 1);
+ gtk_table_attach(GTK_TABLE(table3), gwidget->SndSampleRate, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (gwidget->SndSampleRate);
global->Sound_SampRate=stdSampleRates[global->Sound_SampRateInd];
@@ -204,7 +202,8 @@
label_SndSampRate = gtk_label_new(_("Sample Rate:"));
gtk_misc_set_alignment (GTK_MISC (label_SndSampRate), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table3), label_SndSampRate, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table3), label_SndSampRate, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (label_SndSampRate);
@@ -215,9 +214,8 @@
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gwidget->SndNumChan),_("1 - mono"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gwidget->SndNumChan),_("2 - stereo"));
- gtk_widget_set_halign (gwidget->SndNumChan, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (gwidget->SndNumChan, TRUE);
- gtk_grid_attach(GTK_GRID(table3), gwidget->SndNumChan, 1, line, 1, 1);
+ gtk_table_attach(GTK_TABLE(table3), gwidget->SndNumChan, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (gwidget->SndNumChan);
switch (global->Sound_NumChanInd)
{
@@ -251,7 +249,8 @@
label_SndNumChan = gtk_label_new(_("Channels:"));
gtk_misc_set_alignment (GTK_MISC (label_SndNumChan), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table3), label_SndNumChan, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table3), label_SndNumChan, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (label_SndNumChan);
if (global->debug) g_print("SampleRate:%d Channels:%d\n",global->Sound_SampRate,global->Sound_NumChan);
@@ -302,27 +301,26 @@
label_audioFilters = gtk_label_new(_("---- Audio Effects ----"));
gtk_misc_set_alignment (GTK_MISC (label_audioFilters), 0.5, 0.5);
- gtk_grid_attach (GTK_GRID(table3), label_audioFilters, 0, line, 3, 1);
+ gtk_table_attach (GTK_TABLE(table3), label_audioFilters, 0, 3, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL , 0, 0, 0);
gtk_widget_show (label_audioFilters);
line++;
- table_snd_eff = gtk_grid_new();
- gtk_grid_set_row_spacing (GTK_GRID (table_snd_eff), 4);
- gtk_grid_set_column_spacing (GTK_GRID (table_snd_eff), 4);
+ table_snd_eff = gtk_table_new(1,4,FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (table_snd_eff), 4);
+ gtk_table_set_col_spacings (GTK_TABLE (table_snd_eff), 4);
gtk_container_set_border_width (GTK_CONTAINER (table_snd_eff), 4);
gtk_widget_set_size_request (table_snd_eff, -1, -1);
-
- gtk_widget_set_halign (table_snd_eff, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (table_snd_eff, TRUE);
- gtk_grid_attach (GTK_GRID(table3), table_snd_eff, 0, line, 3, 1);
+
+ gtk_table_attach (GTK_TABLE(table3), table_snd_eff, 0, 3, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL , 0, 0, 0);
gtk_widget_show (table_snd_eff);
// Echo
EffEchoEnable=gtk_check_button_new_with_label (_(" Echo"));
g_object_set_data (G_OBJECT (EffEchoEnable), "effect_info", GINT_TO_POINTER(SND_ECHO));
- gtk_widget_set_halign (EffEchoEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (EffEchoEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_snd_eff), EffEchoEnable, 0, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_snd_eff), EffEchoEnable, 0, 1, 0, 1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(EffEchoEnable),(pdata->snd_Flags & SND_ECHO)>0);
gtk_widget_show (EffEchoEnable);
g_signal_connect (GTK_CHECK_BUTTON(EffEchoEnable), "toggled",
@@ -331,9 +329,8 @@
// FUZZ
EffFuzzEnable=gtk_check_button_new_with_label (_(" Fuzz"));
g_object_set_data (G_OBJECT (EffFuzzEnable), "effect_info", GINT_TO_POINTER(SND_FUZZ));
- gtk_widget_set_halign (EffFuzzEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (EffFuzzEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_snd_eff), EffFuzzEnable, 1, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_snd_eff), EffFuzzEnable, 1, 2, 0, 1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(EffFuzzEnable),(pdata->snd_Flags & SND_FUZZ)>0);
gtk_widget_show (EffFuzzEnable);
@@ -343,9 +340,8 @@
// Reverb
EffRevEnable=gtk_check_button_new_with_label (_(" Reverb"));
g_object_set_data (G_OBJECT (EffRevEnable), "effect_info", GINT_TO_POINTER(SND_REVERB));
- gtk_widget_set_halign (EffRevEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (EffRevEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_snd_eff), EffRevEnable, 2, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_snd_eff), EffRevEnable, 2, 3, 0, 1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(EffRevEnable),(pdata->snd_Flags & SND_REVERB)>0);
gtk_widget_show (EffRevEnable);
@@ -355,9 +351,8 @@
// WahWah
EffWahEnable=gtk_check_button_new_with_label (_(" WahWah"));
g_object_set_data (G_OBJECT (EffWahEnable), "effect_info", GINT_TO_POINTER(SND_WAHWAH));
- gtk_widget_set_halign (EffWahEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (EffWahEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_snd_eff), EffWahEnable, 3, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_snd_eff), EffWahEnable, 3, 4, 0, 1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(EffWahEnable),(pdata->snd_Flags & SND_WAHWAH)>0);
gtk_widget_show (EffWahEnable);
@@ -367,9 +362,8 @@
// Ducky
EffDuckyEnable=gtk_check_button_new_with_label (_(" Ducky"));
g_object_set_data (G_OBJECT (EffDuckyEnable), "effect_info", GINT_TO_POINTER(SND_DUCKY));
- gtk_widget_set_halign (EffDuckyEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (EffDuckyEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_snd_eff), EffDuckyEnable, 4, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_snd_eff), EffDuckyEnable, 0, 1, 1, 2,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(EffDuckyEnable),(pdata->snd_Flags & SND_DUCKY)>0);
gtk_widget_show (EffDuckyEnable);
diff -ur guvcview-src-1.7.1/src/callbacks.c guvcview-1.7.1-james/src/callbacks.c
--- guvcview-src-1.7.1/src/callbacks.c 2013-07-22 21:00:46.000000000 +0700
+++ guvcview-1.7.1-james/src/callbacks.c 2013-09-27 01:11:56.160728414 +0700
@@ -114,18 +114,20 @@
GTK_RESPONSE_REJECT,
NULL);
- GtkWidget *table = gtk_grid_new();
+ GtkWidget *table = gtk_table_new(4,2,FALSE);
GtkWidget *title = gtk_label_new (gettext(err_title));
gtk_widget_modify_font(title, pango_font_description_from_string ("Sans bold 10"));
gtk_misc_set_alignment (GTK_MISC (title), 0, 0);
- gtk_grid_attach (GTK_GRID (table), title, 0, 0, 2, 1);
+ gtk_table_attach (GTK_TABLE (table), title, 0, 2, 0, 1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (title);
GtkWidget *text = gtk_label_new (gettext(err_msg));
gtk_widget_modify_font(text, pango_font_description_from_string ("Sans italic 8"));
gtk_misc_set_alignment (GTK_MISC (text), 0, 0);
- gtk_grid_attach (GTK_GRID (table), text, 0, 1, 2, 1);
+ gtk_table_attach (GTK_TABLE (table), text, 0, 2, 1, 2,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (text);
@@ -133,12 +135,14 @@
"Do you want to try another one ?\n"));
gtk_widget_modify_font(text2, pango_font_description_from_string ("Sans 10"));
gtk_misc_set_alignment (GTK_MISC (text2), 0, 0);
- gtk_grid_attach (GTK_GRID (table), text2, 0, 2, 2, 1);
+ gtk_table_attach (GTK_TABLE (table), text2, 0, 2, 2, 3,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (text2);
GtkWidget *lbl_dev = gtk_label_new(_("Device:"));
gtk_misc_set_alignment (GTK_MISC (lbl_dev), 0.5, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_dev, 0, 3, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_dev, 0, 1, 3, 4,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_dev);
Devices = gtk_combo_box_text_new ();
@@ -150,7 +154,8 @@
}
gtk_combo_box_set_active(GTK_COMBO_BOX(Devices),videoIn->listDevices->num_devices-1);
- gtk_grid_attach(GTK_GRID(table), Devices, 1, 3, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), Devices, 1, 2, 3, 4,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (Devices);
GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (errdialog));
@@ -279,11 +284,8 @@
/** create a file filter */
GtkFileFilter *filter = gtk_file_filter_new();
- GtkWidget *FBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
+ GtkWidget *FBox = gtk_hbox_new(FALSE, 2);
GtkWidget *format_label = gtk_label_new(_("File Format:"));
- gtk_widget_set_halign (FBox, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (FBox, TRUE);
- gtk_widget_set_hexpand (format_label, FALSE);
gtk_widget_show(FBox);
gtk_widget_show(format_label);
gtk_box_pack_start(GTK_BOX(FBox), format_label, FALSE, FALSE, 2);
@@ -298,8 +300,6 @@
/** add format file filters*/
GtkWidget *VidFormat = gtk_combo_box_text_new ();
- gtk_widget_set_halign (VidFormat, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (VidFormat, TRUE);
int vformat_ind =0;
for (vformat_ind =0; vformat_indfps);
- gtk_grid_attach (GTK_GRID(table), enc_fps, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), enc_fps, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (enc_fps);
line++;
GtkWidget *monotonic_pts = gtk_check_button_new_with_label (_(" monotonic pts"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(monotonic_pts),(codec_defaults->monotonic_pts != 0));
-
- gtk_grid_attach (GTK_GRID(table), monotonic_pts, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), monotonic_pts, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (monotonic_pts);
line++;
GtkWidget *lbl_bit_rate = gtk_label_new(_("bit rate: "));
gtk_misc_set_alignment (GTK_MISC (lbl_bit_rate), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_bit_rate, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_bit_rate, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_bit_rate);
GtkWidget *bit_rate = gtk_spin_button_new_with_range(160000,4000000,10000);
gtk_editable_set_editable(GTK_EDITABLE(bit_rate),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(bit_rate), codec_defaults->bit_rate);
- gtk_grid_attach (GTK_GRID(table), bit_rate, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), bit_rate, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (bit_rate);
line++;
GtkWidget *lbl_qmax = gtk_label_new(_("qmax: "));
gtk_misc_set_alignment (GTK_MISC (lbl_qmax), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_qmax, 0, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), lbl_qmax, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_qmax);
GtkWidget *qmax = gtk_spin_button_new_with_range(1,60,1);
gtk_editable_set_editable(GTK_EDITABLE(qmax),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(qmax), codec_defaults->qmax);
- gtk_grid_attach (GTK_GRID(table), qmax, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), qmax, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (qmax);
line++;
GtkWidget *lbl_qmin = gtk_label_new(_("qmin: "));
gtk_misc_set_alignment (GTK_MISC (lbl_qmin), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_qmin, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_qmin, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_qmin);
GtkWidget *qmin = gtk_spin_button_new_with_range(1,31,1);
gtk_editable_set_editable(GTK_EDITABLE(qmin),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(qmin), codec_defaults->qmin);
- gtk_grid_attach (GTK_GRID(table), qmin, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), qmin, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (qmin);
line++;
GtkWidget *lbl_max_qdiff = gtk_label_new(_("max. qdiff: "));
gtk_misc_set_alignment (GTK_MISC (lbl_max_qdiff), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_max_qdiff, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_max_qdiff, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_max_qdiff);
GtkWidget *max_qdiff = gtk_spin_button_new_with_range(1,4,1);
gtk_editable_set_editable(GTK_EDITABLE(max_qdiff),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(max_qdiff), codec_defaults->max_qdiff);
- gtk_grid_attach (GTK_GRID(table), max_qdiff, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), max_qdiff, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (max_qdiff);
line++;
GtkWidget *lbl_dia = gtk_label_new(_("dia size: "));
gtk_misc_set_alignment (GTK_MISC (lbl_dia), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_dia, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_dia, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_dia);
GtkWidget *dia = gtk_spin_button_new_with_range(-1,4,1);
gtk_editable_set_editable(GTK_EDITABLE(dia),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(dia), codec_defaults->dia);
- gtk_grid_attach (GTK_GRID(table), dia, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), dia, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (dia);
line++;
GtkWidget *lbl_pre_dia = gtk_label_new(_("pre dia size: "));
gtk_misc_set_alignment (GTK_MISC (lbl_pre_dia), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_pre_dia, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_pre_dia, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_pre_dia);
GtkWidget *pre_dia = gtk_spin_button_new_with_range(1,4,1);
gtk_editable_set_editable(GTK_EDITABLE(pre_dia),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(pre_dia), codec_defaults->pre_dia);
- gtk_grid_attach (GTK_GRID(table), pre_dia, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), pre_dia, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (pre_dia);
line++;
GtkWidget *lbl_pre_me = gtk_label_new(_("pre me: "));
gtk_misc_set_alignment (GTK_MISC (lbl_pre_me), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_pre_me, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_pre_me, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_pre_me);
GtkWidget *pre_me = gtk_spin_button_new_with_range(0,2,1);
gtk_editable_set_editable(GTK_EDITABLE(pre_me),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(pre_me), codec_defaults->pre_me);
- gtk_grid_attach (GTK_GRID(table), pre_me, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), pre_me, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (pre_me);
line++;
GtkWidget *lbl_me_pre_cmp = gtk_label_new(_("pre cmp: "));
gtk_misc_set_alignment (GTK_MISC (lbl_me_pre_cmp), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_me_pre_cmp, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_me_pre_cmp, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_me_pre_cmp);
GtkWidget *me_pre_cmp = gtk_spin_button_new_with_range(0,6,1);
gtk_editable_set_editable(GTK_EDITABLE(me_pre_cmp),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(me_pre_cmp), codec_defaults->me_pre_cmp);
- gtk_grid_attach (GTK_GRID(table), me_pre_cmp, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), me_pre_cmp, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (me_pre_cmp);
line++;
GtkWidget *lbl_me_cmp = gtk_label_new(_("cmp: "));
gtk_misc_set_alignment (GTK_MISC (lbl_me_cmp), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_me_cmp, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_me_cmp, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_me_cmp);
GtkWidget *me_cmp = gtk_spin_button_new_with_range(0,6,1);
gtk_editable_set_editable(GTK_EDITABLE(me_cmp),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(me_cmp), codec_defaults->me_cmp);
- gtk_grid_attach (GTK_GRID(table), me_cmp, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), me_cmp, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (me_cmp);
line++;
GtkWidget *lbl_me_sub_cmp = gtk_label_new(_("sub cmp: "));
gtk_misc_set_alignment (GTK_MISC (lbl_me_sub_cmp), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_me_sub_cmp, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_me_sub_cmp, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_me_sub_cmp);
GtkWidget *me_sub_cmp = gtk_spin_button_new_with_range(0,6,1);
gtk_editable_set_editable(GTK_EDITABLE(me_sub_cmp),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(me_sub_cmp), codec_defaults->me_sub_cmp);
- gtk_grid_attach (GTK_GRID(table), me_sub_cmp, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), me_sub_cmp, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (me_sub_cmp);
line++;
GtkWidget *lbl_last_pred = gtk_label_new(_("last predictor count: "));
gtk_misc_set_alignment (GTK_MISC (lbl_last_pred), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_last_pred, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_last_pred, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_last_pred);
GtkWidget *last_pred = gtk_spin_button_new_with_range(1,3,1);
gtk_editable_set_editable(GTK_EDITABLE(last_pred),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(last_pred), codec_defaults->last_pred);
- gtk_grid_attach (GTK_GRID(table), last_pred, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), last_pred, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (last_pred);
line++;
GtkWidget *lbl_gop_size = gtk_label_new(_("gop size: "));
gtk_misc_set_alignment (GTK_MISC (lbl_gop_size), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_gop_size, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_gop_size, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_gop_size);
GtkWidget *gop_size = gtk_spin_button_new_with_range(1,250,1);
gtk_editable_set_editable(GTK_EDITABLE(gop_size),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(gop_size), codec_defaults->gop_size);
- gtk_grid_attach (GTK_GRID(table), gop_size, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), gop_size, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (gop_size);
line++;
GtkWidget *lbl_qcompress = gtk_label_new(_("qcompress: "));
gtk_misc_set_alignment (GTK_MISC (lbl_qcompress), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_qcompress, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_qcompress, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_qcompress);
GtkWidget *qcompress = gtk_spin_button_new_with_range(0,1,0.1);
gtk_editable_set_editable(GTK_EDITABLE(qcompress),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(qcompress), codec_defaults->qcompress);
- gtk_grid_attach (GTK_GRID(table), qcompress, 1, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), qcompress, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (qcompress);
line++;
GtkWidget *lbl_qblur = gtk_label_new(_("qblur: "));
gtk_misc_set_alignment (GTK_MISC (lbl_qblur), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_qblur, 0, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), lbl_qblur, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_qblur);
GtkWidget *qblur = gtk_spin_button_new_with_range(0,1,0.1);
gtk_editable_set_editable(GTK_EDITABLE(qblur),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(qblur), codec_defaults->qblur);
- gtk_grid_attach (GTK_GRID(table), qblur, 1, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), qblur, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (qblur);
line++;
GtkWidget *lbl_subq = gtk_label_new(_("subq: "));
gtk_misc_set_alignment (GTK_MISC (lbl_subq), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_subq, 0, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), lbl_subq, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_subq);
GtkWidget *subq = gtk_spin_button_new_with_range(0,8,1);
gtk_editable_set_editable(GTK_EDITABLE(subq),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(subq), codec_defaults->subq);
- gtk_grid_attach (GTK_GRID(table), subq, 1, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), subq, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (subq);
line++;
GtkWidget *lbl_framerefs = gtk_label_new(_("framerefs: "));
gtk_misc_set_alignment (GTK_MISC (lbl_framerefs), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_framerefs, 0, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), lbl_framerefs, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_framerefs);
GtkWidget *framerefs = gtk_spin_button_new_with_range(0,12,1);
gtk_editable_set_editable(GTK_EDITABLE(framerefs),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(framerefs), codec_defaults->framerefs);
- gtk_grid_attach (GTK_GRID(table), framerefs, 1, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), framerefs, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (framerefs);
line++;
GtkWidget *lbl_me_method = gtk_label_new(_("me method: "));
gtk_misc_set_alignment (GTK_MISC (lbl_me_method), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_me_method, 0, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), lbl_me_method, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_me_method);
GtkWidget *me_method = gtk_spin_button_new_with_range(1,10,1);
gtk_editable_set_editable(GTK_EDITABLE(me_method),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(me_method), codec_defaults->me_method);
- gtk_grid_attach (GTK_GRID(table), me_method, 1, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), me_method, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (me_method);
line++;
GtkWidget *lbl_mb_decision = gtk_label_new(_("mb decision: "));
gtk_misc_set_alignment (GTK_MISC (lbl_mb_decision), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_mb_decision, 0, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), lbl_mb_decision, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_mb_decision);
GtkWidget *mb_decision = gtk_spin_button_new_with_range(0,2,1);
gtk_editable_set_editable(GTK_EDITABLE(mb_decision),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(mb_decision), codec_defaults->mb_decision);
- gtk_grid_attach (GTK_GRID(table), mb_decision, 1, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), mb_decision, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (mb_decision);
line++;
GtkWidget *lbl_max_b_frames = gtk_label_new(_("max B frames: "));
gtk_misc_set_alignment (GTK_MISC (lbl_max_b_frames), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_max_b_frames, 0, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), lbl_max_b_frames, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_max_b_frames);
GtkWidget *max_b_frames = gtk_spin_button_new_with_range(0,4,1);
gtk_editable_set_editable(GTK_EDITABLE(max_b_frames),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(max_b_frames), codec_defaults->max_b_frames);
- gtk_grid_attach (GTK_GRID(table), max_b_frames, 1, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), max_b_frames, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (max_b_frames);
line++;
GtkWidget *lbl_num_threads = gtk_label_new(_("num threads: "));
gtk_misc_set_alignment (GTK_MISC (lbl_num_threads), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_num_threads, 0, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), lbl_num_threads, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_num_threads);
GtkWidget *num_threads = gtk_spin_button_new_with_range(0,8,1);
gtk_editable_set_editable(GTK_EDITABLE(num_threads),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(num_threads), codec_defaults->num_threads);
- gtk_grid_attach (GTK_GRID(table), num_threads, 1, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table), num_threads, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (num_threads);
line++;
@@ -801,34 +841,37 @@
GTK_RESPONSE_REJECT,
NULL);
- GtkWidget *table = gtk_grid_new();
- gtk_grid_set_column_homogeneous (GTK_GRID(table), TRUE);
-
+ GtkWidget *table = gtk_table_new(1,2,FALSE);
+
/*bit rate*/
GtkWidget *lbl_bit_rate = gtk_label_new(_("bit rate: "));
gtk_misc_set_alignment (GTK_MISC (lbl_bit_rate), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_bit_rate, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_bit_rate, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_bit_rate);
GtkWidget *bit_rate = gtk_spin_button_new_with_range(48000,384000,8000);
gtk_editable_set_editable(GTK_EDITABLE(bit_rate),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(bit_rate), codec_defaults->bit_rate);
- gtk_grid_attach (GTK_GRID(table), bit_rate, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), bit_rate, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (bit_rate);
line++;
/*sample format*/
GtkWidget *lbl_sample_fmt = gtk_label_new(_("sample format: "));
gtk_misc_set_alignment (GTK_MISC (lbl_sample_fmt), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table), lbl_sample_fmt, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), lbl_sample_fmt, 0, 1, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (lbl_sample_fmt);
GtkWidget *sample_fmt = gtk_spin_button_new_with_range(0, AV_SAMPLE_FMT_NB, 1);
gtk_editable_set_editable(GTK_EDITABLE(sample_fmt),TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(sample_fmt), codec_defaults->sample_format);
- gtk_grid_attach (GTK_GRID(table), sample_fmt, 1, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table), sample_fmt, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (sample_fmt);
line++;
@@ -874,7 +917,9 @@
void
set_sensitive_snd_contrls (const int flag, struct GWIDGET *gwidget)
{
+#ifdef PULSEAUDIO
gtk_widget_set_sensitive (gwidget->SndAPI, flag);
+#endif
gtk_widget_set_sensitive (gwidget->SndSampleRate, flag);
gtk_widget_set_sensitive (gwidget->SndDevice, flag);
gtk_widget_set_sensitive (gwidget->SndNumChan, flag);
diff -ur guvcview-src-1.7.1/src/guvcview.c guvcview-1.7.1-james/src/guvcview.c
--- guvcview-src-1.7.1/src/guvcview.c 2013-07-22 21:00:46.000000000 +0700
+++ guvcview-1.7.1-james/src/guvcview.c 2013-09-27 00:50:56.387476597 +0700
@@ -250,8 +250,7 @@
GtkWidget *VidButton_Img;
GtkWidget *QButton_Img;
GtkWidget *HButtonBox;
-
-
+
s = g_new0(struct VidState, 1);
if(!control_only) /*control_only exclusion (video and Audio) */
@@ -461,7 +460,7 @@
if(!(global->no_display))
{
- gwidget->maintable = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+ gwidget->maintable = gtk_vbox_new(FALSE, 2);
gtk_widget_show (gwidget->maintable);
@@ -486,7 +485,7 @@
gtk_widget_show(scroll1);
- Tab1 = gtk_grid_new();
+ Tab1 = gtk_hbox_new(FALSE,2);
Tab1Label = gtk_label_new(_("Image Controls"));
gtk_widget_show (Tab1Label);
/** check for files */
@@ -496,17 +495,15 @@
Tab1Icon = gtk_image_new_from_file(Tab1IconPath);
g_free(Tab1IconPath);
gtk_widget_show (Tab1Icon);
- gtk_grid_attach (GTK_GRID(Tab1), Tab1Icon, 0, 0, 1, 1);
- gtk_grid_attach (GTK_GRID(Tab1), Tab1Label, 1, 0, 1, 1);
+ gtk_box_pack_start (GTK_BOX(Tab1), Tab1Icon, FALSE, FALSE,1);
+ gtk_box_pack_start (GTK_BOX(Tab1), Tab1Label, FALSE, FALSE,1);
gtk_widget_show (Tab1);
gtk_notebook_append_page(GTK_NOTEBOOK(gwidget->boxh),scroll1,Tab1);
/*---------------------- Add Buttons ---------------------------------*/
- HButtonBox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
- gtk_widget_set_halign (HButtonBox, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (HButtonBox, TRUE);
+ HButtonBox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(HButtonBox),GTK_BUTTONBOX_SPREAD);
gtk_box_set_homogeneous(GTK_BOX(HButtonBox),TRUE);
diff -ur guvcview-src-1.7.1/src/guvcview.h guvcview-1.7.1-james/src/guvcview.h
--- guvcview-src-1.7.1/src/guvcview.h 2013-07-22 21:00:46.000000000 +0700
+++ guvcview-1.7.1-james/src/guvcview.h 2013-09-27 01:06:12.514083995 +0700
@@ -42,7 +42,7 @@
/* A restart Dialog */
GtkWidget *restartdialog;
/*Paned containers*/
- GtkWidget *maintable;
+ GtkWidget *maintable;
GtkWidget *boxh;
//group list for menu video codecs
diff -ur guvcview-src-1.7.1/src/img_controls.c guvcview-1.7.1-james/src/img_controls.c
--- guvcview-src-1.7.1/src/img_controls.c 2013-07-22 21:00:46.000000000 +0700
+++ guvcview-1.7.1-james/src/img_controls.c 2013-09-26 23:54:44.921028042 +0700
@@ -70,14 +70,10 @@
get_ctrl_values (videoIn->fd, s->control_list, s->num_controls, NULL);
- s->table = gtk_grid_new ();
- gtk_grid_set_column_homogeneous (GTK_GRID(s->table), FALSE);
- gtk_widget_set_hexpand (s->table, TRUE);
- gtk_widget_set_halign (s->table, GTK_ALIGN_FILL);
-
- gtk_grid_set_row_spacing (GTK_GRID(s->table), 4);
- gtk_grid_set_column_spacing (GTK_GRID (s->table), 4);
- gtk_container_set_border_width (GTK_CONTAINER (s->table), 2);
+ s->table = gtk_table_new (1, 3, FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (s->table), 4);
+ gtk_table_set_col_spacings (GTK_TABLE (s->table), 4);
+ gtk_container_set_border_width (GTK_CONTAINER (s->table), 2);
//add control widgets to control list
create_control_widgets(s->control_list, (void *) all_data, global->control_only, global->debug);
@@ -117,7 +113,7 @@
global->AFcontrol = 0;
else
{
- GtkWidget *Focus_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ GtkWidget *Focus_box = gtk_hbox_new(FALSE,0); //gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *AutoFocus = gtk_check_button_new_with_label (_("Auto Focus (continuous)"));
GtkWidget *FocusButton = gtk_button_new_with_label (_("set Focus"));
gtk_box_pack_start (GTK_BOX (Focus_box), AutoFocus, TRUE, TRUE, 0);
@@ -125,8 +121,9 @@
gtk_widget_show (Focus_box);
gtk_widget_show (AutoFocus);
gtk_widget_show (FocusButton);
- gtk_grid_attach(GTK_GRID(s->table), Focus_box, 1, row, 1, 1);
-
+ gtk_table_attach (GTK_TABLE (s->table), Focus_box, 1, 2, row, row+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
+
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (AutoFocus),
global->autofocus ? TRUE: FALSE);
@@ -142,15 +139,16 @@
if(current->label)
- gtk_grid_attach(GTK_GRID(s->table), current->label, 0, row, 1 , 1);
+ gtk_table_attach (GTK_TABLE (s->table), current->label, 0, 1, row, row+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
if(current->widget)
{
- gtk_grid_attach(GTK_GRID(s->table), current->widget, 1, row, 1 , 1);
- gtk_widget_set_halign (current->widget, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (current->widget, TRUE);
+ gtk_table_attach (GTK_TABLE (s->table), current->widget, 1, 2, row, row+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
}
if(current->spinbutton)
- gtk_grid_attach(GTK_GRID(s->table), current->spinbutton, 2, row, 1 , 1);
+ gtk_table_attach (GTK_TABLE (s->table), current->spinbutton, 2, 3, row, row+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
if(next == NULL)
diff -ur guvcview-src-1.7.1/src/Makefile.in guvcview-1.7.1-james/src/Makefile.in
--- guvcview-src-1.7.1/src/Makefile.in 2013-07-22 23:36:59.000000000 +0700
+++ guvcview-1.7.1-james/src/Makefile.in 2013-09-26 22:37:50.811326546 +0700
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
- esac; \
- test $$am__dry = yes; \
- }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -92,27 +75,22 @@
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(guvcview_SOURCES)
DIST_SOURCES = $(guvcview_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -380,11 +358,8 @@
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
- fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p; \
@@ -418,7 +393,7 @@
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-guvcview$(EXEEXT): $(guvcview_OBJECTS) $(guvcview_DEPENDENCIES) $(EXTRA_guvcview_DEPENDENCIES)
+guvcview$(EXEEXT): $(guvcview_OBJECTS) $(guvcview_DEPENDENCIES)
@rm -f guvcview$(EXEEXT)
$(AM_V_CCLD)$(guvcview_LINK) $(guvcview_OBJECTS) $(guvcview_LDADD) $(LIBS)
diff -ur guvcview-src-1.7.1/src/v4l2_controls.c guvcview-1.7.1-james/src/v4l2_controls.c
--- guvcview-src-1.7.1/src/v4l2_controls.c 2013-07-22 21:00:46.000000000 +0700
+++ guvcview-1.7.1-james/src/v4l2_controls.c 2013-09-27 01:19:31.090698997 +0700
@@ -702,7 +702,7 @@
case V4L2_CID_TILT_RELATIVE:
{
//videoIn->PanTilt++;
- current->widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
+ current->widget = gtk_hbox_new (FALSE, 1); //gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
GtkWidget *PanTilt1 = NULL;
GtkWidget *PanTilt2 = NULL;
@@ -864,7 +864,7 @@
current->control.step*10,
0);
- current->widget = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
+ current->widget = gtk_hscale_new (adjustment);
gtk_scale_set_draw_value (GTK_SCALE (current->widget), FALSE);
gtk_range_set_round_digits(GTK_RANGE (current->widget), 0);
@@ -872,7 +872,7 @@
gtk_widget_show (current->widget);
current->spinbutton = gtk_spin_button_new(adjustment,current->control.step, 0);
-
+
/*can't edit the spin value by hand*/
gtk_editable_set_editable(GTK_EDITABLE(current->spinbutton),TRUE);
diff -ur guvcview-src-1.7.1/src/video_tab.c guvcview-1.7.1-james/src/video_tab.c
--- guvcview-src-1.7.1/src/video_tab.c 2013-07-22 21:00:46.000000000 +0700
+++ guvcview-1.7.1-james/src/video_tab.c 2013-09-27 00:13:58.980953383 +0700
@@ -66,13 +66,9 @@
VidFormats *listVidFormats;
//TABLE
- table2 = gtk_grid_new();
- gtk_grid_set_column_homogeneous (GTK_GRID(table2), FALSE);
- gtk_widget_set_hexpand (table2, TRUE);
- gtk_widget_set_halign (table2, GTK_ALIGN_FILL);
-
- gtk_grid_set_row_spacing (GTK_GRID(table2), 4);
- gtk_grid_set_column_spacing (GTK_GRID (table2), 4);
+ table2 = gtk_table_new(1,3,FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (table2), 4);
+ gtk_table_set_col_spacings (GTK_TABLE (table2), 4);
gtk_container_set_border_width (GTK_CONTAINER (table2), 2);
gtk_widget_show (table2);
//SCROLL
@@ -83,7 +79,7 @@
gtk_widget_show(scroll2);
//new hbox for tab label and icon
- Tab2 = gtk_grid_new();
+ Tab2 = gtk_hbox_new(FALSE,2);
Tab2Label = gtk_label_new(_("Video"));
gtk_widget_show (Tab2Label);
@@ -93,8 +89,8 @@
Tab2Icon = gtk_image_new_from_file(Tab2IconPath);
g_free(Tab2IconPath);
gtk_widget_show (Tab2Icon);
- gtk_grid_attach (GTK_GRID(Tab2), Tab2Icon, 0, 0, 1, 1);
- gtk_grid_attach (GTK_GRID(Tab2), Tab2Label, 1, 0, 1, 1);
+ gtk_box_pack_start (GTK_BOX(Tab2), Tab2Icon, FALSE, FALSE,1);
+ gtk_box_pack_start (GTK_BOX(Tab2), Tab2Label, FALSE, FALSE,1);
gtk_widget_show (Tab2);
gtk_notebook_append_page(GTK_NOTEBOOK(gwidget->boxh),scroll2,Tab2);
@@ -103,14 +99,13 @@
label_Device = gtk_label_new(_("Device:"));
gtk_misc_set_alignment (GTK_MISC (label_Device), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table2), label_Device, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table2), label_Device, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (label_Device);
gwidget->Devices = gtk_combo_box_text_new ();
- gtk_widget_set_halign (gwidget->Devices, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (gwidget->Devices, TRUE);
if (videoIn->listDevices->num_devices < 1)
{
//use current
@@ -128,15 +123,14 @@
gtk_combo_box_set_active(GTK_COMBO_BOX(gwidget->Devices),i);
}
}
- gtk_grid_attach (GTK_GRID(table2), gwidget->Devices, 1, line, 1 ,1);
+ gtk_table_attach(GTK_TABLE(table2), gwidget->Devices, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (gwidget->Devices);
g_signal_connect (GTK_COMBO_BOX_TEXT(gwidget->Devices), "changed",
G_CALLBACK (Devices_changed), all_data);
// Resolution
gwidget->Resolution = gtk_combo_box_text_new ();
- gtk_widget_set_halign (gwidget->Resolution, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (gwidget->Resolution, TRUE);
char temp_str[20];
int defres=0;
@@ -168,8 +162,6 @@
line++;
gwidget->FrameRate = gtk_combo_box_text_new ();
- gtk_widget_set_halign (gwidget->FrameRate, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (gwidget->FrameRate, TRUE);
int deffps=0;
if (global->debug)
g_print("frame rates of %dº resolution=%d \n",
@@ -186,7 +178,8 @@
deffps=i;//set selected
}
- gtk_grid_attach (GTK_GRID(table2), gwidget->FrameRate, 1, line, 1 ,1);
+ gtk_table_attach(GTK_TABLE(table2), gwidget->FrameRate, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (gwidget->FrameRate);
@@ -208,12 +201,14 @@
label_FPS = gtk_label_new(_("Frame Rate:"));
gtk_misc_set_alignment (GTK_MISC (label_FPS), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table2), label_FPS, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table2), label_FPS, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (label_FPS);
ShowFPS=gtk_check_button_new_with_label (_(" Show"));
- gtk_grid_attach (GTK_GRID(table2), ShowFPS, 2, line, 1, 1);
+ gtk_table_attach(GTK_TABLE(table2), ShowFPS, 2, 3, line, line+1,
+ GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ShowFPS),(global->FpsCount > 0));
gtk_widget_show (ShowFPS);
@@ -227,7 +222,8 @@
if(global->debug)
g_print("Def. Res: %i numb. fps:%i\n",defres,videoIn->listFormats->listVidFormats[videoIn->listFormats->current_format].listVidCap[defres].numb_frates);
- gtk_grid_attach (GTK_GRID(table2), gwidget->Resolution, 1, line, 1 ,1);
+ gtk_table_attach(GTK_TABLE(table2), gwidget->Resolution, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_show (gwidget->Resolution);
gtk_widget_set_sensitive (gwidget->Resolution, TRUE);
@@ -236,14 +232,13 @@
labelResol = gtk_label_new(_("Resolution:"));
gtk_misc_set_alignment (GTK_MISC (labelResol), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table2), labelResol, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table2), labelResol, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (labelResol);
// Input Format
line++;
gwidget->InpType= gtk_combo_box_text_new ();
- gtk_widget_set_halign (gwidget->InpType, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (gwidget->InpType, TRUE);
int fmtind=0;
for (fmtind=0; fmtind < videoIn->listFormats->numb_formats; fmtind++)
@@ -253,7 +248,8 @@
gtk_combo_box_set_active(GTK_COMBO_BOX(gwidget->InpType),fmtind); /*set active*/
}
- gtk_grid_attach (GTK_GRID(table2), gwidget->InpType, 1, line, 1 ,1);
+ gtk_table_attach(GTK_TABLE(table2), gwidget->InpType, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_set_sensitive (gwidget->InpType, TRUE);
g_signal_connect (GTK_COMBO_BOX_TEXT(gwidget->InpType), "changed",
@@ -263,7 +259,8 @@
label_InpType = gtk_label_new(_("Camera Output:"));
gtk_misc_set_alignment (GTK_MISC (label_InpType), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table2), label_InpType, 0, line, 1, 1);
+ gtk_table_attach (GTK_TABLE(table2), label_InpType, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (label_InpType);
@@ -272,18 +269,18 @@
{
line++;
gwidget->jpeg_comp = gtk_spin_button_new_with_range(0,100,1);
- gtk_widget_set_halign (gwidget->jpeg_comp, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (gwidget->jpeg_comp, TRUE);
/*can't edit the spin value by hand*/
gtk_editable_set_editable(GTK_EDITABLE(gwidget->jpeg_comp),FALSE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(gwidget->jpeg_comp), videoIn->jpgcomp.quality);
- gtk_grid_attach (GTK_GRID(table2), gwidget->jpeg_comp, 1, line, 1 ,1);
+ gtk_table_attach(GTK_TABLE(table2), gwidget->jpeg_comp, 1, 2, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_widget_set_sensitive (gwidget->jpeg_comp, TRUE);
gtk_widget_show (gwidget->jpeg_comp);
set_jpeg_comp = gtk_button_new_with_label(_("Apply"));
- gtk_grid_attach (GTK_GRID(table2), set_jpeg_comp, 2, line, 1 ,1);
+ gtk_table_attach(GTK_TABLE(table2), set_jpeg_comp, 2, 3, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
g_signal_connect (GTK_BUTTON (set_jpeg_comp), "clicked",
G_CALLBACK (set_jpeg_comp_clicked), all_data);
gtk_widget_set_sensitive (set_jpeg_comp, TRUE);
@@ -292,7 +289,8 @@
label_jpeg_comp = gtk_label_new(_("Quality:"));
gtk_misc_set_alignment (GTK_MISC (label_jpeg_comp), 1, 0.5);
- gtk_grid_attach (GTK_GRID(table2), label_jpeg_comp, 0, line, 1 ,1);
+ gtk_table_attach (GTK_TABLE(table2), label_jpeg_comp, 0, 1, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (label_jpeg_comp);
}
@@ -302,27 +300,26 @@
label_videoFilters = gtk_label_new(_("---- Video Filters ----"));
gtk_misc_set_alignment (GTK_MISC (label_videoFilters), 0.5, 0.5);
- gtk_grid_attach (GTK_GRID(table2), label_videoFilters, 0, line, 3, 1);
+ gtk_table_attach (GTK_TABLE(table2), label_videoFilters, 0, 3, line, line+1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL , 0, 0, 0);
gtk_widget_show (label_videoFilters);
line++;
- table_filt = gtk_grid_new();
- gtk_grid_set_row_spacing (GTK_GRID (table_filt), 4);
- gtk_grid_set_column_spacing (GTK_GRID (table_filt), 4);
+ table_filt = gtk_table_new(1,4,FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (table_filt), 4);
+ gtk_table_set_col_spacings (GTK_TABLE (table_filt), 4);
gtk_container_set_border_width (GTK_CONTAINER (table_filt), 4);
gtk_widget_set_size_request (table_filt, -1, -1);
- gtk_widget_set_halign (table_filt, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (table_filt, TRUE);
- gtk_grid_attach (GTK_GRID(table2), table_filt, 0, line, 3, 1);
+ gtk_table_attach (GTK_TABLE(table2), table_filt, 0, 3, line, line+1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (table_filt);
// Mirror
FiltMirrorEnable=gtk_check_button_new_with_label (_(" Mirror"));
g_object_set_data (G_OBJECT (FiltMirrorEnable), "filt_info", GINT_TO_POINTER(YUV_MIRROR));
- gtk_widget_set_halign (FiltMirrorEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (FiltMirrorEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_filt), FiltMirrorEnable, 0, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_filt), FiltMirrorEnable, 0, 1, 0, 1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(FiltMirrorEnable),(global->Frame_Flags & YUV_MIRROR)>0);
gtk_widget_show (FiltMirrorEnable);
@@ -331,9 +328,8 @@
// Upturn
FiltUpturnEnable=gtk_check_button_new_with_label (_(" Invert"));
g_object_set_data (G_OBJECT (FiltUpturnEnable), "filt_info", GINT_TO_POINTER(YUV_UPTURN));
- gtk_widget_set_halign (FiltUpturnEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (FiltUpturnEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_filt), FiltUpturnEnable, 1, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_filt), FiltUpturnEnable, 1, 2, 0, 1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(FiltUpturnEnable),(global->Frame_Flags & YUV_UPTURN)>0);
gtk_widget_show (FiltUpturnEnable);
@@ -342,9 +338,8 @@
// Negate
FiltNegateEnable=gtk_check_button_new_with_label (_(" Negative"));
g_object_set_data (G_OBJECT (FiltNegateEnable), "filt_info", GINT_TO_POINTER(YUV_NEGATE));
- gtk_widget_set_halign (FiltNegateEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (FiltNegateEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_filt), FiltNegateEnable, 2, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_filt), FiltNegateEnable, 2, 3, 0, 1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(FiltNegateEnable),(global->Frame_Flags & YUV_NEGATE)>0);
gtk_widget_show (FiltNegateEnable);
@@ -353,9 +348,8 @@
// Mono
FiltMonoEnable=gtk_check_button_new_with_label (_(" Mono"));
g_object_set_data (G_OBJECT (FiltMonoEnable), "filt_info", GINT_TO_POINTER(YUV_MONOCR));
- gtk_widget_set_halign (FiltMonoEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (FiltMonoEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_filt), FiltMonoEnable, 3, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_filt), FiltMonoEnable, 3, 4, 0, 1,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(FiltMonoEnable),(global->Frame_Flags & YUV_MONOCR)>0);
gtk_widget_show (FiltMonoEnable);
@@ -365,9 +359,8 @@
// Pieces
FiltPiecesEnable=gtk_check_button_new_with_label (_(" Pieces"));
g_object_set_data (G_OBJECT (FiltPiecesEnable), "filt_info", GINT_TO_POINTER(YUV_PIECES));
- gtk_widget_set_halign (FiltPiecesEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (FiltPiecesEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_filt), FiltPiecesEnable, 4, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_filt), FiltPiecesEnable, 0, 1, 1, 2,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(FiltPiecesEnable),(global->Frame_Flags & YUV_PIECES)>0);
gtk_widget_show (FiltPiecesEnable);
@@ -377,9 +370,8 @@
// Particles
FiltParticlesEnable=gtk_check_button_new_with_label (_(" Particles"));
g_object_set_data (G_OBJECT (FiltParticlesEnable), "filt_info", GINT_TO_POINTER(YUV_PARTICLES));
- gtk_widget_set_halign (FiltParticlesEnable, GTK_ALIGN_FILL);
- gtk_widget_set_hexpand (FiltParticlesEnable, TRUE);
- gtk_grid_attach(GTK_GRID(table_filt), FiltParticlesEnable, 5, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table_filt), FiltParticlesEnable, 1, 2, 1, 2,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(FiltParticlesEnable),(global->Frame_Flags & YUV_PARTICLES)>0);
gtk_widget_show (FiltParticlesEnable);