Mercurial > hg > xemacs-beta
changeset 2680:b26d8b5d0d30
[xemacs-hg @ 2005-03-24 00:27:37 by aidan]
Update some usage & error messages to use the --with-* syntax.
| author | aidan |
|---|---|
| date | Thu, 24 Mar 2005 00:27:40 +0000 |
| parents | 137460151b27 |
| children | f15523a6da7a |
| files | ChangeLog configure configure.ac |
| diffstat | 3 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 23 22:52:13 2005 +0000 +++ b/ChangeLog Thu Mar 24 00:27:40 2005 +0000 @@ -1,3 +1,9 @@ +2005-03-24 Aidan Kehoe <kehoea@parhasard.net> + + * configure: Regenerate. + * configure.ac (XE_COMPLEX_ARG_ENABLE): --OPTION -> --with-OPTION + in various docstrings and error messages. + 2005-03-15 Stephen J. Turnbull <stephen@xemacs.org> * configure.ac (--with-cflags-optimization):
--- a/configure Wed Mar 23 22:52:13 2005 +0000 +++ b/configure Thu Mar 24 00:27:40 2005 +0000 @@ -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
--- a/configure.ac Wed Mar 23 22:52:13 2005 +0000 +++ b/configure.ac Thu Mar 24 00:27:40 2005 +0000 @@ -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)