Merge pull request #597 from quanah/master

Fixes #596 - Remove java plugin

Makefile.am

@@ -59,18 +59,13 @@ SAM = sample
 else
 SAM =
 endif
-if JAVA
-JAV = java
-else
-JAV =
-endif
 if MACOSX
 INSTALLOSX = install-exec-local-osx
 else 
 INSTALLOSX = 
 endif
 
-SUBDIRS=include sasldb common lib plugins utils $(PWC) $(SAM) $(JAV) $(SAD)
+SUBDIRS=include sasldb common lib plugins utils $(PWC) $(SAM) $(SAD)
 EXTRA_DIST=config doc docsrc win32 mac dlcompat-20010505 NTMakefile \
     INSTALL.TXT libsasl2.pc.in
 

config/sasl.spec

@@ -72,7 +72,7 @@ This plugin implements the SASL SCRAM-SHA-1/SCRAM-SHA-2 mechanism.
 %setup
 
 %build
-./configure --prefix=/usr --disable-java
+./configure --prefix=/usr
 make
 
 %install

configure.ac

@@ -152,54 +152,6 @@ if test "$with_purify" = yes; then
   AC_CHECK_PROGS(PURIFY, purify)
 fi
 
-AC_ARG_ENABLE(java, [  --enable-java           compile Java support [[no]]],
-	enable_java=$enableval, enable_java=no)
-if test "$enable_java" = yes; then
-  AC_PATH_PROG(JAVAC, javac, no)
-  AC_PATH_PROGS(JAVAH, javah kaffeh, no)
-  AC_CHECK_PROGS(JAVADOC, javadoc, :)	
-  if test "$JAVAC" = "no" -o "$JAVAH" = "no"; then
-    AC_WARN([Disabling Java support])
-    enable_java=no
-  fi
-else
-# Make distcheck work
-  JAVAC="true"
-  JAVAH="true"
-  JAVADOC="true"
-fi
-AM_CONDITIONAL(JAVA, test "$enable_java" = yes)
-
-if test "$enable_java" = yes; then
-  AC_MSG_CHECKING([JNI cpp flags])
-  AC_CACHE_VAL(sasl_cv_java_includes,[
-  if test `echo $JAVAH | sed 's,.*/,,'` = "kaffeh"; then
-    sasl_cv_java_includes=-I`echo $JAVAH | sed -e 's,/bin.*,/include/kaffe,'`
-  else
-    java_base=`echo $JAVAC | sed 's,/bin.*,'','`
-
-    AC_ARG_WITH(javabase, [  --with-javabase=PATH    set path to find jni.h in [/usr/java/include] ],
-        java_base=$withval,)
-	
-
-    sasl_cv_java_includes=''
-    for dir in `find ${java_base}/include -follow -type d -print | grep -v green_threads`; do
-      sasl_cv_java_includes="${sasl_cv_java_includes} -I$dir"
-    done
-  fi
-
-  sasl_cv_java_includes="${sasl_cv_java_includes} -I$javapath/include"])
-
-  JAVA_INCLUDES=$sasl_cv_java_includes
-  AC_SUBST(JAVA_INCLUDES)
-  AC_MSG_RESULT(ok)
-
-  JAVAROOT=".."
-  AC_SUBST(JAVAROOT)
-  JAVAC=`echo "$JAVAC" | sed 's,.*/,,'`
-  JAVAH=`echo "$JAVAH" | sed 's,.*/,,'`
-fi
-
 AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes)
 
 dnl call before we do the berkeley DB checks
@@ -1564,13 +1516,6 @@ plugins/Makefile
 lib/Makefile
 utils/Makefile
 sample/Makefile
-java/Makefile
-java/CyrusSasl/Makefile
-java/Test/Makefile
-java/javax/Makefile
-java/javax/security/Makefile
-java/javax/security/auth/Makefile
-java/javax/security/auth/callback/Makefile
 pwcheck/Makefile)
 
 AC_MSG_NOTICE([