From 0d627cd693d6f5246331db5d131dcbdd6e5b8ef4 Mon Sep 17 00:00:00 2001
From: AngelCarpintero <AngelCarpintero@4132a67d-e308-0410-984c-893ed6249e5e>
Date: Mon, 15 Sep 2008 18:03:48 +0000
Subject: [PATCH] Fix some warning in new systems

---
 configure    | 20 ++++++++++----------
 configure.in |  2 +-
 track.h      |  9 +++++++++
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index e4b7701f..d8d4be5d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for motion 3.2.11.branch-r408.
+# Generated by GNU Autoconf 2.61 for motion 3.2.11.branch-r409.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='motion'
 PACKAGE_TARNAME='motion'
-PACKAGE_VERSION='3.2.11.branch-r408'
-PACKAGE_STRING='motion 3.2.11.branch-r408'
+PACKAGE_VERSION='3.2.11.branch-r409'
+PACKAGE_STRING='motion 3.2.11.branch-r409'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="motion.c"
@@ -1178,7 +1178,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures motion 3.2.11.branch-r408 to adapt to many kinds of systems.
+\`configure' configures motion 3.2.11.branch-r409 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1239,7 +1239,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of motion 3.2.11.branch-r408:";;
+     short | recursive ) echo "Configuration of motion 3.2.11.branch-r409:";;
    esac
   cat <<\_ACEOF
 
@@ -1375,7 +1375,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-motion configure 3.2.11.branch-r408
+motion configure 3.2.11.branch-r409
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1389,7 +1389,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by motion $as_me 3.2.11.branch-r408, which was
+It was created by motion $as_me 3.2.11.branch-r409, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -7295,7 +7295,7 @@ _ACEOF
 
 
 
-if test "$ac_cv_sizeof_short_int" = "4"; then
+if test "$ac_cv_sizeof_short" = "4"; then
 	TEMP_CFLAGS="${TEMP_CFLAGS} -DTYPE_32BIT=\"short\""
 else
 	if test "$ac_cv_sizeof_int" = "4"; then
@@ -8140,7 +8140,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by motion $as_me 3.2.11.branch-r408, which was
+This file was extended by motion $as_me 3.2.11.branch-r409, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8189,7 +8189,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-motion config.status 3.2.11.branch-r408
+motion config.status 3.2.11.branch-r409
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index 03d1359f..2dc2843e 100644
--- a/configure.in
+++ b/configure.in
@@ -798,7 +798,7 @@ AC_CHECK_SIZEOF(long long)
 AC_CHECK_SIZEOF(int *)
 AC_CHECK_SIZEOF(void *)
 
-if test "$ac_cv_sizeof_short_int" = "4"; then
+if test "$ac_cv_sizeof_short" = "4"; then
 	TEMP_CFLAGS="${TEMP_CFLAGS} -DTYPE_32BIT=\"short\""
 else
 	if test "$ac_cv_sizeof_int" = "4"; then
diff --git a/track.h b/track.h
index aae7cc00..a58275ca 100644
--- a/track.h
+++ b/track.h
@@ -120,9 +120,18 @@ unsigned short int track_move(struct context *, int, struct coord *, struct imag
  */
 
 #ifdef MOTION_V4L2
+
+#ifndef V4L2_CID_PAN_RELATIVE
 #define V4L2_CID_PAN_RELATIVE   (V4L2_CID_PRIVATE_BASE+7)
+#endif
+
+#ifndef V4L2_CID_TILT_RELATIVE
 #define V4L2_CID_TILT_RELATIVE  (V4L2_CID_PRIVATE_BASE+8)
+#endif
+
+#ifndef V4L2_CID_PANTILT_RESET
 #define V4L2_CID_PANTILT_RESET  (V4L2_CID_PRIVATE_BASE+9)
+#endif
 
 #define INCPANTILT 64 // 1 degree
 #endif /* MOTION_V4L2 */