diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 48 | ||||
| -rw-r--r-- | configure.in | 5 |
3 files changed, 29 insertions, 28 deletions
@@ -1,3 +1,7 @@ +2008-04-05 Andreas Schwab <[email protected]> + + * configure.in: No longer create admin/unidata/Makefile. + 2008-03-28 Andreas Schwab <[email protected]> * Makefile.in (SUBDIR_MAKEFILES): Add lisp/Makefile. @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for emacs 23.0.50. +# Generated by GNU Autoconf 2.61 for emacs 23.0.60. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='emacs' PACKAGE_TARNAME='emacs' -PACKAGE_VERSION='23.0.50' -PACKAGE_STRING='emacs 23.0.50' +PACKAGE_VERSION='23.0.60' +PACKAGE_STRING='emacs 23.0.60' PACKAGE_BUGREPORT='' ac_unique_file="src/lisp.h" @@ -1248,7 +1248,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures emacs 23.0.50 to adapt to many kinds of systems. +\`configure' configures emacs 23.0.60 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1322,7 +1322,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of emacs 23.0.50:";; + short | recursive ) echo "Configuration of emacs 23.0.60:";; esac cat <<\_ACEOF @@ -1333,7 +1333,7 @@ Optional Features: specify install directory for Emacs.app on Mac OS X [DIR=/Application] --disable-font-backend don't compile font-backend support - --enable-sync-input compile code with sync-input + --disable-sync-input don't compile code with sync-input --enable-asserts compile code with asserts enabled --enable-maintainer-mode enable make rules and dependencies not useful (and @@ -1450,7 +1450,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -emacs configure 23.0.50 +emacs configure 23.0.60 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1464,7 +1464,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by emacs $as_me 23.0.50, which was +It was created by emacs $as_me 23.0.60, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2137,6 +2137,7 @@ else fi +## Enabled by default. # Check whether --enable-sync-input was given. if test "${enable_sync_input+set}" = set; then enableval=$enable_sync_input; USE_SYNC_INPUT=$enableval @@ -16501,6 +16502,7 @@ cat >>conftest.$ac_ext <<_ACEOF # endif #endif +#include <limits.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -16649,12 +16651,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++) { @@ -16669,10 +16674,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 ()); @@ -24371,7 +24378,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by emacs $as_me 23.0.50, which was +This file was extended by emacs $as_me 23.0.60, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24424,7 +24431,7 @@ Report bugs to <[email protected]>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -emacs config.status 23.0.50 +emacs config.status 23.0.60 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -25233,11 +25240,6 @@ echo creating src/Makefile sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - if test -f ${srcdir}/admin/unidata/UnicodeData.txt; then - echo creating ${srcdir}/admin/unidata/Makefile - cp ${srcdir}/admin/unidata/Makefile.in ${srcdir}/admin/unidata/Makefile - CPPFLAGS="$CPPFLAGS -DHAVE_UNIDATA" - fi $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new diff --git a/configure.in b/configure.in index 84398e1de0..8e46bf995a 100644 --- a/configure.in +++ b/configure.in @@ -3116,11 +3116,6 @@ echo creating src/Makefile sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - if test -f ${srcdir}/admin/unidata/UnicodeData.txt; then - echo creating ${srcdir}/admin/unidata/Makefile - cp ${srcdir}/admin/unidata/Makefile.in ${srcdir}/admin/unidata/Makefile - CPPFLAGS="$CPPFLAGS -DHAVE_UNIDATA" - fi $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new |