Fix a warning in webcam.c when closing socket and setup_mode is on. C…

…hange configure adding PACKAGE_NAME, PACKAGE_VERSION , DOC_DIR. Add all conf files to configure to add PACKAGE_NAME, PACKAGE_VERSION automatically

Makefile.in

@@ -12,7 +12,6 @@
 
 CC      = @CC@
 INSTALL = install
-VERSION = @VERSION@
 
 ################################################################################
 # Install locations, controlled by setting configure flags.                    #
@@ -24,14 +23,14 @@ mandir      = @mandir@
 sysconfdir  = @sysconfdir@
 datadir     = @datadir@
 datarootdir = @datarootdir@
-docdir      = $(datadir)/doc/motion-$(VERSION)
+docdir      = @DOC_DIR@
 examplesdir = $(docdir)/examples
 
 ################################################################################
 # These variables contain compiler flags, object files to build and files to   #
 # install.                                                                     #
 ################################################################################
-CFLAGS       = @CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -D_REENTRANT \
+CFLAGS       = @CFLAGS@ -Wall -D_REENTRANT -DVERSION=\"@PACKAGE_VERSION@\"  \
 	       -Dsysconfdir=\"$(sysconfdir)\" -Ddocdir=\"$(docdir)\"
 LDFLAGS      = @LDFLAGS@
 LIBS         = @LIBS@ 
@@ -68,7 +67,7 @@ pre-build-info:
 	@echo "Motion Guide contains all information you should need to get Motion up and running."
 	@echo "Run \"make updateguide\" to download the latest version of the Motion Guide."
 	@echo
-	@echo "Version:  $(VERSION)"
+	@echo "Version: @PACKAGE_VERSION@"
 ifneq (,$(findstring freebsd,$(VIDEO_OBJ)))
 	@echo "Platform: FreeBSD"
 else

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.61 for motion 3.2.10.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -570,11 +570,11 @@ MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='motion'
+PACKAGE_TARNAME='motion'
+PACKAGE_VERSION='3.2.10'
+PACKAGE_STRING='motion 3.2.10'
+PACKAGE_BUGREPORT=''
 
 ac_unique_file="motion.c"
 # Factoring default headers for most tests.
@@ -650,7 +650,6 @@ LIBS
 build_alias
 host_alias
 target_alias
-VERSION
 VIDEO
 CC
 CFLAGS
@@ -663,6 +662,7 @@ CPP
 GREP
 EGREP
 FFMPEG_OBJ
+DOC_DIR
 BIN_PATH
 LIBOBJS
 LTLIBOBJS'
