* configure.ac: Only check AC_PROG_JAVAC and AC_PROG_JAR for CLDC-1.1

and GNU.

* m4/classpath.m4 (AC_CHECK_WITH_CLASSPATH_CLASSES): Changed default
value for different configurations..

diff --git a/configure.ac b/configure.ac
index 076094b27af93e5ceb4f9fea5d8aec6cf00d81a7..1250bc10625bc7e2d2d43a8ea98e895aea470550 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 dnl 02110-1301, USA.
 dnl 
-dnl $Id: configure.ac 8163 2007-06-29 18:53:55Z twisti $
+dnl $Id: configure.ac 8248 2007-07-31 12:47:11Z twisti $
 
 dnl Process this file with autoconf to produce a configure script.
 
@@ -906,8 +906,19 @@ AC_SUBST(WITH_STATIC_CLASSPATH)
 
 
 dnl check for some programs we need
-AC_PROG_JAVAC
-AC_PROG_JAR
+
+case "${WITH_CLASSPATH}" in
+    cldc1.1 | gnu)
+        AC_PROG_JAVAC
+        AC_PROG_JAR
+        ;;
+    sun)
+        ;;
+    *)
+        AC_MSG_ERROR(unknown classpath configuration ${WITH_CLASSPATH})
+        ;;
+esac
+
 
 AC_CHECK_HEADERS(
        [regex.h], 

diff --git a/m4/classpath.m4 b/m4/classpath.m4
index 700c9685c84c09d5ebf67b54ea5fb28ddaf49e49..2b11adc8de79cc16e495c68591ad201a05fdb22d 100644 (file)
--- a/m4/classpath.m4
+++ b/m4/classpath.m4
@@ -22,7 +22,7 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 dnl 02110-1301, USA.
 dnl 
-dnl $Id: classpath.m4 8133 2007-06-22 13:29:38Z twisti $
+dnl $Id: classpath.m4 8248 2007-07-31 12:47:11Z twisti $
 
 
 dnl which Java core library should we use
@@ -80,9 +80,19 @@ dnl where are Java core library classes installed
 AC_DEFUN([AC_CHECK_WITH_CLASSPATH_CLASSES],[
 AC_MSG_CHECKING(where Java core library classes are installed)
 AC_ARG_WITH([classpath-classes],
-            [AS_HELP_STRING(--with-classpath-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=/usr/local/classpath/share/classpath/glibj.zip]])],
+            [AS_HELP_STRING(--with-classpath-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=CLASSPATH_PREFIX/{share/classpath/glibj.zip,classes}]])],
             [CLASSPATH_CLASSES=${withval}],
-            [CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip])
+            [case "${WITH_CLASSPATH}" in
+                 gnu)
+                     CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip
+                     ;;
+                 sun)
+                     CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/classes
+                     ;;
+                 *)
+                     CLASSPATH_CLASSES=${CLASSPATH_PREFIX}
+                     ;;
+             esac])
 AC_MSG_RESULT(${CLASSPATH_CLASSES})
 AC_DEFINE_UNQUOTED([CLASSPATH_CLASSES], "${CLASSPATH_CLASSES}", [Java core library classes])
 AC_SUBST(CLASSPATH_CLASSES)
@@ -94,7 +104,7 @@ dnl where are Java core library native libraries installed
 AC_DEFUN([AC_CHECK_WITH_CLASSPATH_LIBDIR],[
 AC_MSG_CHECKING(where Java core library native libraries are installed)
 AC_ARG_WITH([classpath-libdir],
-            [AS_HELP_STRING(--with-classpath-libdir=<dir>,installation directory of Java core library native libraries [[default=/usr/local/classpath/lib]])],
+            [AS_HELP_STRING(--with-classpath-libdir=<dir>,installation directory of Java core library native libraries [[default=CLASSPATH_PREFIX/lib]])],
             [CLASSPATH_LIBDIR=${withval}],
             [CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}/lib])
 AC_MSG_RESULT(${CLASSPATH_LIBDIR})