March 2006 - xemacs-cvs＠xemacs.org - XEmacs Mailing List Archives

CVS update by crestani xemacs/src ... 18 years

CVS Monitor

User: crestani Date: 06/03/31 01:10:41 Modified: xemacs/src ChangeLog lisp.h Log: * lisp.h (Dynarr_add): Add local variable imp to avoid VC6 internal compiler error. Revision Changes Path 1.938 +5 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.937 retrieving revision 1.938 diff -u -p -r1.937 -r1.938 --- ChangeLog 2006/03/28 17:43:52 1.937 +++ ChangeLog 2006/03/30 23:10:36 1.938 ＠＠ -1,3 +1,8 ＠＠ +2006-03-30 Adrian Aichner <adrian(a)xemacs.org> + + * lisp.h (Dynarr_add): Add local variable imp to avoid VC6 + internal compiler error. + 2006-03-26 Marcus Crestani <crestani(a)xemacs.org> * gc.c: Remove functions for explicitly-freed statistics 1.141 +3 -3 XEmacs/xemacs/src/lisp.h Index: lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.140 retrieving revision 1.141 diff -u -p -r1.140 -r1.141 --- lisp.h 2006/03/26 14:33:39 1.140 +++ lisp.h 2006/03/30 23:10:38 1.141 ＠＠ -1612,14 +1612,14 ＠＠ do { \ #ifdef NEW_GC #define Dynarr_add(d, el) \ do { \ + const struct lrecord_implementation *imp = (d)->lisp_imp; \ if (Dynarr_verify_mod (d)->cur >= (d)->max) \ Dynarr_resize ((d), (d)->cur+1); \ ((d)->base)[(d)->cur] = (el); \ \ - if ((d)->lisp_imp) \ + if (imp) \ set_lheader_implementation \ - ((struct lrecord_header *)&(((d)->base)[(d)->cur]), \ - (d)->lisp_imp); \ + ((struct lrecord_header *)&(((d)->base)[(d)->cur]), imp); \ \ (d)->cur++; \ if ((d)->cur > (d)->largest) \

1 participants
0 comments

CVS update by viteno xemacs ... 18 years

CVS Monitor

User: viteno Date: 06/03/30 23:51:10 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1484 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1483 retrieving revision 1.1484 diff -u -p -r1.1483 -r1.1484 --- version.sh 2006/03/29 21:51:10 1.1483 +++ version.sh 2006/03/30 21:51:09 1.1484 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20060329)" +xemacs_extra_name="(+CVS-20060330)" xemacs_release_date="2006-02-26"

1 participants
0 comments

CVS update by james xemacs ... 18 years

CVS Monitor

User: james Date: 06/03/30 20:11:33 Modified: xemacs ChangeLog configure.ac configure Log: Fix broken -Kalloca detection due to recent autoconf updates. See xemacs-patches message <m33bgziz2f.fsf(a)jerrypc.cs.usu.edu>. Revision Changes Path 1.497 +5 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.496 retrieving revision 1.497 diff -u -p -r1.496 -r1.497 --- ChangeLog 2006/03/30 16:22:26 1.496 +++ ChangeLog 2006/03/30 18:11:17 1.497 ＠＠ -1,5 +1,10 ＠＠ 2006-03-30 Jerry James <james(a)xemacs.org> + * configure.ac: Fix for -Kalloca detection, also broken by the + recent autoconf updates. Thanks to Ilya Golubev. + +2006-03-30 Jerry James <james(a)xemacs.org> + * configure.ac: Fix FOR_MSW XPM test, broken by previous update. 2006-03-27 Jerry James <james(a)xemacs.org> 1.40 +2 -2 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- configure.ac 2006/03/30 16:22:27 1.39 +++ configure.ac 2006/03/30 18:11:17 1.40 ＠＠ -2184,10 +2184,10 ＠＠ dnl Some versions of SCO native compiler if test "$__USLC__" = yes; then AC_MSG_CHECKING(for whether the -Kalloca compiler flag is needed) need_kalloca=no - AC_LINK_IFELSE([AC_LANG_SOURCE([void *x = alloca(4);])], [:], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [void *x = alloca(4);])], [:], [ xe_save_c_switch_system="$c_switch_system" c_switch_system="$c_switch_system -Kalloca" - AC_LINK_IFELSE([AC_LANG_SOURCE([void *x = alloca(4);])], + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [void *x = alloca(4);])], [ need_kalloca=yes ]) c_switch_system="$xe_save_c_switch_system"]) AC_MSG_RESULT($need_kalloca) 1.278 +14 -0 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.277 retrieving revision 1.278 diff -u -p -r1.277 -r1.278 --- configure 2006/03/30 16:22:27 1.277 +++ configure 2006/03/30 18:11:18 1.278 ＠＠ -9025,7 +9025,14 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + +int +main () +{ void *x = alloca(4); + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ＠＠ -9063,7 +9070,14 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + +int +main () +{ void *x = alloca(4); + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

1 participants
0 comments

CVS update by james xemacs ... 18 years

CVS Monitor

User: james Date: 06/03/30 18:23:12 Modified: xemacs ChangeLog configure.ac configure Log: Fix FOR_MSW detection with the XPM library. See xemacs-patches message <m31wwjkioq.fsf(a)jerrypc.cs.usu.edu>. Revision Changes Path 1.496 +4 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.495 retrieving revision 1.496 diff -u -p -r1.495 -r1.496 --- ChangeLog 2006/03/28 15:55:48 1.495 +++ ChangeLog 2006/03/30 16:22:26 1.496 ＠＠ -1,3 +1,7 ＠＠ +2006-03-30 Jerry James <james(a)xemacs.org> + + * configure.ac: Fix FOR_MSW XPM test, broken by previous update. + 2006-03-27 Jerry James <james(a)xemacs.org> * aclocal.m4: Updates for autoconf 2.59. 1.39 +1 -1 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- configure.ac 2006/03/28 15:55:52 1.38 +++ configure.ac 2006/03/30 16:22:27 1.39 ＠＠ -4014,7 +4014,7 ＠＠ if test "$window_system" != "none"; then XE_PREPEND("$incpath_xpm", XE_CFLAGS) AC_MSG_CHECKING([for "FOR_MSW" xpm]) xe_check_libs=-lXpm - AC_LINK_IFELSE([AC_LANG_SOURCE([XpmCreatePixmapFromData()])], + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[XpmCreatePixmapFromData();])], [xpm_for_msw=no], [xpm_for_msw=yes]) xe_check_libs= 1.277 +13 -6 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.276 retrieving revision 1.277 diff -u -p -r1.276 -r1.277 --- configure 2006/03/28 15:55:49 1.276 +++ configure 2006/03/30 16:22:27 1.277 ＠＠ -16430,7 +16430,7 ＠＠ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ ＠＠ -16438,7 +16438,7 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Intrinsic.h> +#include <X11/Xlib.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ＠＠ -16465,7 +16465,7 ＠＠ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi ＠＠ -16486,11 +16486,11 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Intrinsic.h> +#include <X11/Xlib.h> int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } ＠＠ -23606,7 +23606,14 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -XpmCreatePixmapFromData() + +int +main () +{ +XpmCreatePixmapFromData(); + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

1 participants
0 comments

CVS update by stephent xemacsweb/Install ... 18 years

CVS Monitor

User: stephent Date: 06/03/30 03:52:57 Modified: xemacsweb/Install index.content ChangeLog Log: Don't mention obsolete configure.usage. <871wwkn1iv.fsf(a)tleepslib.sk.tsukuba.ac.jp> Revision Changes Path 1.39 +4 -4 XEmacs/xemacsweb/Install/index.content Index: index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Install/index.content,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- index.content 2005/12/18 20:38:29 1.38 +++ index.content 2006/03/30 01:52:56 1.39 ＠＠ -119,9 +119,9 ＠＠ gzip -dc xemacs-<VERSION>.tar.gz | <li> - This step does not apply to a native Windows build. - After reading about all the available options in - configure.usage, type: + (This step does not apply to a native Windows build.) + After reading about all the available options printed by + <pre xml:space="preserve">./configure --help</pre>, type: <pre xml:space="preserve">./configure <var>[--OPTION[=VALUE] ＠＠ -134,7 +134,7 ＠＠ gzip -dc xemacs-<VERSION>.tar.gz | <pre xml:space="preserve">make install</pre> - If you don't have root priviledge, you may run XEmacs + If you don't have root privilege, you may run XEmacs <cite>in-place</cite> after typing <pre xml:space="preserve">make all</pre> 1.39 +5 -0 XEmacs/xemacsweb/Install/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Install/ChangeLog,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- ChangeLog 2005/12/18 20:38:29 1.38 +++ ChangeLog 2006/03/30 01:52:56 1.39 ＠＠ -1,3 +1,8 ＠＠ +2005-11-03 Stephen J. Turnbull <stephen(a)xemacs.org> + + * index.content: Fix a typo. Change mention of configure.usage + file to invocation of ./configure --help. + 2005-12-18 Adrian Aichner <adrian(a)xemacs.org> * index.content: Update to "Set Download Site" menu name, with

1 participants
0 comments

CVS update by viteno xemacs ... 18 years

CVS Monitor

User: viteno Date: 06/03/29 23:51:11 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1483 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1482 retrieving revision 1.1483 diff -u -p -r1.1482 -r1.1483 --- version.sh 2006/03/28 21:52:06 1.1482 +++ version.sh 2006/03/29 21:51:10 1.1483 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20060328)" +xemacs_extra_name="(+CVS-20060329)" xemacs_release_date="2006-02-26"

1 participants
0 comments

CVS update by viteno xemacs ... 18 years

CVS Monitor

User: viteno Date: 06/03/28 23:52:07 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1482 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1481 retrieving revision 1.1482 diff -u -p -r1.1481 -r1.1482 --- version.sh 2006/03/27 21:51:12 1.1481 +++ version.sh 2006/03/28 21:52:06 1.1482 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20060327)" +xemacs_extra_name="(+CVS-20060328)" xemacs_release_date="2006-02-26"

1 participants
0 comments

CVS update by crestani xemacs/src ... 18 years

CVS Monitor

