User: aidan Date: 05/03/24 01:27:45 Modified: xemacs ChangeLog configure configure.ac Log: Update some usage & error messages to use the --with-* syntax. Revision Changes Path 1.446 +6 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.445 retrieving revision 1.446 diff -u -p -r1.445 -r1.446 --- ChangeLog 2005/03/15 12:37:07 1.445 +++ ChangeLog 2005/03/24 00:27:37 1.446 ＠＠ -1,3 +1,9 ＠＠ +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. + 2005-03-15 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * configure.ac (--with-cflags-optimization): 1.246 +5 -4 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.245 retrieving revision 1.246 diff -u -p -r1.245 -r1.246 --- configure 2005/03/15 12:37:07 1.245 +++ configure 2005/03/24 00:27:37 1.246 ＠＠ -967,7 +967,7 ＠＠ Optional Packages: --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 ＠＠ Optional Packages: --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 ＠＠ unset _enable_database_default _enable_d 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 1.5 +5 -5 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- configure.ac 2005/03/15 12:37:14 1.4 +++ configure.ac 2005/03/24 00:27:40 1.5 ＠＠ -492,7 +492,7 ＠＠ dnl --use-kkcc --enable-k 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([compiler], 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 ＠＠ XE_COMPLEX_ARG_ENABLE([database], [ 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 ＠＠ if test "$enable_clash_detection" != "no 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 For example, `configure --compiler=g 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)