Index: acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/acinclude.m4,v
retrieving revision 1.41
diff -u -b -B -r1.41 acinclude.m4
--- acinclude.m4	26 May 2004 08:46:58 -0000	1.41
+++ acinclude.m4	26 May 2004 11:04:18 -0000
@@ -42,7 +42,6 @@
   [
     CLASSPATH_CHECK_GCJ
   ])
-  AM_CONDITIONAL(USER_SPECIFIED_GCJ, test "x${GCJ}" != x)
   AC_SUBST(GCJ)
 ])
 
@@ -121,7 +120,6 @@
   [ 
     CLASSPATH_CHECK_JIKES
   ])
-  AM_CONDITIONAL(USER_SPECIFIED_JIKES, test "x${JIKES}" != x)
   AC_SUBST(JIKES)
 ])
 
@@ -157,7 +155,6 @@
   [ 
     CLASSPATH_CHECK_KJC
   ])
-  AM_CONDITIONAL(USER_SPECIFIED_KJC, test "x${KJC}" != x)
   AC_SUBST(KJC)
 ])
 
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.58
diff -u -b -B -r1.58 Makefile.am
--- lib/Makefile.am	26 May 2004 08:46:58 -0000	1.58
+++ lib/Makefile.am	26 May 2004 11:04:18 -0000
@@ -16,44 +16,21 @@
 propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java -name \*\.properties)
 
 #-----------------------------------------------------------------
-# defining how to designate classpath for a vm and a javac type
-# program
-#-----------------------------------------------------------------
-ARG_CLASSPATH_VM = -classpath
-
-if USER_SPECIFIED_KJC
-ARG_CLASSPATH_JAVAC = --classpath
-else
-ARG_CLASSPATH_JAVAC = -classpath
-endif
-
-#-----------------------------------------------------------------
 # handling javac definition including programs like jikes here
 #-----------------------------------------------------------------
 if FOUND_JIKES
-JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes
+JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes
 else
 if FOUND_GCJ
-JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes
+JAVAC = $(GCJ) --bootclasspath '' --classpath $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes
 else
 if FOUND_KJC
-JAVAC = $(KJC) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes
+JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
 endif # FOUND_KJC
 endif # FOUND_GCJ
 endif # FOUND_JIKES
 
-#-----------------------------------------------------------------
-# defining how to designate classpath for a vm and a javac type 
-# program
-#-----------------------------------------------------------------
-ARG_JNI_JAVAH = -jni
-
-#-----------------------------------------------------------------
-# defining classpath arg for javah-like program
-#-----------------------------------------------------------------
-ARG_CLASSPATH_JAVAH = -classpath
-
-JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) .:$(USER_CLASSLIB)
+JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
 
 if INSTALL_GLIBJ_ZIP