git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3…

…-4887-817a-d78f3d33393f

config.h.in

@@ -18,6 +18,9 @@
    */
 #undef HAVE_ALLOCA_H
 
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
+
 /* Define to 1 if you have the declaration of `backtrace', and to 0 if you
    don't. */
 #undef HAVE_DECL_BACKTRACE
@@ -32,6 +35,9 @@
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
+/* Define to 1 if you have the <execinfo.h> header file. */
+#undef HAVE_EXECINFO_H
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
@@ -62,9 +68,18 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
+/* Define to 1 if you have the <glob.h> header file. */
+#undef HAVE_GLOB_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `ioctl' function. */
+#undef HAVE_IOCTL
+
+/* Define to 1 if you have the `ioctlsocket' function. */
+#undef HAVE_IOCTLSOCKET
+
 /* Define to 1 if you have the <jpeglib.h> header file. */
 #undef HAVE_JPEGLIB_H
 
@@ -177,15 +192,24 @@
 /* Define to 1 if you have the <pcre/pcre.h> header file. */
 #undef HAVE_PCRE_PCRE_H
 
+/* Define to 1 if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
+
 /* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
 
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
 /* Define to 1 if the system has the type `siginfo_t'. */
 #undef HAVE_SIGINFO_T
 
+/* Define to 1 if you have the `sleep' function. */
+#undef HAVE_SLEEP
+
 /* Define to 1 if you have the `socket' function. */
 #undef HAVE_SOCKET
 
@@ -256,6 +280,12 @@
 /* Define to 1 if `eip' is a member of `struct sigcontext'. */
 #undef HAVE_STRUCT_SIGCONTEXT_EIP
 
