Rev 198: Merged in changes from devel branch. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

------------------------------------------------------------
revno: 198
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Mon 2007-10-29 12:33:15 +0000
message:
  Merged in changes from devel branch.
modified:
  acinclude.m4                   acinclude.m4-20070228020914-u2pk759xg7thauwf-8
    ------------------------------------------------------------
    revno: 192.1.23
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: ndbjmerge
    timestamp: Mon 2007-10-29 10:26:03 +0000
    message:
      Cleaned up --with-java and --with-python configure options.
    modified:
      acinclude.m4                   acinclude.m4-20070228020914-u2pk759xg7thauwf-8
=== modified file 'acinclude.m4'
--- a/acinclude.m4	2007-10-27 10:38:56 +0000
+++ b/acinclude.m4	2007-10-29 10:26:03 +0000
@@ -37,26 +37,41 @@
 
 AC_DEFUN([WITH_PYTHON], [
 
-  AC_ARG_WITH(python, [  --with-python=PATH path to python binary],
-  with_python=$withval, withval="python")
-
-PYTHON=$withval
-
-AM_PATH_PYTHON([2.4],,[with_python="no"])
-
-echo "After AM PATH PYTHON"
-
-#if test "x$with_python" != "xno" ; then
-#  SWIG_PYTHON
-#echo "pythonexists = $pythonexists"
-#  if test "$pythonexists" = "no" ; then
-#    with_python="no"
-#  fi
-#fi
-
-
-])
-
+  AC_ARG_WITH([python], 
+    [AS_HELP_STRING([--with-python],
+      [Build NDB/Python @<:@default=yes@:>@])],
+    [with_python=$withval], 
+    [with_python=python])
+
+  AS_IF([test "x$with_python" != "xno"],[
+    AS_IF([test "x$with_python" != "xyes"],[PYTHON=$with_python])
+    AM_PATH_PYTHON([2.4],,[with_python="no"])
+    ])
+])
+
+
+AC_DEFUN([WITH_JAVA], [
+
+  AC_ARG_WITH([java], 
+    [AS_HELP_STRING([--with-java],
+      [BULD NDB/J @<:@default=yes@:>@])],
+    [with_java=$withval], 
+    [with_java=java])
+
+  AS_IF([test "x$with_java" != "xno"],[
+    AS_IF([test "x$with_java" != "xyes"],[JAVA=$with_java])   
+    AC_PROG_JAVA()
+    AS_IF([test "x$JAVA" = "x"],AC_MSG_ERROR([Couldn't find java.]))
+    AC_PROG_JAVAC()
+    AS_IF([test "x$JAVAC" = "x"],AC_MSG_ERROR([Couldn't find javac.]))
+    AC_PROG_JAR()
+    AS_IF([test "x$JAR" = "x"],AC_MSG_ERROR([Couldn't find jar.]))
+    AC_CHECK_PROGS(ANT,ant)
+    AS_IF([test "x$ANT" = "x"],AC_MSG_ERROR([Couldn't find ant.]))
+    AC_CHECK_JUNIT()
+    AC_CHECK_JAVA_CXXFLAGS()
+  ])
+])
 
 AC_DEFUN([WITH_PERL], [
 
@@ -79,44 +94,6 @@
 
 ])
 
-
-AC_DEFUN([WITH_JAVA], [
-
-  AC_ARG_WITH(java, [  --with-java	Enable or disable java], 
-  with_java=$withval, with_java="yes")
-
-if test "$with_java" = "yes" ; then
-  AC_PROG_JAVAC()
-  if test "x$JAVAC" == "x"  ; then
-    AC_MSG_ERROR([Couldn't find javac.])
-  fi
-  AC_PROG_JAR()
-  if test "x$JAR" == "x"  ; then
-    AC_MSG_ERROR([Couldn't find jar.])
-  fi
-  AC_PROG_JAVA()
-  if test "x$JAVA" == "x"  ; then
-    AC_MSG_ERROR([Couldn't find java.])
-  fi
-  AC_CHECK_PROGS(ANT,ant)
-  if test "x$ANT" == "x"  ; then
-    AC_MSG_ERROR([Couldn't find ant.])
-  fi
-  AC_CHECK_JUNIT()
-  AC_CHECK_JAVA_CXXFLAGS()
-  dnl AC_JNI_INCLUDE_DIR()
-  dnl if test "x${JNI_INCLUDE_DIRS}" == "x"  ; then
-  dnl   AC_MSG_ERROR([Couldn't find JNI includes .])
-  dnl fdnl i 
-fi 
-
-
-dnl for JNI_INCLUDE_DIR in ${JNI_INCLUDE_DIRS} ; do
-dnl   JNI_INCLUDES="$JNI_INCLUDES -I$JNI_INCLUDE_DIR"
-dnl done
-
-])
-
 AC_DEFUN([WITH_RUBY], [
 
   AC_ARG_WITH(ruby, [  --with-ruby=PATH	path to ruby binary],