User: crestani Date: 06/03/28 19:43:59 Modified: xemacs/src ChangeLog gc.c gc.h Log: EMACS_INT -> double for gc_state, gc_state related clean up Revision Changes Path 1.731 +6 -0 XEmacs/xemacs/lisp/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.730 retrieving revision 1.731 diff -u -p -r1.730 -r1.731 --- ChangeLog 2006/03/25 11:20:50 1.730 +++ ChangeLog 2006/03/28 17:43:43 1.731 ＠＠ -1,3 +1,9 ＠＠ +2006-03-26 Marcus Crestani <crestani(a)xemacs.org> + + * diagnose.el (show-gc-stats): Adjust format string, remove + explicitly-freed statistics (the need to explicitly free went away + with the asynchronous finalization patch). + 2006-03-20 Malcolm Purvis <malcolmp(a)xemacs.org> * next-error.el: Rename functions that clash with the next-error 1.9 +9 -16 XEmacs/xemacs/lisp/diagnose.el Index: diagnose.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/diagnose.el,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- diagnose.el 2006/03/12 09:10:39 1.8 +++ diagnose.el 2006/03/28 17:43:45 1.9 ＠＠ -398,10 +398,12 ＠＠ (interactive) (let ((buffer "*garbage collection statistics*") (plist (gc-stats)) - (fmt "%-9s %10s %10s %10s %10s %10s\n")) + (fmt "%-9s %16s %12s %12s %12s %12s\n")) (flet ((plist-get-stat (category field) - (or (plist-get plist (intern (concat category field))) - "-")) + (let ((stat (plist-get plist (intern (concat category field))))) + (if stat + (format "%.0f" stat) + "-"))) (show-stats (category) (princ (format fmt category (plist-get-stat category "-total") ＠＠ -412,12 +414,12 ＠＠ (with-output-to-temp-buffer buffer (save-excursion (set-buffer buffer) - (princ (format "%s %s\n" "Current phase" (plist-get plist 'phase))) - (princ (make-string 64 ?-)) + (princ (format "%s %g\n" "Current phase" (plist-get plist 'phase))) + (princ (make-string 78 ?-)) (princ "\n") (princ (format fmt "stat" "total" "last-gc" "this-gc" "last-cycle" "this-cylce")) - (princ (make-string 64 ?-)) + (princ (make-string 78 ?-)) (princ "\n") (show-stats "n-gc") (show-stats "n-cycles") ＠＠ -428,13 +430,4 ＠＠ (show-stats "dequeued2") (show-stats "finalized") (show-stats "freed") - (princ (make-string 64 ?-)) - (princ "\n") - (princ (format fmt "explicitly" - "freed:" - (plist-get-stat "explicitly" "-freed") - "tried:" - (plist-get-stat "explicitly" "-tried-freed") - ""))) - - (plist-get plist 'n-gc-total))))) + (plist-get plist 'n-gc-total)))))) 1.937 +12 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.936 retrieving revision 1.937 diff -u -p -r1.936 -r1.937 --- ChangeLog 2006/03/27 17:40:57 1.936 +++ ChangeLog 2006/03/28 17:43:52 1.937 ＠＠ -1,3 +1,15 ＠＠ +2006-03-26 Marcus Crestani <crestani(a)xemacs.org> + + * gc.c: Remove functions for explicitly-freed statistics + (the need to explicitly free went away with the asynchronous + finalization patch). + * gc.c (struct gc_state): EMACS_INT -> double, remove + explicitly-freed statistics. + * gc.c (Fgc_stats): Remove explicitly-freed statistics. + * gc.c (PL): Use make_float. + * gc.h: Remove prototypes and macros for explicitly-freed + statistics. + 2006-03-24 Jerry James <james(a)xemacs.org> * alsaplay.c: New file providing support for sound with ALSA. 1.4 +10 -62 XEmacs/xemacs/src/gc.c Index: gc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- gc.c 2006/03/02 17:11:47 1.3 +++ gc.c 2006/03/28 17:43:53 1.4 ＠＠ -125,17 +125,15 ＠＠ enum gc_stat_id struct { enum gc_phase phase; - EMACS_INT n_gc[GC_STAT_COUNT]; - EMACS_INT n_cycles[GC_STAT_COUNT]; - EMACS_INT enqueued[GC_STAT_COUNT]; - EMACS_INT dequeued[GC_STAT_COUNT]; - EMACS_INT repushed[GC_STAT_COUNT]; - EMACS_INT enqueued2[GC_STAT_COUNT]; - EMACS_INT dequeued2[GC_STAT_COUNT]; - EMACS_INT finalized[GC_STAT_COUNT]; - EMACS_INT freed[GC_STAT_COUNT]; - EMACS_INT explicitly_freed; - EMACS_INT explicitly_tried_freed; + double n_gc[GC_STAT_COUNT]; + double n_cycles[GC_STAT_COUNT]; + double enqueued[GC_STAT_COUNT]; + double dequeued[GC_STAT_COUNT]; + double repushed[GC_STAT_COUNT]; + double enqueued2[GC_STAT_COUNT]; + double dequeued2[GC_STAT_COUNT]; + double finalized[GC_STAT_COUNT]; + double freed[GC_STAT_COUNT]; } gc_state; #endif /* ERROR_CHECK_GC */ ＠＠ -226,54 +224,6 ＠＠ gc_stat_freed (void) GC_STAT_TICK (freed); } -void -gc_stat_explicitly_freed (void) -{ - gc_state.explicitly_freed++; -} - -void -gc_stat_explicitly_tried_freed (void) -{ - gc_state.explicitly_tried_freed++; -} - -#define GC_STAT_PRINT_ONE(stat) \ - printf (" | %9s %10d %10d %10d %10d %10d\n", \ - #stat, \ - (int) gc_state.stat[GC_STAT_TOTAL], \ - (int) gc_state.stat[GC_STAT_IN_LAST_GC], \ - (int) gc_state.stat[GC_STAT_IN_THIS_GC], \ - (int) gc_state.stat[GC_STAT_IN_LAST_CYCLE], \ - (int) gc_state.stat[GC_STAT_IN_THIS_CYCLE]) - -void -gc_stat_print_stats (void) -{ - printf (" | PHASE %d TOTAL_GC %d\n", - (int) GC_PHASE, - (int) gc_state.n_gc[GC_STAT_TOTAL]); - printf (" | %9s %10s %10s %10s %10s %10s\n", - "stat", "total", "last_gc", "this_gc", - "last_cycle", "this_cycle"); - printf (" | %9s %10d %10d %10d \n", - "cycle", (int) gc_state.n_cycles[GC_STAT_TOTAL], - (int) gc_state.n_cycles[GC_STAT_IN_LAST_GC], - (int) gc_state.n_cycles[GC_STAT_IN_THIS_GC]); - - GC_STAT_PRINT_ONE (enqueued); - GC_STAT_PRINT_ONE (dequeued); - GC_STAT_PRINT_ONE (repushed); - GC_STAT_PRINT_ONE (enqueued2); - GC_STAT_PRINT_ONE (dequeued2); - GC_STAT_PRINT_ONE (finalized); - GC_STAT_PRINT_ONE (freed); - - printf (" | explicitly freed %d tried %d\n", - (int) gc_state.explicitly_freed, - (int) gc_state.explicitly_tried_freed); -} - DEFUN("gc-stats", Fgc_stats, 0, 0 ,"", /* Return statistics about garbage collection cycles in a property list. */ ＠＠ -281,10 +231,8 ＠＠ Return statistics about garbage collecti { Lisp_Object pl = Qnil; #define PL(name,value) \ - pl = cons3 (intern (name), make_int ((int) gc_state.value), pl) + pl = cons3 (intern (name), make_float (gc_state.value), pl) - PL ("explicitly-tried-freed", explicitly_tried_freed); - PL ("explicitly-freed", explicitly_freed); PL ("freed-in-this-cycle", freed[GC_STAT_IN_THIS_CYCLE]); PL ("freed-in-this-gc", freed[GC_STAT_IN_THIS_GC]); PL ("freed-in-last-cycle", freed[GC_STAT_IN_LAST_CYCLE]); 1.3 +0 -6 XEmacs/xemacs/src/gc.h Index: gc.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gc.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- gc.h 2006/02/27 16:29:26 1.2 +++ gc.h 2006/03/28 17:43:54 1.3 ＠＠ -34,17 +34,11 ＠＠ BEGIN_C_DECLS void gc_stat_print_stats (void); void gc_stat_finalized (void); void gc_stat_freed (void); -void gc_stat_explicitly_freed (void); -void gc_stat_explicitly_tried_freed (void); # define GC_STAT_FINALIZED gc_stat_finalized () # define GC_STAT_FREED gc_stat_freed () -# define GC_STAT_EXPLICITLY_FREED gc_stat_explicitly_freed () -# define GC_STAT_EXPLICITLY_TRIED_FREED gc_stat_explicitly_tried_freed () #else /* not ERROR_CHECK_GC */ # define GC_STAT_FINALIZED # define GC_STAT_FREED -# define GC_STAT_EXPLICITLY_FREED -# define GC_STAT_EXPLICITLY_TRIED_FREED #endif /* not ERROR_CHECK_GC */ #endif /* not NEW_GC */

1 participants
0 comments

CVS update by james xemacs ... 18 years

CVS Monitor

