cvs server: Diffing . Index: CHANGES-beta =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/CHANGES-beta,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- CHANGES-beta 10 May 2003 08:53:26 -0000 1.213 +++ CHANGES-beta 1 Jun 2003 05:10:14 -0000 1.214 @@ -1,3 +1,39 @@ +to 21.5.14 "cassava" + +This release has a few documentation updates thanks to Steve +Turnbull, better Makefile handling for modules on MacOSX from +Andrew Begel and Jerry James. Also, it is now possible for the +user to specify the location of the package-index file for PUI to +use, see `package-get-package-index-file-location'. + +Build + +-- Autoconf tweaks for building modules on MacOSX - James. +-- GCC fixes in ellcc.c - James. +-- Module Makefile fixes - Begel, James. +-- Fix shadow warning in regex.c - James. + +Documentation + +-- New TeXinfo node "Searching and Matching" - Turnbull. +-- New section "Legacy Versions" in FAQ - Turnbull. +-- New FAQ question Q8.0.1 - Turnbull. +-- Update split-string specs in "Regexp Search" - Turnbull. + +Internals + +-- Package index file updated - Koch. +-- Add some debug checks in file-coding.c - Turnbull. + +Lisp API + +-- Make error message report the sym checked in + `autoload-featurep-protect-autoloads' -- Turnbull. +-- `split-string' tweaks - Turnbull. +-- Make the location of the package-index file user customisable - Youngs. +-- Turn on package-index file PGP verification - Youngs. +-- Only use message if interactive for functions in replace.el - Josefsson. + to 21.5.13 "cauliflower" Remember that bug that made return behave as linefeed in a TTY? It's Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.369 retrieving revision 1.371 diff -u -r1.369 -r1.371 --- ChangeLog 10 May 2003 08:53:26 -0000 1.369 +++ ChangeLog 1 Jun 2003 05:10:14 -0000 1.371 @@ -1,3 +1,15 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + +2003-05-20 Jerry James + + * configure.in: Add src to MAKE_SUBDIR early for module builds for + MacOSX and Windows; thanks to Andrew Begel. Set module makefile + variables appropriately if --with-modules=no is specified. + + * configure: Regenerate. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- configure 10 May 2003 02:57:05 -0000 1.200 +++ configure 20 May 2003 18:57:50 -0000 1.201 @@ -4639,12 +4639,12 @@ #line 4640 "configure" #include "confdefs.h" #include -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(short)); - exit(0); + return(0); } EOF if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -4681,12 +4681,12 @@ #line 4682 "configure" #include "confdefs.h" #include -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(int)); - exit(0); + return(0); } EOF if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -4717,12 +4717,12 @@ #line 4718 "configure" #include "confdefs.h" #include -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(long)); - exit(0); + return(0); } EOF if { (eval echo configure:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -4753,12 +4753,12 @@ #line 4754 "configure" #include "confdefs.h" #include -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(long long)); - exit(0); + return(0); } EOF if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -4789,12 +4789,12 @@ #line 4790 "configure" #include "confdefs.h" #include -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(void *)); - exit(0); + return(0); } EOF if { (eval echo configure:4801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -8361,15 +8361,16 @@ EOF } + MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$extra_verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR src" && if test "$extra_verbose" = "yes"; then echo " Appending \"src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi test -n "$libdl" && LIBS="-l${libdl} $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-l${libdl}\" to \$LIBS"; fi for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8370: checking for $ac_func" >&5 +echo "configure:8371: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8432,13 +8433,15 @@ echo " No module support." fi with_modules=no - MOD_CC="$XEMACS_CC" - MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src" - INSTALLPATH="" - MOD_INSTALL_PROGRAM="true" - OBJECT_TO_BUILD="\$(MODNAME).o" fi fi +if test "$with_modules" != "yes"; then + MOD_CC="$XEMACS_CC" + MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src" + INSTALLPATH="" + MOD_INSTALL_PROGRAM="true" + OBJECT_TO_BUILD="\$(MODNAME).o" +fi MODARCHDIR= MAKE_DOCFILE="../../lib-src/make-docfile" @@ -8454,15 +8457,15 @@ for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:8458: checking for ${dir}tt_c.h" >&5 +echo "configure:8461: checking for ${dir}tt_c.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8498,12 +8501,12 @@ xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:8502: checking "$xe_msg_checking"" >&5 +echo "configure:8505: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'` xe_check_libs=" -ltt $extra_libs" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8568,15 +8571,15 @@ test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:8572: checking for Dt/Dt.h" >&5 +echo "configure:8575: checking for Dt/Dt.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8599,12 +8602,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:8603: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:8606: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8696,7 +8699,7 @@ if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:8700: checking if drag and drop API is needed" >&5 +echo "configure:8703: checking if drag and drop API is needed" >&5 if test -n "$dragndrop_proto" ; then with_dragndrop=yes echo "$ac_t""yes (${dragndrop_proto} )" 1>&6 @@ -8716,19 +8719,19 @@ fi echo "checking for LDAP" 1>&6 -echo "configure:8720: checking for LDAP" >&5 +echo "configure:8723: checking for LDAP" >&5 ldap_libs= test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ldap.h""... $ac_c" 1>&6 -echo "configure:8724: checking for ldap.h" >&5 +echo "configure:8727: checking for ldap.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8751,15 +8754,15 @@ } test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lber.h""... $ac_c" 1>&6 -echo "configure:8755: checking for lber.h" >&5 +echo "configure:8758: checking for lber.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8783,12 +8786,12 @@ if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:8787: checking for ldap_search in -lldap" >&5 +echo "configure:8790: checking for ldap_search in -lldap" >&5 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8824,12 +8827,12 @@ xe_msg_checking="for ldap_open in -lldap" test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:8828: checking "$xe_msg_checking"" >&5 +echo "configure:8831: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8865,12 +8868,12 @@ xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:8869: checking "$xe_msg_checking"" >&5 +echo "configure:8872: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8906,12 +8909,12 @@ xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:8910: checking "$xe_msg_checking"" >&5 +echo "configure:8913: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb -ldes" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8971,10 +8974,10 @@ for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8975: checking for $ac_func" >&5 +echo "configure:8978: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9036,20 +9039,20 @@ postgresql_libs= if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:9040: checking for PostgreSQL" >&5 +echo "configure:9043: checking for PostgreSQL" >&5 for header_dir in "" "pgsql/" "postgresql/"; do ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6 -echo "configure:9045: checking for ${header_dir}libpq-fe.h" >&5 +echo "configure:9048: checking for ${header_dir}libpq-fe.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9073,12 +9076,12 @@ test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:9077: checking for PQconnectdb in -lpq" >&5 +echo "configure:9080: checking for PQconnectdb in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9122,12 +9125,12 @@ echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:9126: checking for PQconnectStart in -lpq" >&5 +echo "configure:9129: checking for PQconnectStart in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9189,7 +9192,7 @@ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:9193: checking for graphics libraries" >&5 +echo "configure:9196: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= @@ -9215,10 +9218,10 @@ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:9219: checking for Xpm - no older than 3.4f" >&5 +echo "configure:9222: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext < @@ -9227,7 +9230,7 @@ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:9231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; xpm_status=$?; if test "$xpm_status" = "0"; then @@ -9271,17 +9274,17 @@ libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:9275: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:9278: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else @@ -9307,15 +9310,15 @@ test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:9311: checking for compface.h" >&5 +echo "configure:9314: checking for compface.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9338,12 +9341,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9342: checking for UnGenFace in -lcompface" >&5 +echo "configure:9345: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9403,12 +9406,12 @@ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:9407: checking for inflate in -lc" >&5 +echo "configure:9410: checking for inflate in -lc" >&5 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9438,12 +9441,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:9442: checking for inflate in -lz" >&5 +echo "configure:9445: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lz " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9473,12 +9476,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:9477: checking for inflate in -lgz" >&5 +echo "configure:9480: checking for inflate in -lgz" >&5 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lgz " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9519,15 +9522,15 @@ test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:9523: checking for jpeglib.h" >&5 +echo "configure:9526: checking for jpeglib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9550,12 +9553,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:9554: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:9557: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9602,10 +9605,10 @@ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:9606: checking for pow" >&5 +echo "configure:9609: checking for pow" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pow=yes" else @@ -9649,15 +9652,15 @@ } test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:9653: checking for png.h" >&5 +echo "configure:9656: checking for png.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9680,12 +9683,12 @@ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:9684: checking for png_read_image in -lpng" >&5 +echo "configure:9687: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9719,10 +9722,10 @@ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:9723: checking for workable png version information" >&5 +echo "configure:9726: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext < int main(int c, char **v) { @@ -9730,7 +9733,7 @@ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:9734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; png_status=$?; if test "$png_status" = "0"; then @@ -9773,15 +9776,15 @@ test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:9777: checking for tiffio.h" >&5 +echo "configure:9780: checking for tiffio.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9804,12 +9807,12 @@ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:9808: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:9811: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9859,15 +9862,15 @@ if test "$with_gtk" = "yes"; then test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:9863: checking for compface.h" >&5 +echo "configure:9866: checking for compface.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9890,12 +9893,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9894: checking for UnGenFace in -lcompface" >&5 +echo "configure:9897: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9945,7 +9948,7 @@ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:9949: checking for X11 graphics libraries" >&5 +echo "configure:9952: checking for X11 graphics libraries" >&5 fi case "$with_widgets" in @@ -9955,7 +9958,7 @@ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then echo "checking for the Athena widgets" 1>&6 -echo "configure:9959: checking for the Athena widgets" >&5 +echo "configure:9962: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; @@ -9969,12 +9972,12 @@ if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9973: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:9976: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10001,12 +10004,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10005: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:10008: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10048,12 +10051,12 @@ else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10052: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:10055: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10082,12 +10085,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:10086: checking for threeDClassRec in -lXaw" >&5 +echo "configure:10089: checking for threeDClassRec in -lXaw" >&5 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10129,15 +10132,15 @@ if test "$athena_3d" = "no"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10133: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:10136: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10157,15 +10160,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6 -echo "configure:10161: checking for X11/Xaw/XawInit.h" >&5 +echo "configure:10164: checking for X11/Xaw/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10191,15 +10194,15 @@ else ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:10195: checking for X11/$athena_variant/XawInit.h" >&5 +echo "configure:10198: checking for X11/$athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10216,15 +10219,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10220: checking for X11/$athena_variant/ThreeD.h" >&5 +echo "configure:10223: checking for X11/$athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10252,15 +10255,15 @@ if test -z "$athena_h_path"; then ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:10256: checking for $athena_variant/XawInit.h" >&5 +echo "configure:10259: checking for $athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10277,15 +10280,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10281: checking for $athena_variant/ThreeD.h" >&5 +echo "configure:10284: checking for $athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10314,15 +10317,15 @@ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:10318: checking for X11/Xaw3d/XawInit.h" >&5 +echo "configure:10321: checking for X11/Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10339,15 +10342,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10343: checking for X11/Xaw3d/ThreeD.h" >&5 +echo "configure:10346: checking for X11/Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10379,15 +10382,15 @@ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:10383: checking for Xaw3d/XawInit.h" >&5 +echo "configure:10386: checking for Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10404,15 +10407,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10408: checking for Xaw3d/ThreeD.h" >&5 +echo "configure:10411: checking for Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10444,15 +10447,15 @@ if test -z "$athena_h_path"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10448: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:10451: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10491,15 +10494,15 @@ if test "$with_x11" = "yes"; then ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:10495: checking for Xm/Xm.h" >&5 +echo "configure:10498: checking for Xm/Xm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10516,12 +10519,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:10520: checking for XmStringFree in -lXm" >&5 +echo "configure:10523: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10561,9 +10564,9 @@ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:10565: checking for Lesstif" >&5 +echo "configure:10568: checking for Lesstif" >&5 cat > conftest.$ac_ext < #ifdef LESSTIF_VERSION @@ -10936,7 +10939,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:10940: checking for Mule-related features" >&5 +echo "configure:10943: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -10950,15 +10953,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10954: checking for $ac_hdr" >&5 +echo "configure:10957: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10989,12 +10992,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:10993: checking for strerror in -lintl" >&5 +echo "configure:10996: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11038,18 +11041,18 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:11042: checking for Mule input methods" >&5 +echo "configure:11045: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:11045: checking for XIM" >&5 +echo "configure:11048: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:11048: checking for XOpenIM in -lX11" >&5 +echo "configure:11051: checking for XOpenIM in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11084,12 +11087,12 @@ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:11088: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:11091: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11165,15 +11168,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:11169: checking for XFontSet" >&5 +echo "configure:11172: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:11172: checking for XmbDrawString in -lX11" >&5 +echo "configure:11175: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11224,15 +11227,15 @@ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:11228: checking for wnn/jllib.h" >&5 +echo "configure:11231: checking for wnn/jllib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11255,15 +11258,15 @@ } test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6 -echo "configure:11259: checking for wnn/commonhd.h" >&5 +echo "configure:11262: checking for wnn/commonhd.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11288,10 +11291,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11292: checking for $ac_func" >&5 +echo "configure:11295: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11343,12 +11346,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:11347: checking for crypt in -lcrypt" >&5 +echo "configure:11350: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11394,12 +11397,12 @@ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:11398: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:11401: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11428,12 +11431,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:11432: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:11435: checking for jl_dic_list_e in -lwnn4" >&5 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn4 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11462,12 +11465,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:11466: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:11469: checking for jl_dic_list_e in -lwnn6" >&5 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11496,12 +11499,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:11500: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:11503: checking for dic_list_e in -lwnn6_fromsrc" >&5 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6_fromsrc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11557,12 +11560,12 @@ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:11561: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:11564: checking for jl_fi_dic_list in -l$libwnn" >&5 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -l$libwnn " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11608,15 +11611,15 @@ if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:11612: checking for canna/jrkanji.h" >&5 +echo "configure:11615: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11643,15 +11646,15 @@ c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:11647: checking for canna/jrkanji.h" >&5 +echo "configure:11650: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11679,15 +11682,15 @@ test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:11683: checking for canna/RK.h" >&5 +echo "configure:11686: checking for canna/RK.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11710,12 +11713,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:11714: checking for RkBgnBun in -lRKC" >&5 +echo "configure:11717: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11749,12 +11752,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:11753: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:11756: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11811,12 +11814,12 @@ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:11815: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:11818: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11914,10 +11917,10 @@ for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strlwr strupr symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask wcslen wcscmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11918: checking for $ac_func" >&5 +echo "configure:11921: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11981,10 +11984,10 @@ for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11985: checking for $ac_func" >&5 +echo "configure:11988: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12036,10 +12039,10 @@ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:12040: checking for openpty" >&5 +echo "configure:12043: checking for openpty" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openpty=yes" else @@ -12081,12 +12084,12 @@ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:12085: checking for openpty in -lutil" >&5 +echo "configure:12088: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` xe_check_libs=" -lutil " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12132,15 +12135,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12136: checking for $ac_hdr" >&5 +echo "configure:12139: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12177,15 +12180,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12181: checking for $ac_hdr" >&5 +echo "configure:12184: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12218,15 +12221,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12222: checking for $ac_hdr" >&5 +echo "configure:12225: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12259,15 +12262,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12263: checking for $ac_hdr" >&5 +echo "configure:12266: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12303,15 +12306,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12307: checking for $ac_hdr" >&5 +echo "configure:12310: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12344,10 +12347,10 @@ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12348: checking for $ac_func" >&5 +echo "configure:12351: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12401,15 +12404,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12405: checking for $ac_hdr" >&5 +echo "configure:12408: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12442,10 +12445,10 @@ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12446: checking for $ac_func" >&5 +echo "configure:12449: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12501,15 +12504,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12505: checking for $ac_hdr" >&5 +echo "configure:12508: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12545,12 +12548,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:12549: checking for kstat_open in -lkstat" >&5 +echo "configure:12552: checking for kstat_open in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lkstat " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12596,15 +12599,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12600: checking for $ac_hdr" >&5 +echo "configure:12603: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12636,12 +12639,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:12640: checking for kvm_read in -lkvm" >&5 +echo "configure:12643: checking for kvm_read in -lkvm" >&5 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` xe_check_libs=" -lkvm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12686,16 +12689,16 @@ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:12690: checking whether netdb declares h_errno" >&5 +echo "configure:12693: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext < int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:12699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -12715,16 +12718,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:12719: checking for sigsetjmp" >&5 +echo "configure:12722: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:12728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -12744,11 +12747,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:12748: checking whether localtime caches TZ" >&5 +echo "configure:12751: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext < #if STDC_HEADERS @@ -12783,7 +12786,7 @@ exit (0); } EOF -if { (eval echo configure:12787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -12813,9 +12816,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:12817: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:12820: checking whether gettimeofday accepts one or two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""two" 1>&6 else @@ -12858,19 +12861,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:12862: checking for inline" >&5 +echo "configure:12865: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -12911,17 +12914,17 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:12915: checking for working alloca.h" >&5 +echo "configure:12918: checking for working alloca.h" >&5 cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:12925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -12945,10 +12948,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:12949: checking for alloca" >&5 +echo "configure:12952: checking for alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -13015,10 +13018,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:13019: checking whether alloca needs Cray hooks" >&5 +echo "configure:13022: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <&6 -echo "configure:13046: checking for $ac_func" >&5 +echo "configure:13049: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13098,10 +13101,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:13102: checking stack direction for C alloca" >&5 +echo "configure:13105: checking stack direction for C alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -13149,9 +13152,9 @@ fi echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6 -echo "configure:13153: checking for working alloca in function calls" >&5 +echo "configure:13156: checking for working alloca in function calls" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then working_alloca_in_function_calls=yes else @@ -13227,10 +13230,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:13231: checking for working strcoll" >&5 +echo "configure:13234: checking for working strcoll" >&5 cat > conftest.$ac_ext < main () @@ -13240,7 +13243,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:13244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -13268,10 +13271,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13272: checking for $ac_func" >&5 +echo "configure:13275: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13322,10 +13325,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:13326: checking whether getpgrp takes no argument" >&5 +echo "configure:13329: checking whether getpgrp takes no argument" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -13407,10 +13410,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:13411: checking for working mmap" >&5 +echo "configure:13414: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext < #include @@ -13443,7 +13446,7 @@ return 1; } EOF -if { (eval echo configure:13447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -13472,9 +13475,9 @@ if test "$rel_alloc $have_mmap" = "default yes"; then if test "$doug_lea_malloc" = "yes"; then echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6 -echo "configure:13476: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:13479: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext < int main() { @@ -13486,7 +13489,7 @@ ; return 0; } EOF -if { (eval echo configure:13490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -13511,15 +13514,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:13515: checking for termios.h" >&5 +echo "configure:13518: checking for termios.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13562,15 +13565,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:13566: checking for termio.h" >&5 +echo "configure:13569: checking for termio.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13602,10 +13605,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:13606: checking for socket" >&5 +echo "configure:13609: checking for socket" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -13643,15 +13646,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:13647: checking for netinet/in.h" >&5 +echo "configure:13650: checking for netinet/in.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13668,15 +13671,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:13672: checking for arpa/inet.h" >&5 +echo "configure:13675: checking for arpa/inet.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13701,9 +13704,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:13705: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:13708: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext < @@ -13714,7 +13717,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:13718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN @@ -13732,9 +13735,9 @@ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:13736: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:13739: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext < @@ -13744,7 +13747,7 @@ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:13748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST @@ -13775,10 +13778,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:13779: checking for msgget" >&5 +echo "configure:13782: checking for msgget" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -13816,15 +13819,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:13820: checking for sys/ipc.h" >&5 +echo "configure:13823: checking for sys/ipc.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13841,15 +13844,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:13845: checking for sys/msg.h" >&5 +echo "configure:13848: checking for sys/msg.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13887,15 +13890,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:13891: checking for dirent.h" >&5 +echo "configure:13894: checking for dirent.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13922,15 +13925,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:13926: checking for sys/dir.h" >&5 +echo "configure:13929: checking for sys/dir.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13963,15 +13966,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:13967: checking for nlist.h" >&5 +echo "configure:13970: checking for nlist.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14001,22 +14004,22 @@ echo "checking "for sound support"" 1>&6 -echo "configure:14005: checking "for sound support"" >&5 +echo "configure:14008: checking "for sound support"" >&5 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes if test "$with_native_sound" != "no"; then if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:14012: checking for multimedia/audio_device.h" >&5 +echo "configure:14015: checking for multimedia/audio_device.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14064,12 +14067,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:14068: checking for ALopenport in -laudio" >&5 +echo "configure:14071: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14111,12 +14114,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:14115: checking for AOpenAudio in -lAlib" >&5 +echo "configure:14118: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14175,15 +14178,15 @@ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:14179: checking for ${dir}/soundcard.h" >&5 +echo "configure:14182: checking for ${dir}/soundcard.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14237,15 +14240,15 @@ if test "$with_nas_sound" != "no"; then ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6 -echo "configure:14241: checking for audio/audiolib.h" >&5 +echo "configure:14244: checking for audio/audiolib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14263,12 +14266,12 @@ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:14267: checking for AuOpenServer in -laudio" >&5 +echo "configure:14270: checking for AuOpenServer in -laudio" >&5 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14318,7 +14321,7 @@ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext < EOF @@ -14349,7 +14352,7 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14353: checking for $ac_word" >&5 +echo "configure:14356: checking for $ac_word" >&5 if test -n "$have_esd_config"; then ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test. @@ -14378,10 +14381,10 @@ c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6 -echo "configure:14382: checking for esd_play_stream" >&5 +echo "configure:14385: checking for esd_play_stream" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_esd_play_stream=yes" else @@ -14455,7 +14458,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:14459: checking for TTY-related features" >&5 +echo "configure:14462: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -14468,12 +14471,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:14472: checking for tgetent in -lncurses" >&5 +echo "configure:14475: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14517,15 +14520,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:14521: checking for ncurses/curses.h" >&5 +echo "configure:14524: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14547,15 +14550,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:14551: checking for ncurses/term.h" >&5 +echo "configure:14554: checking for ncurses/term.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14585,15 +14588,15 @@ c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:14589: checking for ncurses/curses.h" >&5 +echo "configure:14592: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14628,12 +14631,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:14632: checking for tgetent in -l$lib" >&5 +echo "configure:14635: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -l$lib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14675,12 +14678,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:14679: checking for tgetent in -lcurses" >&5 +echo "configure:14682: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14709,12 +14712,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:14713: checking for tgetent in -ltermcap" >&5 +echo "configure:14716: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14773,15 +14776,15 @@ test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:14777: checking for gpm.h" >&5 +echo "configure:14780: checking for gpm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14804,12 +14807,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:14808: checking for Gpm_Open in -lgpm" >&5 +echo "configure:14811: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14863,20 +14866,20 @@ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:14867: checking for database support" >&5 +echo "configure:14870: checking for database support" >&5 if test "$with_database_gdbm $with_database_dbm" != "no no"; then ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:14872: checking for ndbm.h" >&5 +echo "configure:14875: checking for ndbm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14906,12 +14909,12 @@ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:14910: checking for dbm_open in -lgdbm" >&5 +echo "configure:14913: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14950,10 +14953,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:14954: checking for dbm_open" >&5 +echo "configure:14957: checking for dbm_open" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -14995,12 +14998,12 @@ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:14999: checking for dbm_open in -ldbm" >&5 +echo "configure:15002: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15052,10 +15055,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:15056: checking for Berkeley db.h" >&5 +echo "configure:15059: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext < @@ -15077,7 +15080,7 @@ ; return 0; } EOF -if { (eval echo configure:15081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -15093,9 +15096,9 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:15097: checking for Berkeley DB version" >&5 +echo "configure:15100: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 1 @@ -15107,7 +15110,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 2 @@ -15119,7 +15122,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 3 @@ -15153,10 +15156,10 @@ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:15157: checking for $dbfunc" >&5 +echo "configure:15160: checking for $dbfunc" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$dbfunc=yes" else @@ -15198,12 +15201,12 @@ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15202: checking for $dbfunc in -ldb" >&5 +echo "configure:15205: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15248,12 +15251,12 @@ echo "configure: warning: "db_create is really $dbfunc"" 1>&2 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15252: checking for $dbfunc in -ldb" >&5 +echo "configure:15255: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15323,12 +15326,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:15327: checking for SOCKSinit in -lsocks" >&5 +echo "configure:15330: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15393,11 +15396,11 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -15502,8 +15505,11 @@ ld_libs_all="$T" +if test "$with_modules" = "no"; then + MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$extra_verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi +fi + -MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$extra_verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi internal_makefile_list="Makefile.in" SUBDIR_MAKEFILES='' test -d lock || mkdir lock Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- configure.in 10 May 2003 02:57:07 -0000 1.201 +++ configure.in 20 May 2003 18:57:50 -0000 1.202 @@ -3228,6 +3228,10 @@ if test "$can_build_shared" = "yes"; then AC_DEFINE(HAVE_SHLIB) + dnl src must be built before modules on MacOSX and Windows platforms, since + dnl the binary must be available to properly link the modules + dnl For no-module builds, this is added *after* the module directories + XE_APPEND(src, MAKE_SUBDIR) XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR) test -n "$libdl" && XE_PREPEND(-l${libdl}, LIBS) AC_CHECK_FUNCS(dlerror _dlerror) @@ -3244,13 +3248,15 @@ echo " No module support." fi with_modules=no - MOD_CC="$XEMACS_CC" - MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src" - INSTALLPATH="" - MOD_INSTALL_PROGRAM="true" - OBJECT_TO_BUILD="\$(MODNAME).o" fi fi +if test "$with_modules" != "yes"; then + MOD_CC="$XEMACS_CC" + MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src" + INSTALLPATH="" + MOD_INSTALL_PROGRAM="true" + OBJECT_TO_BUILD="\$(MODNAME).o" +fi MODARCHDIR= MAKE_DOCFILE="../../lib-src/make-docfile" AC_SUBST(with_modules) @@ -4749,9 +4755,13 @@ XE_SPACE(ld_libs_window_system, $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS) XE_SPACE(ld_libs_all, $ld_libs_window_system $ld_libs_general $ld_libs_module) +dnl For no-module builds, make the src dir last +if test "$with_modules" = "no"; then + XE_APPEND(src, MAKE_SUBDIR) +fi + dnl Compute lists of Makefiles and subdirs AC_SUBST(SRC_SUBDIR_DEPS) -XE_APPEND(src, MAKE_SUBDIR) internal_makefile_list="Makefile.in" SUBDIR_MAKEFILES='' test -d lock || mkdir lock Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.431 retrieving revision 1.454 diff -u -r1.431 -r1.454 --- version.sh 10 May 2003 08:53:26 -0000 1.431 +++ version.sh 1 Jun 2003 05:10:14 -0000 1.454 @@ -2,8 +2,8 @@ emacs_is_beta=t emacs_major_version=21 emacs_minor_version=5 -emacs_beta_version=13 -xemacs_codename="cauliflower" +emacs_beta_version=14 +xemacs_codename="cassava" xemacs_extra_name= emacs_kit_version= infodock_major_version=4 cvs server: Diffing dynodump cvs server: Diffing dynodump/i386 cvs server: Diffing dynodump/ppc cvs server: Diffing dynodump/sparc cvs server: Diffing etc Index: etc/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v retrieving revision 1.24 retrieving revision 1.26 diff -u -r1.24 -r1.26 --- etc/ChangeLog 10 May 2003 08:53:29 -0000 1.24 +++ etc/ChangeLog 1 Jun 2003 05:10:17 -0000 1.26 @@ -1,3 +1,11 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + +2003-05-24 Norbert Koch + + * package-index.LATEST.gpg: Official package release. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. Index: etc/package-index.LATEST.gpg =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/package-index.LATEST.gpg,v retrieving revision 1.6 retrieving revision 1.9 diff -u -r1.6 -r1.9 --- etc/package-index.LATEST.gpg 2 May 2003 23:12:16 -0000 1.6 +++ etc/package-index.LATEST.gpg 28 May 2003 05:23:23 -0000 1.9 @@ -28,19 +28,19 @@ (package-get-update-base-entry (quote (pgg (standards-version 1.1 - version "1.02" + version "1.03" author-version "0.1" - date "2002-12-06" - build-date "2002-12-06" + date "2003-05-14" + build-date "2003-05-14" maintainer "Simon Josefsson " distribution xemacs priority low category "standard" dump nil description "Emacs interface to various PGP implementations." - filename "pgg-1.02-pkg.tar.gz" - md5sum "d721f51a1e97a997e0cf256dfd19020a" - size 30199 + filename "pgg-1.03-pkg.tar.gz" + md5sum "d5f112441b77a17e23fabd6bf4f17f49" + size 31526 provides (pgg pgg-def pgg-parse pgg-gpg pgg-pgp pgg-pgp5) requires (xemacs-base fsf-compat edebug) type regular @@ -228,8 +228,8 @@ (standards-version 1.1 version "1.12" author-version "1.14.4" - date "2002-08-12" - build-date "2002-08-12" + date "2003-03-30" + build-date "2003-05-18" maintainer "Simon Josefsson " distribution xemacs priority low @@ -237,8 +237,8 @@ dump nil description "Simple Authentication and Security Layer (SASL) library." filename "sasl-1.12-pkg.tar.gz" - md5sum "7e8e46e9cbbc54732a68d097c88e5f65" - size 26693 + md5sum "b583cc11a62f56ec79490274e3deb3ec" + size 26974 provides (hmac-def hmac-md5 hmac-sha1 ntlm sasl sasl-cram sasl-digest sasl-ntlm sasl-plain sasl-login sasl-anonymous) requires (ecrypto) type regular @@ -336,19 +336,19 @@ (package-get-update-base-entry (quote (liece (standards-version 1.1 - version "1.11" + version "1.12" author-version "1.4.9" - date "2002-10-15" - build-date "2002-10-15" + date "2003-04-22" + build-date "2003-04-22" maintainer "Daiki Ueno " distribution xemacs priority high category "standard" dump nil description "IRC (Internet Relay Chat) client for Emacs." - filename "liece-1.11-pkg.tar.gz" - md5sum "f4c6488e97125cdb6533bbe0ef5535f7" - size 198675 + filename "liece-1.12-pkg.tar.gz" + md5sum "c7f2aab45f8ada9398d4b0807e80433a" + size 199275 provides (liece-xemacs gettext liece-clfns liece-handler liece-compat liece-version liece-vars liece-globals liece-inlines liece-filter liece-coding liece-dcc liece-menu liece-000 liece-200 liece-300 liece-400 liece-500 liece-nick liece-channel liece-commands liece-ctcp liece-q-el liece-message liece-handle liece-hilit liece-intl liece-mail liece-minibuf liece-misc liece-tcp liece-url liece-x-face liece-window liece) requires (apel mail-lib fsf-compat xemacs-base) type regular @@ -424,19 +424,19 @@ (package-get-update-base-entry (quote (xemacs-base (standards-version 1.1 - version "1.75" + version "1.77" author-version "21.4" - date "2003-01-18" - build-date "2003-01-18" + date "2003-04-29" + build-date "2003-04-29" maintainer "XEmacs Development Team " distribution xemacs priority high category "standard" dump nil description "Fundamental XEmacs support, you almost certainly need this." - filename "xemacs-base-1.75-pkg.tar.gz" - md5sum "0d6c6012b7a21c867b59ae902d95ca77" - size 469016 + filename "xemacs-base-1.77-pkg.tar.gz" + md5sum "b25c2c30ba719d7152ab24210fa27045" + size 469663 provides (add-log advice-preload advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu ffap helper imenu iso-syntax macros novice outline passwd pp regexp-opt regi ring shell skeleton sort thing time-stamp timezone tq xbm-button xpm-button) requires () type regular @@ -512,20 +512,20 @@ (package-get-update-base-entry (quote (mail-lib (standards-version 1.1 - version "1.57" - author-version "21.4" - date "2003-01-13" - build-date "2003-01-13" + version "1.59" + author-version "21.5b13" + date "2003-05-14" + build-date "2003-05-14" maintainer "Simon Josefsson " distribution xemacs priority medium category "standard" dump nil description "Fundamental lisp files for providing email support." - filename "mail-lib-1.57-pkg.tar.gz" - md5sum "c6419162479944320929ab7fed38dc92" - size 195163 - provides (base64 browse-url-xemacs browse-url highlight-headers mail-abbrevs mail-extr mail-utils mailheader netrc pop3 reporter rfc2104 rfc822 rmail rmail-mini rmailout sendmail smtpmail starttls) + filename "mail-lib-1.59-pkg.tar.gz" + md5sum "576bfafe24b1b08cfdf184fe021066c9" + size 198415 + provides (base64 browse-url-xemacs browse-url highlight-headers mail-abbrevs mail-extr mail-utils mailheader netrc pop3 reporter rfc2104 rfc822 rmail rmail-mini rmailout sendmail smtpmail starttls tls) requires (eterm xemacs-base fsf-compat sh-script ecrypto) type regular )) @@ -908,19 +908,19 @@ (package-get-update-base-entry (quote (mule-base (standards-version 1.1 - version "1.42" - author-version "21.5b6" - date "2002-06-27" - build-date "2002-06-27" + version "1.43" + author-version "21.5b13" + date "2003-05-11" + build-date "2003-05-11" maintainer "XEmacs Development Team " distribution mule priority high category "mule" dump nil description "MULE: Basic Mule support, required for building with Mule." - filename "mule-base-1.42-pkg.tar.gz" - md5sum "d521ca4256a8333db5dc686b9d719232" - size 443826 + filename "mule-base-1.43-pkg.tar.gz" + md5sum "5caadede1749519085b30a016c99a7af" + size 444550 provides (canna-leim canna char-table china-util cyril-util isearch-ext japan-util ccl can-n-egg mule-help) requires (fsf-compat xemacs-base apel) type regular @@ -952,19 +952,19 @@ (package-get-update-base-entry (quote (time (standards-version 1.1 - version "1.12" + version "1.13" author-version "1.17" - date "2002-08-26" - build-date "2002-08-26" + date "2003-05-11" + build-date "2003-05-11" maintainer "XEmacs Development Team " distribution xemacs priority medium category "standard" dump nil description "Display time & date on the modeline." - filename "time-1.12-pkg.tar.gz" - md5sum "151911897d2540bd7461f1a5324017b5" - size 20127 + filename "time-1.13-pkg.tar.gz" + md5sum "6fff6a2cf70c65710a905de3bbbc2e5d" + size 20550 provides (time) requires (xemacs-base) type regular @@ -1304,20 +1304,20 @@ (package-get-update-base-entry (quote (ilisp (standards-version 1.1 - version "1.31" + version "1.32" author-version "5.12.0" - date "2003-01-03" - build-date "2003-01-03" + date "2003-05-02" + build-date "2003-05-02" maintainer "ilisp Maintainers " distribution xemacs priority low category "standard" dump nil description "Front-end for Inferior Lisp." - filename "ilisp-1.31-pkg.tar.gz" - md5sum "c1fd42c184abe4341a389e8774ddab2f" - size 337557 - provides (bridge comint-ipc comint completer ilcompat compat-fsf18 compat-fsf-19 compat-fsf-20 ilisp-chs ilisp-cl-easy-menu ilisp-ext ilisp-lw ilisp-key ilisp-menu ilisp-mnb ilisp-scheme-easy-menu ilisp il-luc19 il-luc19) + filename "ilisp-1.32-pkg.tar.gz" + md5sum "b862aeb9131e1c51272b3fddfc79f323" + size 345070 + provides (bridge comint-ipc completer ilcompat compat-fsf18 compat-fsf-19 compat-fsf-20 ilisp-chs ilisp-cl-easy-menu ilisp-ext ilisp-lw ilisp-key ilisp-menu ilisp-mnb ilisp-scheme-easy-menu ilisp il-luc19 il-luc19) requires (xemacs-base mail-lib fsf-compat eterm sh-script) type regular )) @@ -1370,19 +1370,19 @@ (package-get-update-base-entry (quote (viper (standards-version 1.1 - version "1.35" + version "1.36" author-version "3.09" - date "2002-09-25" - build-date "2002-09-25" + date "2003-05-19" + build-date "2003-05-19" maintainer "Michael Kifer " distribution xemacs priority low category "standard" dump nil description "VI emulation support." - filename "viper-1.35-pkg.tar.gz" - md5sum "e5ae74dedc17a8ae8ecd33cf46343526" - size 330509 + filename "viper-1.36-pkg.tar.gz" + md5sum "26b328fcd02c52acbf61bdc502daa489" + size 329897 provides (viper-cmd viper-ex viper-init viper-keym viper-macs viper-mous viper-util viper) requires (xemacs-base) type regular @@ -1436,19 +1436,19 @@ (package-get-update-base-entry (quote (texinfo (standards-version 1.1 - version "1.23" + version "1.24" author-version "21.4" - date "2003-01-13" - build-date "2003-01-13" + date "2003-04-26" + build-date "2003-04-26" maintainer "XEmacs Development Team " distribution xemacs priority high category "standard" dump nil description "XEmacs TeXinfo support." - filename "texinfo-1.23-pkg.tar.gz" - md5sum "4321534b29660dc130a55bb6526ef128" - size 133424 + filename "texinfo-1.24-pkg.tar.gz" + md5sum "76c161778c926f90312f1596e75a9d76" + size 133715 provides (makeinfo tex-mode texinfmt texinfo texnfo-tex texnfo-upd) requires (xemacs-base) type regular @@ -1568,19 +1568,19 @@ (package-get-update-base-entry (quote (x-symbol (standards-version 1.1 - version "1.03" + version "1.04" author-version "4.5" - date "2003-04-02" - build-date "2003-04-02" + date "2003-04-22" + build-date "2003-04-22" maintainer "Steve Youngs " distribution xemacs priority high category "standard" dump nil description "Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts." - filename "x-symbol-1.03-pkg.tar.gz" - md5sum "6ea6966d62caf49fbef5ba8d656e5f47" - size 585973 + filename "x-symbol-1.04-pkg.tar.gz" + md5sum "eafad9c20b1327b05e0d5987be665e85" + size 687520 provides (x-symbol-bib x-symbol-hooks x-symbol-image x-symbol-macs x-symbol-mule x-symbol-nomule x-symbol-sgml x-symbol-tex x-symbol-texi x-symbol-vars x-symbol-xmacs x-symbol) requires (x-symbol xemacs-base auctex mail-lib) type regular @@ -1678,19 +1678,19 @@ (package-get-update-base-entry (quote (prog-modes (standards-version 1.1 - version "1.72" + version "1.73" author-version "21.4" - date "2003-01-24" - build-date "2003-01-24" + date "2003-04-26" + build-date "2003-04-26" maintainer "XEmacs Development Team " distribution xemacs priority medium category "standard" dump nil description "Support for various programming languages." - filename "prog-modes-1.72-pkg.tar.gz" - md5sum "39cc163d6e6408ae317a228c4430733d" - size 655779 + filename "prog-modes-1.73-pkg.tar.gz" + md5sum "12a9d668f797d1bcf2acbded8ad5d95d" + size 655974 provides (autoconf-mode awk-mode c-mode cvs diff-mode eiffel-mode icon javascript-mode ksh-mode m4-mode makefile mode-compile mode-compile-kill modula2 p4 php-mode postscript rexx-mode rpm-spec-mode simula-mode sql tcl teco verilog-mode) requires (mail-lib xemacs-devel xemacs-base cc-mode fsf-compat edit-utils ediff emerge efs vc speedbar dired ilisp sh-script) type regular @@ -1744,19 +1744,19 @@ (package-get-update-base-entry (quote (ediff (standards-version 1.1 - version "1.46" + version "1.47" author-version "2.75" - date "2003-01-26" - build-date "2003-01-26" + date "2003-05-19" + build-date "2003-05-19" maintainer "Michael Kifer " distribution xemacs priority medium category "standard" dump nil description "Interface over GNU patch." - filename "ediff-1.46-pkg.tar.gz" - md5sum "1f7c307d05ed8a511952b581dcd2f4e0" - size 305601 + filename "ediff-1.47-pkg.tar.gz" + md5sum "32276e3b47bb3bf1e461c7271091bbab" + size 305650 provides (ediff-diff ediff-help ediff-hook ediff-init ediff-merg ediff-mult ediff-ptch ediff-tbar ediff-util ediff-vers ediff-wind ediff) requires (pcl-cvs elib dired xemacs-base edebug prog-modes) type regular @@ -1964,21 +1964,21 @@ (package-get-update-base-entry (quote (bbdb (standards-version 1.1 - version "1.21" + version "1.23" author-version "2.34" - date "2002-06-27" - build-date "2002-06-27" + date "2003-05-18" + build-date "2003-05-18" maintainer "Ronan Waide " distribution xemacs priority medium category "standard" dump nil description "The Big Brother Data Base" - filename "bbdb-1.21-pkg.tar.gz" - md5sum "8b1d6fe03d444a4977a358a431f1430e" - size 373823 + filename "bbdb-1.23-pkg.tar.gz" + md5sum "6cced769e1bd48d5a571b654958cd35d" + size 374355 provides (bbdb-com bbdb-ftp bbdb-gnus bbdb-gui bbdb-hooks bbdb-merge bbdb-mhe bbdb-migrate bbdb-print bbdb-reportmail bbdb-rmail bbdb-sc bbdb-snarf bbdb-srv bbdb-vm bbdb-w3 bbdb-whois bbdb-xemacs bbdb) - requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base w3) + requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base w3 fsf-compat eterm sh-script net-utils os-utils) type regular )) )) @@ -2030,21 +2030,21 @@ (package-get-update-base-entry (quote (tm (standards-version 1.1 - version "1.35" - author-version "21.4" - date "2003-01-03" - build-date "2003-01-03" + version "1.36" + author-version "21.5b13" + date "2003-05-14" + build-date "2003-05-14" maintainer "XEmacs Development Team " distribution xemacs priority low category "standard" dump nil description "Emacs MIME support. Not needed for gnus >= 5.8.0" - filename "tm-1.35-pkg.tar.gz" - md5sum "0fc1d56984ec0b70aa3f828abd42ba43" - size 189262 + filename "tm-1.36-pkg.tar.gz" + md5sum "03830180796f04f085bcec5a62e2d17a" + size 334020 provides (char-util cless gnus-art-mime gnus-charset gnus-mime gnus-sum-mime latex-math-symbol mel-b mel-g mel-q mel-u mel message-mime mime-setup mu-bbdb mu-cite range sc-setup signature texi-util tl-atype tl-list tl-misc tl-num tl-seq tl-str tm-bbdb tm-def tm-edit-mc tm-edit tm-ew-d tm-ew-e tm-file tm-ftp tm-html tm-image tm-latex tm-mail tm-mh-e tm-parse tm-partial tm-pgp tm-play tm-rmail tm-setup tm-tar tm-text tm-view tm-vm tmh-comp) - requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base fsf-compat) + requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base fsf-compat sh-script net-utils) type regular )) )) @@ -2052,21 +2052,21 @@ (package-get-update-base-entry (quote (gnus (standards-version 1.1 - version "1.68" - author-version "5.8.8" - date "2003-01-03" - build-date "2003-01-03" - maintainer "XEmacs Development Team " + version "1.71" + author-version "5.10.2" + date "2003-05-18" + build-date "2003-05-18" + maintainer "Steve Youngs " distribution xemacs priority medium category "standard" dump nil description "The Gnus Newsreader and Mailreader." - filename "gnus-1.68-pkg.tar.gz" - md5sum "4a78d2088ede0a375922ebbb50fc3be9" - size 2358728 - provides (binhex drums earcon flow-fill format-spec gnus-agent gnus-art gnus-async gnus-audio gnus-bcklg gnus-cache gnus-cite gnus-cus gnus-demon gnus-draft gnus-dup gnus-eform gnus-ems gnus-gl gnus-group gnus-int gnus-kill gnus-load gnus-logic gnus-mh gnus-ml gnus-mlspl gnus-move gnus-msg gnus-nocem gnus-picon gnus-range gnus-salt gnus-score gnus-setup gnus-soup gnus-spec gnus-srvr gnus-start gnus-sum gnus-topic gnus-undo gnus-util gnus-uu gnus-vm gnus-win gnus-xmas gnus ietf-drums imap lpath mail-parse mail-prsvr mail-source mailcap message messagexmas messcompat mm-bodies mm-decode mm-encode mm-util mm-uu mm-view mml-smime mml nnagent nnbabyl nndb nndir nndoc nndraft nneething nnfolder nngateway nnheader nnheaderxm nnimap nnkiboze nnlistserv nnmail nnmbox nnmh nnml nnoo nnslashdot nnsoup nnspool nntp nnultimate nnvirtual nnwarchive nnweb nnwfm parse-time qp rfc1843 rfc2015 rfc2045 rfc2047 rfc2231 score-mode smiley smiley smime time-date utf7 uudecode vcard webmail) - requires (gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat ecrypto tm apel) + filename "gnus-1.71-pkg.tar.gz" + md5sum "87a26e70ef2632dc11831964c5b9267b" + size 3282718 + provides (binhex canlock compface deuglify earcon flow-fill format-spec gnus-agent gnus-art gnus-async gnus-audio gnus-bcklg gnus-cache gnus-cite gnus-cus gnus-delay gnus-demon gnus-diary gnus-dired gnus-draft gnus-dup gnus-eform gnus-ems gnus-fun gnus-gl gnus-group gnus-int gnus-kill gnus-logic gnus-mh gnus-ml gnus-mlspl gnus-move gnus-msg gnus-nocem gnus-picon gnus-range gnus-registry gnus-salt gnus-score gnus-setup gnus-sieve gnus-soup gnus-spec gnus-srvr gnus-start gnus-sum gnus-topic gnus-undo gnus-util gnus-uu gnus-vm gnus-win gnus-xmas gnus ietf-drums imap mail-parse mail-prsvr mail-source mailcap message messagexmas messcompat mm-bodies mm-decode mm-encode mm-extern mm-partial mm-url mm-util mm-uu mm-view mml-sec mml-smime mml mml1991 mml2015 nnagent nnbabyl nndb nndiary nndir nndoc nndraft nneething nnfolder nngateway nnheader nnheaderxm nnimap nnkiboze nnlistserv nnmail nnmaildir nnmbox nnmh nnml nnnil nnoo nnrss nnslashdot nnsoup nnspool nntp nnultimate nnvirtual nnwarchive nnweb nnwfm parse-time qp rfc1843 rfc2045 rfc2047 rfc2231 score-mode smiley smime spam-report spam-stat spam time-date utf7 uudecode webmail yenc gnus-idna gpg-ring gpg hashcash vcard) + requires (gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat ecrypto tm apel pgg net-utils sh-script os-utils dired sieve sasl) type regular )) )) @@ -2140,21 +2140,21 @@ (package-get-update-base-entry (quote (mh-e (standards-version 1.1 - version "1.19" - author-version "7.2" - date "2003-01-13" - build-date "2003-01-13" + version "1.23" + author-version "7.3" + date "2003-05-19" + build-date "2003-05-19" maintainer "Steve Youngs " distribution xemacs priority low category "standard" dump nil description "Front end support for MH." - filename "mh-e-1.19-pkg.tar.gz" - md5sum "a74a2a0836d5ba0f428fa250489a40c8" - size 466000 - provides (mh-comp mh-e mh-funcs mh-index mh-mime mh-pick mh-seq mh-speed mh-utils mh-xemacs-compat) - requires (gnus mail-lib xemacs-base speedbar rmail tm apel sh-script fsf-compat) + filename "mh-e-1.23-pkg.tar.gz" + md5sum "d7d99f142797bbe3fba206d6932a1e75" + size 551037 + provides (mh-alias mh-comp mh-customize mh-e mh-funcs mh-identity mh-inc mh-index mh-junk mh-loaddefs mh-mime mh-pick mh-seq mh-speed mh-unit mh-utils mh-xemacs-compat mh-xemacs-icons) + requires (gnus mail-lib xemacs-base speedbar rmail tm apel sh-script fsf-compat xemacs-devel net-utils eterm os-utils) type regular )) )) @@ -2206,21 +2206,21 @@ (package-get-update-base-entry (quote (eudc (standards-version 1.1 - version "1.37" + version "1.38" author-version "1.32" - date "2003-01-03" - build-date "2003-01-03" + date "2003-05-18" + build-date "2003-05-18" maintainer "Oscar Figueiredo " distribution xemacs priority low category "standard" dump nil description "Emacs Unified Directory Client (LDAP, PH)." - filename "eudc-1.37-pkg.tar.gz" - md5sum "cb04fd847a9f0c5e46a0a0ac1bd5839d" - size 79243 + filename "eudc-1.38-pkg.tar.gz" + md5sum "44f701aa6b6460eb766e994a6f0f3072" + size 79327 provides (eudc eudc-vars eudc-hotlist eudc-export eudc-bob eudcb-ldap eudcb-ph eudcb-bbdb) - requires (fsf-compat xemacs-base bbdb mail-lib gnus rmail tm apel) + requires (fsf-compat xemacs-base bbdb mail-lib gnus rmail tm apel eterm sh-script net-utils) type regular )) )) @@ -2228,20 +2228,20 @@ (package-get-update-base-entry (quote (net-utils (standards-version 1.1 - version "1.31" + version "1.32" author-version "21.4" - date "2003-01-24" - build-date "2003-01-24" + date "2003-05-02" + build-date "2003-05-02" maintainer "XEmacs Development Team " distribution xemacs priority low category "standard" dump nil description "Miscellaneous Networking Utilities." - filename "net-utils-1.31-pkg.tar.gz" - md5sum "9a53646e3d5939b9348f0a459a4e91a4" - size 121893 - provides (ilisp-browse-cltl2 xemacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www) + filename "net-utils-1.32-pkg.tar.gz" + md5sum "0c756dbe87fac94fda8c175283fc7f2c" + size 137374 + provides (ilisp-browse-cltl2 xemacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www dig dns xml) requires (bbdb w3 efs mail-lib xemacs-base fsf-compat eterm sh-script gnus rmail tm apel) type single )) @@ -2338,21 +2338,21 @@ (package-get-update-base-entry (quote (xemacs-devel (standards-version 1.1 - version "1.52" + version "1.55" author-version "21.4" - date "2003-01-03" - build-date "2003-01-03" + date "2003-05-18" + build-date "2003-05-18" maintainer "XEmacs Development Team " distribution xemacs priority medium category "standard" dump nil description "Emacs Lisp developer support." - filename "xemacs-devel-1.52-pkg.tar.gz" - md5sum "dc83cba7e8689c7de1f34fcd59872d55" - size 232825 + filename "xemacs-devel-1.55-pkg.tar.gz" + md5sum "6fe0e1b869502c94adaa9e5d6623d5f3" + size 233111 provides (checkdoc docref eldoc elp eval-expr find-func hide-copyleft ielm patcher pp trace patch-keywords) - requires (xemacs-base ispell mail-lib gnus rmail tm apel) + requires (xemacs-base ispell mail-lib gnus rmail tm apel sh-script net-utils eterm) type single )) )) @@ -2513,9 +2513,10 @@ ;;;@@@ ;; Package Index file ends here -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.1 (FreeBSD) +Version: GnuPG v1.2.2 (FreeBSD) +Comment: The XEmacs Development Team -iD8DBQE+lPqjgu3ywdHdhM0RAqwXAJ0bzFQGzRMeRB0mNfW4HPQwr2qt5ACg6ZYW -P+HXtfEmt6eqKtwuXjS/zn8= -=R2Oc +iD8DBQE+yF5fgu3ywdHdhM0RArZ1AKCVsFgWDjkYse/jn3DHseo6E+1uZgCeIwSb +RKeoQNFGQ4zB69j042VVNig= +=oQus -----END PGP SIGNATURE----- Index: etc/sample.Xresources =================================================================== RCS file: etc/sample.Xresources diff -N etc/sample.Xresources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ etc/sample.Xresources 14 May 2003 10:34:46 -0000 1.1 @@ -0,0 +1,300 @@ +! This is a sample .Xresources file. The resources below are the +! actual resources used as defaults for XEmacs, although the +! form of these resources in the XEmacs app-defaults file is +! slightly different. +! +! You can use the examples below as a basis for your own customizations: +! copy and modify any of the resources below into your own ~/.Xresources file. +! .Xresources specifies defaults for all applications, not just XEmacs; it is +! normally used to customize fonts, colors, and the like, while ~/.emacs is +! used to change other sorts of (XEmacs-specific) behavior. +! +! In general, changes to your .Xresources file will not take effect until the +! next time you restart the window system. To reload your resources +! explicitly, use the shell command +! +! xrdb -load ~/.Xresources +! +! The resources will take effect the next time you restart XEmacs. (Simply +! creating a new xemacs frame is not enough - you must restart the editor +! for the changes to take effect.) +! + + +! Colors and backgrounds. +! ====================== +! The contrasts of these colors will cause them to map to the appropriate +! one of "black" or "white" on monochrome systems. +! +! The valid color names on your system can be found by looking in the file +! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/. + +! Set the foreground and background colors of the `default' face. +! The default face colors are the base for most of the other faces' +! colors. The default background is gray80, and the default foreground +! is black. +Emacs.default.attributeBackground: gray80 +Emacs.default.attributeForeground: black + +! Set the modeline colors. +Emacs.modeline*attributeForeground: Black +Emacs.modeline*attributeBackground: Gray75 + +! Set the color of the text cursor. +Emacs.text-cursor*attributeBackground: Red3 + +! If you want to set the color of the mouse pointer, do this: +! Emacs.pointer*attributeForeground: Black +! If you want to set the background of the mouse pointer, do this: +! Emacs.pointer*attributeBackground: White +! Note that by default, the pointer foreground and background are the same +! as the default face. + +! Set the menubar colors. This overrides the default foreground and +! background colors specified above. +Emacs*menubar*Foreground: Gray30 +Emacs*menubar*Background: Gray75 +! This is for buttons in the menubar. +! Yellow would be better, but that would map to white on monochrome. +Emacs*menubar.buttonForeground: Blue +Emacs*XlwMenu.selectColor: ForestGreen +Emacs*XmToggleButton.selectColor: ForestGreen + +! Specify the colors of popup menus. +Emacs*popup*Foreground: Black +Emacs*popup*Background: Gray75 + +! Specify the colors of the various sub-widgets of the dialog boxes. +Emacs*dialog*Foreground: Black +! #A5C0C1 is a shade of blue +Emacs*dialog*Background: #A5C0C1 +! The following three are for Motif dialog boxes ... +Emacs*dialog*XmTextField*Background: WhiteSmoke +Emacs*dialog*XmText*Background: WhiteSmoke +Emacs*dialog*XmList*Background: WhiteSmoke +! While this one is for Athena dialog boxes. +Emacs*dialog*Command*Background: WhiteSmoke + +! Athena dialog boxes are sometimes built with the Xaw3d +! variant of the Athena toolkit. +! XEmacs being nice to 8bit displays, it defaults to: +Emacs*dialog*Command*beNiceToColormap: true +! If you are shocked by the ugliness of the 3d rendition, +! you may want to set (even on 8bit displays) the above to false. + +! Xlw Scrollbar colors +Emacs*XlwScrollBar.Foreground: Gray30 +Emacs*XlwScrollBar.Background: Gray75 +Emacs*XmScrollBar.Foreground: Gray30 +Emacs*XmScrollBar.Background: Gray75 + +! +! The Lucid Scrollbar supports two added resources, SliderStyle is either +! "plain" (default) or "dimple". Dimple puts a small dimple in the middle +! of the slider that depresses when the slider is clicked on. ArrowPosition is +! either "opposite" (default) or "same". Opposite puts the arrows at opposite +! of the scrollbar, same puts both arrows at the same end, like the Amiga. +! +! Emacs*XlwScrollBar.SliderStyle: dimple +! Emacs*XlwScrollBar.ArrowPosition: opposite + + +! +! If you want to turn off a toolbar, set its height or width to 0. +! The correct size value is not really arbitrary. We only control it +! this way in order to avoid excess frame resizing when turning the +! toolbars on and off. +! +! To change the heights and widths of the toolbars: +! +! Emacs.topToolBarHeight: 37 +! Emacs.bottomToolBarHeight: 0 +! Emacs.leftToolBarWidth: 0 +! Emacs.rightToolBarWidth: 0 + +Emacs*topToolBarShadowColor: Gray90 +Emacs*bottomToolBarShadowColor: Gray40 +Emacs*backgroundToolBarColor: Gray75 +Emacs*toolBarShadowThickness: 2 + + +! If you want to turn off vertical scrollbars, or change the default +! pixel width of the vertical scrollbars, do it like this (0 width +! means no vertical scrollbars): +! +! Emacs.scrollBarWidth: 0 +! +! To change it for a particular frame, do this: +! +! Emacs*FRAME-NAME.scrollBarWidth: 0 + + +! If you want to turn off horizontal scrollbars, or change the default +! pixel height of the horizontal scrollbars, do it like this (0 height +! means no horizontal scrollbars): +! +! Emacs.scrollBarHeight: 0 +! +! To change it for a particular frame, do this: +! +! Emacs*FRAME-NAME.scrollBarHeight: 0 + + +! To dynamically change the labels used for menubar buttons... +! +! Emacs*XlwMenu.resourceLabels: True +! Emacs*XlwMenu.newFrame.labelString: Open Another Window + +! To have the Motif scrollbars on the left instead of the right, do this: +! +! Emacs*scrollBarPlacement: BOTTOM_LEFT +! +! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead + +! To have Motif scrollbars act more like Xt scrollbars... +! +! Emacs*XmScrollBar.translations: #override \n\ +! : PageDownOrRight(0) \n\ +! : PageUpOrLeft(0) + +! Fonts. +! ====== +! XEmacs requires the use of XLFD (X Logical Font Description) format font +! names, which look like +! +! *-courier-medium-r-*-*-*-120-*-*-*-*-*-* +! +! if you use any of the other, less strict font name formats, some of which +! look like +! lucidasanstypewriter-12 +! and fixed +! and 9x13 +! +! then XEmacs won't be able to guess the names of the bold and italic versions. +! All X fonts can be referred to via XLFD-style names, so you should use those +! forms. See the man pages for X(1), xlsfonts(1), and xfontsel(1). + + +! The default font for the text area of XEmacs is chosen at run-time +! by lisp code which tries a number of different possibilities in order +! of preference. If you wish to override it, use this: +! +! Emacs.default.attributeFont: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* + +! If you choose a font which does not have an italic version, you can specify +! some other font to use for it here: +! +! Emacs.italic.attributeFont: -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-* +! +! If you choose a font which does not have a bold-italic version, +! you can specify some other font to use for it here: +! +! Emacs.bold-italic.attributeFont: -*-courier-bold-o-*-*-*-120-*-*-*-*-iso8859-* +! +! And here is how you would set the background color of the `highlight' face, +! but only on the screen named `debugger': +! +! Emacs*debugger.highlight.attributeBackground: PaleTurquoise +! +! See the NEWS file (C-h n) for a more complete description of the resource +! syntax of faces. + + +! Font of the modeline, menubar and pop-up menus. +! Note that the menubar resources do not use the `face' syntax, since they +! are X toolkit widgets and thus outside the domain of XEmacs proper. +! +Emacs*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +Emacs*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* + +! Font in the Motif dialog boxes. +! (Motif uses `fontList' while most other things use `font' - if you don't +! know why you probably don't want to.) +! +Emacs*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +Emacs*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* +Emacs*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* +Emacs*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* + +! Font in the Athena dialog boxes. +! I think 14-point looks nicer than 12-point. +! Some people use 12-point anyway because you get more text, but +! there's no purpose at all in doing this for dialog boxes. + +Emacs*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* + +! Dialog box translations. +! ======================= + +! This accelerator binds in a dialog box to on button1 +Emacs*dialog*button1.accelerators:#override\ +Return: ArmAndActivate()\n\ +KP_Enter: ArmAndActivate()\n\ +Ctrlm: ArmAndActivate()\n + +! Translations to make the TextField widget behave more like XEmacs +Emacs*XmTextField.translations: #override\n\ + !osfBackSpace: delete-previous-character()\n\ + !osfDelete: delete-previous-character()\n\ + !Ctrlh: delete-previous-character()\n\ + !Ctrld: delete-next-character()\n\ + !MetaosfDelete: delete-previous-word()\n\ + !MetaosfBackSpace: delete-previous-word()\n\ + !Metad: delete-next-word()\n\ + !Ctrlk: delete-to-end-of-line()\n\ + !Ctrlg: process-cancel()\n\ + !Ctrlb: backward-character()\n\ + !osfLeft: backward-character()\n\ + !Ctrlf: forward-character()\n\ + !osfRight: forward-character()\n\ + !Metab: backward-word()\n\ + !MetaosfLeft: backward-word()\n\ + !Metaf: forward-word()\n\ + !MetaosfRight: forward-word()\n\ + !Ctrle: end-of-line()\n\ + !Ctrla: beginning-of-line()\n\ + !Ctrlw: cut-clipboard()\n\ + !Metaw: copy-clipboard()\n\ + : copy-primary()\n + +! With the XEmacs typeahead it's better to not have space be bound to +! ArmAndActivate() for buttons that appear in dialog boxes. This is +! not 100% Motif compliant but the benefits far outweight the +! compliancy problem. +Emacs*dialog*XmPushButton.translations:#override\n\ + : Arm()\n\ + ,: Activate()\ + Disarm()\n\ + (2+): MultiArm()\n\ + (2+): MultiActivate()\n\ + : Activate()\ + Disarm()\n\ + osfSelect: ArmAndActivate()\n\ + osfActivate: ArmAndActivate()\n\ + osfHelp: Help()\n\ + ~Shift ~Meta ~Alt Return: ArmAndActivate()\n\ + : Enter()\n\ + : Leave()\n + +! XIM input method style +! ======================= + +! ximStyles is a (whitespace or comma-separated) list of XIMStyles in +! order of user's preference. +! Choose a subset of the following styles or reorder to taste +Emacs*ximStyles: XIMPreeditPosition|XIMStatusArea\ + XIMPreeditPosition|XIMStatusNothing\ + XIMPreeditPosition|XIMStatusNone\ + XIMPreeditNothing|XIMStatusArea\ + XIMPreeditNothing|XIMStatusNothing\ + XIMPreeditNothing|XIMStatusNone\ + XIMPreeditNone|XIMStatusArea\ + XIMPreeditNone|XIMStatusNothing\ + XIMPreeditNone|XIMStatusNone + +! XIM Preedit and Status foreground and background +Emacs*EmacsFrame.ximForeground: black +Emacs*EmacsFrame.ximBackground: white + +! XIM fontset (defaults to system fontset default) +! Emacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-* cvs server: Diffing etc/custom cvs server: Diffing etc/custom/example-themes cvs server: Diffing etc/eos cvs server: Diffing etc/idd cvs server: Diffing etc/photos cvs server: Diffing etc/sparcworks cvs server: Diffing etc/tests cvs server: Diffing etc/tests/external-widget cvs server: Diffing etc/toolbar cvs server: Diffing etc/unicode cvs server: Diffing etc/unicode/ibm cvs server: Diffing etc/unicode/mule-ucs cvs server: Diffing etc/unicode/other cvs server: Diffing etc/unicode/unicode-consortium cvs server: Diffing info cvs server: Diffing lib-src Index: lib-src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.159 retrieving revision 1.161 diff -u -r1.159 -r1.161 --- lib-src/ChangeLog 10 May 2003 08:53:30 -0000 1.159 +++ lib-src/ChangeLog 1 Jun 2003 05:10:18 -0000 1.161 @@ -1,3 +1,11 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + +2003-05-29 Jerry James + + * ellcc.c: Rationalize and repair use of GCC function attributes. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. Index: lib-src/ellcc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ellcc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lib-src/ellcc.c 7 Feb 2003 15:33:35 -0000 1.5 +++ lib-src/ellcc.c 29 May 2003 17:02:31 -0000 1.6 @@ -79,6 +79,27 @@ #include #include /* Generated files must be included using <...> */ +#ifndef ATTRIBUTE_MALLOC +# if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__==2 && __GNUC_MINOR__>=96)) +# define ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +# else +# define ATTRIBUTE_MALLOC +# endif /* GCC version >= 2.96 */ +#endif /* ATTRIBUTE_MALLOC */ + +#ifdef __GNUC_ +# define ATTRIBUTE_FATAL __attribute__ ((noreturn, format (printf, 1, 2))) +#else +# define ATTRIBUTE_FATAL +#endif /* __GNUC__ */ + +#if defined(__GNUC__) && (__GNUC__ >= 2 || (__GNUC__==2 && __GNUC_MINOR__>=5)) +# define ATTRIBUTE_CONST __attribute__ ((const)) +#else +# define ATTRIBUTE_CONST +#endif + + #ifndef HAVE_SHLIB int main (int argc, char *argv[]) @@ -142,11 +163,7 @@ enum mode { ELLCC_COMPILE_MODE, ELLCC_LINK_MODE, ELLCC_INIT_MODE }; #ifdef DEBUG -static const char *ellcc_mode_name (enum mode ellcc_mode) -#if defined(__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 5 - __attribute__ ((const)) -#endif - ; +static const char *ellcc_mode_name (enum mode ellcc_mode) ATTRIBUTE_CONST; static const char * ellcc_mode_name (enum mode ellcc_mode) @@ -168,30 +185,10 @@ * Function Prototypes */ -static void *xmalloc (size_t size) -#ifdef __GNUC__ - __attribute__ ((malloc)) -#endif - ; - -static void *xrealloc (void *ptr, size_t size) -#ifdef __GNUC__ - __attribute__ ((malloc)) -#endif - ; - -static char *xstrdup (char *) -#ifdef __GNUC__ - __attribute__ ((malloc)) -#endif - ; - -static void fatal (char *, ...) -#ifdef __GNUC__ - __attribute__ ((noreturn, format (printf, 1, 2))) -#endif - ; - +static void *xmalloc (size_t size) ATTRIBUTE_MALLOC; +static void *xrealloc (void *ptr, size_t size) ATTRIBUTE_MALLOC; +static char *xstrdup (char *) ATTRIBUTE_MALLOC; +static void fatal (char *, ...) ATTRIBUTE_FATAL; static char ** add_string (char **, char *); static char ** add_to_argv (char **, const char *); static char ** do_compile_mode (void); cvs server: Diffing lisp Index: lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.504 retrieving revision 1.509 diff -u -r1.504 -r1.509 --- lisp/ChangeLog 10 May 2003 08:53:31 -0000 1.504 +++ lisp/ChangeLog 1 Jun 2003 05:10:19 -0000 1.509 @@ -1,3 +1,35 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + +2003-05-22 Stephen J. Turnbull + + * autoload.el (autoload-featurep-protect-autoloads): + Make the error message say which sym was checked. + +2003-05-16 Stephen J. Turnbull + + * subr.el (split-string): Update dox, tweak logic, to synch to GNU. + +2003-05-15 Steve Youngs + + * package-get.el (package-get-package-index-file-location): New, + so it is possible to specify a location for the index file. + (package-get-locate-index-file): Use it. + (package-get-maybe-save-index): Ditto. + (package-get-user-index-filename): Remove. + +2003-05-14 Steve Youngs + + * package-get.el (package-get-require-signed-base-updates): Turn + the PGP verification code back on. + +2003-05-11 Simon Josefsson + + * replace.el (delete-non-matching-lines, kill-non-matching-lines) + (copy-non-matching-lines, delete-matching-lines) + (kill-matching-lines, copy-matching-lines): Don't message. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. Index: lisp/autoload.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/autoload.el,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- lisp/autoload.el 15 Feb 2003 00:31:58 -0000 1.17 +++ lisp/autoload.el 22 May 2003 07:41:27 -0000 1.18 @@ -852,7 +852,7 @@ (progn (insert ";;; DO NOT MODIFY THIS FILE\n") (insert "(if (featurep '" sym ")") - (insert " (error \"Already loaded\"))\n") + (insert " (error \"Feature " sym " already loaded\"))\n") (goto-char (point-max)) (insert "\n(provide '" sym ")\n"))))) Index: lisp/package-get.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-get.el,v retrieving revision 1.61 retrieving revision 1.63 diff -u -r1.61 -r1.63 --- lisp/package-get.el 1 May 2003 02:29:00 -0000 1.61 +++ lisp/package-get.el 14 May 2003 23:57:35 -0000 1.63 @@ -170,6 +170,14 @@ :group 'package-get) ;;;###autoload +(defcustom package-get-package-index-file-location + (or (getenv "EMACSPACKAGEPATH") + user-init-directory) + "*The directory where the package-index file can be found." + :type 'directory + :group 'package-get) + +;;;###autoload (defcustom package-get-install-to-user-init-directory nil "*If non-nil install packages under `user-init-directory'." :type 'boolean @@ -372,10 +380,6 @@ :type 'file :group 'package-get) -(defvar package-get-user-index-filename - (paths-construct-path (list user-init-directory package-get-base-filename)) - "Name for the user-specific location of the package-get database file.") - (defcustom package-get-always-update nil "*If Non-nil always make sure we are using the latest package index (base). Otherwise respect the `force-current' argument of `package-get-require-base'." @@ -410,11 +414,7 @@ result nil))) -;;; FIXME: There's something strange happening with verifying the -;;; package-index file, it is reporting "The message was corrupt" even -;;; though verifying from the command line (outside of XEmacs) reports -;;; a good signature. --SY -(defcustom package-get-require-signed-base-updates nil +(defcustom package-get-require-signed-base-updates (package-get-pgp-available-p) "*If non-nil, try to verify the package index database via PGP. If nil, no PGP verification is done. If the package index database @@ -493,14 +493,35 @@ file))))) (defun package-get-locate-index-file (no-remote) - "Locate the package-get index file. Do not return remote paths if NO-REMOTE -is non-nil." + "Locate the package-get index file. + +Do not return remote paths if NO-REMOTE is non-nil. If the index +file doesn't exist in `package-get-package-index-file-location', ask +the user if one should be created using the index file in core as a +template." (or (package-get-locate-file package-get-base-filename t no-remote) - (if (file-exists-p package-get-user-index-filename) - package-get-user-index-filename) - (locate-data-file package-get-base-filename) - (error 'search-failed - "Can't locate a package index file."))) + (if (file-exists-p (expand-file-name package-get-base-filename + package-get-package-index-file-location)) + (expand-file-name package-get-base-filename + package-get-package-index-file-location) + (if (y-or-n-p (format "No index file, shall I create one in %s? " + package-get-package-index-file-location)) + (progn + (save-excursion + (set-buffer + (find-file-noselect (expand-file-name + package-get-base-filename + package-get-package-index-file-location))) + (let ((coding-system-for-write 'binary)) + (erase-buffer) + (insert-file-contents-literally + (locate-data-file package-get-base-filename)) + (save-buffer (current-buffer)) + (kill-buffer (current-buffer)))) + (expand-file-name package-get-base-filename + package-get-package-index-file-location)) + (error 'search-failed + "Can't locate a package index file."))))) (defun package-get-maybe-save-index (filename) "Offer to save the current buffer as the local package index file, @@ -512,8 +533,14 @@ (with-temp-buffer (insert-file-contents-literally location) (md5 (current-buffer))))) - (unless (and location (file-writable-p location)) - (setq location package-get-user-index-filename)) + (when (not (file-writable-p location)) + (if (y-or-n-p (format "Sorry, %s is read-only, can I use %s? " + location user-init-directory)) + (setq location (expand-file-name + package-get-base-filename + package-get-package-index-file-location)) + (error 'file-error + (format "%s is read-only" location)))) (when (y-or-n-p (concat "Update package index in " location "? ")) (let ((coding-system-for-write 'binary)) (write-file location))))))) Index: lisp/replace.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/replace.el,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lisp/replace.el 2 Mar 2003 09:38:40 -0000 1.9 +++ lisp/replace.el 12 May 2003 05:12:10 -0000 1.10 @@ -1,6 +1,6 @@ ;;; replace.el --- search and replace commands for XEmacs. -;; Copyright (C) 1985-7, 1992, 1994, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1985-7, 1992, 1994, 1997, 2003 Free Software Foundation, Inc. ;; Maintainer: XEmacs Development Team ;; Keywords: dumped, matching @@ -300,7 +300,8 @@ (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-non-matching-lines regexp t nil beg end)) - (message "%i lines deleted" count))) + (when (interactive-p) + (message "%i lines deleted" count)))) (defun kill-non-matching-lines (regexp) "Delete the lines that do not match REGEXP, from point to the end of @@ -316,7 +317,8 @@ (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-non-matching-lines regexp t t beg end)) - (message "%i lines killed" count))) + (when (interactive-p) + (message "%i lines killed" count)))) (defun copy-non-matching-lines (regexp) "Find all lines that do not match REGEXP from point to the end of the @@ -332,7 +334,8 @@ (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-non-matching-lines regexp nil t beg end)) - (message "%i lines copied" count))) + (when (interactive-p) + (message "%i lines copied" count)))) (defun operate-on-matching-lines (regexp delete kill &optional beg end) "Internal function used by delete-matching-lines, kill-matching-lines, @@ -393,7 +396,8 @@ (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-matching-lines regexp t nil beg end)) - (message "%i lines deleted" count))) + (when (interactive-p) + (message "%i lines deleted" count)))) (defun kill-matching-lines (regexp) "Delete the lines that match REGEXP, from point to the end of the @@ -409,7 +413,8 @@ (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-matching-lines regexp t t beg end)) - (message "%i lines killed" count))) + (when (interactive-p) + (message "%i lines killed" count)))) (defun copy-matching-lines (regexp) "Find all lines that match REGEXP from point to the end of the @@ -425,7 +430,8 @@ (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-matching-lines regexp nil t beg end)) - (message "%i lines copied" count))) + (when (interactive-p) + (message "%i lines copied" count)))) (define-function 'how-many 'count-matches) (defun count-matches (regexp) Index: lisp/subr.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/subr.el,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- lisp/subr.el 23 Apr 2003 15:42:50 -0000 1.31 +++ lisp/subr.el 22 May 2003 07:41:27 -0000 1.32 @@ -619,6 +619,11 @@ ;; specification for `split-string' agreed with rms 2003-04-23 ;; xemacs design <87vfx5vor0.fsf@tleepslib.sk.tsukuba.ac.jp> +;; The specification says that if both SEPARATORS and OMIT-NULLS are +;; defaulted, OMIT-NULLS should be treated as t. Simplifying the logical +;; expression leads to the equivalent implementation that if SEPARATORS +;; is defaulted, OMIT-NULLS is treated as t. + (defun split-string (string &optional separators omit-nulls) "Splits STRING into substrings bounded by matches for SEPARATORS. @@ -627,24 +632,24 @@ the substrings between the splitting points are collected as a list, which is returned. -If SEPARATORS is nil, it defaults to the value of -`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\". +If SEPARATORS is non-nil, it should be a regular expression matching text +which separates, but is not part of, the substrings. If nil it defaults to +`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and +OMIT-NULLS is forced to t. If OMIT-NULLs is t, zero-length substrings are omitted from the list \(so that for the default value of SEPARATORS leading and trailing whitespace are effectively trimmed). If nil, all zero-length substrings are retained, which correctly parses CSV format, for example. -As a special case, if both SEPARATORS and OMIT-NULLS are nil, white-space -will be trimmed (ie, the effect of `(split-string STRING)' is the same as -`(split-string STRING split-string-default-separators t)'). In the very -rare case that you need to retain zero-length substrings when splitting on -the default separators, use -`(split-string STRING split-string-default-separators)'. +Note that the effect of `(split-string STRING)' is the same as +`(split-string STRING split-string-default-separators t)'). In the rare +case that you wish to retain zero-length substrings when splitting on +whitespace, use `(split-string STRING split-string-default-separators nil)'. Modifies the match data; use `save-match-data' if necessary." - (let ((keep-nulls (if separators (not omit-nulls) nil)) + (let ((keep-nulls (not (if separators omit-nulls t))) (rexp (or separators split-string-default-separators)) (start 0) notfirst cvs server: Diffing lisp/mule cvs server: Diffing lisp/term cvs server: Diffing lock cvs server: Diffing lwlib Index: lwlib/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- lwlib/ChangeLog 10 May 2003 08:53:32 -0000 1.53 +++ lwlib/ChangeLog 1 Jun 2003 05:10:22 -0000 1.54 @@ -1,3 +1,7 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. cvs server: Diffing man Index: man/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.220 retrieving revision 1.223 diff -u -r1.220 -r1.223 --- man/ChangeLog 10 May 2003 08:53:33 -0000 1.220 +++ man/ChangeLog 1 Jun 2003 05:10:23 -0000 1.223 @@ -1,3 +1,25 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + +2003-05-22 Stephen J. Turnbull + + * internals/internals.texi (Searching and Matching): New node. + +2003-05-17 Stephen J. Turnbull + + * xemacs-faq.texi (detail menu): Reformat "Current Events" caption. + (Legacy Versions): New section. + (Q8.0.1): New question. + +2003-05-16 Stephen J. Turnbull + + * lispref/searching.texi (Regexp Search): Update split-string for + new specification. + + * lispref/strings.texi (Creating Strings): Xref split-string + (this is where GNU Emacs documents it). + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. Index: man/xemacs-faq.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs-faq.texi,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- man/xemacs-faq.texi 2 May 2003 06:00:43 -0000 1.70 +++ man/xemacs-faq.texi 22 May 2003 07:41:21 -0000 1.71 @@ -7,7 +7,7 @@ @finalout @titlepage @title XEmacs FAQ -@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/05/02 06:00:43 $ +@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/05/22 07:41:21 $ @sp 1 @author Tony Rossini @author Ben Wing @@ -84,6 +84,7 @@ * Miscellaneous:: The Miscellaneous Stuff. * MS Windows:: XEmacs on Microsoft Windows. * Current Events:: What the Future Holds. +* Legacy Versions:: New information about old XEmacsen. @detailmenu @@ -417,14 +418,20 @@ * Q6.4.2:: Why do I get a blank toolbar on Windows 95? * Q6.4.3:: XEmacs complains "No such file or directory, diff" +What the Future Holds -Current Events: * Q7.0.1:: What new features will be in XEmacs soon? * Q7.0.2:: What's new in XEmacs 21.4? * Q7.0.3:: What's new in XEmacs 21.1? * Q7.0.4:: What's new in XEmacs 20.4? * Q7.0.5:: What's new in XEmacs 20.3? * Q7.0.6:: What's new in XEmacs 20.2? + +New information about old XEmacsen. + +XEmacs 21.1: +* Q8.0.1:: Gnus 5.10 won't display smileys in XEmacs 21.1. + @end detailmenu @end menu @@ -6906,7 +6913,7 @@ -@node Current Events, , MS Windows, Top +@node Current Events, Legacy Versions, MS Windows, Top @unnumbered 7 What the Future Holds This is part 7 of the XEmacs Frequently Asked Questions list. This @@ -7237,5 +7244,61 @@ For older news, see the file @file{ONEWS} in the @file{etc} directory of the XEmacs distribution. + + + +@node Legacy Versions, , Current Events, Top +@unnumbered 8 New information about old XEmacsen + +This is part 8 of the XEmacs Frequently Asked Questions list. It will +occasionally be updated to reflect new information about versions which +are no longer being revised by the XEmacs Project. The primary purpose +is advice on compatibility of older XEmacsen with new packages and +updated versions of packages, but bug fixes (which will not be applied +to released XEmacsen, but users can apply themselves) are also accepted. + + +@menu +* Q8.0.1:: Gnus 5.10 won't display smileys in XEmacs 21.1. +@end menu + +@node Q8.0.1, , , Legacy Versions +@unnumberedsubsec Q8.0.1: Gnus 5.10 won't display smileys in XEmacs 21.1. + +@email{eeide@@cs.utah.edu, Eric Eide} wrote: + +@quotation +Previously I wrote: + + Eric> Summary: with Gnus 5.10.1 in XEmacs 21.1.14, I don't see + Eric> any smileys :-(. + +After a bit of sleuthing, I discovered the essence of the problem. +For me, the form: + +@lisp + (with-temp-buffer + (insert-file-contents "foo.xpm") + (buffer-string)) +@end lisp + +returns the empty string. This is because something somewhere +replaces the XPM data with a glyph --- I haven't figured out where +this occurs. +@end quotation + +@email{kyle_jones@@wonderworks.com, Kyle Jones} replies: + +@quotation +Do this: + +@lisp + (setq format-alist nil) +@end lisp + +The image-mode stuff is gone from format-alist in the 21.4 +branch, praise be. +@end quotation + @bye cvs server: Diffing man/internals Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- man/internals/internals.texi 2 Mar 2003 09:38:47 -0000 1.41 +++ man/internals/internals.texi 22 May 2003 09:57:57 -0000 1.42 @@ -270,6 +270,7 @@ * Markers and Extents:: Tagging locations within a buffer. * Ibytes and Ichars:: Representation of individual characters. * The Buffer Object:: The Lisp object corresponding to a buffer. +* Searching and Matching:: Higher-level algorithms. MULE Character Sets and Encodings @@ -8183,6 +8184,7 @@ * Markers and Extents:: Tagging locations within a buffer. * Ibytes and Ichars:: Representation of individual characters. * The Buffer Object:: The Lisp object corresponding to a buffer. +* Searching and Matching:: Higher-level algorithms. @end menu @node Introduction to Buffers @@ -8565,6 +8567,225 @@ This field holds the buffer's base buffer (if it is an indirect buffer), or @code{nil}. @end table + +@node Searching and Matching +@section Searching and Matching +@cindex searching +@cindex matching + +Very incomplete, limited to a brief introduction. + +People find the searching and matching code difficult to understand. +And indeed, the details are hard. However, the basic structures are not +so complex. First, there's a hard question with a simple answer. What +about Mule? The answer here is that it turns out that Mule characters +can be matched byte by byte, so neither the search code nor the regular +expression code need take much notice of it at all! Of course, we add +some special features (such as regular expressions that match only +certain charsets), but these do not require new concepts. The main +exception is that wild-card matches in Mule have to be careful to +swallow whole characters. This is handled using the same basic macros +that are used for buffer and string movements. + +The complex algorithms for searching are for simple string searches. In +particular, the algorithm used for fast string searching is Boyer-Moore. +This algorithm is based on the idea that if you have a mismatch at a +given position, you can precompute where to restart the search. This +typically means that you can often make many fewer than N character +comparisons, where N is the position at which the match is found, or the +size of the text if it contains no match. That's fast! But it's not +easy. You must ``compile'' the search string into a jump table. See +the source, @file{search.c}, for more information. + +Emacs changes the basic algorithms somewhat in order to handle +case-insensitive searches without a full-blown regular expression. + +Regular expressions, on the other hand, have a trivial search +implementation: try a match at each position. (Under POSIX rules, it's +a bit more complex, because POSIX requires that you find the +@emph{longest} match in the text. This means you keep a record of the +best match so far, and find all the matches.) + +The matching code for regular expressions is quite complex. First, the +regular expression itself is compiled. There are two basic approaches +that could be taken. The first is to compile the expression into tables +to drive a generic finite automaton emulator. This is the approach +given in many textbooks (Sedgewick's @emph{Algorithms} and Aho, Sethi, +and Ullmann's @emph{Compilers: Principles, Techniques, and Tools}, aka +``The Dragon Book'') as well as being used by the @file{lex} family of +lexical analysis engines. + +Emacs uses a somewhat different technique. The expression is compiled +into a form of bytecode, which is interpreted by a special interpreter. +The interpreter itself basically amounts to an inline implementation of +the finite automaton emulator. The advantage of this technique is that +it's easier to add special features, such as control of case-sensitivity +via a global variable. + +The compiler is not treated here. See the source, @file{regex.c}. The +interpreter, although it is divided into several functions, and looks +fearsomely complex, is actually quite simple in concept. However, +basically what you're doing there is a strcmp on steroids, right? + +@example +int +strcmp (char *p, /* pattern pointer */ + char *b) /* buffer pointer */ +@{ + while (*p++ == *b++) + ; + return *(--p) - *(--b); /* oops, we overshot */ +@} +@end example + +Really, it's no harder than that. (A bit of a white lie, OK?) + +How does the regexp code generalize this? + +@enumerate +@item +Depending on the pattern, @code{*b} may have a general relationship to +@code{*p}. @emph{I.e.}, direct comparison against @code{*p} is +generalized to include checks for set membership, and context dependent +properties. This depends on @code{&*b}. Of course that's meaningless +in C, so we use @code{b} directly, instead. + +@item +Although to ensure the algorithm terminates, @code{b} must advance step +by step, @code{p} can branch and jump. + +@item +The information returned is much greater, including information about +subexpressions. +@end enumerate + +We'll ignore (3). (2) is mostly interesting when compiling the regular +expression. Now we have + +@example +@group +enum operator_t @{ + accept = 0, + exact, + any, + range, + group, /* actually, these are probably */ + repeat, /* turned into conditional code */ + /* etc */ +@}; +@end group + +@group +enum status_t @{ + working = 0, + matched, + mismatch, + end_of_buffer, + error + @}; +@end group + +@group +struct pattern @{ + enum operator_t operator; + char char_value; + boolean range_table[256]; + /* etc, etc */ + @}; +@end group + +@group +char *p, /* pattern pointer */ + *b; /* buffer pointer */ + +enum status_t +match (struct pattern *p, char *b) +@{ + enum status_t done = working; + + while (!(done = match_1_operator (p, b))) + @{ + struct pattern *p1 = p; + p = next_p (p, b); + b = next_b (p1, b); + @} + return done; +@} +@end group +@end example + +This format exposes the underlying finite automaton. + +All of them have the following structure, except that the @samp{next_*} +functions decide where to jump (for @samp{p}) and whether or not to +increment (for @samp{b}), rather than checking for satisfaction of a +matching condition. + +@example +enum status_t +match_1_operator (pattern *p, char *b) +@{ + if (! *b) return end_of_buffer; + switch (p->operator) + @{ + case accept: + return matched; + case exact: + if (*b != p->char_value) return mismatch; else break; + case any: + break; + case range: + /* range_table is computed in the regexp_compile function */ + if (! p->range_table[*b]) return mismatch; + /* etc, etc */ + @} + return working; +@} +@end example + +Grouping, repetition, and alternation are handled by compiling the +subexpression and calling @code{match (p->subpattern, b)} recursively. + +In terms of reading the actual code, there are five optimizations +(obfuscations, if you like) that have been done. + +@enumerate +@item +An explicit "failure stack" has been substituted for recursion. + +@item +The @code{match_1_operator}, @code{next_p}, and @code{next_b} functions +are actually inlined into the @code{match} function for efficiency. +Then the pointer movement is interspersed with the matching operations. + +@item +If the operator uses buffer context, the buffer pointer movement is +sometimes implicit in the operations retrieving the context. + +@item +Some cases are combined into short preparation for individual cases, and +a "fall-through" into combined code for several cases. + +@item +The @code{pattern} type is not an explicit @samp{struct}. Instead, the +data (including, @emph{e.g.}, @samp{range_table}) is inlined into the +compiled bytecode. This leads to bizarre code in the interpreter like + +@example +case range: + p += *(p + 1); break; +@end example + +in @code{next_p}, because the compiled pattern is laid out + +@example +..., 'range', count, first_8_flags, second_8_flags, ..., next_op, ... +@end example +@end enumerate + +But if you keep your eye on the "switch in a loop" structure, you +should be able to understand the parts you need. + @node MULE Character Sets and Encodings, The Lisp Reader and Compiler, Buffers and Textual Representation, Top @chapter MULE Character Sets and Encodings cvs server: Diffing man/lispref Index: man/lispref/searching.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/searching.texi,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- man/lispref/searching.texi 9 May 2003 14:52:43 -0000 1.10 +++ man/lispref/searching.texi 22 May 2003 07:41:24 -0000 1.11 @@ -772,31 +772,75 @@ @end example @end defun -@defun split-string string &optional pattern -This function splits @var{string} to substrings delimited by -@var{pattern}, and returns a list of substrings. If @var{pattern} is -omitted, it defaults to @samp{[ \f\t\n\r\v]+}, which means that it -splits @var{string} by white--space. +The function @code{split-string} can be used to parse a string into +components delimited by text matching a regular expression. + +@defvar split-string-default-separators +The default value of @var{separators} for @code{split-string}, initially +@samp{"[ \f\t\n\r\v]+"}. +@end defvar + +@defun split-string string &optional separators omit-nulls +This function splits @var{string} into substrings delimited by matches +for the regular expression @var{separators}. Each match for +@var{separators} defines a splitting point; the substrings between the +splitting points are made into a list, which is the value returned by +@code{split-string}. If @var{omit-nulls} is @code{t}, null strings will +be removed from the result list. Otherwise, null strings are left in +the result. If @var{separators} is @code{nil} (or omitted), the default +is the value of @code{split-string-default-separators}. + +As a special case, when @var{separators} is @code{nil} (or omitted), +null strings are always omitted from the result. Thus: + +@example +(split-string " two words ") + @result{} ("two" "words") +@end example + +The result is not @samp{("" "two" "words" "")}, which would rarely be +useful. If you need such a result, use an explict value for +@var{separators}: @example +(split-string " two words " split-string-default-separators) + @result{} ("" "two" "words" "") +@end example + +A few examples (there are more in the regression tests): + +@example +@group +(split-string "foo" "") + @result{} ("" "f" "o" "o" "") +@end group @group -(split-string "foo bar") +(split-string "foo" "^") + @result{} ("" "foo") +@end group +@group +(split-string "foo" "$") + @result{} ("foo" "")) +@end group +@group +(split-string "foo,bar" ",") @result{} ("foo" "bar") @end group - @group -(split-string "something") - @result{} ("something") +(split-string ",foo,bar," ",") + @result{} ("" "foo" "bar" "") @end group - @group -(split-string "a:b:c" ":") - @result{} ("a" "b" "c") +(split-string ",foo,bar," "^,") + @result{} ("" "foo,bar,") @end group - @group -(split-string ":a::b:c" ":") - @result{} ("" "a" "" "b" "c") +(split-string "foo,bar" "," t) + @result{} ("foo" "bar") +@end group +@group +(split-string ",foo,bar," "," t) + @result{} ("foo" "bar") @end group @end example @end defun Index: man/lispref/strings.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/strings.texi,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- man/lispref/strings.texi 12 Apr 2001 18:22:20 -0000 1.6 +++ man/lispref/strings.texi 22 May 2003 07:41:24 -0000 1.7 @@ -288,6 +288,10 @@ in @ref{Building Lists}. @end defun +The function @code{split-string}, in @ref{Regexp Search}, generates a +list of strings by splitting a string on occurances of a regular +expression. + @node Predicates for Characters @section The Predicates for Characters cvs server: Diffing man/new-users-guide cvs server: Diffing man/xemacs cvs server: Diffing modules Index: modules/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v retrieving revision 1.18 retrieving revision 1.21 diff -u -r1.18 -r1.21 --- modules/ChangeLog 10 May 2003 08:53:34 -0000 1.18 +++ modules/ChangeLog 1 Jun 2003 05:10:24 -0000 1.21 @@ -1,3 +1,20 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + +2003-05-09 Andrew Begel + + * common/Makefile.common: Move use of srcdir below its definition. + * sample/internal/Makefile.in.in: Ditto. + * sample/external/Makefile.in.in: Ditto. + +2003-05-20 Jerry James + + * sample/internal/Makefile.in.in: Expand $^ for makes that don't + understand it. + * sample/external/Makefile.in.in: Ditto. + * common/Makefile.common: Ditto. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. cvs server: Diffing modules/base64 cvs server: Diffing modules/common Index: modules/common/Makefile.common =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/common/Makefile.common,v retrieving revision 1.3 retrieving revision 1.5 diff -u -r1.3 -r1.5 --- modules/common/Makefile.common 3 Feb 2003 17:46:58 -0000 1.3 +++ modules/common/Makefile.common 20 May 2003 15:00:24 -0000 1.5 @@ -27,9 +27,6 @@ ## Note: This will be appended to the individual module Makefiles by configure. -SRC_SRCS:=$(SRCS:%=$(srcdir)/%) -OBJS=$(SRCS:.c=.o) - SHELL=/bin/sh RM=rm -f PROGNAME=@PROGNAME@ @@ -47,6 +44,9 @@ srcdir=@srcdir@ VPATH=@srcdir@ +SRC_SRCS:=$(SRCS:%=$(srcdir)/%) +OBJS=$(SRCS:.c=.o) + MODCC=@MOD_CC@ MODARCHDIR=@MODARCHDIR@ MAKE_DOCFILE=@MAKE_DOCFILE@ @@ -62,7 +62,8 @@ $(MODCC) $(MODCFLAGS) -c $< $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o - $(MODCC) --mode=link --mode=verbose --mod-output=$@ $^ $(LDFLAGS) + $(MODCC) --mode=link --mode=verbose --mod-output=$@ \ + $(OBJS) $(MODNAME)_i.o $(LDFLAGS) $(MODNAME)_i.c: $(SRCS) ELLMAKEDOC=$(MAKE_DOCFILE) $(MODCC) --mode=init --mod-output=$@ \ cvs server: Diffing modules/ldap cvs server: Diffing modules/postgresql cvs server: Diffing modules/sample cvs server: Diffing modules/sample/external Index: modules/sample/external/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/sample/external/Makefile.in.in,v retrieving revision 1.1 retrieving revision 1.3 diff -u -r1.1 -r1.3 --- modules/sample/external/Makefile.in.in 10 Sep 2002 15:27:24 -0000 1.1 +++ modules/sample/external/Makefile.in.in 20 May 2003 15:00:27 -0000 1.3 @@ -10,9 +10,6 @@ SRCS=sample.c ### You should not need to modify anything below this line -SRC_SRCS=$(SRCS:%=$(srcdir)/%) -OBJS=$(SRCS:.c=.o) - SHELL=/bin/sh RM=rm -f CFLAGS=@CFLAGS@ @@ -21,6 +18,9 @@ srcdir=@srcdir@ VPATH=@srcdir@ +SRC_SRCS=$(SRCS:%=$(srcdir)/%) +OBJS=$(SRCS:.c=.o) + ELLCC=@ELLCC@ MODARCHDIR=$(shell @ELLCC@ --mod-archdir) INSTALLPATH=$(shell @ELLCC@ --mod-site-location) @@ -35,7 +35,7 @@ -I$(MODARCHDIR)/include -c $< $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o - $(ELLCC) --mode=link --mod-output=$@ $^ $(LDFLAGS) + $(ELLCC) --mode=link --mod-output=$@ $(OBJS) $(MODNAME)_i.o $(LDFLAGS) $(MODNAME)_i.c: $(SRCS) ELLMAKEDOC=$(MODARCHDIR)/make-docfile $(ELLCC) --mode=init \ cvs server: Diffing modules/sample/internal Index: modules/sample/internal/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/sample/internal/Makefile.in.in,v retrieving revision 1.1 retrieving revision 1.3 diff -u -r1.1 -r1.3 --- modules/sample/internal/Makefile.in.in 10 Sep 2002 15:27:27 -0000 1.1 +++ modules/sample/internal/Makefile.in.in 20 May 2003 15:00:28 -0000 1.3 @@ -33,9 +33,6 @@ SRCS=sample.c ### You should not need to modify anything below this line -SRC_SRCS=$(SRCS:%=$(srcdir)/%) -OBJS=$(SRCS:.c=.o) - SHELL=/bin/sh RM=rm -f PROGNAME=@PROGNAME@ @@ -53,6 +50,9 @@ srcdir=@srcdir@ VPATH=@srcdir@ +SRC_SRCS=$(SRCS:%=$(srcdir)/%) +OBJS=$(SRCS:.c=.o) + CC=@MOD_CC@ MODARCHDIR=@MODARCHDIR@ MAKE_DOCFILE=@MAKE_DOCFILE@ @@ -68,7 +68,7 @@ $(CC) $(MODCFLAGS) -c $< $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o - $(CC) --mode=link --mod-output=$@ $^ $(LDFLAGS) + $(CC) --mode=link --mod-output=$@ $(OBJS) $(MODNAME)_i.o $(LDFLAGS) $(MODNAME)_i.c: $(SRCS) ELLMAKEDOC=$(MAKE_DOCFILE) $(CC) --mode=init --mod-output=$@ \ cvs server: Diffing modules/zlib cvs server: Diffing netinstall Index: netinstall/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- netinstall/ChangeLog 10 May 2003 08:53:35 -0000 1.26 +++ netinstall/ChangeLog 1 Jun 2003 05:10:25 -0000 1.27 @@ -1,3 +1,7 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. @@ -479,6 +483,6 @@ * all: port from cygwin setup. -%%% $Id: ChangeLog,v 1.26 2003/05/10 08:53:35 youngs Exp $ -$Revision: 1.26 $ +%%% $Id: ChangeLog,v 1.27 2003/06/01 05:10:25 youngs Exp $ +$Revision: 1.27 $ cvs server: Diffing nt Index: nt/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- nt/ChangeLog 10 May 2003 08:53:36 -0000 1.161 +++ nt/ChangeLog 1 Jun 2003 05:10:26 -0000 1.162 @@ -1,3 +1,7 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. cvs server: Diffing nt/installer cvs server: Diffing nt/installer/Wise Index: nt/installer/Wise/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/installer/Wise/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- nt/installer/Wise/ChangeLog 10 May 2003 08:53:37 -0000 1.15 +++ nt/installer/Wise/ChangeLog 1 Jun 2003 05:10:27 -0000 1.16 @@ -1,3 +1,7 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. cvs server: Diffing src Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.594 retrieving revision 1.597 diff -u -r1.594 -r1.597 --- src/ChangeLog 10 May 2003 08:53:38 -0000 1.594 +++ src/ChangeLog 1 Jun 2003 05:10:28 -0000 1.597 @@ -1,3 +1,26 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + +2003-05-20 Jerry James + + * regex.c (re_match_2_internal): pos -> charpos to fix shadow warning. + +2003-05-22 Stephen J. Turnbull + + * file-coding.c: DEFSYMBOL Qslightly_unlikely. + (detection_result_number_to_symbol): + (detection_result_symbol_to_number): + Decode/encode corresponding result numbers. + (detection_result_number_to_symbol): + Use switch to get warnings about unhandled enumerators. + (detect_coding_type): Add debug check for 0 detector categories. + (undecided_init_coding_stream): Add debug output. + +2003-05-15 Stephen J. Turnbull + + * event-Xt.c (x_to_emacs_keysym): Fix typo in comment. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. Index: src/broken-sun.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/broken-sun.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- src/broken-sun.h 13 Mar 2002 08:52:32 -0000 1.5 +++ src/broken-sun.h 22 May 2003 07:41:25 -0000 1.6 @@ -107,6 +107,9 @@ /*********************** file-system functions *********************/ +/* Ilya Golubev reports that stat can be a #define on some systems. + Presumably none of the systems this file is used for, and I don't + know what file to include on a system known to be broken, anyway. */ struct stat; #include Index: src/event-Xt.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-Xt.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- src/event-Xt.c 21 Feb 2003 06:56:56 -0000 1.76 +++ src/event-Xt.c 22 May 2003 06:09:04 -0000 1.77 @@ -1010,7 +1010,7 @@ #else /* XIM_XLIB */ if (xic) len = XmbLookupString (xic, event, bufptr, bufsiz, &keysym, &status); -#endif /* HAVE_XIM */ +#endif /* XIM_MOTIF */ #ifdef DEBUG_XEMACS if (debug_x_events > 0) Index: src/file-coding.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- src/file-coding.c 9 Mar 2003 13:24:48 -0000 1.35 +++ src/file-coding.c 22 May 2003 06:09:04 -0000 1.36 @@ -474,6 +474,7 @@ Lisp_Object Qconvert_eol_autodetect; Lisp_Object Qnear_certainty, Qquite_probable, Qsomewhat_likely; +Lisp_Object Qslightly_likely; Lisp_Object Qas_likely_as_unlikely, Qsomewhat_unlikely, Qquite_improbable; Lisp_Object Qnearly_impossible; @@ -3488,15 +3489,19 @@ static Lisp_Object detection_result_number_to_symbol (enum detection_result result) { -#define FROB(sym, num) if (result == num) return (sym) + /* let compiler warn if not all enumerators are handled */ + switch (result) { +#define FROB(sym, num) case num: return (sym) FROB (Qnear_certainty, DET_NEAR_CERTAINTY); FROB (Qquite_probable, DET_QUITE_PROBABLE); FROB (Qsomewhat_likely, DET_SOMEWHAT_LIKELY); + FROB (Qslightly_likely, DET_SLIGHTLY_LIKELY); FROB (Qas_likely_as_unlikely, DET_AS_LIKELY_AS_UNLIKELY); FROB (Qsomewhat_unlikely, DET_SOMEWHAT_UNLIKELY); FROB (Qquite_improbable, DET_QUITE_IMPROBABLE); FROB (Qnearly_impossible, DET_NEARLY_IMPOSSIBLE); #undef FROB + } abort (); return Qnil; /* (usually) not reached */ @@ -3506,10 +3511,12 @@ static enum detection_result detection_result_symbol_to_number (Lisp_Object symbol) { + /* using switch here would be bad style, and doesn't help */ #define FROB(sym, num) if (EQ (symbol, sym)) return (num) FROB (Qnear_certainty, DET_NEAR_CERTAINTY); FROB (Qquite_probable, DET_QUITE_PROBABLE); FROB (Qsomewhat_likely, DET_SOMEWHAT_LIKELY); + FROB (Qslightly_likely, DET_SLIGHTLY_LIKELY); FROB (Qas_likely_as_unlikely, DET_AS_LIKELY_AS_UNLIKELY); FROB (Qsomewhat_unlikely, DET_SOMEWHAT_UNLIKELY); FROB (Qquite_improbable, DET_QUITE_IMPROBABLE); @@ -3642,6 +3649,9 @@ if (!NILP (Vdebug_coding_detection)) { stderr_out ("seen_non_ascii: %d\n", st->seen_non_ascii); + if (coding_detector_category_count <= 0) + stderr_out ("found %d detector categories\n", + coding_detector_category_count); for (i = 0; i < coding_detector_category_count; i++) stderr_out_lisp ("%s: %s\n", @@ -3923,6 +3933,11 @@ /* We can determine the coding system now. */ data->actual = determine_real_coding_system (lst); } + +#ifdef DEBUG_XEMACS + if (!NILP (Vdebug_coding_detection)) + stderr_out_lisp ("detected coding system: %s\n", 1, data->actual); +#endif /* DEBUG_XEMACS */ } static void @@ -4621,6 +4636,7 @@ DEFSYMBOL (Qnear_certainty); DEFSYMBOL (Qquite_probable); DEFSYMBOL (Qsomewhat_likely); + DEFSYMBOL (Qslightly_likely); DEFSYMBOL (Qas_likely_as_unlikely); DEFSYMBOL (Qsomewhat_unlikely); DEFSYMBOL (Qquite_improbable); Index: src/regex.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- src/regex.c 9 May 2003 14:52:38 -0000 1.46 +++ src/regex.c 22 May 2003 10:18:58 -0000 1.47 @@ -6075,7 +6075,7 @@ /* XEmacs change */ /* Straightforward and (I hope) correct implementation. Probably should be optimized by arranging to compute - pos only once. */ + charpos only once. */ /* emch1 is the character before d, syn1 is the syntax of emch1, emch2 is the character at d, and syn2 is the syntax of emch2. */ @@ -6087,7 +6087,7 @@ at_beg = AT_STRINGS_BEG (d), at_end = AT_STRINGS_END (d); #ifdef emacs - Charxpos pos; + Charxpos charpos; #endif if (at_beg && at_end) @@ -6102,9 +6102,10 @@ DEC_IBYTEPTR_FMT (d_before, fmt); emch1 = itext_ichar_fmt (d_before, fmt, lispobj); #ifdef emacs - pos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)) - 1; + charpos = offset_to_charxpos (lispobj, + PTR_TO_OFFSET (d)) - 1; BEGIN_REGEX_MALLOC_OK (); - UPDATE_SYNTAX_CACHE (scache, pos); + UPDATE_SYNTAX_CACHE (scache, charpos); #endif syn1 = SYNTAX_FROM_CACHE (scache, emch1); END_REGEX_MALLOC_OK (); @@ -6114,9 +6115,9 @@ d_after = POS_AFTER_GAP_UNSAFE (d); emch2 = itext_ichar_fmt (d_after, fmt, lispobj); #ifdef emacs - pos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)); + charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)); BEGIN_REGEX_MALLOC_OK (); - UPDATE_SYNTAX_CACHE_FORWARD (scache, pos); + UPDATE_SYNTAX_CACHE_FORWARD (scache, charpos); #endif syn2 = SYNTAX_FROM_CACHE (scache, emch2); END_REGEX_MALLOC_OK (); cvs server: Diffing src/m cvs server: Diffing src/s cvs server: Diffing tests Index: tests/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tests/ChangeLog 10 May 2003 08:53:40 -0000 1.35 +++ tests/ChangeLog 1 Jun 2003 05:10:30 -0000 1.36 @@ -1,3 +1,7 @@ +2003-06-01 Steve Youngs + + * XEmacs 21.5.14 "cassava" is released. + 2003-05-10 Steve Youngs * XEmacs 21.5.13 "cauliflower" is released. cvs server: Diffing tests/DLL cvs server: Diffing tests/Dnd cvs server: Diffing tests/automated cvs server: Diffing tests/gtk cvs server: Diffing tests/mule cvs server: Diffing tests/tooltalk