Makefile: skip hadoop client if jni.h not present

diff --git a/configure.ac b/configure.ac
index f575542a3740baee5bb7a9f478335f79d8b53fa9..7d20228899c0cf974f78155305b5bb525aba19aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,22 @@ AS_IF([test "x$with_fuse" != xno],
              ])])
 AM_CONDITIONAL(WITH_FUSE, [test "$HAVE_LIBFUSE" = "1"])
 
+# jni?
+AC_ARG_WITH([hadoop],
+            [AS_HELP_STRING([--with-hadoop], [build hadoop client])],
+            [],
+            [with_hadoop=check])
+AS_IF([test "x$with_hadoop" != xno],
+           [AC_CHECK_HEADER([jni.h],
+             [HAVE_JNI=1],
+             [if test "x$with_hadoop" != xcheck; then
+                 AC_MSG_FAILURE(
+                   [--with-hadoop was given, but jni.h not found])
+               fi
+             ])])
+AM_CONDITIONAL(WITH_HADOOPCLIENT, [test "$HAVE_JNI" = "1"])
+
+
 # CommonC++?
 AC_ARG_WITH([ccgnu],
             [AS_HELP_STRING([--with-ccgnu],

diff --git a/src/Makefile.am b/src/Makefile.am
index 1327fa901b86a8d6d6f8a4f9eb830f4615c08495..b58bd4b94b930286296cb561b435c4ecb981c083 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -163,7 +163,9 @@ libcls_acl.so: cls_acl.cc
        ${CXX} -I. -fPIC -shared -g -o libcls_acl.so cls_acl.cc
 BUILT_SOURCES += libcls_acl.so
 
+
 ## hadoop client
+if WITH_HADOOPCLIENT
 JAVA_BASE = /usr/lib/jvm/java-6-sun
 libhadoopcephfs_la_SOURCES = client/hadoop/CephFSInterface.cc \
 ${JAVA_BASE}/include \
@@ -172,6 +174,8 @@ libhadoopcephfs_la_CFLAGS = ${AM_CFLAGS}
 libhadoopcephfs_la_CXXFLAGS = ${AM_CXXFLAGS}
 libhadoopcephfs_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'hadoopcephfs_.*'
 lib_LTLIBRARIES += libhadoopcephfs.la
+endif
+
 
 # shell scripts
 editpaths = sed \