APPROVE COMMIT 21.5
Stephen J. Turnbull writes:
Hm. It appears that there is code already in configure.ac to spoof
the Seal of Approval, but that it doesn't work because, rather than
the usual use of ":" as a sequence separator, the autoconf implementor
chose to use a newline as separator in the list of declared options.
I've implemented and pushed this patch. It does *not* fix the problem
with not finding GNU dbm's ndbm.h; that will come in a separate patch
shortly. (It takes longer because I plan to audit configure.ac for
other libraries with the same kind of issue.)
It does, however, commit a version of configure without the bug. "hg
pull -u" or "hg fetch" (fetch requires the fetch extension), and
you're ready to go.
diff -r 13273cffca2a ChangeLog
--- a/ChangeLog Sat Jul 18 23:51:21 2009 +0100
+++ b/ChangeLog Mon Jul 27 01:18:27 2009 +0900
@@ -0,0 +1,5 @@
+2009-07-26 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (XE_MERGED_ARG): Use correct separator when
+ registering options to _AC_USER_OPTS.
+
diff -r 13273cffca2a configure
--- a/configure Sat Jul 18 23:51:21 2009 +0100
+++ b/configure Mon Jul 27 01:18:27 2009 +0900
@@ -859,7 +859,214 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
-enable_compiler:with_compiler:enable_xemacs_compiler:with_xemacs_compiler:enable_gcc:with_gcc:enable_cflags:with_cflags:enable_cflags_warning:with_cflags_warning:enable_optimization:with_optimization:enable_cflags_optimization:with_cflags_optimization:enable_cflags_debugging:with_cflags_debugging:enable_cpp:with_cpp:enable_cppflags:with_cppflags:enable_libs=LIBS:with_libs=LIBS:enable_ldflags=FLAGS:with_ldflags=FLAGS:enable_site_includes:with_site_includes:enable_site_libraries:with_site_libraries:enable_site_prefixes:with_site_prefixes:enable_site_runtime_libraries:with_site_runtime_libraries:enable_dynamic:with_dynamic:enable_prefix:with_prefix:enable_netinstall:with_netinstall:enable_statedir:with_statedir:enable_lispdir:with_lispdir:enable_archlibdir:with_archlibdir:enable_moduledir:with_moduledir:enable_etcdir:with_etcdir:enable_docdir:with_docdir:enable_site_lisp:with_site_lisp:enable_site_modules:with_site_modules:enable_early_packages:with_early_packages:enable_user_!
packages:with_user_packages:enable_late_packages:with_late_packages:enable_system_packages:with_system_packages:enable_last_packages:with_last_packages:enable_legacy_packages:with_legacy_packages:enable_package_path:with_package_path:enable_infopath:with_infopath:enable_xft:with_xft:enable_gtk:with_gtk:enable_gnome:with_gnome:enable_msw:with_msw:enable_toolbars:with_toolbars:enable_wmcommand:with_wmcommand:enable_athena:with_athena:enable_menubars:with_menubars:enable_scrollbars:with_scrollbars:enable_dialogs:with_dialogs:enable_widgets:with_widgets:enable_dragndrop:with_dragndrop:enable_cde:with_cde:enable_offix:with_offix:enable_xmu:with_xmu:enable_external_widget:with_external_widget:enable_tty:with_tty:enable_ncurses:with_ncurses:enable_gpm:with_gpm:enable_xpm:with_xpm:enable_png:with_png:enable_jpeg:with_jpeg:enable_tiff:with_tiff:enable_xface:with_xface:enable_gif:with_gif:enable_sound:with_sound:enable_native_sound_lib:with_native_sound_lib:enable_mule:with_mule:enab!
le_xim:with_xim:enable_canna:with_canna:enable_wnn:with_wnn:en!
able_wnn
6:with_wnn6:enable_xfs:with_xfs:enable_default_eol_detection:with_default_eol_detection:enable_clash_detection:with_clash_detection:enable_zlib:with_zlib:enable_database:with_database:enable_ldap:with_ldap:enable_postgresql:with_postgresql:enable_mail_locking:with_mail_locking:enable_pop:with_pop:enable_kerberos:with_kerberos:enable_hesiod:with_hesiod:enable_tooltalk:with_tooltalk:enable_socks:with_socks:enable_dnet:with_dnet:enable_ipv6_cname:with_ipv6_cname:enable_rel_alloc:with_rel_alloc:enable_dlmalloc:with_dlmalloc:enable_system_malloc:with_system_malloc:enable_debug_malloc:with_debug_malloc:enable_pdump:with_pdump:enable_dump_in_exec:with_dump_in_exec:enable_kkcc:with_kkcc:enable_newgc:with_newgc:enable_vdb:with_vdb:enable_modules:with_modules:enable_bignum:with_bignum:enable_workshop:with_workshop:enable_sparcworks:with_sparcworks:enable_infodock:with_infodock:enable_debug:with_debug:enable_error_checking:with_error_checking:enable_assertions:with_assertions:enable_me!
mory_usage_stats:with_memory_usage_stats:enable_quick_build:with_quick_build:enable_union_type:with_union_type:enable_quantify:with_quantify:enable_purify:with_purify
+enable_compiler
+with_compiler
+enable_xemacs_compiler
+with_xemacs_compiler
+enable_gcc
+with_gcc
+enable_cflags
+with_cflags
+enable_cflags_warning
+with_cflags_warning
+enable_optimization
+with_optimization
+enable_cflags_optimization
+with_cflags_optimization
+enable_cflags_debugging
+with_cflags_debugging
+enable_cpp
+with_cpp
+enable_cppflags
+with_cppflags
+enable_libs=LIBS
+with_libs=LIBS
+enable_ldflags=FLAGS
+with_ldflags=FLAGS
+enable_site_includes
+with_site_includes
+enable_site_libraries
+with_site_libraries
+enable_site_prefixes
+with_site_prefixes
+enable_site_runtime_libraries
+with_site_runtime_libraries
+enable_dynamic
+with_dynamic
+enable_prefix
+with_prefix
+enable_netinstall
+with_netinstall
+enable_statedir
+with_statedir
+enable_lispdir
+with_lispdir
+enable_archlibdir
+with_archlibdir
+enable_moduledir
+with_moduledir
+enable_etcdir
+with_etcdir
+enable_docdir
+with_docdir
+enable_site_lisp
+with_site_lisp
+enable_site_modules
+with_site_modules
+enable_early_packages
+with_early_packages
+enable_user_packages
+with_user_packages
+enable_late_packages
+with_late_packages
+enable_system_packages
+with_system_packages
+enable_last_packages
+with_last_packages
+enable_legacy_packages
+with_legacy_packages
+enable_package_path
+with_package_path
+enable_infopath
+with_infopath
+enable_xft
+with_xft
+enable_gtk
+with_gtk
+enable_gnome
+with_gnome
+enable_msw
+with_msw
+enable_toolbars
+with_toolbars
+enable_wmcommand
+with_wmcommand
+enable_athena
+with_athena
+enable_menubars
+with_menubars
+enable_scrollbars
+with_scrollbars
+enable_dialogs
+with_dialogs
+enable_widgets
+with_widgets
+enable_dragndrop
+with_dragndrop
+enable_cde
+with_cde
+enable_offix
+with_offix
+enable_xmu
+with_xmu
+enable_external_widget
+with_external_widget
+enable_tty
+with_tty
+enable_ncurses
+with_ncurses
+enable_gpm
+with_gpm
+enable_xpm
+with_xpm
+enable_png
+with_png
+enable_jpeg
+with_jpeg
+enable_tiff
+with_tiff
+enable_xface
+with_xface
+enable_gif
+with_gif
+enable_sound
+with_sound
+enable_native_sound_lib
+with_native_sound_lib
+enable_mule
+with_mule
+enable_xim
+with_xim
+enable_canna
+with_canna
+enable_wnn
+with_wnn
+enable_wnn6
+with_wnn6
+enable_xfs
+with_xfs
+enable_default_eol_detection
+with_default_eol_detection
+enable_clash_detection
+with_clash_detection
+enable_zlib
+with_zlib
+enable_database
+with_database
+enable_ldap
+with_ldap
+enable_postgresql
+with_postgresql
+enable_mail_locking
+with_mail_locking
+enable_pop
+with_pop
+enable_kerberos
+with_kerberos
+enable_hesiod
+with_hesiod
+enable_tooltalk
+with_tooltalk
+enable_socks
+with_socks
+enable_dnet
+with_dnet
+enable_ipv6_cname
+with_ipv6_cname
+enable_rel_alloc
+with_rel_alloc
+enable_dlmalloc
+with_dlmalloc
+enable_system_malloc
+with_system_malloc
+enable_debug_malloc
+with_debug_malloc
+enable_pdump
+with_pdump
+enable_dump_in_exec
+with_dump_in_exec
+enable_kkcc
+with_kkcc
+enable_newgc
+with_newgc
+enable_vdb
+with_vdb
+enable_modules
+with_modules
+enable_bignum
+with_bignum
+enable_workshop
+with_workshop
+enable_sparcworks
+with_sparcworks
+enable_infodock
+with_infodock
+enable_debug
+with_debug
+enable_error_checking
+with_error_checking
+enable_assertions
+with_assertions
+enable_memory_usage_stats
+with_memory_usage_stats
+enable_quick_build
+with_quick_build
+enable_union_type
+with_union_type
+enable_quantify
+with_quantify
+enable_purify
+with_purify
with_x
'
ac_precious_vars='build_alias
diff -r 13273cffca2a configure.ac
--- a/configure.ac Sat Jul 18 23:51:21 2009 +0100
+++ b/configure.ac Mon Jul 27 01:18:27 2009 +0900
@@ -254,8 +254,10 @@
m4_divert_once([HELP_ENABLE], m4_bpatsubst([[$2]],[--enable\([^ ]+\) ],[--with\1
]))dnl
dnl Register both forms with the option checking list.
dnl Options are only checked with autoconf > 2.61.
-m4_append_uniq([_AC_USER_OPTS], [enable_]m4_bpatsubst([$1], -, _), [:])dnl
-m4_append_uniq([_AC_USER_OPTS], [with_]m4_bpatsubst([$1], -, _), [:])dnl
+m4_append_uniq([_AC_USER_OPTS], [enable_]m4_bpatsubst([$1], -, _), [
+])dnl
+m4_append_uniq([_AC_USER_OPTS], [with_]m4_bpatsubst([$1], -, _), [
+])dnl
# If --with-$1 or --without-$1 were given then copy the value to the
# equivalent enable_$1 variable.
if test "[${with_]m4_bpatsubst([$1], -, _)+set}" = set; then
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta