This is the mail archive of the
java-patches@sourceware.cygnus.com
mailing list for the Java project.
[libgcj 2.95] configure --help fixes
- To: java-patches@sourceware.cygnus.com
- Subject: [libgcj 2.95] configure --help fixes
- From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
- Date: Mon, 9 Aug 1999 20:01:11 +0200 (MET DST)
I noticed that the libgcj 2.95 configure --help output from boehm-gc,
libffi, libjava and zlib doesn't align nicely. The following patch fixes
this. Please note that there are several different blocks of patches,
intermixed with ChangeLog fragments.
The remaining inconsistencies are in automake's AM_MAINTAINER_MODE (for
--enable-maintainer-mode) and libtool's AC_ENABLE_FAST_INSTALL (for
--enable-fast-install).
Rainer
-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University
Email: ro@TechFak.Uni-Bielefeld.DE
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
Index: acinclude.m4
===================================================================
RCS file: /cvs/java/libgcj/libjava/acinclude.m4,v
retrieving revision 1.2
diff -u -p -r1.2 acinclude.m4
--- acinclude.m4 1999/05/19 12:55:12 1.2
+++ acinclude.m4 1999/08/09 16:46:12
@@ -8,7 +8,7 @@ AC_DEFUN(LIBGCJ_CONFIGURE,
[
dnl Default to --enable-multilib
AC_ARG_ENABLE(multilib,
-[ --enable-multilib build many library versions (default)],
+[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.19
diff -u -p -r1.19 configure.in
--- configure.in 1999/08/08 14:06:20 1.19
+++ configure.in 1999/08/09 16:46:24
@@ -8,9 +8,10 @@ AC_CANONICAL_SYSTEM
dnl We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir,
-[ --with-target-subdir=SUBDIR Configuring in a subdirectory])
+[ --with-target-subdir=SUBDIR
+ configuring in a subdirectory])
AC_ARG_WITH(cross-host,
-[ --with-cross-host=HOST Configuring with a cross compiler])
+[ --with-cross-host=HOST configuring with a cross compiler])
LIBGCJ_CONFIGURE(.)
@@ -31,20 +32,20 @@ AM_CONDITIONAL(TESTSUBDIR, test -d $srcd
dnl See whether the user prefers size or speed for Character.
dnl The default is size.
AC_ARG_ENABLE(fast-character,
-[ --enable-fast-character Prefer speed over size for Character],
+[ --enable-fast-character prefer speed over size for Character],
# Nothing
, AC_DEFINE(COMPACT_CHARACTER))
dnl See if the user has requested runtime debugging.
AC_ARG_ENABLE(libgcj-debug,
-[ --enable-libgcj-debug Enable runtime debugging code],
+[ --enable-libgcj-debug enable runtime debugging code],
if test "$enable_libgcj_debug" = yes; then
AC_DEFINE(DEBUG)
fi)
dnl See if the user has the enterpreter included.
AC_ARG_ENABLE(interpreter,
-[ --enable-interpreter Enable interpreter],
+[ --enable-interpreter enable interpreter],
if test "$enable_interpreter" = yes; then
AC_DEFINE(INTERPRETER)
fi)
@@ -59,7 +60,7 @@ dnl FIXME: this should not be a local op
dnl system; at present there is no eCos target.
TARGET_ECOS="no"
AC_ARG_WITH(ecos,
-[ --with-ecos Enable runtime eCos target support.],
+[ --with-ecos enable runtime eCos target support],
TARGET_ECOS="$with_ecos"
)
@@ -101,7 +102,7 @@ SYSTEMSPEC=
AC_SUBST(SYSTEMSPEC)
AC_ARG_WITH(system-zlib,
-[ --with-system-zlib Use installed libz])
+[ --with-system-zlib use installed libz])
ZLIBSPEC=
AC_SUBST(ZLIBSPEC)
@@ -112,7 +113,7 @@ dnl Allow the GC to be disabled. Can be
AC_MSG_CHECKING([for garbage collector to use])
AC_ARG_ENABLE(java-gc,
changequote(<<,>>)dnl
-<< --enable-java-gc=TYPE choose garbage collector [boehm]>>,
+<< --enable-java-gc=TYPE choose garbage collector [boehm]>>,
changequote([,])
GC=$enableval,
GC=boehm)
@@ -159,7 +160,7 @@ dnl Note that this code is kept in sync
dnl In particular both packages must make the same decision about which
dnl thread package to use.
AC_MSG_CHECKING([for threads package to use])
-AC_ARG_ENABLE(threads, [ --enable-threads=TYPE choose threading package],
+AC_ARG_ENABLE(threads, [ --enable-threads=TYPE choose threading package],
THREADS=$enableval,
dnl FIXME: figure out native threads to use here.
THREADS=no)
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
Index: acinclude.m4
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/acinclude.m4,v
retrieving revision 1.2
diff -u -p -r1.2 acinclude.m4
--- acinclude.m4 1999/06/30 12:43:04 1.2
+++ acinclude.m4 1999/08/09 17:41:10
@@ -8,7 +8,7 @@ AC_DEFUN(BOEHM_CONFIGURE,
[
dnl Default to --enable-multilib
AC_ARG_ENABLE(multilib,
-[ --enable-multilib build many library versions (default)],
+[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/configure.in,v
retrieving revision 1.12
diff -u -p -r1.12 configure.in
--- configure.in 1999/08/04 20:57:53 1.12
+++ configure.in 1999/08/09 17:41:13
@@ -13,9 +13,10 @@ AM_PROG_LIBTOOL
dnl We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir,
-[ --with-target-subdir=SUBDIR Configuring with a cross compiler])
+[ --with-target-subdir=SUBDIR
+ configuring with a cross compiler])
AC_ARG_WITH(cross-host,
-[ --with-cross-host=HOST Configuring with a cross compiler])
+[ --with-cross-host=HOST configuring with a cross compiler])
AM_MAINTAINER_MODE
# automake wants to see AC_EXEEXT. But we don't need it. And having
@@ -26,7 +27,7 @@ if test "x" = "y"; then
fi
AC_MSG_CHECKING([for threads package to use])
-AC_ARG_ENABLE(threads, [ --enable-threads=TYPE choose threading package],
+AC_ARG_ENABLE(threads, [ --enable-threads=TYPE choose threading package],
THREADS=$enableval,
dnl FIXME: figure out native threads to use here.
THREADS=no)
@@ -96,7 +97,7 @@ AC_MSG_RESULT($THREADS)
AC_ARG_ENABLE(java-gc,
changequote(<<,>>)dnl
-<< --enable-java-gc=TYPE choose garbage collector [boehm]>>,
+<< --enable-java-gc=TYPE choose garbage collector [boehm]>>,
changequote([,])
GC=$enableval,
GC=boehm)
@@ -112,7 +113,7 @@ dnl FIXME: this should not be a local op
dnl system; at present there is no eCos target.
TARGET_ECOS="no"
AC_ARG_WITH(ecos,
-[ --with-ecos Enable runtime eCos target support.],
+[ --with-ecos enable runtime eCos target support],
TARGET_ECOS="$with_ecos"
)
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in: Use lowercase in configure --help explanations.
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libffi/configure.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 configure.in
--- configure.in 1999/08/08 13:27:19 1.1.1.1
+++ configure.in 1999/08/09 17:45:13
@@ -67,14 +67,14 @@ AC_SUBST(TARGETDIR)
AC_SUBST(SHELL)
-AC_ARG_ENABLE(debug,[ --enable-debug Debugging mode], AC_DEFINE(FFI_DEBUG))
+AC_ARG_ENABLE(debug,[ --enable-debug debugging mode], AC_DEFINE(FFI_DEBUG))
-AC_ARG_ENABLE(debug,[ --disable-structs Omit code for struct support], AC_DEFINE(FFI_NO_STRUCTS))
+AC_ARG_ENABLE(debug,[ --disable-structs omit code for struct support], AC_DEFINE(FFI_NO_STRUCTS))
-AC_ARG_ENABLE(debug,[ --disable-raw-api Make the raw api unavailable], AC_DEFINE(FFI_NO_RAW_API))
+AC_ARG_ENABLE(debug,[ --disable-raw-api make the raw api unavailable], AC_DEFINE(FFI_NO_RAW_API))
AC_ARG_ENABLE(purify-safety,
-[ --enable-purify-safety Purify-safe mode], AC_DEFINE(USING_PURIFY))
+[ --enable-purify-safety purify-safe mode], AC_DEFINE(USING_PURIFY))
AC_OUTPUT(include/Makefile include/ffi.h Makefile,,
test ! -d include && mkdir include
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in: Properly align --help output, fix capitalization.
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/zlib/configure.in,v
retrieving revision 1.3
diff -u -p -r1.3 configure.in
--- configure.in 1999/06/21 12:58:22 1.3
+++ configure.in 1999/08/09 17:52:22
@@ -11,13 +11,14 @@ AC_CONFIG_AUX_DIR(..)
dnl We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir,
-[ --with-target-subdir=SUBDIR Configuring in a subdirectory])
+[ --with-target-subdir=SUBDIR
+ configuring in a subdirectory])
AC_ARG_WITH(cross-host,
-[ --with-cross-host=HOST Configuring with a cross compiler])
+[ --with-cross-host=HOST configuring with a cross compiler])
dnl Default to --enable-multilib
AC_ARG_ENABLE(multilib,
-[ --enable-multilib build many library versions (default)],
+[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
@@ -39,7 +40,7 @@ fi
AC_SUBST(zlib_basedir)
AC_ARG_WITH(system-zlib,
-[ --with-system-zlib Use installed libz])
+[ --with-system-zlib use installed libz])
LIB_AC_PROG_CC
AM_PROG_LIBTOOL