diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 36 | ||||
| -rw-r--r-- | configure.in | 18 |
3 files changed, 39 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index cab4f54d0eb..652f53e731e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-07 Andreas Schwab <schwab@suse.de> + + * configure.in: Correctly handle + --enable-cocoa-experimental-ctrl-g=no and + --enable-ns-self-contained=yes. + * configure: Regenerate. + 2008-08-06 Adrian Robert <Adrian.B.Robert@gmail.com> * configure.in (NS_HAVE_INTEGER): Rename to NS_HAVE_NSINTEGER. diff --git a/configure b/configure index 6cdecb3c863..934ff01b5bb 100755 --- a/configure +++ b/configure @@ -1333,8 +1333,10 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-cocoa-experimental-ctrl-g enable experimental improved ctrl-g recognition - --disable-ns-self-contained disable self contained build under NS + --enable-cocoa-experimental-ctrl-g + enable experimental improved ctrl-g recognition + --disable-ns-self-contained + disable self contained build under NeXTstep --enable-asserts compile code with asserts enabled --enable-maintainer-mode enable make rules and dependencies not useful (and @@ -2133,9 +2135,9 @@ fi # Check whether --with-gcc was given. if test "${with_gcc+set}" = set; then withval=$with_gcc; { { echo "$as_me:$LINENO: error: --with-gcc has been removed. Set the \`CC' environment - variable to specify a compiler." >&5 +variable to specify a compiler." >&5 echo "$as_me: error: --with-gcc has been removed. Set the \`CC' environment - variable to specify a compiler." >&2;} +variable to specify a compiler." >&2;} { (exit 1); exit 1; }; } fi @@ -2154,7 +2156,7 @@ fi # Check whether --enable-cocoa-experimental-ctrl-g was given. if test "${enable_cocoa_experimental_ctrl_g+set}" = set; then - enableval=$enable_cocoa_experimental_ctrl_g; EN_COCOA_EXPERIMENTAL_CTRL_G=yes + enableval=$enable_cocoa_experimental_ctrl_g; EN_COCOA_EXPERIMENTAL_CTRL_G=$enableval else EN_COCOA_EXPERIMENTAL_CTRL_G=no fi @@ -2162,7 +2164,7 @@ fi # Check whether --enable-ns-self-contained was given. if test "${enable_ns_self_contained+set}" = set; then - enableval=$enable_ns_self_contained; EN_NS_SELF_CONTAINED=no + enableval=$enable_ns_self_contained; EN_NS_SELF_CONTAINED=$enableval else EN_NS_SELF_CONTAINED=yes fi @@ -16651,6 +16653,7 @@ cat >>conftest.$ac_ext <<_ACEOF # endif #endif +#include <limits.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -16799,12 +16802,15 @@ main () isn't worth using anyway. */ alarm (60); - for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) - continue; - time_t_max--; - if ((time_t) -1 < 0) - for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) - continue; + for (;;) + { + t = (time_t_max << 1) + 1; + if (t <= time_t_max) + break; + time_t_max = t; + } + time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; + delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) { @@ -16819,10 +16825,12 @@ main () && mktime_test ((time_t) (60 * 60 * 24)))) return 1; - for (j = 1; 0 < j; j *= 2) + for (j = 1; ; j <<= 1) if (! bigtime_test (j)) return 1; - if (! bigtime_test (j - 1)) + else if (INT_MAX / 2 < j) + break; + if (! bigtime_test (INT_MAX)) return 1; } return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); diff --git a/configure.in b/configure.in index 868eeedf522..55b3d3d286a 100644 --- a/configure.in +++ b/configure.in @@ -153,12 +153,12 @@ OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals]) dnl Can remove these in Emacs 24. AC_ARG_WITH([gtk],, - AC_MSG_ERROR([--with-gtk has been removed. Use --with-x-toolkit to -specify a toolkit.]),,) + [AC_MSG_ERROR([--with-gtk has been removed. Use --with-x-toolkit to +specify a toolkit.])],,) AC_ARG_WITH([gcc],, - AC_MSG_ERROR([--with-gcc has been removed. Set the `CC' environment - variable to specify a compiler.]),,) + [AC_MSG_ERROR([--with-gcc has been removed. Set the `CC' environment +variable to specify a compiler.])],,) AC_ARG_WITH([pkg-config-prog],dnl [AS_HELP_STRING([--with-pkg-config-prog=PATH], @@ -170,13 +170,15 @@ if test "X${with_pkg_config_prog}" != X; then fi AC_ARG_ENABLE(cocoa-experimental-ctrl-g, -[ --enable-cocoa-experimental-ctrl-g enable experimental improved ctrl-g recognition], - EN_COCOA_EXPERIMENTAL_CTRL_G=yes, +[AS_HELP_STRING([--enable-cocoa-experimental-ctrl-g], + [enable experimental improved ctrl-g recognition])], + EN_COCOA_EXPERIMENTAL_CTRL_G=$enableval, EN_COCOA_EXPERIMENTAL_CTRL_G=no) AC_ARG_ENABLE(ns-self-contained, -[ --disable-ns-self-contained disable self contained build under NS], - EN_NS_SELF_CONTAINED=no, +[AS_HELP_STRING([--disable-ns-self-contained], + [disable self contained build under NeXTstep])], + EN_NS_SELF_CONTAINED=$enableval, EN_NS_SELF_CONTAINED=yes) AC_ARG_ENABLE(asserts, |