Index: acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/acinclude.m4,v
retrieving revision 1.34
diff -u -r1.34 acinclude.m4
--- acinclude.m4	12 Apr 2004 05:51:58 -0000	1.34
+++ acinclude.m4	17 May 2004 09:04:39 -0000
@@ -164,8 +164,8 @@
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_WITH_JAPHAR],
 [
-  AC_ARG_WITH(japhar, 
-  [  --with-japhar		  configure GNU Classpath for Japhar [default=yes]],
+  AC_ARG_WITH([japhar], 
+  	      [AS_HELP_STRINH(--with-japhar,configure GNU Classpath for Japhar [default=yes])],
   [
     if test "x${withval}" = xyes || test "x${withval}" = x; then
       CLASSPATH_CHECK_JAPHAR
@@ -185,8 +185,8 @@
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_WITH_KAFFE],
 [
-  AC_ARG_WITH(kaffe, 
-  [  --with-kaffe		  configure GNU Classpath for Kaffe [default=no]],
+  AC_ARG_WITH([kaffe], 
+	      [AS_HELP_STRING(--with-kaffe,configure GNU Classpath for Kaffe [default=no])],
   [   
     if test "x${withval}" = xyes || test "x${withval}" = x; then
       CLASSPATH_CHECK_KAFFE
@@ -285,8 +285,8 @@
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_WITH_GCJ],
 [
-  AC_ARG_WITH(gcj,
-  [  --with-gcj              bytecode compilation with gcj ],
+  AC_ARG_WITH([gcj],
+	      [AS_HELP_STRING(--with-gcj,bytecode compilation with gcj)],
   [
     if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
       CLASSPATH_CHECK_GCJ(${withval})
@@ -342,8 +342,8 @@
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_WITH_JIKES],
 [
-  AC_ARG_WITH(jikes,
-  [  --with-jikes		  bytecode compilation with jikes ],
+  AC_ARG_WITH([jikes],
+	      [AS_HELP_STRING(--with-jikes,bytecode compilation with jikes)],
   [
     if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
       CLASSPATH_CHECK_JIKES(${withval})
@@ -378,8 +378,8 @@
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_WITH_KJC],
 [
-  AC_ARG_WITH(kjc, 
-  [  --with-kjc=<ksusu.jar>  bytecode compilation with kjc [default=no]],
+  AC_ARG_WITH([kjc], 
+  	      [AS_HELP_STRING(--with-kjc=<ksusu.jar>,bytecode compilation with kjc [default=no])],
   [
     if test "x${withval}" != xno; then
       AC_MSG_CHECKING(for kjc)
@@ -410,8 +410,8 @@
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_WITH_JAVA],
 [
-  AC_ARG_WITH(java,
-  [  --with-java		  specify path or name of a java-like program ],
+  AC_ARG_WITH([java],
+	      [AS_HELP_STRING(--with-java,specify path or name of a java-like program)],
   [
     if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
       CLASSPATH_CHECK_JAVA(${withval})
@@ -453,8 +453,8 @@
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_WITH_JAVAH],
 [
-  AC_ARG_WITH(javah,
-  [  --with-javah		  specify path or name of a javah-like program ],
+  AC_ARG_WITH([javah],
+	      [AS_HELP_STRING(--with-javah,specify path or name of a javah-like program)],
   [
     if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
       CLASSPATH_CHECK_JAVAH(${withval})
@@ -500,8 +500,8 @@
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_WITH_CLASSLIB],
 [
-  AC_ARG_WITH(classpath,
-  [  --with-classpath        specify path to a classes.zip like file ],
+  AC_ARG_WITH([classpath],
+	      [AS_HELP_STRING(--with-classpath,specify path to a classes.zip like file)],
   [
     if test "x${withval}" = xyes; then
       # set user classpath to CLASSPATH from env