@@ -714,7 +714,7 @@ sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -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 this package to adapt to many kinds of systems.
+\`configure' configures motion 3.2.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1226,7 +1226,7 @@ Fine tuning of the installation directories:
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/motion]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -1238,7 +1238,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of motion 3.2.10:";;
+   esac
   cat <<\_ACEOF
 
 Optional Packages:
@@ -1362,7 +1364,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+motion configure 3.2.10
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1376,7 +1378,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 $as_me, which was
+It was created by motion $as_me 3.2.10, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1709,6 +1711,14 @@ fi
 
 
 
+
+
+
+
+
+
+
+
 
 
 
@@ -1725,9 +1735,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_config_headers="$ac_config_headers config.h"
 
 
-VERSION=3.2.10
-
-
 THREAD_CFLAGS=""
 THREAD_CHECK="pthread.h"
 
@@ -6971,17 +6978,21 @@ if test $prefix = "NONE";then
 	else
 		BIN_PATH="$BIN_PATH/$bindir"
 	fi
+	DOC_DIR="$ac_default_prefix/share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 else
 	if test $exec_prefix = "NONE";then
 		BIN_PATH="$prefix/bin"
 	else
 		BIN_PATH="$prefix/$bindir"
 	fi
+	DOC_DIR="$prefix/share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 fi
 
 
 
-ac_config_files="$ac_config_files motion.init-FreeBSD.sh motion.init-Debian motion.init-RH motion.spec Makefile"
+
+
+ac_config_files="$ac_config_files motion-help.conf thread1.conf thread2.conf thread3.conf thread4.conf motion-dist.conf motion.init-FreeBSD.sh motion.init-Debian motion.init-RH motion.spec Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7379,7 +7390,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 $as_me, which was
+This file was extended by motion $as_me 3.2.10, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7428,7 +7439,7 @@ Report bugs to <[email protected]>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-config.status
+motion config.status 3.2.10
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -7536,6 +7547,12 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "motion-help.conf") CONFIG_FILES="$CONFIG_FILES motion-help.conf" ;;
+    "thread1.conf") CONFIG_FILES="$CONFIG_FILES thread1.conf" ;;
+    "thread2.conf") CONFIG_FILES="$CONFIG_FILES thread2.conf" ;;
+    "thread3.conf") CONFIG_FILES="$CONFIG_FILES thread3.conf" ;;
+    "thread4.conf") CONFIG_FILES="$CONFIG_FILES thread4.conf" ;;
+    "motion-dist.conf") CONFIG_FILES="$CONFIG_FILES motion-dist.conf" ;;
     "motion.init-FreeBSD.sh") CONFIG_FILES="$CONFIG_FILES motion.init-FreeBSD.sh" ;;
     "motion.init-Debian") CONFIG_FILES="$CONFIG_FILES motion.init-Debian" ;;
     "motion.init-RH") CONFIG_FILES="$CONFIG_FILES motion.init-RH" ;;
@@ -7639,7 +7656,6 @@ LIBS!$LIBS$ac_delim
 build_alias!$build_alias$ac_delim
 host_alias!$host_alias$ac_delim
 target_alias!$target_alias$ac_delim
-VERSION!$VERSION$ac_delim
 VIDEO!$VIDEO$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
@@ -7652,6 +7668,7 @@ CPP!$CPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 FFMPEG_OBJ!$FFMPEG_OBJ$ac_delim
+DOC_DIR!$DOC_DIR$ac_delim
 BIN_PATH!$BIN_PATH$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
@@ -8083,9 +8100,10 @@ fi
 
 
 echo ""
-echo "   ************************"
-echo "   *   Configure status   *"
-echo "   ************************"
+echo "   *********************"
+echo "     Configure status    "
+echo "      ${PACKAGE_NAME} ${PACKAGE_VERSION}"
+echo "   *********************"
 echo ""
 
 

configure.in

@@ -1,11 +1,8 @@
 dnl Process this file with autoconf to produce a configure script
-AC_INIT
+AC_INIT(motion,3.2.10)
 AC_CONFIG_SRCDIR([motion.c])
 AC_CONFIG_HEADERS(config.h)
 
-VERSION=3.2.10
-AC_SUBST(VERSION)
-
 THREAD_CFLAGS=""
 THREAD_CHECK="pthread.h"
 
@@ -974,17 +971,27 @@ if test $prefix = "NONE";then
 	else
 		BIN_PATH="$BIN_PATH/$bindir"
 	fi
+	DOC_DIR="$ac_default_prefix/share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 else
 	if test $exec_prefix = "NONE";then
 		BIN_PATH="$prefix/bin"
 	else
 		BIN_PATH="$prefix/$bindir"
 	fi
+	DOC_DIR="$prefix/share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 fi
 
+
+AC_SUBST(DOC_DIR)
 AC_SUBST(BIN_PATH)
 
-AC_CONFIG_FILES([motion.init-FreeBSD.sh
+AC_CONFIG_FILES([motion-help.conf
+thread1.conf
+thread2.conf
+thread3.conf
+thread4.conf
+motion-dist.conf
+motion.init-FreeBSD.sh
 motion.init-Debian
 motion.init-RH
 motion.spec
@@ -993,9 +1000,10 @@ Makefile
 AC_OUTPUT
 
 echo ""
-echo "   ************************"
-echo "   *   Configure status   *"
-echo "   ************************"
+echo "   *********************"
+echo "     Configure status    "
+echo "      ${PACKAGE_NAME} ${PACKAGE_VERSION}"
+echo "   *********************"
 echo ""