You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2018/07/19 17:15:22 UTC
zookeeper git commit: ZOOKEEPER-3077: build outside of source
directory
Repository: zookeeper
Updated Branches:
refs/heads/master 25035f10e -> fc9c9fc3b
ZOOKEEPER-3077: build outside of source directory
Allow building native C library outside of source directory by explicitly
looking for jute generated header and source files inside source directory.
Signed-off-by: Kent R. Spillner <kspillneracm.org>
Author: Kent R. Spillner <ks...@acm.org>
Reviewers: phunt@apache.org
Closes #557 from sl4mmy/zookeeper-3077
Change-Id: I7dafcaed6367362f3d8df283e7d0ef5804774ddc
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/fc9c9fc3
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/fc9c9fc3
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/fc9c9fc3
Branch: refs/heads/master
Commit: fc9c9fc3b2c24f78c90bd4c7b717e3410afd5e58
Parents: 25035f1
Author: Kent R. Spillner <ks...@acm.org>
Authored: Thu Jul 19 10:14:59 2018 -0700
Committer: Patrick Hunt <ph...@apache.org>
Committed: Thu Jul 19 10:14:59 2018 -0700
----------------------------------------------------------------------
src/c/configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/fc9c9fc3/src/c/configure.ac
----------------------------------------------------------------------
diff --git a/src/c/configure.ac b/src/c/configure.ac
index 9811618..8a2e44d 100644
--- a/src/c/configure.ac
+++ b/src/c/configure.ac
@@ -41,7 +41,7 @@ if test "$CALLER" = "ANT" ; then
CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS -DZKSERVER_CMD=\"\\\"${base_dir}/src/c/tests/zkServer.sh\\\"\""
else
CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS -DZKSERVER_CMD=\"\\\"./tests/zkServer.sh\\\"\""
-AC_CHECK_FILES([generated/zookeeper.jute.c generated/zookeeper.jute.h],[],
+AC_CHECK_FILES([$srcdir/generated/zookeeper.jute.c $srcdir/generated/zookeeper.jute.h],[],
[AC_MSG_ERROR([jute files are missing! Please run "ant compile_jute" while in the zookeeper top level directory.])
])
fi