emacs: configure comparison

comparison configure @ 96759:1e2f7aab70ba

* Makefile.in: Undef LIB_STANDARD before defining it to silence warning in case it was defined already. USE @GNUSTEP_MAKEFILES@ rather than envvars. * nsterm.m (ns_term_init): Pass Qt and Qnil rather than YES/NO to ns_default. (applicationShouldTerminate, setValuesFromPanel): Use EQ to compare Lisp_Objects. * nsterm.h (Fx_display_grayscale_p, Fx_display_planes) (ns_defined_color, ns_color_to_lisp): Declare. * nsselect.m (ns_handle_selection_request, ns_handle_selection_clear) (Fns_own_selection_internal): Make the big ugly hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE. * nsmenu.m (ns_update_menubar): Use EQ to compare Lisp_Objects. (update_frame_tool_bar): Remove apparently obsolete tests for non-integerness of f->tool_bar_lines. (windowShouldClose, addButton, clicked, runDialogAt): Make the big ugly hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE. * nsfont.m (nsfont_driver): Use just 0 rather than an invalid cast. (nsfont_open): Don't confuse NULL for Qnil. * nsfns.m (ns_implicitly_set_icon_type): Use EQ to compare Lisp_Objects. * menu.h (find_and_call_menu_selection): * menu.c (find_and_call_menu_selection): Use just int for vector size. (find_and_return_menu_selection): Always return something. * frame.h: Include dispextern.h for Display_Info. (display_x_get_resource): Declare. * configure.in: Extract and substitute GNUSTEP_MAKEFILES.

author	Stefan Monnier <monnier@iro.umontreal.ca>
date	Thu, 17 Jul 2008 03:33:59 +0000
parents	f5cf56c90437
children	2b46fd076f88

comparison

equal deleted inserted replaced

-:4962b860277b
+:1e2f7aab70ba
 X_TOOLKIT_TYPE
 machfile
 opsysfile
 carbon_appdir
 ns_appdir
+GNUSTEP_MAKEFILES
 LTLIBOBJS'
 ac_subst_files=''
 ac_precious_vars='build_alias
 host_alias
 target_alias
 NS_IMPL_COCOA=yes
 elif test -f /etc/GNUstep/GNUstep.conf; then
 NS_IMPL_GNUSTEP=yes
 GNUSTEP_SYSTEM_HEADERS="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)"
 GNUSTEP_SYSTEM_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)"
+GNUSTEP_MAKEFILES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_MAKEFILES)"
 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
 fi
 # else
 #  include <time.h>
 # endif
 #endif
+#include <limits.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 /* This test makes some buggy mktime implementations loop.
 Give up after 60 seconds; a mktime slower than that
 isn't worth using anyway.  */
 alarm (60);
-for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
+for (;;)
-continue;
+{
-time_t_max--;
+t = (time_t_max << 1) + 1;
-if ((time_t) -1 < 0)
+if (t <= time_t_max)
-for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
+	break;
-continue;
+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++)
 {
 if (tz_strings[i])
 	putenv (tz_strings[i]);
 if (! (mktime_test ((time_t) 1)
 	     && mktime_test ((time_t) (60 * 60))
 	     && 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 ());
 }
 _ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+#include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
 ;
 return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+#include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
 ;
 return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 { (exit 1); exit 1; }; }
 fi
 ### Specify what sort of things we'll be editing into Makefile and config.h.
 ### Use configuration here uncanonicalized to avoid exceeding size limits.
 X_TOOLKIT_TYPE!$X_TOOLKIT_TYPE$ac_delim
 machfile!$machfile$ac_delim
 opsysfile!$opsysfile$ac_delim
 carbon_appdir!$carbon_appdir$ac_delim
 ns_appdir!$ns_appdir$ac_delim
+GNUSTEP_MAKEFILES!$GNUSTEP_MAKEFILES$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
-if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
 break
 elif $ac_last_try; then
 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 { (exit 1); exit 1; }; }

Mercurial > emacs

comparison configure @ 96759:1e2f7aab70ba