1) Rebased to 1.24.4

2) Reverted to stock zmdc.pl.in and zmwatch.pl.in because the bugs are fixed
3) Updated configure and Makefile files

scripts/zmdc.pl.in

@@ -128,9 +128,6 @@ foreach my $arg ( @ARGV )
     }
 }
 
-# Create the directory first if it doesn't exist
-mkdir(ZM_PATH_SOCKS);
-
 socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 ) or Fatal( "Can't open socket: $!" );
 
 my $saddr = sockaddr_un( SOCK_FILE );

scripts/zmwatch.pl.in

@@ -87,7 +87,6 @@ while( 1 )
 			{
 				# Check we have got an image recently
 				my $image_time = zmGetLastWriteTime( $monitor );
-				zmMemInvalidate( $monitor );
 				next if ( !defined($image_time) ); # Can't read from shared data
 				next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
 
@@ -96,9 +95,9 @@ while( 1 )
 				Debug( "Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay\n" );
 				if ( $image_delay > $max_image_delay )
 				{
-					Info( "Restarting capture daemon for ".$monitor->{Name}.", time since last capture $image_delay seconds ($now-$image_time)\n" );
-					$restart = 1;
-				}
+				    Info( "Restarting capture daemon for ".$monitor->{Name}.", time since last capture $image_delay seconds ($now-$image_time)\n" );
+                    $restart = 1;
+                }
 			}
 			else
 			{
@@ -125,7 +124,6 @@ while( 1 )
                 {
                     # Check we have got an image recently
                     my $image_time = zmGetLastReadTime( $monitor );
-                    zmMemInvalidate( $monitor );
                     next if ( !defined($image_time) ); # Can't read from shared data
                     next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
 

src/Makefile.in

@@ -242,7 +242,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = gnu
-AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
+AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -finline-functions
 #AM_CXXFLAGS = -frepo
 CLEANFILES = *.rpo