svn commit: r916151 - in /tuscany/sca-cpp/trunk: configure.ac kernel/fstream.hpp

[js...@apache.org]

Author: jsdelfino
Date: Thu Feb 25 06:41:37 2010
New Revision: 916151

URL: http://svn.apache.org/viewvc?rev=916151&view=rev
Log:
Fixed build errors, undefined AC_PROG_JAR autoconf macro, debug macro redefinition.

Modified:
    tuscany/sca-cpp/trunk/configure.ac
    tuscany/sca-cpp/trunk/kernel/fstream.hpp

Modified: tuscany/sca-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=916151&r1=916150&r2=916151&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Thu Feb 25 06:41:37 2010
@@ -316,16 +316,22 @@
   JAVA_PREFIX="${withval}"
   JAVA_INCLUDE="${withval}/include"
   JAVA_LIB="${withval}/jre/lib/i386"
+  JAVAC="${withval}/bin/javac"
+  JAR="${withval}/bin/jar" 
   AC_MSG_RESULT("${withval}")
 ], [
   JAVA_PREFIX="/usr/lib/jvm/default-java"
   JAVA_INCLUDE="/usr/lib/jvm/default-java/include"
   JAVA_LIB="/usr/lib/jvm/default-java/jre/lib/i386"
+  JAVAC="/usr/lib/jvm/default-java/bin/javac"
+  JAR="/usr/lib/jvm/default-java/bin/jar" 
   AC_MSG_RESULT(/usr/lib/jvm/default-java)
 ])
 AC_SUBST(JAVA_PREFIX)
 AC_SUBST(JAVA_INCLUDE)
 AC_SUBST(JAVA_LIB)
+AC_SUBST(JAVAC)
+AC_SUBST(JAR)
 
 # Enable Java support.
 AC_MSG_CHECKING([whether to enable Java support])
@@ -343,8 +349,18 @@
 if test "${want_java}" = "true"; then
   LIBS="-L${JAVA_LIB} -L${JAVA_LIB}/server ${default_LIBS}"
   AC_CHECK_LIB([java], [JNI_CreateJavaVM], [], [AC_MSG_ERROR([couldn't find a suitable libjava, use --with-java=PATH])], [-ljvm -lverify])
-  AC_PROG_JAVAC
-  AC_PROG_JAR
+  AC_MSG_CHECKING([for javac])
+  if test -x "${JAVAC}"; then
+    AC_MSG_RESULT("${JAVAC}")
+  else
+    AC_MSG_ERROR([couldn't find a suitable javac tool, use --with-java=PATH])
+  fi
+  AC_MSG_CHECKING([for jar])
+  if test -x "${JAR}"; then
+    AC_MSG_RESULT("${JAR}")
+  else
+    AC_MSG_ERROR([couldn't find a suitable jar tool, use --with-java=PATH])
+  fi 
   AM_CONDITIONAL([WANT_JAVA], true)
   AC_DEFINE([WANT_JAVA], 1, [enable Java support])
 else

Modified: tuscany/sca-cpp/trunk/kernel/fstream.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/fstream.hpp?rev=916151&r1=916150&r2=916151&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/fstream.hpp (original)
+++ tuscany/sca-cpp/trunk/kernel/fstream.hpp Thu Feb 25 06:41:37 2010
@@ -153,8 +153,7 @@
 
 #else
 
-#define debug(v, msg)
-#define debug(msg)
+#define debug(...)
 
 #endif