[vhffs-dev] [1600] fixed autotool so that vhffs-fssync are compiling

[subversion@xxxxxxxxxxxxx]

Revision: 1600
Author:   gradator
Date:     2010-04-26 17:05:12 +0200 (Mon, 26 Apr 2010)
Log Message:
-----------
fixed autotool so that vhffs-fssync are compiling

Modified Paths:
--------------
    trunk/configure.ac
    trunk/vhffs-fs/bootstrap.sh
    trunk/vhffs-fs/configure.ac
    trunk/vhffs-fssync/Makefile.am

Added Paths:
-----------
    trunk/debian/vhffs-fssync.files

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-04-17 19:11:26 UTC (rev 1599)
+++ trunk/configure.ac	2010-04-26 15:05:12 UTC (rev 1600)
@@ -1,13 +1,15 @@
 AC_REVISION($Revision: 101 $)dnl
 AC_INIT(vhffs, [4.3], [support@xxxxxxxxx])
 AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_MACRO_DIR([m4])
 
-
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_SED
 AC_PREFIX_DEFAULT([/usr])
 
+PKG_PROG_PKG_CONFIG
+
 # Ugly but will remain until we do some cleanup in directories handling
 test "x$prefix" = "xNONE" && prefix="/usr"
 
@@ -342,10 +344,18 @@
 fi
 
 if test "$enable_extra" = yes ; then
-    AM_PATH_GLIB_2_0( 2.0.0, [], [AC_MSG_FAILURE([Glib not found (needed for extra packages)])])
     AM_PROG_CC_C_O
+#    AM_PATH_GLIB_2_0( 2.0.0, [], [AC_MSG_FAILURE([Glib not found (needed for extra packages)])])
 fi
 
+if test "$enable_fssync" = yes ; then
+    PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= 2.16.0])
+    AC_SUBST(GLIB2_CFLAGS)
+    AC_SUBST(GLIB2_LIBS)
+    AC_CHECK_HEADERS([sys/inotify.h],,[AC_MSG_ERROR([Cannot find inotify headers])])
+    AC_CHECK_FUNCS([inotify_init inotify_add_watch inotify_rm_watch])
+fi
+
 AC_CONFIG_FILES([ vhffs-intl/Makefile.in
 	vhffs-test-dependencies],
 	[chmod ug+x $ac_file]

Added: trunk/debian/vhffs-fssync.files
===================================================================
--- trunk/debian/vhffs-fssync.files	                        (rev 0)
+++ trunk/debian/vhffs-fssync.files	2010-04-26 15:05:12 UTC (rev 1600)
@@ -0,0 +1,2 @@
+usr/bin/vhffsfssync_master
+usr/bin/vhffsfssync_slave

Modified: trunk/vhffs-fs/bootstrap.sh
===================================================================
--- trunk/vhffs-fs/bootstrap.sh	2010-04-17 19:11:26 UTC (rev 1599)
+++ trunk/vhffs-fs/bootstrap.sh	2010-04-26 15:05:12 UTC (rev 1600)
@@ -3,4 +3,4 @@
 set -x
 aclocal
 automake --add-missing --copy
-autoconf 	
+autoconf

Modified: trunk/vhffs-fs/configure.ac
===================================================================
--- trunk/vhffs-fs/configure.ac	2010-04-17 19:11:26 UTC (rev 1599)
+++ trunk/vhffs-fs/configure.ac	2010-04-26 15:05:12 UTC (rev 1600)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([VHFFS-fs], [4.1], [bugs@xxxxxxxxx])
+AC_INIT([VHFFS-fs], [4.3], [bugs@xxxxxxxxx])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([vhffsfs.c])
 AC_CONFIG_HEADER([config.h])
@@ -139,7 +139,7 @@
 AC_CHECK_HEADERS([fcntl.h inttypes.h postgresql/libpq-fe.h pthread.h signal.h stdint.h stdio.h unistd.h], 
     [], [AC_MSG_ERROR([Missing headers, bailing out])])
 if test "$enable_cache_query" = yes || test "$enable_checkquota_cache" = yes ; then
-    PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= 2.0.2])
+    PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= 2.16.0])
     CFLAGS="$CFLAGS $GLIB2_CFLAGS"
     LIBS="$LIBS $GLIB2_LIBS"
 fi

Modified: trunk/vhffs-fssync/Makefile.am
===================================================================
--- trunk/vhffs-fssync/Makefile.am	2010-04-17 19:11:26 UTC (rev 1599)
+++ trunk/vhffs-fssync/Makefile.am	2010-04-26 15:05:12 UTC (rev 1600)
@@ -3,16 +3,13 @@
 vhffsfssync_masterdir=@EXTRADIR@/vhffs-fssync
 vhffsfssync_master_SOURCES=vhffsfssync_master.c
 vhffsfssync_master_PROGRAMS=vhffsfssync_master
-vhffsfssync_master_CPPFLAGS=@GLIB_CFLAGS@
-vhffsfssync_master_LDADD=@GLIB_LIBS@
+vhffsfssync_master_CPPFLAGS=@GLIB2_CFLAGS@
+vhffsfssync_master_LDADD=@GLIB2_LIBS@
 
 vhffsfssync_slavedir=@EXTRADIR@/vhffs-fssync
 vhffsfssync_slave_SOURCES=vhffsfssync_slave.c
 vhffsfssync_slave_PROGRAMS=vhffsfssync_slave
-vhffsfssync_slave_CPPFLAGS=@GLIB_CFLAGS@
-vhffsfssync_slave_LDADD=@GLIB_LIBS@
+vhffsfssync_slave_CPPFLAGS=@GLIB2_CFLAGS@
+vhffsfssync_slave_LDADD=@GLIB2_LIBS@
 
-#gcc -ggdb -Wall -Werror -o vhffsfssync_master `pkg-config --cflags --libs glib-2.0` vhffsfssync_master.c && ./vhffsfssync_master src
-#gcc -ggdb -Wall -Werror -o vhffsfssync_slave `pkg-config --cflags --libs glib-2.0` vhffsfssync_slave.c && ./vhffsfssync_slave dst0 127.0.0.1 4567
-
 endif