+/* Define to 1 if you have the `syscall' function. */
+#undef HAVE_SYSCALL
+
+/* Define to 1 if you have the <syscall.h> header file. */
+#undef HAVE_SYSCALL_H
+
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
@@ -289,12 +319,18 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/un.h> header file. */
+#undef HAVE_SYS_UN_H
+
 /* Define to 1 if the system has the type `ucontext_t'. */
 #undef HAVE_UCONTEXT_T
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `usleep' function. */
+#undef HAVE_USLEEP
+
 /* Define to 1 if you have the <values.h> header file. */
 #undef HAVE_VALUES_H
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for zm 1.24.4.
+# Generated by GNU Autoconf 2.65 for zm 1.25.0.
 #
 # Report bugs to <[email protected]>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='zm'
 PACKAGE_TARNAME='ZoneMinder'
-PACKAGE_VERSION='1.24.4'
-PACKAGE_STRING='zm 1.24.4'
+PACKAGE_VERSION='1.25.0'
+PACKAGE_STRING='zm 1.25.0'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://www.zoneminder.com/downloads.html'
 
@@ -1309,7 +1309,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 zm 1.24.4 to adapt to many kinds of systems.
+\`configure' configures zm 1.25.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1375,7 +1375,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of zm 1.24.4:";;
+     short | recursive ) echo "Configuration of zm 1.25.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1491,7 +1491,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-zm configure 1.24.4
+zm configure 1.25.0
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2050,7 +2050,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 zm $as_me 1.24.4, which was
+It was created by zm $as_me 1.25.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2861,7 +2861,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ZoneMinder'
- VERSION='1.24.4'
+ VERSION='1.25.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6257,6 +6257,19 @@ _ACEOF
 fi
 done
 
+for ac_func in syscall sleep usleep ioctl ioctlsocket sigaction
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
 
 # Other programs
 # Extract the first word of "ffmpeg", so it can be a program name with args.
@@ -7588,7 +7601,21 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
-for ac_header in fcntl.h limits.h memory.h netdb.h netinet/in.h stddef.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h values.h
+for ac_header in fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+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
+
+fi
+
+done
+
+for ac_header in netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -7602,6 +7629,42 @@ fi
 
 done
 
+for ac_header in execinfo.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_execinfo_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EXECINFO_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in syscall.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "syscall.h" "ac_cv_header_syscall_h" "$ac_includes_default"
+if test "x$ac_cv_header_syscall_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSCALL_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in pthread.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_H 1
+_ACEOF
+
+fi
+
+done
+
 for ac_header in linux/videodev.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
@@ -9904,7 +9967,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by zm $as_me 1.24.4, which was
+This file was extended by zm $as_me 1.25.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9971,7 +10034,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-zm config.status 1.24.4
+zm config.status 1.25.0
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(zm,1.24.4,[email protected],ZoneMinder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.25.0,[email protected],ZoneMinder,http://www.zoneminder.com/downloads.html)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AM_CONFIG_HEADER(config.h)
@@ -247,6 +247,7 @@ AC_FUNC_STRFTIME
 AC_FUNC_STRTOD
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday memmove memset mkdir munmap putenv select socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strsignal strspn strstr strtol strtoull])
+AC_CHECK_FUNCS([syscall sleep usleep ioctl ioctlsocket sigaction])
 
 # Other programs
 AC_CHECK_PROG(OPT_FFMPEG,ffmpeg,yes,no)
@@ -285,7 +286,11 @@ AC_CHECK_LIB(z,compress,,)
 # Checks for header files.
 AC_FUNC_ALLOCA
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h limits.h memory.h netdb.h netinet/in.h stddef.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h values.h])
+AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h])
+AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h])
+AC_CHECK_HEADERS(execinfo.h,,,)
+AC_CHECK_HEADERS(syscall.h,,,)
+AC_CHECK_HEADERS(pthread.h,,,)
 AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),)
 AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),)
 if test "$ZM_HAS_V4L1" == "1" || test "$ZM_HAS_V4L2" == "1"; then

db/Makefile.am

@@ -40,4 +40,5 @@ EXTRA_DIST = \
 	zm_update-1.24.0.sql \
 	zm_update-1.24.1.sql \
 	zm_update-1.24.2.sql \
-	zm_update-1.24.3.sql
+	zm_update-1.24.3.sql \
+	zm_update-1.24.4.sql

db/Makefile.in

@@ -222,7 +222,8 @@ EXTRA_DIST = \
 	zm_update-1.24.0.sql \
 	zm_update-1.24.1.sql \
 	zm_update-1.24.2.sql \
-	zm_update-1.24.3.sql
+	zm_update-1.24.3.sql \
+	zm_update-1.24.4.sql
 
 all: all-am
 

db/zm_create.sql.in

@@ -259,6 +259,21 @@ CREATE TABLE `Groups` (
   PRIMARY KEY  (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
+--
+-- Table structure for table `Logs`
+--
+CREATE TABLE `Logs` (
+  `TimeKey` decimal(16,6) NOT NULL,
+  `Component` varchar(32) NOT NULL,
+  `Pid` smallint(6) DEFAULT NULL,
+  `Level` tinyint(3) NOT NULL,
+  `Code` char(3) NOT NULL,
+  `Message` varchar(255) NOT NULL,
+  `File` varchar(255) DEFAULT NULL,
+  `Line` smallint(5) unsigned DEFAULT NULL,
+  KEY `TimeKey` (`TimeKey`)
+) ENGINE=@ZM_MYSQL_ENGINE@;
+
 --
 -- Table structure for table `MonitorPresets`
 --

db/zm_update-1.24.4.sql

@@ -0,0 +1,30 @@
+--
+-- This updates a 1.24.4 database to the next version
+--
+
+--
+-- Create Logs table
+-- TODO - defaults to MyISAM as not easy to import selected engine
+--
+
+CREATE TABLE `Logs` (
+  `TimeKey` decimal(16,6) NOT NULL,
+  `Component` varchar(32) NOT NULL,
+  `Pid` smallint(6) DEFAULT NULL,
+  `Level` tinyint(3) NOT NULL,
+  `Code` char(3) NOT NULL,
+  `Message` varchar(255) NOT NULL,
+  `File` varchar(255) DEFAULT NULL,
+  `Line` smallint(5) unsigned DEFAULT NULL,
+  KEY `TimeKey` (`TimeKey`)
+) ENGINE=MyISAM;
+
+--
+-- These are optional, but we might as well do it now
+--
+optimize table Frames;
+optimize table Events;
+optimize table Filters;
+optimize table Zones;
+optimize table Monitors;
+optimize table Stats;

scripts/Makefile.am

@@ -44,7 +44,7 @@ EXTRA_DIST = \
 	ZoneMinder/lib/ZoneMinder.pm \
 	ZoneMinder/lib/ZoneMinder/Base.pm.in \
 	ZoneMinder/lib/ZoneMinder/Config.pm.in \
-	ZoneMinder/lib/ZoneMinder/Debug.pm \
+	ZoneMinder/lib/ZoneMinder/Logger.pm \
 	ZoneMinder/lib/ZoneMinder/General.pm \
 	ZoneMinder/lib/ZoneMinder/Database.pm \
 	ZoneMinder/lib/ZoneMinder/Memory.pm.in \

scripts/Makefile.in

@@ -294,7 +294,7 @@ EXTRA_DIST = \
 	ZoneMinder/lib/ZoneMinder.pm \
 	ZoneMinder/lib/ZoneMinder/Base.pm.in \
 	ZoneMinder/lib/ZoneMinder/Config.pm.in \
-	ZoneMinder/lib/ZoneMinder/Debug.pm \
+	ZoneMinder/lib/ZoneMinder/Logger.pm \
 	ZoneMinder/lib/ZoneMinder/General.pm \
 	ZoneMinder/lib/ZoneMinder/Database.pm \
 	ZoneMinder/lib/ZoneMinder/Memory.pm.in \

scripts/ZoneMinder/Makefile.PL

@@ -10,9 +10,9 @@ WriteMakefile(
 		'lib/ZoneMinder.pm' => '$(INST_LIBDIR)/ZoneMinder.pm',
 		'lib/ZoneMinder/Base.pm' => '$(INST_LIBDIR)/ZoneMinder/Base.pm',
 		'lib/ZoneMinder/Config.pm' => '$(INST_LIBDIR)/ZoneMinder/Config.pm',
-		'lib/ZoneMinder/Debug.pm' => '$(INST_LIBDIR)/ZoneMinder/Debug.pm',
 		'lib/ZoneMinder/General.pm' => '$(INST_LIBDIR)/ZoneMinder/General.pm',
 		'lib/ZoneMinder/Database.pm' => '$(INST_LIBDIR)/ZoneMinder/Database.pm',
+		'lib/ZoneMinder/Logger.pm' => '$(INST_LIBDIR)/ZoneMinder/Logger.pm',
 		'lib/ZoneMinder/Memory.pm' => '$(INST_LIBDIR)/ZoneMinder/Memory.pm',
 		'lib/ZoneMinder/Memory/Shared.pm' => '$(INST_LIBDIR)/ZoneMinder/Memory/Shared.pm',
 		'lib/ZoneMinder/Memory/Mapped.pm' => '$(INST_LIBDIR)/ZoneMinder/Memory/Mapped.pm',