X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=m4%2Fclasspath.m4;h=3e873ed1db0f6e830a20cf724cf354c3c7c825bb;hb=39f00e317d5032a3e16e00af55f9664910eadd51;hp=b5a322b8f3102e382893828e3a245b14664751dd;hpb=773281400f5bab23de28144498baeffcfed4159a;p=cacao.git

diff --git a/m4/classpath.m4 b/m4/classpath.m4
index b5a322b8f..3e873ed1d 100644
--- 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$
+dnl $Id: classpath.m4 8398 2007-08-22 16:56:45Z 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,9 +104,19 @@ 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,lib/${JAVA_ARCH}]])],
             [CLASSPATH_LIBDIR=${withval}],
-            [CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}/lib])
+            [case "${WITH_CLASSPATH}" in
+                 gnu)
+                     CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}/lib
+                     ;;
+                 sun)
+                     CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}/lib/${JAVA_ARCH}
+                     ;;
+                 *)
+                     CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}
+                     ;;
+             esac])
 AC_MSG_RESULT(${CLASSPATH_LIBDIR})
 
 dnl expand CLASSPATH_LIBDIR to something that is usable in C code