User: ben Date: 05/10/14 03:00:47 Modified: xemacs ChangeLog configure.ac Log: fix optimization handling in configure.ac configure.ac: Break lines. configure.ac: Rewrite optimization help to be accurate. Setting `--with-cflags-optimization=""' will now unilaterally turn off optimization; setting it to something non-null unilaterally turns it on. Revision Changes Path 1.461 +10 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.460 retrieving revision 1.461 diff -u -p -r1.460 -r1.461 --- ChangeLog 2005/10/04 17:51:13 1.460 +++ ChangeLog 2005/10/14 01:00:44 1.461 ＠＠ -1,3 +1,13 ＠＠ +2005-10-13 Ben Wing <ben(a)xemacs.org&gt; + + * configure.ac (XE_COMPLEX_ARG_ENABLE): + Break lines. + * configure.ac (TAB): + Rewrite optimization help to be accurate. Setting + `--with-cflags-optimization=""' will now unilaterally turn off + optimization; setting it to something non-null unilaterally turns it + on. + 2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * configure.ac (Canna): Configure as module if appropriate. 1.15 +14 -6 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- configure.ac 2005/10/04 17:51:13 1.14 +++ configure.ac 2005/10/14 01:00:45 1.15 ＠＠ -757,16 +757,16 ＠＠ 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. + 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. `--with-xemacs-compiler=g++'. This turns on a lot of additional error-checking.]), [], []) AC_ARG_WITH([cflags], - AC_HELP_STRING([--with-cflags],[Compiler flags (such as -O); setting this overrides - all default compiler flags except those that control - warnings.]), + AC_HELP_STRING([--with-cflags], + [Compiler flags. These flags will be placed after any flags inserted for warnings, debugging or optimization; setting this does not disable the insertion of those flags. Use configure settings such as `--with-optimization=no' or `enable-debug=no' to turn them off, or override them with `--with-cflags-optimization', `--with-cflags-debugging', or `with-cflags-warning'.]), [], []) AC_ARG_WITH([cflags-warning], ＠＠ -777,7 +777,7 ＠＠ AC_ARG_WITH([cflags-warning], AC_ARG_WITH([cflags-optimization], AC_HELP_STRING([--with-cflags-optimization=FLAGS], - [Override compiler flags used to control optimization. Only has an effect when optimization is enabled. Normally, don't set this, as XEmacs will already set the maximum safe optimization flags appropriate for the compiler being invoked.]), + [Override compiler flags used to control optimization. If blank, forces no optimization; if non-blank, forces optimization. Normally, don't set this; XEmacs automatically sets the maximum safe optimization flags appropriate for the compiler being invoked. If you just want to turn optimization on or off, use `with-optimization' instead.]), [], []) AC_ARG_WITH([cflags-debugging], ＠＠ -2074,7 +2074,15 ＠＠ dnl Calculate optimization flags. These dnl versions and on in release versions. if test -z "$with_optimization"; then - if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then + # If user set --with-cflags-optimization, use it to unilaterally + # determine whether optimization should be enabled. + if test "$cflags_optimization_specified" = "yes" ; then + if -z "$with_cflags_optimization" ; then + with_optimization=no + else + with_optimization=yes + fi + elif test -z "$emacs_is_beta" ; then with_optimization=yes else with_optimization=no