[COMMIT] Update some usage & error messages to use the --with-* syntax

APPROVE COMMIT NOTE: This patch has been committed. I had thought, and mentioned in mail, that the copy of configure in the repository was out of date, but it turned out I had a sticky tag locally. While looking into it, I noticed some docstrings that needed changing. ChangeLog addition: 2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net&gt; * configure: Regenerate. * configure.ac (XE_COMPLEX_ARG_ENABLE): --OPTION -> --with-OPTION in various docstrings and error messages. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: configure.ac configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.245 diff -u -u -r1.245 configure --- configure 2005/03/15 12:37:07 1.245 +++ configure 2005/03/24 00:26:20 ＠＠ -967,7 +967,7 ＠＠ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-prefix=no Don't compile the value of --prefix into the + --with-prefix=no Don't compile the value for `prefix' into the executable. --with-site-lisp=no Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages. ＠＠ -1072,8 +1072,9 ＠＠ --with-compiler C compiler to use --with-xemacs-compiler compiler to use to compile just the xemacs executable and C modules. If you want to compile - XEmacs as C++, use e.g. `--xemacs-compiler=g++'. - This turns on a lot of additional error-checking. + XEmacs as C++, use e.g. + `--with-xemacs-compiler=g++'. This turns on a lot of + additional error-checking. --with-cflags Compiler flags (such as -O); setting this overrides all default compiler flags except those that control warnings. ＠＠ -2334,7 +2335,7 ＠＠ if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then (echo "$progname: Usage error:" echo " " "Only one of \`dbm' and \`gnudbm' may be specified -with the \`--$optname' option." +with the \`--enable-database' option." echo " Use \`$progname --help' to show usage.") >&2 && exit 1 fi Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.4 diff -u -u -r1.4 configure.ac --- configure.ac 2005/03/15 12:37:14 1.4 +++ configure.ac 2005/03/24 00:26:25 ＠＠ -492,7 +492,7 ＠＠ dnl parse flags AC_ARG_WITH([prefix], - AC_HELP_STRING([--with-prefix=no],[Don't compile the value of --prefix into the executable.]), + AC_HELP_STRING([--with-prefix=no],[Don't compile the value for `prefix' into the executable.]), [true], [with_prefix=yes]) AC_ARG_WITH([site-lisp], AC_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]), ＠＠ -751,7 +751,7 ＠＠ AC_ARG_WITH([xemacs-compiler], AC_HELP_STRING([--with-xemacs-compiler],[compiler to use to compile just the xemacs executable and C modules. If you want to compile XEmacs as C++, use e.g. - `--xemacs-compiler=g++'. This turns on a lot of + `--with-xemacs-compiler=g++'. This turns on a lot of additional error-checking.]), [], []) ＠＠ -818,7 +818,7 ＠＠ [ if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified -with the \`--$optname' option.") +with the \`--enable-database' option.") fi ], [], ＠＠ -1685,7 +1685,7 ＠＠ fi dnl Choose a compiler from (in order) -dnl --compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC +dnl --with-compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC test -n "$with_compiler" && CC="$with_compiler" if test "$with_gcc" = "no"; then dnl Try to find a non-gcc compiler case "$CC" in "" | *gcc* ) CC="${NON_GNU_CC-cc}" ;; esac ＠＠ -1753,7 +1753,7 ＠＠ dnl The compiler used to build xemacs, as opposed to the compiler dnl used by configure and lib-src, is determined from the following dnl sources, in order of priority: -dnl o --xemacs-compiler configure flag +dnl o --with-xemacs-compiler configure flag dnl o XEMACS_CC environment variable dnl o same as the regular compiler, (determined previously) -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien