Merge pull request #3 from ggtakec/master

Updated dependency for fixing bugs in libfullock
yahoojapan · Feb 15, 2017 · bacf396 · bacf396
2 parents f932621 + 168eead
commit bacf396
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+chmpx (1.0.51) unstable; urgency=low
+
+  * Updated dependency for fixing bugs in libfullock
+  * Fixed error/warning for compiling and changed travis.yaml - #2
+
+ -- Takeshi Nakatani <[email protected]>  Tue, 14 Feb 2017 13:01:55 +0900
+
 chmpx (1.0.50) unstable; urgency=low
 
   * First version of open sorce on Github

diff --git a/configure.ac b/configure.ac
@@ -76,11 +76,11 @@ AC_CONFIG_FILES([Makefile
 
 # Check for k2hash + libfullock
 if test "x${CHECK_K2HASH}" != "xno"; then
-	PKG_CHECK_MODULES([k2hash], [libk2hash >= 1.0.52], [have_k2hash=yes], [have_k2hash=no])
+	PKG_CHECK_MODULES([k2hash], [libk2hash >= 1.0.54], [have_k2hash=yes], [have_k2hash=no])
 	if test "x${have_k2hash}" = "xno"; then
 		AC_MSG_ERROR([not found k2hash package.])
 	fi
-	PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.21], [have_fullock=yes], [have_fullock=no])
+	PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.23], [have_fullock=yes], [have_fullock=no])
 	if test "x${have_fullock}" = "xno"; then
 		AC_MSG_ERROR([not found fullock package.])
 	fi

diff --git a/fullock b/fullock
diff --git a/k2hash b/k2hash
+1 −0		.gitignore
+12 −0		ChangeLog
+48 −18		lib/flckbaselist.tcc
+15 −0		lib/flckshm.cc
+1 −0		lib/flckshm.h
+10 −0		lib/flckshminit.cc
+234 −81		lib/flckthread.cc
+10 −1		lib/flckthread.h
+4 −1		tests/Makefile.am
+166 −0		tests/forktest.cc
+21 −1		tests/test.sh