Mercurial > emacs
changeset 98491:29005e3eddab
configure.in: Report USE_TOOLKIT_SCROLLBARS as such (not mentioning 'X') to avoid confusion
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Fri, 03 Oct 2008 18:43:29 +0000 |
| parents | 468c55dd37a2 |
| children | b3eefcc54430 |
| files | ChangeLog configure configure.in |
| diffstat | 3 files changed, 27 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Oct 03 18:23:43 2008 +0000 +++ b/ChangeLog Fri Oct 03 18:43:29 2008 +0000 @@ -1,3 +1,10 @@ +2008-08-28 Adrian Robert <Adrian.B.Robert@gmail.com> + + * configure.in: Report USE_TOOLKIT_SCROLLBARS as such (not mentioning + "X") to avoid confusion. + + * configure: Regenerate. + 2008-09-07 Romain Francoise <romain@orebokech.com> * make-dist: Distribute doc/man/ChangeLog.
--- a/configure Fri Oct 03 18:23:43 2008 +0000 +++ b/configure Fri Oct 03 18:43:29 2008 +0000 @@ -16660,7 +16660,6 @@ # endif #endif -#include <limits.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -16809,15 +16808,12 @@ isn't worth using anyway. */ alarm (60); - 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; - + 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; delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) { @@ -16832,12 +16828,10 @@ && mktime_test ((time_t) (60 * 60 * 24)))) return 1; - for (j = 1; ; j <<= 1) + for (j = 1; 0 < j; j *= 2) if (! bigtime_test (j)) return 1; - else if (INT_MAX / 2 < j) - break; - if (! bigtime_test (INT_MAX)) + if (! bigtime_test (j - 1)) return 1; } return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); @@ -18746,13 +18740,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <sys/types.h> /* for off_t */ - #include <stdio.h> -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +#include <stdio.h> +int +main () +{ +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -18792,13 +18784,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include <sys/types.h> /* for off_t */ - #include <stdio.h> -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +#include <stdio.h> +int +main () +{ +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -24297,7 +24287,7 @@ echo " Does Emacs use -lotf? ${HAVE_LIBOTF}" echo " Does Emacs use -lxft? ${HAVE_XFT}" -echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" +echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" echo if test $USE_XASSERTS = yes; then
--- a/configure.in Fri Oct 03 18:23:43 2008 +0000 +++ b/configure.in Fri Oct 03 18:43:29 2008 +0000 @@ -2846,7 +2846,7 @@ echo " Does Emacs use -lotf? ${HAVE_LIBOTF}" echo " Does Emacs use -lxft? ${HAVE_XFT}" -echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" +echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" echo if test $USE_XASSERTS = yes; then