User: james Date: 06/03/28 17:55:57 Modified: xemacs ChangeLog aclocal.m4 configure configure.ac Log: Update obsolete autoconf macros. See xemacs-patches discussion starting with message <m3r74nvb3t.fsf(a)jerrypc.cs.usu.edu>. Revision Changes Path 1.495 +6 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.494 retrieving revision 1.495 diff -u -p -r1.494 -r1.495 --- ChangeLog 2006/03/27 21:00:01 1.494 +++ ChangeLog 2006/03/28 15:55:48 1.495 ＠＠ -1,5 +1,11 ＠＠ 2006-03-27 Jerry James <james(a)xemacs.org> + * aclocal.m4: Updates for autoconf 2.59. + * configure.ac: Ditto. Also, don't bother checking for inttypes.h + and unistd.h explicitly, since AC_HEADER_STDC does that. + +2006-03-27 Jerry James <james(a)xemacs.org> + * configure.ac: Repair ALSA detection. 2006-03-24 Jerry James <james(a)xemacs.org> 1.13 +7 -5 XEmacs/xemacs/aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/aclocal.m4,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- aclocal.m4 2005/03/11 11:18:45 1.12 +++ aclocal.m4 2006/03/28 15:55:49 1.13 ＠＠ -42,7 +42,8 ＠＠ ld_dynamic_link_flags= xehost=$ac_cv_build xealias=$ac_cv_build_alias -AC_CHECKING([how to build dynamic libraries for ${xehost}]) +AC_MSG_CHECKING([how to build dynamic libraries for ${xehost}]) +AC_MSG_RESULT() # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; ＠＠ -184,7 +185,7 ＠＠ if test -n "$dll_cflags"; then AC_MSG_CHECKING([if PIC flag ${dll_cflags} really works]) save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" - AC_TRY_COMPILE(,[int x=0;],[ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int x=0;])],[ # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also # reports no error. So, we need to grep stderr for (Bundled). if grep '(Bundled)' config.log >/dev/null; then ＠＠ -300,12 +301,13 ＠＠ if test -n "$xcldf"; then LDFLAGS="$xcldf $LDFLAGS" LIBS= xe_libs= - ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AC_FD_CC' - AC_TRY_LINK(,[int x=0;],cc_produces_so=yes,cc_produces_so=no) + ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AS_MESSAGE_LOG_FD' + AC_LINK_IFELSE([AC_LANG_SOURCE([int x=0;])], + [cc_produces_so=yes],[cc_produces_so=no]) LDFLAGS=$save_LDFLAGS LIBS=$save_LIBS xe_libs=$save_xe_libs - ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AC_FD_CC' + ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AS_MESSAGE_LOG_FD' else cc_produces_so=no fi 1.276 +92 -161 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.275 retrieving revision 1.276 diff -u -p -r1.275 -r1.276 --- configure 2006/03/27 21:00:01 1.275 +++ configure 2006/03/28 15:55:49 1.276 ＠＠ -9025,14 +9025,7 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ void *x = alloca(4); - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ＠＠ -9070,14 +9063,7 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ void *x = alloca(4); - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ＠＠ -9728,8 +9714,8 ＠＠ else case "$opsys" in fi if test "$add_runtime_path" = "yes"; then - echo "$as_me:$LINENO: checking \"for runtime libraries flag\"" >&5 -echo $ECHO_N "checking \"for runtime libraries flag\"... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for runtime libraries flag" >&5 +echo $ECHO_N "checking for runtime libraries flag... $ECHO_C" >&6 case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; ＠＠ -9750,22 +9736,7 ＠＠ if test "$GCC" = "yes"; then shift done fi - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>conftest.er1 ac_status=$? ＠＠ -9794,14 +9765,14 ＠＠ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext xe_check_libs="" test -n "$dash_r" && break done ;; esac if test -n "$dash_r"; - then echo "$as_me:$LINENO: result: "\"${dash_r}\""" >&5 -echo "${ECHO_T}"\"${dash_r}\""" >&6 + then echo "$as_me:$LINENO: result: \"${dash_r}\"" >&5 +echo "${ECHO_T}\"${dash_r}\"" >&6 else echo "$as_me:$LINENO: result: NONE" >&5 echo "${ECHO_T}NONE" >&6 fi ＠＠ -10523,10 +10494,8 ＠＠ done - - -for ac_header in a.out.h elf.h cygwin/version.h fcntl.h inttypes.h libgen.h locale.h wchar.h mach/mach.h sys/param.h sys/pstat.h sys/resource.h sys/time.h sys/timeb.h sys/times.h sys/un.h sys/vlimit.h ulimit.h unistd.h +for ac_header in a.out.h elf.h cygwin/version.h fcntl.h libgen.h locale.h wchar.h mach/mach.h sys/param.h sys/pstat.h sys/resource.h sys/time.h sys/timeb.h sys/times.h sys/un.h sys/vlimit.h ulimit.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then ＠＠ -11665,13 +11634,6 ＠＠ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> intptr_t x; -int -main () -{ - - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ＠＠ -11723,13 +11685,6 ＠＠ cat >>conftest.$ac_ext <<_ACEOF #include <sys/socket.h> socklen_t x; -int -main () -{ - - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ＠＠ -11770,13 +11725,6 ＠＠ cat >>conftest.$ac_ext <<_ACEOF #include <sys/socket.h> int accept (int, struct sockaddr *, size_t *); -int -main () -{ - - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ＠＠ -15374,8 +15322,10 ＠＠ fi done -{ echo "$as_me:$LINENO: checking type of mail spool file locking..." >&5 -echo "$as_me: checking type of mail spool file locking..." >&6;} +echo "$as_me:$LINENO: checking type of mail spool file locking" >&5 +echo $ECHO_N "checking type of mail spool file locking... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 for ac_func in lockf flock ＠＠ -15627,8 +15577,10 ＠＠ echo "${ECHO_T}no" >&6 ;; fi -{ echo "$as_me:$LINENO: checking for specified window system..." >&5 -echo "$as_me: checking for specified window system..." >&6;} +echo "$as_me:$LINENO: checking for specified window system" >&5 +echo $ECHO_N "checking for specified window system... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 GNOME_CONFIG=no ＠＠ -18118,8 +18070,10 ＠＠ fi _ACEOF - { echo "$as_me:$LINENO: checking for X defines extracted by xmkmf..." >&5 -echo "$as_me: checking for X defines extracted by xmkmf..." >&6;} + echo "$as_me:$LINENO: checking for X defines extracted by xmkmf" >&5 +echo $ECHO_N "checking for X defines extracted by xmkmf... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ＠＠ -19014,13 +18968,6 ＠＠ cat >>conftest.$ac_ext <<_ACEOF extern Bool XRegisterIMInstantiateCallback( Display*, struct _XrmHashBucketRec*, char*, char*, XIMProc, XPointer*); -int -main () -{ - - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ＠＠ -19219,8 +19166,8 ＠＠ fi if test "$with_xft_emacs" = "yes"; then - { echo "$as_me:$LINENO: checking for Xrender, fontconfig, and Xft..." >&5 -echo "$as_me: checking for Xrender, fontconfig, and Xft..." >&6;} + echo "$as_me:$LINENO: checking for Xrender, fontconfig, and Xft" >&5 +echo $ECHO_N "checking for Xrender, fontconfig, and Xft... $ECHO_C" >&6 xft_includes_found=no for ac_header in freetype/config/ftheader.h ＠＠ -19374,8 +19321,8 ＠＠ else "/usr/include/freetype2" do if test -d $freetype_include_top; then - { echo "$as_me:$LINENO: checking in ${freetype_include_top}/freetype2..." >&5 -echo "$as_me: checking in ${freetype_include_top}/freetype2..." >&6;} + echo "$as_me:$LINENO: checking in ${freetype_include_top}/freetype2" >&5 +echo $ECHO_N "checking in ${freetype_include_top}/freetype2... $ECHO_C" >&6 unset "$as_ac_Header" save_c_switch_site="$c_switch_site" c_switch_site="$c_switch_site -I${freetype_include_top}" ＠＠ -19760,8 +19707,10 ＠＠ _ACEOF fi if test "$with_msw" != "no"; then - { echo "$as_me:$LINENO: checking for MS-Windows..." >&5 -echo "$as_me: checking for MS-Windows..." >&6;} + echo "$as_me:$LINENO: checking for MS-Windows" >&5 +echo $ECHO_N "checking for MS-Windows... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 echo "$as_me:$LINENO: checking for main in -lgdi32" >&5 echo $ECHO_N "checking for main in -lgdi32... $ECHO_C" >&6 if test "${ac_cv_lib_gdi32_main+set}" = set; then ＠＠ -20016,13 +19965,18 ＠＠ case "$x_libraries" in *X11R4* ) test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h" esac -{ echo "$as_me:$LINENO: checking for WM_COMMAND option..." >&5 -echo "$as_me: checking for WM_COMMAND option..." >&6;} +echo "$as_me:$LINENO: checking for WM_COMMAND option" >&5 +echo $ECHO_N "checking for WM_COMMAND option... $ECHO_C" >&6 if test "$with_wmcommand" != "no"; then cat >>confdefs.h <<\_ACEOF #define HAVE_WMCOMMAND 1 _ACEOF + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no ＠＠ -20265,8 +20219,10 ＠＠ fi if test "$enable_modules" != "no"; then - { echo "$as_me:$LINENO: checking for module support..." >&5 -echo "$as_me: checking for module support..." >&6;} + echo "$as_me:$LINENO: checking for module support" >&5 +echo $ECHO_N "checking for module support... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 case "$opsys" in mingw* | cygwin* ) have_dl=yes ;; ＠＠ -20428,7 +20384,7 ＠＠ cat >>conftest.$ac_ext <<_ACEOF int main () { - dlopen ("", 0); +dlopen ("", 0); ; return 0; } ＠＠ -20478,7 +20434,7 ＠＠ cat >>conftest.$ac_ext <<_ACEOF int main () { - dlopen ("", 0); +dlopen ("", 0); ; return 0; } ＠＠ -20527,7 +20483,7 ＠＠ cat >>conftest.$ac_ext <<_ACEOF int main () { - dlopen ("", 0); +dlopen ("", 0); ; return 0; } ＠＠ -20731,7 +20687,7 ＠＠ cat >>conftest.$ac_ext <<_ACEOF int main () { - shl_load ("", 0, 0); +shl_load ("", 0, 0); ; return 0; } ＠＠ -20781,7 +20737,7 ＠＠ cat >>conftest.$ac_ext <<_ACEOF int main () { - shl_load ("", 0, 0); +shl_load ("", 0, 0); ; return 0; } ＠＠ -20983,7 +20939,7 ＠＠ cat >>conftest.$ac_ext <<_ACEOF int main () { - lt_dlinit (); +lt_dlinit (); ; return 0; } ＠＠ -21046,8 +21002,10 ＠＠ ld_dynamic_link_flags= xehost=$ac_cv_build xealias=$ac_cv_build_alias -{ echo "$as_me:$LINENO: checking how to build dynamic libraries for ${xehost}..." >&5 -echo "$as_me: checking how to build dynamic libraries for ${xehost}..." >&6;} +echo "$as_me:$LINENO: checking how to build dynamic libraries for ${xehost}" >&5 +echo $ECHO_N "checking how to build dynamic libraries for ${xehost}... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; ＠＠ -21215,14 +21173,7 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ int x=0; - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ＠＠ -21343,14 +21294,7 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ int x=0; - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ＠＠ -22384,8 +22328,10 ＠＠ echo "${ECHO_T}no" >&6 fi fi -{ echo "$as_me:$LINENO: checking for LDAP..." >&5 -echo "$as_me: checking for LDAP..." >&6;} +echo "$as_me:$LINENO: checking for LDAP" >&5 +echo $ECHO_N "checking for LDAP... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 ldap_libs= test -z "$with_ldap" && { if test "${ac_cv_header_ldap_h+set}" = set; then echo "$as_me:$LINENO: checking for ldap.h" >&5 ＠＠ -23149,8 +23095,10 ＠＠ fi postgresql_libs= if test "$with_postgresql" != "no"; then - { echo "$as_me:$LINENO: checking for PostgreSQL..." >&5 -echo "$as_me: checking for PostgreSQL..." >&6;} + echo "$as_me:$LINENO: checking for PostgreSQL" >&5 +echo $ECHO_N "checking for PostgreSQL... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 for header_dir in "" "pgsql/" "postgresql/"; do as_ac_Header=`echo "ac_cv_header_${header_dir}libpq-fe.h" | $as_tr_sh` ＠＠ -23546,8 +23494,10 ＠＠ fi if test "$window_system" != "none"; then - { echo "$as_me:$LINENO: checking for graphics libraries..." >&5 -echo "$as_me: checking for graphics libraries..." >&6;} + echo "$as_me:$LINENO: checking for graphics libraries" >&5 +echo $ECHO_N "checking for graphics libraries... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 libpath_xpm= incpath_xpm= ＠＠ -23656,14 +23606,7 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ XpmCreatePixmapFromData() - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ＠＠ -25206,10 +25149,11 ＠＠ _ACEOF fi - if test "$with_x11" = "yes"; then - { echo "$as_me:$LINENO: checking for X11 graphics libraries..." >&5 -echo "$as_me: checking for X11 graphics libraries..." >&6;} + echo "$as_me:$LINENO: checking for X11 graphics libraries" >&5 +echo $ECHO_N "checking for X11 graphics libraries... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 fi case "$enable_widgets" in ＠＠ -25222,8 +25166,10 ＠＠ case "$enable_dialogs" in esac if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then - { echo "$as_me:$LINENO: checking for the Athena widgets..." >&5 -echo "$as_me: checking for the Athena widgets..." >&6;} + echo "$as_me:$LINENO: checking for the Athena widgets" >&5 +echo $ECHO_N "checking for the Athena widgets... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; ＠＠ -27227,8 +27173,8 ＠＠ canna_libs= wnn_libs= if test "$enable_mule" = "yes" ; then - { echo "$as_me:$LINENO: checking for Mule-related features..." >&5 -echo "$as_me: checking for Mule-related features..." >&6;} + echo "$as_me:$LINENO: checking for Mule-related features" >&5 +echo $ECHO_N "checking for Mule-related features... $ECHO_C" >&6 cat >>confdefs.h <<\_ACEOF #define MULE 1 _ACEOF ＠＠ -27459,11 +27405,11 ＠＠ _ACEOF fi - { echo "$as_me:$LINENO: checking for Mule input methods..." >&5 -echo "$as_me: checking for Mule input methods..." >&6;} + echo "$as_me:$LINENO: checking for Mule input methods" >&5 +echo $ECHO_N "checking for Mule input methods... $ECHO_C" >&6 case "$with_xim" in "" | "yes" ) - { echo "$as_me:$LINENO: checking for XIM..." >&5 -echo "$as_me: checking for XIM..." >&6;} + echo "$as_me:$LINENO: checking for XIM" >&5 +echo $ECHO_N "checking for XIM... $ECHO_C" >&6 echo "$as_me:$LINENO: checking for XOpenIM in -lX11" >&5 echo $ECHO_N "checking for XOpenIM in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenIM+set}" = set; then ＠＠ -27704,8 +27650,8 ＠＠ _ACEOF fi if test "$with_xfs" = "yes" ; then - { echo "$as_me:$LINENO: checking for XFontSet..." >&5 -echo "$as_me: checking for XFontSet..." >&6;} + echo "$as_me:$LINENO: checking for XFontSet" >&5 +echo $ECHO_N "checking for XFontSet... $ECHO_C" >&6 echo "$as_me:$LINENO: checking for XmbDrawString in -lX11" >&5 echo $ECHO_N "checking for XmbDrawString in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XmbDrawString+set}" = set; then ＠＠ -32372,14 +32318,7 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ int i; __typeof__(i) j; - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ＠＠ -32414,14 +32353,7 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ int i; typeof(i) j; - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ＠＠ -34028,8 +33960,8 ＠＠ if test $ac_cv_header_arpa_inet_h = yes; #define HAVE_SOCKETS 1 _ACEOF - echo "$as_me:$LINENO: checking \"for sun_len member in struct sockaddr_un\"" >&5 -echo $ECHO_N "checking \"for sun_len member in struct sockaddr_un\"... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for sun_len member in struct sockaddr_un" >&5 +echo $ECHO_N "checking for sun_len member in struct sockaddr_un... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF ＠＠ -34085,8 +34017,8 ＠＠ echo "${ECHO_T}no" >&6 fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - echo "$as_me:$LINENO: checking \"for ip_mreq struct in netinet/in.h\"" >&5 -echo $ECHO_N "checking \"for ip_mreq struct in netinet/in.h\"... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for ip_mreq struct in netinet/in.h" >&5 +echo $ECHO_N "checking for ip_mreq struct in netinet/in.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF ＠＠ -34970,8 +34902,10 ＠＠ fi -{ echo "$as_me:$LINENO: checking for sound support..." >&5 -echo "$as_me: checking for sound support..." >&6;} +echo "$as_me:$LINENO: checking for sound support" >&5 +echo $ECHO_N "checking for sound support... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 test -n "$with_native_sound_lib" && enable_sound_native=yes ＠＠ -36223,8 +36157,10 ＠＠ test "$need_miscplay" = "yes" && extra_o test -z "$with_tty" && with_tty=yes if test "$with_tty" = "yes" ; then - { echo "$as_me:$LINENO: checking for TTY-related features..." >&5 -echo "$as_me: checking for TTY-related features..." >&6;} + echo "$as_me:$LINENO: checking for TTY-related features" >&5 +echo $ECHO_N "checking for TTY-related features... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 cat >>confdefs.h <<\_ACEOF #define HAVE_TTY 1 _ACEOF ＠＠ -37221,8 +37157,10 ＠＠ echo "$as_me: WARNING: --with-${feature} fi test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \ - != "no no no" && { echo "$as_me:$LINENO: checking for database support..." >&5 -echo "$as_me: checking for database support..." >&6;} + != "no no no" && echo "$as_me:$LINENO: checking for database support" >&5 +echo $ECHO_N "checking for database support... $ECHO_C" >&6 && \ + echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then if test "${ac_cv_header_ndbm_h+set}" = set; then ＠＠ -37659,13 +37597,6 ＠＠ typedef uint64_t u_int64_t; #endif #include <$header> -int -main () -{ - - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 1.38 +206 -188 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- configure.ac 2006/03/27 21:00:13 1.37 +++ configure.ac 2006/03/28 15:55:52 1.38 ＠＠ -497,7 +497,7 ＠＠ dnl Boilerplate help string for complex dnl #### This doesn't read so well for alternative libraries like sound. dnl define([XE_COMPLEX_OPTION_HELP_STRING], -[AC_HELP_STRING([$1],[Compile with support for $2. Components that can use +[AS_HELP_STRING([$1],[Compile with support for $2. Components that can use $3 are $4. Prefix component with `no' to disable its use of $3. Requires $5 support. Default is $6.])])dnl dnl ＠＠ -528,7 +528,7 ＠＠ XE_APPEND(lib-src, INSTALL_ARCH_DEP_SUBD with_dragndrop_default="no" dnl ------------------------------------------------------------------------- dnl Command line argument processing. -dnl Note that AC_HELP_STRING compresses whitespace, wraps, and indents the +dnl Note that AS_HELP_STRING compresses whitespace, wraps, and indents the dnl string to fit the --help display; there's no need to preformat. dnl dnl I think these will be caught by autoconf internal checks, ＠＠ -549,123 +549,123 ＠＠ dnl dnl parse flags XE_HELP_SUBSECTION([Compilation options]) XE_MERGED_ARG([compiler], - AC_HELP_STRING([--with-compiler],[C compiler to use]), + AS_HELP_STRING([--with-compiler],[C compiler to use]), [], []) XE_MERGED_ARG([xemacs-compiler], - AC_HELP_STRING([--with-xemacs-compiler], + AS_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.]), [], []) XE_MERGED_ARG([gcc], - AC_HELP_STRING([--with-gcc],[Use GCC to compile XEmacs.]), + AS_HELP_STRING([--with-gcc],[Use GCC to compile XEmacs.]), [], []) XE_MERGED_ARG([cflags], - AC_HELP_STRING([--with-cflags=FLAGS], + AS_HELP_STRING([--with-cflags=FLAGS], [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'.]), [], []) XE_MERGED_ARG([cflags-warning], - AC_HELP_STRING([--with-cflags-warning=FLAGS],[Override compiler flags used to control warnings. + AS_HELP_STRING([--with-cflags-warning=FLAGS],[Override compiler flags used to control warnings. Normally, don't set this, as XEmacs already turns on the maximum safe warning level.]), [], []) XE_MERGED_ARG([optimization], - AC_HELP_STRING([--with-optimization],[Control whether compilation is optimized. By default, optimization is on in release versions and off in beta versions, since it can interfere with proper stack backtraces.]), + AS_HELP_STRING([--with-optimization],[Control whether compilation is optimized. By default, optimization is on in release versions and off in beta versions, since it can interfere with proper stack backtraces.]), [], []) XE_MERGED_ARG([cflags-optimization], - AC_HELP_STRING([--with-cflags-optimization=FLAGS], + AS_HELP_STRING([--with-cflags-optimization=FLAGS], [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.]), [], []) XE_MERGED_ARG([cflags-debugging], - AC_HELP_STRING([--with-cflags-debugging=FLAGS], + AS_HELP_STRING([--with-cflags-debugging=FLAGS], [Override compiler flags used to add debugging information to the executable. Normally, debugging information is added whenever possible (i.e. unless optimization is turned on and the compiler does not permit debugging and optimization simultaneously).]), [], []) XE_MERGED_ARG([cpp], - AC_HELP_STRING([--with-cpp],[C preprocessor to use (e.g. /usr/ccs/lib/cpp or cc -E)]), + AS_HELP_STRING([--with-cpp],[C preprocessor to use (e.g. /usr/ccs/lib/cpp or cc -E)]), [CPP="$with_cpp"], []) XE_MERGED_ARG([cppflags], - AC_HELP_STRING([--with-cppflags],[C preprocessor flags (e.g. -I/foo or -Dfoo=bar)]), + AS_HELP_STRING([--with-cppflags],[C preprocessor flags (e.g. -I/foo or -Dfoo=bar)]), [CPPFLAGS="$with_cppflags"], []) XE_MERGED_ARG([libs=LIBS], - AC_HELP_STRING([--with-libs],[Additional libraries (e.g. -lfoo)]), + AS_HELP_STRING([--with-libs],[Additional libraries (e.g. -lfoo)]), [LIBS="$with_libs"], []) XE_MERGED_ARG([ldflags=FLAGS], - AC_HELP_STRING([--with-ldflags],[Additional linker flags (e.g. -L/foo)]), + AS_HELP_STRING([--with-ldflags],[Additional linker flags (e.g. -L/foo)]), [LDFLAGS="$with_ldflags"], []) XE_MERGED_ARG([site-includes], - AC_HELP_STRING([--with-site-includes=PATHS],[Prepend to include search path.]), + AS_HELP_STRING([--with-site-includes=PATHS],[Prepend to include search path.]), [], []) XE_MERGED_ARG([site-libraries], - AC_HELP_STRING([--with-site-libraries=PATHS],[Prepend to library search path.]), + AS_HELP_STRING([--with-site-libraries=PATHS],[Prepend to library search path.]), [], []) XE_MERGED_ARG([site-prefixes], - AC_HELP_STRING([--with-site-prefixes=PATHS],[Prepend to include and library search paths, with /include and /lib added. Comes after site-includes and site-libraries, if any.]), + AS_HELP_STRING([--with-site-prefixes=PATHS],[Prepend to include and library search paths, with /include and /lib added. Comes after site-includes and site-libraries, if any.]), [], []) XE_MERGED_ARG([site-runtime-libraries], - AC_HELP_STRING([--with-site-runtime-libraries=PATHS],[Prepend to the runtime library search path]), + AS_HELP_STRING([--with-site-runtime-libraries=PATHS],[Prepend to the runtime library search path]), [], []) XE_MERGED_ARG([dynamic], - AC_HELP_STRING([--with-dynamic],[Link dynamically if supported by system. 'No' forces static linking.]), + AS_HELP_STRING([--with-dynamic],[Link dynamically if supported by system. 'No' forces static linking.]), [], []) dnl XE_HELP_SUBSECTION([Installation options]) XE_MERGED_ARG([prefix], - AC_HELP_STRING([--with-prefix=no],[Don't compile the value for `prefix' into the executable.]), + AS_HELP_STRING([--with-prefix=no],[Don't compile the value for `prefix' into the executable.]), [true], [with_prefix=yes]) XE_MERGED_ARG([netinstall], - AC_HELP_STRING([--with-netinstall],[Support for installation over the internet. + AS_HELP_STRING([--with-netinstall],[Support for installation over the internet. Only functional on the MS Windows platforms.]), [], [with_netinstall="no"]) XE_MERGED_ARG([statedir], - AC_HELP_STRING([--with-statedir=DIR],[]), + AS_HELP_STRING([--with-statedir=DIR],[]), [], [with_statedir='${prefix}/lib']) XE_MERGED_ARG([lispdir], - AC_HELP_STRING([--with-lispdir=DIR],[]), + AS_HELP_STRING([--with-lispdir=DIR],[]), [AC_DEFINE(LISPDIR_USER_DEFINED)], [with_lispdir='${datadir}/${instvardir}/lisp']) XE_MERGED_ARG([archlibdir], - AC_HELP_STRING([--with-archlibdir=DIR],[]), + AS_HELP_STRING([--with-archlibdir=DIR],[]), [AC_DEFINE(ARCHLIBDIR_USER_DEFINED)], [with_archlibdir='${libdir}/${instvardir}/${configuration}']) XE_MERGED_ARG([moduledir], - AC_HELP_STRING([--with-moduledir=DIR],[]), + AS_HELP_STRING([--with-moduledir=DIR],[]), [AC_DEFINE(MODULEDIR_USER_DEFINED)], [with_moduledir='${libdir}/${instvardir}/${configuration}/modules']) XE_MERGED_ARG([etcdir], - AC_HELP_STRING([--with-etcdir=DIR],[]), + AS_HELP_STRING([--with-etcdir=DIR],[]), [AC_DEFINE(ETCDIR_USER_DEFINED)], [with_etcdir='${datadir}/${instvardir}/etc']) XE_MERGED_ARG([docdir], - AC_HELP_STRING([--with-docdir=DIR],[]), + AS_HELP_STRING([--with-docdir=DIR],[]), [AC_DEFINE(DOCDIR_USER_DEFINED)], [with_docdir='${archlibdir}']) dnl XE_HELP_SUBSECTION([Run-time path-searching options]) XE_MERGED_ARG([site-lisp], - AC_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]), + AS_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]), [true], [with_site_lisp=no]) XE_MERGED_ARG([site-modules], - AC_HELP_STRING([--with-site-modules=no],[Disable site-modules directory in the XEmacs hierarchy, which is searched before the installation modules.]), + AS_HELP_STRING([--with-site-modules=no],[Disable site-modules directory in the XEmacs hierarchy, which is searched before the installation modules.]), [], []) XE_MERGED_ARG([early-packages], - AC_HELP_STRING([--with-early-packages=DIR],[Specify location of early/user packages (instead of ~/.xemacs; same as --with-user-packages).]), + AS_HELP_STRING([--with-early-packages=DIR],[Specify location of early/user packages (instead of ~/.xemacs; same as --with-user-packages).]), [AC_DEFINE(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([user-packages], - AC_HELP_STRING([--with-user-packages=DIR],[Specify location of early/user packages (instead of ~/.xemacs; same as --with-early-packages).]), + AS_HELP_STRING([--with-user-packages=DIR],[Specify location of early/user packages (instead of ~/.xemacs; same as --with-early-packages).]), [AC_DEFINE(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([late-packages], - AC_HELP_STRING([--with-late-packages=DIR],[Specify location of late/system packages (instead of default location; same as --with-system-packages).]), + AS_HELP_STRING([--with-late-packages=DIR],[Specify location of late/system packages (instead of default location; same as --with-system-packages).]), [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([system-packages], - AC_HELP_STRING([--with-late-packages=DIR],[Specify location of late/system packages (instead of default location; same as --with-late-packages).]), + AS_HELP_STRING([--with-late-packages=DIR],[Specify location of late/system packages (instead of default location; same as --with-late-packages).]), [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([last-packages], - AC_HELP_STRING([--with-last-packages=DIR],[Specify location of last/legacy packages (instead of default location; same as --with-legacy-packages).]), + AS_HELP_STRING([--with-last-packages=DIR],[Specify location of last/legacy packages (instead of default location; same as --with-legacy-packages).]), [AC_DEFINE(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([legacy-packages], - AC_HELP_STRING([--with-late-packages=DIR],[Specify location of late/legacy packages (instead of default location; same as --with-late-packages).]), + AS_HELP_STRING([--with-late-packages=DIR],[Specify location of late/legacy packages (instead of default location; same as --with-late-packages).]), [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], []) XE_MERGED_ARG([package-path], - AC_HELP_STRING([--with-package-path=PATH],[Search path for package directories.]), + AS_HELP_STRING([--with-package-path=PATH],[Search path for package directories.]), [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) XE_MERGED_ARG([infopath], - AC_HELP_STRING([--with-infopath=PATH],[Location of info directories]), + AS_HELP_STRING([--with-infopath=PATH],[Location of info directories]), [AC_DEFINE(INFOPATH_USER_DEFINED)], []) dnl XE_HELP_SUBSECTION([Window-system options]) ＠＠ -683,57 +683,57 ＠＠ XE_COMPLEX_ARG([xft], XE_COMPLEX_OPTION([tabs],[no]), XE_COMPLEX_OPTION([gauges],[no])]) XE_MERGED_ARG([gtk], - AC_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]), + AS_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]), [true], [with_gtk=no]) XE_MERGED_ARG([gnome], - AC_HELP_STRING([--with-gnome],[Support GNOME on the X Window System. (EXPERIMENTAL)]), + AS_HELP_STRING([--with-gnome],[Support GNOME on the X Window System. (EXPERIMENTAL)]), [true], [with_gnome=no]) XE_MERGED_ARG([msw], - AC_HELP_STRING([--with-msw],[Support MS Windows as a window system (only under Cygwin and MinGW). `--with-msw=no' may be needed on *nix systems with Wine installed.]), + AS_HELP_STRING([--with-msw],[Support MS Windows as a window system (only under Cygwin and MinGW). `--with-msw=no' may be needed on *nix systems with Wine installed.]), [], []) XE_MERGED_ARG([toolbars], - AC_HELP_STRING([--enable-toolbars],[Enable toolbar support. Default: yes.]), + AS_HELP_STRING([--enable-toolbars],[Enable toolbar support. Default: yes.]), [], []) XE_MERGED_ARG([wmcommand], - AC_HELP_STRING([--with-wmcommand],[Compile without realized leader window which will + AS_HELP_STRING([--with-wmcommand],[Compile without realized leader window which will keep the WM_COMMAND property.]), [], []) XE_KEYWORD_ARG([athena], - AC_HELP_STRING([--with-athena=TYPE],[Use TYPE Athena widgets (`xaw', `3d', `next', `95', or `xpm').]), + AS_HELP_STRING([--with-athena=TYPE],[Use TYPE Athena widgets (`xaw', `3d', `next', `95', or `xpm').]), [],[],[xaw,3d,next,95,xpm])dnl XE_KEYWORD_ARG([menubars], - AC_HELP_STRING([--enable-menubars=TYPE],[Use TYPE menubars ('yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). The Lucid + AS_HELP_STRING([--enable-menubars=TYPE],[Use TYPE menubars ('yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). The Lucid widgets emulate Motif (mostly) but are faster. *WARNING* The Motif menubar is currently broken. Lucid menubars are the default.]), [], [],[yes,no,lucid,motif,athena,gtk,msw]) XE_KEYWORD_ARG([scrollbars], - AC_HELP_STRING([--enable-scrollbars=TYPE],[Use TYPE scrollbars 'yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). + AS_HELP_STRING([--enable-scrollbars=TYPE],[Use TYPE scrollbars 'yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). Lucid scrollbars are the default.]), [], [],[yes,no,lucid,motif,athena,gtk,msw]) XE_KEYWORD_ARG([dialogs], - AC_HELP_STRING([--enable-dialogs=TYPE],[Use TYPE dialog boxes 'yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). + AS_HELP_STRING([--enable-dialogs=TYPE],[Use TYPE dialog boxes 'yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). There are no true Lucid dialogs; Motif dialogs will be used if Motif can be found, else Athena is used.]), [], [],[yes,no,lucid,motif,athena,gtk,msw]) XE_KEYWORD_ARG([widgets], - AC_HELP_STRING([--enable-widgets=TYPE],[Use TYPE native widgets ('yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). + AS_HELP_STRING([--enable-widgets=TYPE],[Use TYPE native widgets ('yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). Other widget types are currently unsupported. There are no true Lucid widgets; Motif widgets will be used if Motif can be found, else Athena is used.]), [], [],[yes,no,lucid,motif,athena,gtk,msw]) XE_MERGED_ARG([dragndrop], - AC_HELP_STRING([--with-dragndrop],[Compile in the generic drag and drop API. This is automatically added if one of the drag and drop + AS_HELP_STRING([--with-dragndrop],[Compile in the generic drag and drop API. This is automatically added if one of the drag and drop protocols is found (currently CDE, OffiX, MSWindows, and GTK). *WARNING* The Drag'n'drop support is under development and is considered experimental.]), [], []) XE_MERGED_ARG([cde], - AC_HELP_STRING([--with-cde],[Compile in support for CDE drag and drop.]), + AS_HELP_STRING([--with-cde],[Compile in support for CDE drag and drop.]), [], []) XE_MERGED_ARG([offix], - AC_HELP_STRING([--with-offix],[Compile in support for OffiX drag and drop. + AS_HELP_STRING([--with-offix],[Compile in support for OffiX drag and drop. *WARNING* If you compile in OffiX, you may not be able to use multiple X displays success- fully. If the two servers are from ＠＠ -741,56 +741,56 ＠＠ XE_MERGED_ARG([offix], unpredictable.]), [], []) XE_MERGED_ARG([xmu], - AC_HELP_STRING([--with-xmu],[Use Xmu utilities. Default: yes.]), + AS_HELP_STRING([--with-xmu],[Use Xmu utilities. Default: yes.]), [], []) XE_MERGED_ARG([external-widget], - AC_HELP_STRING([--enable-external-widget],[Support XEmacs server for text widgets in other applications.]), + AS_HELP_STRING([--enable-external-widget],[Support XEmacs server for text widgets in other applications.]), [], []) dnl XE_HELP_SUBSECTION([TTY (character terminal) options]) XE_MERGED_ARG([tty], - AC_HELP_STRING([--with-tty],[Enable TTY support. Default: yes.]), + AS_HELP_STRING([--with-tty],[Enable TTY support. Default: yes.]), [], []) XE_MERGED_ARG([ncurses], - AC_HELP_STRING([--with-ncurses],[Use the ncurses library for tty support.]), + AS_HELP_STRING([--with-ncurses],[Use the ncurses library for tty support.]), [], []) XE_MERGED_ARG([gpm], - AC_HELP_STRING([--with-gpm],[Compile in GPM mouse support for ttys.]), + AS_HELP_STRING([--with-gpm],[Compile in GPM mouse support for ttys.]), [], []) dnl XE_HELP_SUBSECTION([Image options]) XE_MERGED_ARG([xpm], - AC_HELP_STRING([--with-xpm],[Compile with support for XPM images. PRACTICALLY + AS_HELP_STRING([--with-xpm],[Compile with support for XPM images. PRACTICALLY REQUIRED. Although this library is nonstandard and a real hassle to build, many basic things (e.g. toolbars) depend on it, and you will run into many problems without it.]), [], []) XE_MERGED_ARG([png], - AC_HELP_STRING([--with-png],[Compile with support for PNG images. Recommended + AS_HELP_STRING([--with-png],[Compile with support for PNG images. Recommended because the images on the About page are not viewable without it.]), [], []) XE_MERGED_ARG([jpeg], - AC_HELP_STRING([--with-jpeg],[Compile with support for JPEG images. Useful if + AS_HELP_STRING([--with-jpeg],[Compile with support for JPEG images. Useful if you are using a mail, news reader, or web browser in XEmacs, so that JPEG images can be displayed.]), [], []) XE_MERGED_ARG([tiff], - AC_HELP_STRING([--with-tiff],[Compile with support for TIFF images. Possibly + AS_HELP_STRING([--with-tiff],[Compile with support for TIFF images. Possibly useful, for the same reason as JPEG images.]), [], []) XE_MERGED_ARG([xface], - AC_HELP_STRING([--with-xface],[Compile with support for X-Face mail headers. + AS_HELP_STRING([--with-xface],[Compile with support for X-Face mail headers. Requires the compface package.]), [], []) XE_MERGED_ARG([gif], - AC_HELP_STRING([--with-gif],[Compile without the (builtin) support for GIF images.]), + AS_HELP_STRING([--with-gif],[Compile without the (builtin) support for GIF images.]), [], []) dnl XE_HELP_SUBSECTION([Sound options]) XE_COMPLEX_ARG([sound], - AC_HELP_STRING([--enable-sound=TYPE],[Compile with sound support. + AS_HELP_STRING([--enable-sound=TYPE],[Compile with sound support. Valid types are `native', `alsa', `nas' and `esd'. Prefix a type with 'no' to disable. The first type can be `none' or `all'. `none' means ＠＠ -806,53 +806,53 ＠＠ XE_COMPLEX_ARG([sound], XE_COMPLEX_OPTION([nas],[""]), XE_COMPLEX_OPTION([esd],[no])]) XE_MERGED_ARG([native-sound-lib], - AC_HELP_STRING([--with-native-sound-lib],[Path to sound library (for systems with name conflicts).]), + AS_HELP_STRING([--with-native-sound-lib],[Path to sound library (for systems with name conflicts).]), [], []) dnl XE_HELP_SUBSECTION([Internationalization options]) XE_MERGED_ARG([mule], - AC_HELP_STRING([--enable-mule],[Compile with Mule (Multi-Lingual Emacs) support, + AS_HELP_STRING([--enable-mule],[Compile with Mule (Multi-Lingual Emacs) support, needed to support non-Latin-1 (including Asian) languages.]), [], []) XE_KEYWORD_ARG([xim], - AC_HELP_STRING([--with-xim==TYPE],[Enable XIM support. TYPE is `yes', `no', `xlib', or `motif']), + AS_HELP_STRING([--with-xim==TYPE],[Enable XIM support. TYPE is `yes', `no', `xlib', or `motif']), [],[],[yes,no,xlib,motif])dnl XE_MERGED_ARG([canna], - AC_HELP_STRING([--with-canna],[Support the Canna Japanese input method. Requires Mule.]), + AS_HELP_STRING([--with-canna],[Support the Canna Japanese input method. Requires Mule.]), [], []) XE_MERGED_ARG([wnn], - AC_HELP_STRING([--with-wnn],[Support the Wnn Asian language input + AS_HELP_STRING([--with-wnn],[Support the Wnn Asian language input method. Requires Mule.]), [], []) XE_MERGED_ARG([wnn6], - AC_HELP_STRING([--with-wnn6],[Support the Wnn6 Asian language input + AS_HELP_STRING([--with-wnn6],[Support the Wnn6 Asian language input method (proprietary). Requires Mule.]), [], []) XE_MERGED_ARG([xfs], - AC_HELP_STRING([--with-xfs],[Enable XFontSet support for internationalized + AS_HELP_STRING([--with-xfs],[Enable XFontSet support for internationalized menubar. Incompatible with `--with-xim=motif' and `--with-xft'. `--enable-menubars=lucid' (the default) is desirable.]), [], []) dnl XE_HELP_SUBSECTION([File-related options]) XE_MERGED_ARG([default-eol-detection], - AC_HELP_STRING([--enable-default-eol-detection],[Turns on by default auto-detection of end-of-line type + AS_HELP_STRING([--enable-default-eol-detection],[Turns on by default auto-detection of end-of-line type when reading a file. Applies to those platforms where auto-detection is off by default (non-Mule Unix). Has no effect otherwise.]), [], []) XE_MERGED_ARG([clash-detection], - AC_HELP_STRING([--enable-clash-detection],[Disable use of lock files to detect multiple edits + AS_HELP_STRING([--enable-clash-detection],[Disable use of lock files to detect multiple edits of the same file.]), [], []) XE_MERGED_ARG([zlib], - AC_HELP_STRING([--with-zlib],[Support inflate (de)compression internally.]), + AS_HELP_STRING([--with-zlib],[Support inflate (de)compression internally.]), [], []) dnl XE_HELP_SUBSECTION([Database options]) XE_COMPLEX_ARG([database], - AC_HELP_STRING([--enable-database=TYPE],[Compile with database support. Valid types are + AS_HELP_STRING([--enable-database=TYPE],[Compile with database support. Valid types are `no' or a comma-separated list of one or more of `berkdb' and either `dbm' or `gnudbm'.]), [ ＠＠ -866,72 +866,72 ＠＠ fi XE_COMPLEX_OPTION([dbm],[""]), XE_COMPLEX_OPTION([gdbm],[""])]) XE_MERGED_ARG([ldap], - AC_HELP_STRING([--with-ldap],[Support the LDAP protocol.]), + AS_HELP_STRING([--with-ldap],[Support the LDAP protocol.]), [], []) XE_MERGED_ARG([postgresql], - AC_HELP_STRING([--with-postgresql],[Support the PostgreSQL RDBMS.]), + AS_HELP_STRING([--with-postgresql],[Support the PostgreSQL RDBMS.]), [], []) dnl XE_HELP_SUBSECTION([Mail options]) XE_KEYWORD_ARG([mail-locking], - AC_HELP_STRING([--with-mail-locking=TYPE],[Specify the locking to be used by movemail to prevent + AS_HELP_STRING([--with-mail-locking=TYPE],[Specify the locking to be used by movemail to prevent concurrent updates of mail spool files. Valid types are `lockf', `flock', `file', `locking', `mmdf' or `pop'.]), [],[],[lockf,flock,file,locking,mmdf,pop])dnl XE_MERGED_ARG([pop], - AC_HELP_STRING([--with-pop],[Support POP for mail retrieval.]), + AS_HELP_STRING([--with-pop],[Support POP for mail retrieval.]), [], []) XE_MERGED_ARG([kerberos], - AC_HELP_STRING([--with-kerberos],[Support Kerberos-authenticated POP.]), + AS_HELP_STRING([--with-kerberos],[Support Kerberos-authenticated POP.]), [], []) XE_MERGED_ARG([hesiod], - AC_HELP_STRING([--with-hesiod],[Support Hesiod to get the POP server host.]), + AS_HELP_STRING([--with-hesiod],[Support Hesiod to get the POP server host.]), [], []) dnl XE_HELP_SUBSECTION([Networking options]) XE_MERGED_ARG([tooltalk], - AC_HELP_STRING([--with-tooltalk],[Support the ToolTalk IPC protocol.]), + AS_HELP_STRING([--with-tooltalk],[Support the ToolTalk IPC protocol.]), [], []) XE_MERGED_ARG([socks], - AC_HELP_STRING([--with-socks],[Compile with support for SOCKS (an Internet proxy).]), + AS_HELP_STRING([--with-socks],[Compile with support for SOCKS (an Internet proxy).]), [], []) XE_MERGED_ARG([dnet], - AC_HELP_STRING([--with-dnet],[Compile with support for DECnet.]), + AS_HELP_STRING([--with-dnet],[Compile with support for DECnet.]), [], []) XE_MERGED_ARG([ipv6-cname], - AC_HELP_STRING([--with-ipv6-cname],[Try IPv6 information first when canonicalizing host names. This option has no effect unless system supports getaddrinfo(3) and getnameinfo(3).]), + AS_HELP_STRING([--with-ipv6-cname],[Try IPv6 information first when canonicalizing host names. This option has no effect unless system supports getaddrinfo(3) and getnameinfo(3).]), [], [with_ipv6_cname="no"]) dnl XE_HELP_SUBSECTION([Memory allocation options]) XE_MERGED_ARG([rel-alloc], - AC_HELP_STRING([--with-rel-alloc],[Enable the relocating allocator.]), + AS_HELP_STRING([--with-rel-alloc],[Enable the relocating allocator.]), [], [with_rel_alloc='default']) XE_MERGED_ARG([dlmalloc], - AC_HELP_STRING([--with-dlmalloc],[Use Doug Lea's malloc implementation.]), + AS_HELP_STRING([--with-dlmalloc],[Use Doug Lea's malloc implementation.]), [], [with_dlmalloc='default']) XE_MERGED_ARG([system-malloc], - AC_HELP_STRING([--with-system-malloc],[Use the system malloc, not the one distributed with XEmacs.]), + AS_HELP_STRING([--with-system-malloc],[Use the system malloc, not the one distributed with XEmacs.]), [], [with_system_malloc='default']) XE_MERGED_ARG([debug-malloc], - AC_HELP_STRING([--with-debug-malloc],[Use a debugging malloc.]), + AS_HELP_STRING([--with-debug-malloc],[Use a debugging malloc.]), [], []) XE_MERGED_ARG([pdump], - AC_HELP_STRING([--enable-pdump],[Enable portable LISP preloader.]), + AS_HELP_STRING([--enable-pdump],[Enable portable LISP preloader.]), [], []) XE_MERGED_ARG([dump-in-exec], - AC_HELP_STRING([--enable-dump-in-exec],[Enable dumping into executable (enabled by default + AS_HELP_STRING([--enable-dump-in-exec],[Enable dumping into executable (enabled by default for `pdump', not enabled by default in combination with `newgc').]), [], []) XE_MERGED_ARG([kkcc], - AC_HELP_STRING([--enable-kkcc],[Enable experimental new GC mark algorithms.]), + AS_HELP_STRING([--enable-kkcc],[Enable experimental new GC mark algorithms.]), [], [enable_kkcc=yes]) XE_MERGED_ARG([newgc], - AC_HELP_STRING([--enable-newgc],[Enable new incremental garbage collector and new allocator.]), + AS_HELP_STRING([--enable-newgc],[Enable new incremental garbage collector and new allocator.]), [], []) XE_COMPLEX_ARG([vdb], - AC_HELP_STRING([--enable-vdb=TYPE],[Override auto-detection of + AS_HELP_STRING([--enable-vdb=TYPE],[Override auto-detection of virtual-dirty-bit write-barrier implementation for the new garbage collector. TYPE must be one of "auto" (for auto-detection), "posix", "win32", "mach", or "fake" ＠＠ -942,33 +942,33 ＠＠ XE_COMPLEX_ARG([vdb], dnl XE_HELP_SUBSECTION([Emacs Lisp options]) XE_MERGED_ARG([modules], - AC_HELP_STRING([--enable-modules],[Compile in experimental support for dynamically + AS_HELP_STRING([--enable-modules],[Compile in experimental support for dynamically loaded libraries (Dynamic Shared Objects).]), [], []) XE_KEYWORD_ARG([bignum], - AC_HELP_STRING([--enable-bignum=TYPE],[Compile in support for bignums, ratios, or bigfloats + AS_HELP_STRING([--enable-bignum=TYPE],[Compile in support for bignums, ratios, or bigfloats using library support. TYPE must be one of "gmp" (for GNU MP), "mp" (for BSD MP), or "no" (disabled).]), [], [enable_bignum="no"],[no,gmp,mp]) dnl XE_HELP_SUBSECTION([Platform Specific options]) XE_MERGED_ARG([workshop], - AC_HELP_STRING([--with-workshop],[Support the Sun WorkShop (formerly Sparcworks) + AS_HELP_STRING([--with-workshop],[Support the Sun WorkShop (formerly Sparcworks) development environment.]), [], []) XE_MERGED_ARG([sparcworks], - AC_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]), + AS_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]), [], []) XE_MERGED_ARG([infodock], - AC_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]), + AS_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]), [], []) dnl XE_HELP_SUBSECTION([Debugging options]) XE_MERGED_ARG([debug], - AC_HELP_STRING([--enable-debug],[Enable additional debugging information. No time cost.]), + AS_HELP_STRING([--enable-debug],[Enable additional debugging information. No time cost.]), [], []) XE_COMPLEX_ARG([error-checking], - AC_HELP_STRING([--enable-error-checking=TESTS],[Compile with internal error-checking added. + AS_HELP_STRING([--enable-error-checking=TESTS],[Compile with internal error-checking added. Causes noticeable loss of speed. Valid TESTS are `extents', `bufpos', `malloc', `gc', `types', `text', `byte_code', `glyphs', `display', `structures'.]), [], [], ＠＠ -982,13 +982,13 ＠＠ XE_COMPLEX_ARG([error-checking], XE_COMPLEX_OPTION([display],[""]), XE_COMPLEX_OPTION([structures],[""])]) XE_MERGED_ARG([assertions], - AC_HELP_STRING([--enable-assertions],[Compile in runtime assertions.]), + AS_HELP_STRING([--enable-assertions],[Compile in runtime assertions.]), [], []) XE_MERGED_ARG([memory-usage-stats], - AC_HELP_STRING([--enable-memory-usage-stats],[Enable LISP memory usage API.]), + AS_HELP_STRING([--enable-memory-usage-stats],[Enable LISP memory usage API.]), [], []) XE_MERGED_ARG([quick-build], - AC_HELP_STRING([--enable-quick-build],[Speed up the build cycle by leaving out steps where + AS_HELP_STRING([--enable-quick-build],[Speed up the build cycle by leaving out steps where XEmacs will still work (more or less) without them. Potentially dangerous if you don't know what you're doing. This (1) doesn't garbage-collect after loading ＠＠ -1000,13 +1000,13 ＠＠ XE_MERGED_ARG([quick-build], to be rebuilt.]), [], []) XE_MERGED_ARG([union-type], - AC_HELP_STRING([--enable-union-type],[Use union definition of Lisp_Object type. Known to trigger bugs in some compilers.]), + AS_HELP_STRING([--enable-union-type],[Use union definition of Lisp_Object type. Known to trigger bugs in some compilers.]), [], []) XE_MERGED_ARG([quantify], - AC_HELP_STRING([--with-quantify],[Support performance debugging using Quantify.]), + AS_HELP_STRING([--with-quantify],[Support performance debugging using Quantify.]), [], []) XE_MERGED_ARG([purify], - AC_HELP_STRING([--with-purify],[Support memory debugging using Purify.]), + AS_HELP_STRING([--with-purify],[Support memory debugging using Purify.]), [], []) dnl ------------------------------------------------------------------------- dnl Final command line argument checks. ＠＠ -1925,12 +1925,12 ＠＠ dnl We want feature macros defined here dnl the compilation environment at configure time and compile time agree. AC_MSG_CHECKING(for GNU libc) -AC_TRY_COMPILE([#include <features.h>],[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <features.h>],[ #if ! (defined __GLIBC__ || defined __GNU_LIBRARY__) #error Not a GNU libc system :-( ******* ======= ******** &&&&&&&& #endif -], have_glibc=yes, have_glibc=no) +])], have_glibc=yes, have_glibc=no) AC_MSG_RESULT($have_glibc) dnl I'm tired of pop being broken with GLIBC -slb dnl Well. then why not fix fucking pop? ＠＠ -2184,10 +2184,11 ＠＠ dnl Some versions of SCO native compiler if test "$__USLC__" = yes; then AC_MSG_CHECKING(for whether the -Kalloca compiler flag is needed) need_kalloca=no - AC_TRY_LINK([], [void *x = alloca(4);], [:], [ + AC_LINK_IFELSE([AC_LANG_SOURCE([void *x = alloca(4);])], [:], [ xe_save_c_switch_system="$c_switch_system" c_switch_system="$c_switch_system -Kalloca" - AC_TRY_LINK([], [void *x = alloca(4);], [ need_kalloca=yes ]) + AC_LINK_IFELSE([AC_LANG_SOURCE([void *x = alloca(4);])], + [ need_kalloca=yes ]) c_switch_system="$xe_save_c_switch_system"]) AC_MSG_RESULT($need_kalloca) test "$need_kalloca" = "yes" && XE_APPEND(-Kalloca,c_switch_system) ＠＠ -2439,7 +2440,7 ＠＠ dnl a usage message, that's often good e dnl #### Should make this Solaris-friendly. dnl Link with -z nocombreloc for now. if test "$enable_pdump" != "yes"; then - AC_MSG_CHECKING(for \"-z nocombreloc\" linker flag) + AC_MSG_CHECKING([for "-z nocombreloc" linker flag]) case "`ld --help 2>&1`" in *-z\ nocombreloc* ) AC_MSG_RESULT(yes) XE_PREPEND(-z nocombreloc, ld_switch_site) ;; ＠＠ -2738,7 +2739,7 ＠＠ fi if test "$add_runtime_path" = "yes"; then dnl Try to autodetect runtime library flag (usually -R), dnl and whether it works (or at least does no harm) - AC_MSG_CHECKING("for runtime libraries flag") + AC_MSG_CHECKING([for runtime libraries flag]) case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; ＠＠ -2747,13 +2748,13 ＠＠ if test "$add_runtime_path" = "yes"; the for try_dash_r in "-R" "-R " "-rpath "; do xe_check_libs="${try_dash_r}/no/such/file-or-directory" XE_PROTECT_LINKER_FLAGS(xe_check_libs) - AC_TRY_LINK(, , dash_r="$try_dash_r") + AC_LINK_IFELSE([], dash_r="$try_dash_r") xe_check_libs="" test -n "$dash_r" && break done ;; esac if test -n "$dash_r"; - then AC_MSG_RESULT("\"${dash_r}\"") + then AC_MSG_RESULT(["${dash_r}"]) else AC_MSG_RESULT(NONE) fi fi ＠＠ -2786,7 +2787,8 ＠＠ fi after_morecore_hook_exists=yes AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no) AC_MSG_CHECKING(whether __after_morecore_hook exists) -AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0], +AC_LINK_IFELSE([AC_LANG_PROGRAM([extern void (* __after_morecore_hook)();], + [__after_morecore_hook = 0])], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) after_morecore_hook_exists=no]) ＠＠ -2846,7 +2848,6 ＠＠ AC_CHECK_HEADERS(dnl elf.h dnl cygwin/version.h dnl fcntl.h dnl - inttypes.h dnl libgen.h dnl locale.h dnl wchar.h dnl ＠＠ -2860,7 +2861,6 ＠＠ AC_CHECK_HEADERS(dnl sys/un.h dnl sys/vlimit.h dnl ulimit.h dnl - unistd.h dnl ) AC_HEADER_SYS_WAIT AC_HEADER_STDC ＠＠ -2881,9 +2881,9 ＠＠ dnl Some systems have utime.h but do not dnl so we use a more sophisticated test for utime than AC_CHECK_FUNCS. dnl ---------------------------------------------------------------- AC_MSG_CHECKING(for utime) -AC_TRY_COMPILE([#include <sys/types.h> +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h> #include <utime.h>], -[struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);], +[struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);])], [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_UTIME)], [AC_MSG_RESULT(no) ＠＠ -2904,30 +2904,30 ＠＠ AC_CHECK_TYPE(ssize_t, int) dnl not AC_CHECK_TYPE; lisp.h does hairy conditional typedef if test "$ac_cv_header_inttypes_h" != "yes"; then AC_MSG_CHECKING(for intptr_t in sys/types.h) -AC_TRY_COMPILE([#include <sys/types.h> +AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <sys/types.h> intptr_t x; -],[],[AC_MSG_RESULT(yes) +])],[AC_MSG_RESULT(yes) AC_DEFINE(HAVE_INTPTR_T_IN_SYS_TYPES_H,1)], [AC_MSG_RESULT(no)]) fi dnl check for Unix98 socklen_t AC_MSG_CHECKING(for socklen_t) -AC_TRY_COMPILE([#include <sys/types.h> +AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <sys/types.h> #include <sys/socket.h> socklen_t x; -],[],[AC_MSG_RESULT(yes)],[ -AC_TRY_COMPILE([#include <sys/types.h> +])],[AC_MSG_RESULT(yes)],[ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <sys/types.h> #include <sys/socket.h> int accept (int, struct sockaddr *, size_t *); -],[],[ +])],[ AC_MSG_RESULT(size_t) AC_DEFINE(socklen_t,size_t)], [ AC_MSG_RESULT(int) AC_DEFINE(socklen_t,int)])]) AC_MSG_CHECKING(for struct timeval) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#ifdef TIME_WITH_SYS_TIME #include <sys/time.h> #include <time.h> #else ＠＠ -2936,7 +2936,7 ＠＠ AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIM #else #include <time.h> #endif -#endif], [static struct timeval x; x.tv_sec = x.tv_usec;], +#endif], [static struct timeval x; x.tv_sec = x.tv_usec;])], [AC_MSG_RESULT(yes) HAVE_TIMEVAL=yes AC_DEFINE(HAVE_TIMEVAL)], ＠＠ -2976,15 +2976,16 ＠＠ AC_SYS_LONG_FILE_NAMES dnl -lm is required for floating point support, among other things AC_CHECK_FUNC(sin, ,AC_CHECK_LIB(m, sin)) -AC_TRY_LINK([#include <math.h>], - [return atanh(1.0) + asinh(1.0) + acosh(1.0); ], +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <math.h>], + [return atanh(1.0) + asinh(1.0) + acosh(1.0); ])], AC_DEFINE(HAVE_INVERSE_HYPERBOLIC)) dnl See if mkstemp is available AC_CHECK_FUNCS(mkstemp) dnl Determine type of mail locking from configure args and s&m headers -AC_CHECKING([type of mail spool file locking]) +AC_MSG_CHECKING([type of mail spool file locking]) +AC_MSG_RESULT() AC_CHECK_FUNCS(lockf flock) dnl The mail_use_xxx variables are set according to the s&m headers. test -z "$with_mail_locking" -a "$mail_use_flock" = "yes" && with_mail_locking=flock ＠＠ -3034,7 +3035,7 ＠＠ fi dnl Link with "-z ignore" on Solaris if supported if test "$opsys" = "sol2"; then if test "$os_release" -ge 506; then - AC_MSG_CHECKING(for \"-z ignore\" linker flag) + AC_MSG_CHECKING([for "-z ignore" linker flag]) case "`ld -h 2>&1`" in *-z\ ignore\|record* ) AC_MSG_RESULT(yes) XE_PREPEND(-z ignore, ld_switch_site) ;; ＠＠ -3047,7 +3048,8 ＠＠ dnl ---------------------- dnl Choose a window system dnl ---------------------- -AC_CHECKING([for specified window system]) +AC_MSG_CHECKING([for specified window system]) +AC_MSG_RESULT() dnl Autodetection of Gdk libraries and includes dnl ------------------------------------------- ＠＠ -3307,7 +3309,8 ＠＠ if test "$with_x11" = "yes"; then test ! -z "$bitmapdirs" && AC_DEFINE_UNQUOTED(BITMAPDIR, "$bitmapdirs") dnl Autodetect defines extracted from X config by xmkmf, e.g. NARROWPROTO - AC_CHECKING([for X defines extracted by xmkmf]) + AC_MSG_CHECKING([for X defines extracted by xmkmf]) + AC_MSG_RESULT() rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ＠＠ -3385,12 +3388,12 ＠＠ dnl Avoid re-AC_DEFINE-ing xmkmf symbols dnl XFree86 has a non-standard prototype for this X11R6 function AC_CHECK_FUNCS(XRegisterIMInstantiateCallback) AC_MSG_CHECKING(for standard XRegisterIMInstantiateCallback prototype) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #define NeedFunctionPrototypes 1 #include <X11/Xlib.h> extern Bool XRegisterIMInstantiateCallback( Display*, struct _XrmHashBucketRec*, char*, char*, XIMProc, XPointer*); -], [], +])], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) AC_DEFINE(XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE)]) ＠＠ -3428,7 +3431,7 ＠＠ extern Bool XRegisterIMInstantiateCallba dnl #### need to check for includes here (especially, freetype.h for v.2) if test "$with_xft_emacs" = "yes"; then - AC_CHECKING([for Xrender, fontconfig, and Xft]) + AC_MSG_CHECKING([for Xrender, fontconfig, and Xft]) xft_includes_found=no AC_CHECK_HEADERS([freetype/config/ftheader.h], [xft_includes_found=yes], ＠＠ -3439,7 +3442,7 ＠＠ extern Bool XRegisterIMInstantiateCallba "/usr/include/freetype2" do if test -d $freetype_include_top; then - AC_CHECKING([in ${freetype_include_top}/freetype2]) + AC_MSG_CHECKING([in ${freetype_include_top}/freetype2]) dnl disable autoconf's fucking cache; why these fuckheads think it dnl is better to be broken than to be slow, I don't know! dnl #### there's gotta be a better-looking way to do this!! ＠＠ -3470,7 +3473,8 ＠＠ extern Bool XRegisterIMInstantiateCallba fi dnl $with_x11 = yes if test "$with_msw" != "no"; then - AC_CHECKING([for MS-Windows]) + AC_MSG_CHECKING([for MS-Windows]) + AC_MSG_RESULT() AC_CHECK_LIB(gdi32,main,with_msw=yes) if test "$with_msw" = "yes"; then AC_DEFINE(HAVE_MS_WINDOWS) ＠＠ -3583,10 +3587,13 ＠＠ case "$x_libraries" in *X11R4* ) esac dnl Enable or disable proper handling of WM_COMMAND -AC_CHECKING([for WM_COMMAND option]) +AC_MSG_CHECKING([for WM_COMMAND option]) dnl if test "$with_wmcommand" = "yes"; then if test "$with_wmcommand" != "no"; then AC_DEFINE(HAVE_WMCOMMAND) + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) fi dnl Autodetect Xauth ＠＠ -3619,7 +3626,8 ＠＠ AC_SUBST(LIBSTDCPP) dnl This must come before the detection code for anything that is in a module if test "$enable_modules" != "no"; then - AC_CHECKING([for module support]) + AC_MSG_CHECKING([for module support]) + AC_MSG_RESULT() case "$opsys" in mingw* | cygwin* ) have_dl=yes ;; ＠＠ -3630,19 +3638,19 ＠＠ if test "$enable_modules" != "no"; then dnl Check for the ELFish dlopen() AC_CHECK_HEADER(dlfcn.h, [ AC_MSG_CHECKING([for dlopen in -lc]) - AC_TRY_LINK([#include <dlfcn.h>],dnl - [dlopen ("", 0);], [ have_dl=yes ; AC_MSG_RESULT($have_dl)], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <dlfcn.h>], + [dlopen ("", 0);])], [ have_dl=yes ; AC_MSG_RESULT($have_dl)], [ AC_MSG_RESULT([no]) AC_MSG_CHECKING([for dlopen in -ldl]) ac_save_LIBS="$LIBS" LIBS="$LIBS -ldl" - AC_TRY_LINK([#include <dlfcn.h>],dnl - [dlopen ("", 0);], [ have_dl=yes; AC_MSG_RESULT($have_dl)], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <dlfcn.h>], + [dlopen ("", 0);])], [ have_dl=yes; AC_MSG_RESULT($have_dl)], [ AC_MSG_RESULT([no]) AC_MSG_CHECKING([for dlopen in -lsvld]) LIBS="$ac_save_LIBS -lsvld" - AC_TRY_LINK([#include <dlfcn.h>],dnl - [dlopen ("", 0);], [ have_dl=yes; AC_MSG_RESULT($have_dl) ], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <dlfcn.h>], + [dlopen ("", 0);])], [ have_dl=yes; AC_MSG_RESULT($have_dl) ], [LIBS="$ac_save_LIBS" ; AC_MSG_RESULT([no])])])])]) if test "$have_dl" = "yes"; then AC_DEFINE(HAVE_DLOPEN) ＠＠ -3650,14 +3658,14 ＠＠ if test "$enable_modules" != "no"; then dnl Check for HP/UX shl_load AC_CHECK_HEADER(dl.h, [ AC_MSG_CHECKING([for shl_load in -lc]) - AC_TRY_LINK([#include <dl.h>],dnl - [shl_load ("", 0, 0);], [have_dl=yes; AC_MSG_RESULT($have_dl)], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <dl.h>], + [shl_load ("", 0, 0);])], [have_dl=yes; AC_MSG_RESULT($have_dl)], [ AC_MSG_RESULT([no]) AC_MSG_CHECKING([for shl_load in -ldl]) ac_save_LIBS="$LIBS" LIBS="$LIBS -ldld" - AC_TRY_LINK([#include <dl.h>],dnl - [shl_load ("", 0, 0);], [have_dl=yes], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <dl.h>], + [shl_load ("", 0, 0);])], [have_dl=yes], [LIBS="$ac_save_LIBS"; AC_MSG_RESULT([no])])])]) if test "$have_dl" = "yes"; then AC_DEFINE(HAVE_SHL_LOAD) ＠＠ -3667,8 +3675,8 ＠＠ if test "$enable_modules" != "no"; then AC_MSG_CHECKING([for lt_dlinit in -lltdl]) ac_save_LIBS="$LIBS" LIBS="$LIBS -lltdl" - AC_TRY_LINK([#include <ltdl.h>],dnl - [lt_dlinit ();], [have_dl=yes], [LIBS="$ac_save_LIBS"])]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ltdl.h>], + [lt_dlinit ();])], [have_dl=yes], [LIBS="$ac_save_LIBS"])]) AC_MSG_RESULT($have_dl) if test "$have_dl" = "yes"; then AC_DEFINE(HAVE_LTDL) ＠＠ -3766,7 +3774,7 ＠＠ test -z "$with_cde" && { AC_CHECK_HEADER test -z "$with_cde" && { AC_CHECK_LIB(DtSvc, DtDndDragStart, [:], with_cde=no) } if test "$with_dragndrop" = "no" ; then if test "$with_cde" = "yes" ; then - AC_MSG_WARN([--with-cde forced to \`no'; no generic Drag'n'Drop support]) + AC_MSG_WARN([--with-cde forced to `no'; no generic Drag'n'Drop support]) fi with_cde=no fi ＠＠ -3787,19 +3795,19 ＠＠ dnl is in use, we now disable it by defa test "$window_system" != "x11" && with_offix=no if test "$with_xmu" != yes -a "$with_x11" = yes; then if test "$with_offix" = "yes" ; then - AC_MSG_WARN([--with-offix forced to \`no'; no real Xmu support]) + AC_MSG_WARN([--with-offix forced to `no'; no real Xmu support]) fi with_offix=no fi if test "$with_dragndrop" = no; then if test "$with_offix" = "yes" ; then - AC_MSG_WARN([--with-offix forced to \`no'; no generic Drag'n'Drop support]) + AC_MSG_WARN([--with-offix forced to `no'; no generic Drag'n'Drop support]) fi with_offix=no fi if test "$with_cde" = yes; then if test "$with_offix" = "yes" ; then - AC_MSG_WARN([--with-offix forced to \`no'; CDE already found]) + AC_MSG_WARN([--with-offix forced to `no'; CDE already found]) fi with_offix=no fi ＠＠ -3829,7 +3837,8 ＠＠ if test "$with_dragndrop" != "no" ; then fi dnl Autodetect LDAP -AC_CHECKING([for LDAP]) +AC_MSG_CHECKING([for LDAP]) +AC_MSG_RESULT() ldap_libs= test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) } test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) } ＠＠ -3879,7 +3888,8 ＠＠ dnl (such as the default /usr/local/pgsq dnl that prefix must be specified using the --with-site-prefixes flag. postgresql_libs= if test "$with_postgresql" != "no"; then - AC_CHECKING([for PostgreSQL]) + AC_MSG_CHECKING([for PostgreSQL]) + AC_MSG_RESULT() dnl Look for these standard header file locations, known to be used on Linux for header_dir in "" "pgsql/" "postgresql/"; do ＠＠ -3928,7 +3938,8 ＠＠ dnl Graphics libraries dnl ---------------------- if test "$window_system" != "none"; then - AC_CHECKING([for graphics libraries]) + AC_MSG_CHECKING([for graphics libraries]) + AC_MSG_RESULT() dnl add special code to handle xpm-nox on Cygwin (csw) dnl -- should only happen if CYGWIN && WITH_XPM && WITH_MSW && !WITH_X ＠＠ -4001,9 +4012,9 ＠＠ if test "$window_system" != "none"; then XE_PREPEND(-lXpm, libs_x) XE_PREPEND("$incpath_xpm", CFLAGS) XE_PREPEND("$incpath_xpm", XE_CFLAGS) - AC_MSG_CHECKING(for \"FOR_MSW\" xpm) + AC_MSG_CHECKING([for "FOR_MSW" xpm]) xe_check_libs=-lXpm - AC_TRY_LINK(, [XpmCreatePixmapFromData()], + AC_LINK_IFELSE([AC_LANG_SOURCE([XpmCreatePixmapFromData()])], [xpm_for_msw=no], [xpm_for_msw=yes]) xe_check_libs= ＠＠ -4110,13 +4121,13 ＠＠ if test "$with_gtk" = "yes"; then fi fi - dnl ---------------------- dnl X-Specific Graphics libraries dnl ---------------------- if test "$with_x11" = "yes"; then - AC_CHECKING([for X11 graphics libraries]) + AC_MSG_CHECKING([for X11 graphics libraries]) + AC_MSG_RESULT() fi case "$enable_widgets" in ＠＠ -4129,7 +4140,8 ＠＠ case "$enable_dialogs" in esac if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then - AC_CHECKING([for the Athena widgets]) + AC_MSG_CHECKING([for the Athena widgets]) + AC_MSG_RESULT() dnl What in heck did the user actually want? case "$with_athena" in ＠＠ -4461,17 +4473,17 ＠＠ canna_libs= wnn_libs= if test "$enable_mule" = "yes" ; then - AC_CHECKING([for Mule-related features]) + AC_MSG_CHECKING([for Mule-related features]) AC_DEFINE(MULE) dnl Use -lintl to get internationalized strerror for Mule AC_CHECK_HEADERS(libintl.h) AC_CHECK_LIB(intl, strerror) - AC_CHECKING([for Mule input methods]) + AC_MSG_CHECKING([for Mule input methods]) dnl Do we have the XmIm* routines? And if so, do we want to use them? case "$with_xim" in "" | "yes" ) - AC_CHECKING([for XIM]) + AC_MSG_CHECKING([for XIM]) AC_CHECK_LIB(X11, XOpenIM, with_xim=xlib, with_xim=no) dnl XIM + Lesstif is not (yet?) usable dnl Only use Motif if linking Motif anyway, or don't have xlib XIM ＠＠ -4501,7 +4513,7 ＠＠ if test "$enable_mule" = "yes" ; then dnl "with_xfs" = "yes" if test "$with_xfs" = "yes" ; then - AC_CHECKING([for XFontSet]) + AC_MSG_CHECKING([for XFontSet]) AC_CHECK_LIB(X11, XmbDrawString, [:], with_xfs=no) if test "$with_xfs" = "yes" && test "$enable_menubars" = "lucid"; then AC_DEFINE(USE_XFONTSET) ＠＠ -4711,15 +4723,15 ＠＠ fi dnl If netdb.h does not declare h_errno, we must declare it by hand. AC_MSG_CHECKING(whether netdb declares h_errno) -AC_TRY_LINK([#include <netdb.h>], - [return h_errno;], +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>], + [return h_errno;])], [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_H_ERRNO)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for sigsetjmp) -AC_TRY_COMPILE([#include <setjmp.h>], - [sigjmp_buf bar; sigsetjmp (bar, 0);], +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <setjmp.h>], + [sigjmp_buf bar; sigsetjmp (bar, 0);])], [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SIGSETJMP)], [AC_MSG_RESULT(no)]) ＠＠ -4773,7 +4785,7 ＠＠ fi if test "$HAVE_TIMEVAL" = "yes"; then AC_MSG_CHECKING(whether gettimeofday accepts one or two arguments) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> #include <time.h> ＠＠ -4788,7 +4800,7 ＠＠ AC_TRY_LINK([ [ struct timeval time; gettimeofday (&time, 0); -], +])], [AC_MSG_RESULT(two)], [AC_MSG_RESULT(one) AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)]) ＠＠ -4800,8 +4812,10 ＠＠ test "$ac_cv_c_inline" != "no" -a "$GCC" dnl check for the typeof extension AC_MSG_CHECKING(for typeof) -AC_TRY_COMPILE(, [int i; __typeof__(i) j;], typeofname="__typeof__", - [AC_TRY_COMPILE(, [int i; typeof(i) j;], typeofname="typeof", +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i; __typeof__(i) j;])], + typeofname="__typeof__", + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i; typeof(i) j;])], + typeofname="typeof", typeofname=no)]) AC_MSG_RESULT($typeofname) if test "$typeofname" != "no"; then ＠＠ -4950,12 +4964,13 ＠＠ if test "$with_rel_alloc $have_mmap" = " if test "$doug_lea_malloc" = "yes"; then dnl Check if malloc() calls mmap(), making rel_alloc pointless. AC_MSG_CHECKING(for M_MMAP_THRESHOLD) - AC_TRY_COMPILE([#include <malloc.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <malloc.h>],[ #ifndef M_MMAP_THRESHOLD #error No M_MMAP_THRESHOLD :-( !＠+$%^&*_)(_ - unlikely to compile... #endif -], [with_rel_alloc=no; AC_MSG_RESULT(yes);], [with_rel_alloc=yes; AC_MSG_RESULT(no);]) +])], [with_rel_alloc=no; AC_MSG_RESULT(yes);], + [with_rel_alloc=yes; AC_MSG_RESULT(no);]) else with_rel_alloc=yes fi ＠＠ -4976,21 +4991,21 ＠＠ AC_CHECK_FUNC(socket, [AC_CHECK_HEADER(netinet/in.h, [AC_CHECK_HEADER(arpa/inet.h, [ AC_DEFINE(HAVE_SOCKETS) - AC_MSG_CHECKING("for sun_len member in struct sockaddr_un") - AC_TRY_LINK([ + AC_MSG_CHECKING([for sun_len member in struct sockaddr_un]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> ], - [static struct sockaddr_un x; x.sun_len = 1;], + [static struct sockaddr_un x; x.sun_len = 1;])], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOCKADDR_SUN_LEN)], [AC_MSG_RESULT(no)]) - AC_MSG_CHECKING("for ip_mreq struct in netinet/in.h") - AC_TRY_LINK([ + AC_MSG_CHECKING([for ip_mreq struct in netinet/in.h]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <sys/types.h> #include <netinet/in.h> ], - [static struct ip_mreq x;], + [static struct ip_mreq x;])], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_MULTICAST)], [AC_MSG_RESULT(no)])])])]) ＠＠ -5008,7 +5023,8 ＠＠ dnl Check for nlist.h AC_CHECK_HEADER(nlist.h, AC_DEFINE(NLIST_STRUCT), ) dnl Check for sound of various sorts. -AC_CHECKING([for sound support]) +AC_MSG_CHECKING([for sound support]) +AC_MSG_RESULT() dnl Autodetect native sound test -n "$with_native_sound_lib" && enable_sound_native=yes ＠＠ -5197,7 +5213,8 ＠＠ dnl --------------------- test -z "$with_tty" && with_tty=yes if test "$with_tty" = "yes" ; then - AC_CHECKING([for TTY-related features]) + AC_MSG_CHECKING([for TTY-related features]) + AC_MSG_RESULT() AC_DEFINE(HAVE_TTY) dnl Autodetect ncurses. ＠＠ -5282,7 +5299,8 ＠＠ dnl On FreeBSD, both DB and DBM are part dnl By default, we check for DBM support in libgdbm, then libc, then libdbm. test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \ - != "no no no" && AC_CHECKING([for database support]) + != "no no no" && AC_MSG_CHECKING([for database support]) && \ + AC_MSG_RESULT() dnl Check for ndbm.h, required for either kind of DBM support. if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then ＠＠ -5322,7 +5340,7 ＠＠ dnl Check for Berkeley DB. if test "$enable_database_berkdb" != "no"; then AC_MSG_CHECKING(for Berkeley db.h) for header in "db/db.h" "db.h"; do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <stdlib.h> #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) #ifdef HAVE_INTTYPES_H ＠＠ -5337,7 +5355,7 ＠＠ typedef uint64_t u_int64_t; #endif #endif #include <$header> -],[], db_h_file="$header"; break) +])], db_h_file="$header"; break) done if test -z "$db_h_file" then AC_MSG_RESULT(no); enable_database_berkdb=no

1 participants
0 comments

CVS update by viteno xemacs/src ... 18 years

CVS Monitor

User: viteno Date: 06/03/27 23:51:29 Modified: xemacs/src depend Log: Update src depends Revision Changes Path 1.61 +1 -0 XEmacs/xemacs/src/depend Index: depend =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/depend,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- depend 2005/11/26 12:09:39 1.60 +++ depend 2006/03/27 21:51:28 1.61 ＠＠ -106,6 +106,7 ＠＠ extw-Xt.o: $(CONFIG_H) extw-Xlib.h extw- abbrev.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h insdel.h redisplay.h scrollbar.h syntax.h window.h alloc.o: $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h coding-system-slots.h conslots.h console-impl.h console-stream.h console.h device.h elhash.h events.h extents-impl.h extents.h file-coding.h frame-impl.h frame.h frameslots.h glyphs.h lstream.h opaque.h process.h profile.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h systime.h window-impl.h window.h winslots.h alloca.o: $(LISP_H) +alsaplay.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h sound.h sysfile.h blocktype.o: $(LISP_H) blocktype.h buffer.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h commands.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h elhash.h extents.h faces.h file-coding.h frame-impl.h frame.h frameslots.h insdel.h intl-auto-encap-win32.h lstream.h ndir.h process.h redisplay.h scrollbar.h select.h specifier.h syntax.h sysdir.h sysfile.h syswindows.h window.h bytecode.o: $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h opaque.h redisplay.h scrollbar.h syntax.h window.h

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

xemacs-cvs March 2006