Mercurial > hg > xemacs-beta
changeset 239:41f2f0e326e9 r20-5b18
Import from CVS: tag r20-5b18
line wrap: on
line diff
--- a/CHANGES-beta Mon Aug 13 10:15:04 2007 +0200 +++ b/CHANGES-beta Mon Aug 13 10:15:48 2007 +0200 @@ -1,4 +1,12 @@ -*- indented-text -*- +to 20.5 beta18 "Daera Din Panah" +-- Miscellaneous and sundry fixes for 20.4 merged +-- MS Windows updates from Kirill Katsnelson and Andy Piper +-- New command line arg `-no-autoloads' to suppress auto-autoloads loading + at startup (also implies -vanilla) +-- auto-autoloads are not dumped +-- Miscellaneous bug fixes + to 20.5 beta17 "Chapar" -- Tutorial menubar support courtesy of Didier Verna -- Package-get refined courtesy of Pete Ware
--- a/ChangeLog Mon Aug 13 10:15:04 2007 +0200 +++ b/ChangeLog Mon Aug 13 10:15:48 2007 +0200 @@ -1,3 +1,37 @@ +1998-01-10 SL Baur <steve@altair.xemacs.org> + + * XEmacs 20.5-beta18 is released. + + * etc/FTP: Update address of what was formerly ftp.ibp.fr. + +1998-01-08 Didier Verna <verna@inf.enst.fr> + + * configure.in: Get rid of INFOPATH for configure time. + * configure.usage (Usage): Ditto. + +1998-01-09 SL Baur <steve@altair.xemacs.org> + + * Makefine.in: Correct reported amount of disk savings from + compression. + From Markus Linnala <maage@cs.tut.fi> + +Thu Jan 08 09:42:36 1998 <andyp@parallax.co.uk> + + * configure.in: detect and set scrollbars and menubars with + MS-Windows more appropriately. Check for sys/un.h to use in + gnuserv. + +1998-01-07 SL Baur <steve@altair.xemacs.org> + + * Makefile.in (progname): Cleanly parameterize XEmacs-specific + naming. + +1998-01-05 Glynn Clements <glynn@sensei.co.uk> + + * lwlib/xlwmenu.c (push_button_draw): use inactive_gc instead of + inactive_button_gc for menu entries. + (remap_menubar): ignore the enabled status + 1998-01-04 SL Baur <steve@altair.xemacs.org> * XEmacs 20.5-beta17 is released.
--- a/Makefile.in Mon Aug 13 10:15:04 2007 +0200 +++ b/Makefile.in Mon Aug 13 10:15:48 2007 +0200 @@ -140,6 +140,8 @@ ## These variables hold the values XEmacs will actually use. They are ## based on the values of the standard Make variables above. +progname=xemacs + ## Where to install the lisp files distributed with ## XEmacs. This includes the XEmacs version, so that the ## lisp files for different versions of XEmacs will install @@ -418,21 +420,21 @@ for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \ do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ else true; fi - ${INSTALL_PROGRAM} src/xemacs ${bindir}/xemacs-${version} - -chmod 0755 ${bindir}/xemacs-${version} - cd ${bindir} && $(RM) ./xemacs && ${LN_S} xemacs-${version} ./xemacs + ${INSTALL_PROGRAM} src/xemacs ${bindir}/${progname}${version} + -chmod 0755 ${bindir}/${progname}${version} + cd ${bindir} && $(RM) ./xemacs && ${LN_S} ${progname}${version} ./xemacs if test "${prefix}" != "${exec_prefix}"; then \ test ! -d ${exec_prefix}/lib/xemacs && \ $(LN_S) ${prefix}/lib/xemacs ${exec_prefix}/lib/xemacs; \ - test ! -d ${exec_prefix}/lib/xemacs-${version}/etc && \ - $(LN_S) ${prefix}/lib/xemacs-${version}/etc \ - ${exec_prefix}/lib/xemacs-${version}/etc; \ - test ! -d ${exec_prefix}/lib/xemacs-${version}/info && \ - $(LN_S) ${prefix}/lib/xemacs-${version}/info \ - ${exec_prefix}/lib/xemacs-${version}/info; \ - test ! -d ${exec_prefix}/lib/xemacs-${version}/lisp && \ - $(LN_S) ${prefix}/lib/xemacs-${version}/lisp \ - ${exec_prefix}/lib/xemacs-${version}/lisp; \ + test ! -d ${exec_prefix}/lib/${progname}${version}/etc && \ + $(LN_S) ${prefix}/lib/${progname}${version}/etc \ + ${exec_prefix}/lib/${progname}${version}/etc; \ + test ! -d ${exec_prefix}/lib/${progname}${version}/info && \ + $(LN_S) ${prefix}/lib/${progname}${version}/info \ + ${exec_prefix}/lib/${progname}${version}/info; \ + test ! -d ${exec_prefix}/lib/${progname}${version}/lisp && \ + $(LN_S) ${prefix}/lib/${progname}${version}/lisp \ + ${exec_prefix}/lib/${progname}${version}/lisp; \ fi install-arch-indep: mkdir info @@ -473,7 +475,7 @@ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ chmod 0644 ${mandir}/$${page}${manext} ; \ done - @echo "If you would like to save approximately 15M of disk space, do" + @echo "If you would like to save approximately 2M of disk space, do" @echo "make gzip-el" @echo "or you may run " @echo ${srcdir}/lib-src/gzip-el.sh lispdir " from the command line." @@ -486,7 +488,7 @@ MAKEPATH=./lib-src/make-path ## Build all the directories to install XEmacs in. ## Since we may be creating several layers of directories, -## (e.g. /usr/local/lib/xemacs-20.5/sparc-sun-solaris2.6), we use +## (e.g. /usr/local/lib/${progname}20.5/sparc-sun-solaris2.6), we use ## make-path instead of mkdir. Not all mkdirs have the `-p' flag. mkdir: FRC.mkdir ${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \ @@ -518,7 +520,7 @@ # done # cd ${infodir} && $(RM) cl* xemacs* forms* info* vip* # cd ${mandir} && $(RM) xemacs.1 etags.1 ctags.1 gnuserv.1 -# cd ${bindir} && $(RM) xemacs-${version} xemacs +# cd ${bindir} && $(RM) ${progname}${version} xemacs ## Some makes seem to remember that they've built something called FRC,
--- a/configure Mon Aug 13 10:15:04 2007 +0200 +++ b/configure Mon Aug 13 10:15:48 2007 +0200 @@ -220,7 +220,7 @@ mandir='${prefix}/man/man1' infodir='${datadir}/xemacs-${version}/info' infodir_user_defined='no' -infopath='/usr/local/info:/usr/info:/usr/local/lib/texmf/doc/info:/usr/lib/texmf/doc/info' +infopath='/usr/local/lib/texmf/doc/info:/usr/local/lib/texmf/info:/usr/lib/texmf/doc/info:/usr/lib/texmf/info:/usr/local/info:/usr/info' infopath_user_defined='no' lispdir='${datadir}/xemacs-${version}/lisp' lispdir_user_defined='no' @@ -569,9 +569,6 @@ done -if test "$infopath_user_defined" = "no" -a -n "$INFOPATH" ; then - infopath="$INFOPATH" -fi eval set x "$quoted_arguments"; shift @@ -638,7 +635,7 @@ esac echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:642: checking whether ln -s works" >&5 +echo "configure:639: checking whether ln -s works" >&5 rm -f conftestdata if ln -s X conftestdata 2>/dev/null @@ -815,7 +812,7 @@ echo "checking "the configuration name"" 1>&6 -echo "configure:819: checking "the configuration name"" >&5 +echo "configure:816: checking "the configuration name"" >&5 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'` if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else exit $? @@ -1272,7 +1269,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1276: checking for $ac_word" >&5 +echo "configure:1273: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1298,7 +1295,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1302: checking for $ac_word" >&5 +echo "configure:1299: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1343,7 +1340,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1347: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1344: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1355,11 +1352,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1359 "configure" +#line 1356 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1379,19 +1376,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1383: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1380: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1388: checking whether we are using GNU C" >&5 +echo "configure:1385: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1405,7 +1402,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1409: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1406: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1434,7 +1431,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1438: checking for $ac_word" >&5 +echo "configure:1435: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1460,7 +1457,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1464: checking for $ac_word" >&5 +echo "configure:1461: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1505,7 +1502,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1509: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1506: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1517,11 +1514,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1521 "configure" +#line 1518 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1541,19 +1538,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1545: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1542: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1550: checking whether we are using GNU C" >&5 +echo "configure:1547: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1567,7 +1564,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1571: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1568: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1596,7 +1593,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1600: checking for $ac_word" >&5 +echo "configure:1597: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1622,7 +1619,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1626: checking for $ac_word" >&5 +echo "configure:1623: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1667,7 +1664,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1671: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1668: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1679,11 +1676,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1683 "configure" +#line 1680 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1703,19 +1700,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1707: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1704: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1712: checking whether we are using GNU C" >&5 +echo "configure:1709: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1729,7 +1726,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1733: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1730: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1762,7 +1759,7 @@ test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1766: checking how to run the C preprocessor" >&5 +echo "configure:1763: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1775,13 +1772,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1779 "configure" +#line 1776 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1792,13 +1789,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1796 "configure" +#line 1793 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1821,9 +1818,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1825: checking for AIX" >&5 -cat > conftest.$ac_ext <<EOF -#line 1827 "configure" +echo "configure:1822: checking for AIX" >&5 +cat > conftest.$ac_ext <<EOF +#line 1824 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1850,9 +1847,9 @@ echo $ac_n "checking whether we are using SunPro C""... $ac_c" 1>&6 -echo "configure:1854: checking whether we are using SunPro C" >&5 -cat > conftest.$ac_ext <<EOF -#line 1856 "configure" +echo "configure:1851: checking whether we are using SunPro C" >&5 +cat > conftest.$ac_ext <<EOF +#line 1853 "configure" #include "confdefs.h" int main() { @@ -1863,7 +1860,7 @@ ; return 0; } EOF -if { (eval echo configure:1867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* __sunpro_c=yes else @@ -2139,7 +2136,7 @@ fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:2143: checking for dynodump" >&5 +echo "configure:2140: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -2237,19 +2234,19 @@ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:2241: checking "for runtime libraries flag"" >&5 +echo "configure:2238: checking "for runtime libraries flag"" >&5 dash_r="" for try_dash_r in "-R" "-R " "-rpath "; do xe_check_libs="${try_dash_r}/no/such/file-or-directory" cat > conftest.$ac_ext <<EOF -#line 2246 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +#line 2243 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* dash_r="$try_dash_r" else @@ -2347,7 +2344,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2351: checking for $ac_word" >&5 +echo "configure:2348: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -2400,7 +2397,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2404: checking for a BSD compatible install" >&5 +echo "configure:2401: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" @@ -2451,7 +2448,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2455: checking for $ac_word" >&5 +echo "configure:2452: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -2482,15 +2479,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2486: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2489 "configure" +echo "configure:2483: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2486 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2523,15 +2520,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2527: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2530 "configure" +echo "configure:2524: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2527 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2564,15 +2561,56 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2568: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2571 "configure" +echo "configure:2565: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2568 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + { test "$extra_verbose" = "yes" && cat << EOF + Defining $ac_tr_hdr +EOF +cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF +} + +else + echo "$ac_t""no" 1>&6 +fi +done + +for ac_hdr in sys/un.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2606: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2609 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2602,10 +2640,10 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2606: checking for sys/wait.h that is POSIX.1 compatible" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2609 "configure" +echo "configure:2644: checking for sys/wait.h that is POSIX.1 compatible" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2647 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -2621,7 +2659,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2645,10 +2683,10 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2649: checking for ANSI C header files" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2652 "configure" +echo "configure:2687: checking for ANSI C header files" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2690 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2656,7 +2694,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2673,7 +2711,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2677 "configure" +#line 2715 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2691,7 +2729,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2695 "configure" +#line 2733 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2709,7 +2747,7 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. cat > conftest.$ac_ext <<EOF -#line 2713 "configure" +#line 2751 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2720,7 +2758,7 @@ exit (0); } EOF -if { (eval echo configure:2724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:2762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then : else @@ -2745,10 +2783,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2749: checking whether time.h and sys/time.h may both be included" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2752 "configure" +echo "configure:2787: checking whether time.h and sys/time.h may both be included" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2790 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2757,7 +2795,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2781,10 +2819,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2785: checking for sys_siglist declaration in signal.h or unistd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2788 "configure" +echo "configure:2823: checking for sys_siglist declaration in signal.h or unistd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2826 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2796,7 +2834,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2821,9 +2859,9 @@ echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 -echo "configure:2825: checking for struct utimbuf" >&5 -cat > conftest.$ac_ext <<EOF -#line 2827 "configure" +echo "configure:2863: checking for struct utimbuf" >&5 +cat > conftest.$ac_ext <<EOF +#line 2865 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -2842,7 +2880,7 @@ static struct utimbuf x; x.actime = x.modtime; ; return 0; } EOF -if { (eval echo configure:2846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2884: \"$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 @@ -2862,10 +2900,10 @@ rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2866: checking return type of signal handlers" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2869 "configure" +echo "configure:2904: checking return type of signal handlers" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2907 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2882,7 +2920,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2904,10 +2942,10 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2908: checking for size_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2911 "configure" +echo "configure:2946: checking for size_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2949 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2938,10 +2976,10 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2942: checking for pid_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2945 "configure" +echo "configure:2980: checking for pid_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2983 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2972,10 +3010,10 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2976: checking for uid_t in sys/types.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2979 "configure" +echo "configure:3014: checking for uid_t in sys/types.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3017 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3011,10 +3049,10 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3015: checking for mode_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3018 "configure" +echo "configure:3053: checking for mode_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3056 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3045,10 +3083,10 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3049: checking for off_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3052 "configure" +echo "configure:3087: checking for off_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3090 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3080,9 +3118,9 @@ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:3084: checking for struct timeval" >&5 -cat > conftest.$ac_ext <<EOF -#line 3086 "configure" +echo "configure:3122: checking for struct timeval" >&5 +cat > conftest.$ac_ext <<EOF +#line 3124 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -3098,7 +3136,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:3102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -3120,10 +3158,10 @@ rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3124: checking whether struct tm is in sys/time.h or time.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3127 "configure" +echo "configure:3162: checking whether struct tm is in sys/time.h or time.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3165 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -3131,7 +3169,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3155,10 +3193,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3159: checking for tm_zone in struct tm" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3162 "configure" +echo "configure:3197: checking for tm_zone in struct tm" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3200 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -3166,7 +3204,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3189,10 +3227,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3193: checking for tzname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3196 "configure" +echo "configure:3231: checking for tzname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3234 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -3202,7 +3240,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3228,10 +3266,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3232: checking for working const" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3235 "configure" +echo "configure:3270: checking for working const" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3273 "configure" #include "confdefs.h" int main() { @@ -3280,7 +3318,7 @@ ; return 0; } EOF -if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3305,7 +3343,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:3309: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:3347: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -3330,12 +3368,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3334: checking whether byte ordering is bigendian" >&5 +echo "configure:3372: checking whether byte ordering is bigendian" >&5 ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 3339 "configure" +#line 3377 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3346,11 +3384,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 3354 "configure" +#line 3392 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3361,7 +3399,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3378,7 +3416,7 @@ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 3382 "configure" +#line 3420 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -3391,7 +3429,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:3395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_bigendian=no else @@ -3417,10 +3455,10 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:3421: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3424 "configure" +echo "configure:3459: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3462 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3431,7 +3469,7 @@ exit(0); } EOF -if { (eval echo configure:3435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -3458,10 +3496,10 @@ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3462: checking size of int" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3465 "configure" +echo "configure:3500: checking size of int" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3503 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3472,7 +3510,7 @@ exit(0); } EOF -if { (eval echo configure:3476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -3493,10 +3531,10 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3497: checking size of long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3500 "configure" +echo "configure:3535: checking size of long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3538 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3507,7 +3545,7 @@ exit(0); } EOF -if { (eval echo configure:3511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -3528,10 +3566,10 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:3532: checking size of long long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3535 "configure" +echo "configure:3570: checking size of long long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3573 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3542,7 +3580,7 @@ exit(0); } EOF -if { (eval echo configure:3546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_long_long=`cat conftestval` else @@ -3563,10 +3601,10 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:3567: checking size of void *" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3570 "configure" +echo "configure:3605: checking size of void *" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3608 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3577,7 +3615,7 @@ exit(0); } EOF -if { (eval echo configure:3581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_void_p=`cat conftestval` else @@ -3599,7 +3637,7 @@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:3603: checking for long file names" >&5 +echo "configure:3641: checking for long file names" >&5 ac_cv_sys_long_file_names=yes # Test for long file names in all the places we know might matter: @@ -3646,12 +3684,12 @@ echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:3650: checking for sin in -lm" >&5 +echo "configure:3688: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` xe_check_libs=" -lm " cat > conftest.$ac_ext <<EOF -#line 3655 "configure" +#line 3693 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3662,7 +3700,7 @@ sin() ; return 0; } EOF -if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3704,7 +3742,7 @@ echo "checking type of mail spool file locking" 1>&6 -echo "configure:3708: checking type of mail spool file locking" >&5 +echo "configure:3746: checking type of mail spool file locking" >&5 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf if test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF @@ -3728,12 +3766,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:3732: checking for kstat_open in -lkstat" >&5 +echo "configure:3770: 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 <<EOF -#line 3737 "configure" +#line 3775 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3744,7 +3782,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3778,12 +3816,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:3782: checking for kvm_read in -lkvm" >&5 +echo "configure:3820: 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 <<EOF -#line 3787 "configure" +#line 3825 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3794,7 +3832,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3828,12 +3866,12 @@ echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:3832: checking for cma_open in -lpthreads" >&5 +echo "configure:3870: checking for cma_open in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lpthreads " cat > conftest.$ac_ext <<EOF -#line 3837 "configure" +#line 3875 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3844,7 +3882,7 @@ cma_open() ; return 0; } EOF -if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3880,7 +3918,7 @@ fi echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:3884: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:3922: checking whether the -xildoff compiler flag is required" >&5 if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then echo "$ac_t""no" 1>&6; @@ -3891,7 +3929,7 @@ if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:3895: checking for \"-z ignore\" linker flag" >&5 +echo "configure:3933: checking for \"-z ignore\" linker flag" >&5 case "`ld -h 2>&1`" in *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6 ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;; @@ -3901,7 +3939,7 @@ echo "checking "for specified window system"" 1>&6 -echo "configure:3905: checking "for specified window system"" >&5 +echo "configure:3943: checking "for specified window system"" >&5 if test "$with_x11" != "no"; then test "$x_includes $x_libraries" != "NONE NONE" && \ @@ -3931,7 +3969,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3935: checking for X" >&5 +echo "configure:3973: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3991,12 +4029,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 3995 "configure" +#line 4033 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4065,14 +4103,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 4069 "configure" +#line 4107 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:4076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -4181,17 +4219,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:4185: checking whether -R must be followed by a space" >&5 +echo "configure:4223: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 4188 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +#line 4226 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -4207,14 +4245,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 4211 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +#line 4249 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:4256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -4250,12 +4288,12 @@ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4254: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4292: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet " cat > conftest.$ac_ext <<EOF -#line 4259 "configure" +#line 4297 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4266,7 +4304,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4290,12 +4328,12 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:4294: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4332: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet_stub " cat > conftest.$ac_ext <<EOF -#line 4299 "configure" +#line 4337 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4306,7 +4344,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4335,10 +4373,10 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:4339: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4342 "configure" +echo "configure:4377: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4380 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -4361,7 +4399,7 @@ ; return 0; } EOF -if { (eval echo configure:4365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4382,12 +4420,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4386: checking for gethostbyname in -lnsl" >&5 +echo "configure:4424: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <<EOF -#line 4391 "configure" +#line 4429 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4398,7 +4436,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:4402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4428,10 +4466,10 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:4432: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4435 "configure" +echo "configure:4470: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4473 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -4454,7 +4492,7 @@ ; return 0; } EOF -if { (eval echo configure:4458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -4477,12 +4515,12 @@ xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:4481: checking "$xe_msg_checking"" >&5 +echo "configure:4519: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocket $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 4486 "configure" +#line 4524 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4493,7 +4531,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4517,10 +4555,10 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:4521: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4524 "configure" +echo "configure:4559: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4562 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -4543,7 +4581,7 @@ ; return 0; } EOF -if { (eval echo configure:4547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -4564,12 +4602,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4568: checking for remove in -lposix" >&5 +echo "configure:4606: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <<EOF -#line 4573 "configure" +#line 4611 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4580,7 +4618,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:4584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4604,10 +4642,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4608: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4611 "configure" +echo "configure:4646: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4649 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -4630,7 +4668,7 @@ ; return 0; } EOF -if { (eval echo configure:4634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -4651,12 +4689,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4655: checking for shmat in -lipc" >&5 +echo "configure:4693: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <<EOF -#line 4660 "configure" +#line 4698 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4667,7 +4705,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4701,12 +4739,12 @@ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4705: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4743: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE " cat > conftest.$ac_ext <<EOF -#line 4710 "configure" +#line 4748 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4717,7 +4755,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:4721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4754,22 +4792,22 @@ if test "$window_system" = "none"; then echo "checking for MS-Windows" 1>&6 -echo "configure:4758: checking for MS-Windows" >&5 +echo "configure:4796: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:4761: checking for main in -lgdi32" >&5 +echo "configure:4799: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdi32 " cat > conftest.$ac_ext <<EOF -#line 4766 "configure" +#line 4804 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4798,14 +4836,19 @@ EOF } + libs_system="$libs_system -lgdi32 -luser32" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lgdi32 -luser32\" to \$libs_system"; fi window_system=msw - with_scrollbars=msw + test "$with_scrollbars" != "no" && with_scrollbars=msw && extra_objs="$extra_objs scrollbar-msw.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"scrollbar-msw.o\"" + fi + test "$with_menubars" != "no" && with_menubars=msw && extra_objs="$extra_objs menubar-msw.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"menubar-msw.o\"" + fi with_dialogs=msw - with_menubars=no with_toolbars=no with_tty=no - extra_objs="$extra_objs console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o msw-proc.o scrollbar-msw.o" && if test "$extra_verbose" = "yes"; then - echo " xemacs will be linked with \"console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o msw-proc.o scrollbar-msw.o\"" + extra_objs="$extra_objs console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o msw-proc.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o msw-proc.o\"" fi fi fi @@ -4908,7 +4951,7 @@ fi echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:4912: checking for X defines extracted by xmkmf" >&5 +echo "configure:4955: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -4940,15 +4983,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:4944: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4947 "configure" +echo "configure:4987: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4990 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4972,12 +5015,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:4976: checking for XOpenDisplay in -lX11" >&5 +echo "configure:5019: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 4981 "configure" +#line 5024 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4988,7 +5031,7 @@ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:4992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5013,12 +5056,12 @@ xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:5017: checking "$xe_msg_checking"" >&5 +echo "configure:5060: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 -b i486-linuxaout" cat > conftest.$ac_ext <<EOF -#line 5022 "configure" +#line 5065 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5029,7 +5072,7 @@ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:5033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5056,12 +5099,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:5060: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:5103: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <<EOF -#line 5065 "configure" +#line 5108 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5072,7 +5115,7 @@ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5095,12 +5138,12 @@ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:5099: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:5142: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <<EOF -#line 5104 "configure" +#line 5147 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5111,7 +5154,7 @@ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:5115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5134,14 +5177,14 @@ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:5138: checking the version of X11 being used" >&5 +echo "configure:5181: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 5140 "configure" +#line 5183 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:5188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ./conftest foobar; x11_release=$? else @@ -5165,15 +5208,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5169: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5172 "configure" +echo "configure:5212: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5215 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5204,7 +5247,7 @@ echo $ac_n "checking for XFree86""... $ac_c" 1>&6 -echo "configure:5208: checking for XFree86" >&5 +echo "configure:5251: checking for XFree86" >&5 if test -d "/usr/X386/include" -o \ -f "/etc/XF86Config" -o \ -f "/etc/X11/XF86Config" -o \ @@ -5224,12 +5267,12 @@ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:5228: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:5271: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <<EOF -#line 5233 "configure" +#line 5276 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5240,7 +5283,7 @@ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:5244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5279,19 +5322,19 @@ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:5283: checking for main in -lXbsd" >&5 +echo "configure:5326: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lXbsd " cat > conftest.$ac_ext <<EOF -#line 5288 "configure" +#line 5331 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5346,7 +5389,7 @@ esac echo "checking for session-management option" 1>&6 -echo "configure:5350: checking for session-management option" >&5; +echo "configure:5393: checking for session-management option" >&5; if test "$with_session" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SESSION @@ -5361,15 +5404,15 @@ test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:5365: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5368 "configure" +echo "configure:5408: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5411 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5392,12 +5435,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:5396: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:5439: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <<EOF -#line 5401 "configure" +#line 5444 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5408,7 +5451,7 @@ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5468,15 +5511,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:5472: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5475 "configure" +echo "configure:5515: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5518 "configure" #include "confdefs.h" #include <${dir}tt_c.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5505,12 +5548,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:5509: checking "$xe_msg_checking"" >&5 +echo "configure:5552: 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 <<EOF -#line 5514 "configure" +#line 5557 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5521,7 +5564,7 @@ tt_message_create() ; return 0; } EOF -if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5570,15 +5613,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:5574: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5577 "configure" +echo "configure:5617: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5620 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5601,12 +5644,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:5605: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:5648: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <<EOF -#line 5610 "configure" +#line 5653 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5617,7 +5660,7 @@ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:5621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5657,12 +5700,12 @@ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:5661: checking for X11 graphics libraries" >&5 +echo "configure:5704: checking for X11 graphics libraries" >&5 echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:5663: checking for Xpm - no older than 3.4f" >&5 +echo "configure:5706: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF -#line 5666 "configure" +#line 5709 "configure" #include "confdefs.h" #include <X11/xpm.h> int main(int c, char **v) { @@ -5672,7 +5715,7 @@ 0 ; } EOF -if { (eval echo configure:5676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:5719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ./conftest foobar; xpm_status=$?; if test "$xpm_status" = "0"; then with_xpm=yes; else with_xpm=no; fi; @@ -5710,15 +5753,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:5714: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5717 "configure" +echo "configure:5757: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5760 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5741,12 +5784,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:5745: checking for UnGenFace in -lcompface" >&5 +echo "configure:5788: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 5750 "configure" +#line 5793 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5757,7 +5800,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:5761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5793,15 +5836,15 @@ test "$with_imagick" != "no" && { ac_safe=`echo "magick/magick.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for magick/magick.h""... $ac_c" 1>&6 -echo "configure:5797: checking for magick/magick.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5800 "configure" +echo "configure:5840: checking for magick/magick.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5843 "configure" #include "confdefs.h" #include <magick/magick.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5821,15 +5864,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/magick/magick.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/magick/magick.h""... $ac_c" 1>&6 -echo "configure:5825: checking for X11/magick/magick.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5828 "configure" +echo "configure:5868: checking for X11/magick/magick.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5871 "configure" #include "confdefs.h" #include <X11/magick/magick.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5863,12 +5906,12 @@ imagick_libs="" echo $ac_n "checking for XDPSPixelsPerPoint in -ldps""... $ac_c" 1>&6 -echo "configure:5867: checking for XDPSPixelsPerPoint in -ldps" >&5 +echo "configure:5910: checking for XDPSPixelsPerPoint in -ldps" >&5 ac_lib_var=`echo dps'_'XDPSPixelsPerPoint | sed 'y%./+-%__p_%'` xe_check_libs="-ldpstk -ldps " cat > conftest.$ac_ext <<EOF -#line 5872 "configure" +#line 5915 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5879,7 +5922,7 @@ XDPSPixelsPerPoint() ; return 0; } EOF -if { (eval echo configure:5883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5901,12 +5944,12 @@ echo $ac_n "checking for FPX_SetToolkitMemoryLimit in -lfpx""... $ac_c" 1>&6 -echo "configure:5905: checking for FPX_SetToolkitMemoryLimit in -lfpx" >&5 +echo "configure:5948: checking for FPX_SetToolkitMemoryLimit in -lfpx" >&5 ac_lib_var=`echo fpx'_'FPX_SetToolkitMemoryLimit | sed 'y%./+-%__p_%'` xe_check_libs=" -lfpx " cat > conftest.$ac_ext <<EOF -#line 5910 "configure" +#line 5953 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5917,7 +5960,7 @@ FPX_SetToolkitMemoryLimit() ; return 0; } EOF -if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5939,12 +5982,12 @@ echo $ac_n "checking for DF24getdims in -ldf""... $ac_c" 1>&6 -echo "configure:5943: checking for DF24getdims in -ldf" >&5 +echo "configure:5986: checking for DF24getdims in -ldf" >&5 ac_lib_var=`echo df'_'DF24getdims | sed 'y%./+-%__p_%'` xe_check_libs=" -ldf " cat > conftest.$ac_ext <<EOF -#line 5948 "configure" +#line 5991 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5955,7 +5998,7 @@ DF24getdims() ; return 0; } EOF -if { (eval echo configure:5959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5977,12 +6020,12 @@ echo $ac_n "checking for jbg_dec_init in -ljbig""... $ac_c" 1>&6 -echo "configure:5981: checking for jbg_dec_init in -ljbig" >&5 +echo "configure:6024: checking for jbg_dec_init in -ljbig" >&5 ac_lib_var=`echo jbig'_'jbg_dec_init | sed 'y%./+-%__p_%'` xe_check_libs=" -ljbig " cat > conftest.$ac_ext <<EOF -#line 5986 "configure" +#line 6029 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5993,7 +6036,7 @@ jbg_dec_init() ; return 0; } EOF -if { (eval echo configure:5997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6015,12 +6058,12 @@ echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:6019: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:6062: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <<EOF -#line 6024 "configure" +#line 6067 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6031,7 +6074,7 @@ jpeg_read_header() ; return 0; } EOF -if { (eval echo configure:6035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6053,12 +6096,12 @@ echo $ac_n "checking for OpenMPEG in -lmpeg""... $ac_c" 1>&6 -echo "configure:6057: checking for OpenMPEG in -lmpeg" >&5 +echo "configure:6100: checking for OpenMPEG in -lmpeg" >&5 ac_lib_var=`echo mpeg'_'OpenMPEG | sed 'y%./+-%__p_%'` xe_check_libs=" -lmpeg " cat > conftest.$ac_ext <<EOF -#line 6062 "configure" +#line 6105 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6069,7 +6112,7 @@ OpenMPEG() ; return 0; } EOF -if { (eval echo configure:6073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6091,12 +6134,12 @@ echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6 -echo "configure:6095: checking for TT_Init_FreeType in -lttf" >&5 +echo "configure:6138: checking for TT_Init_FreeType in -lttf" >&5 ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'` xe_check_libs=" -lttf " cat > conftest.$ac_ext <<EOF -#line 6100 "configure" +#line 6143 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6107,7 +6150,7 @@ TT_Init_FreeType() ; return 0; } EOF -if { (eval echo configure:6111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6129,12 +6172,12 @@ echo $ac_n "checking for png_create_read_struct in -lpng""... $ac_c" 1>&6 -echo "configure:6133: checking for png_create_read_struct in -lpng" >&5 +echo "configure:6176: checking for png_create_read_struct in -lpng" >&5 ac_lib_var=`echo png'_'png_create_read_struct | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng " cat > conftest.$ac_ext <<EOF -#line 6138 "configure" +#line 6181 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6145,7 +6188,7 @@ png_create_read_struct() ; return 0; } EOF -if { (eval echo configure:6149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6165,12 +6208,12 @@ xe_msg_checking="for png_create_read_struct in -lpng" test -n "-lz" && xe_msg_checking="$xe_msg_checking using extra libs -lz" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6169: checking "$xe_msg_checking"" >&5 +echo "configure:6212: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo png'_'png_create_read_struct | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng -lz" cat > conftest.$ac_ext <<EOF -#line 6174 "configure" +#line 6217 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6181,7 +6224,7 @@ png_create_read_struct() ; return 0; } EOF -if { (eval echo configure:6185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6206,12 +6249,12 @@ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:6210: checking for TIFFOpen in -ltiff" >&5 +echo "configure:6253: checking for TIFFOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <<EOF -#line 6215 "configure" +#line 6258 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6222,7 +6265,7 @@ TIFFOpen() ; return 0; } EOF -if { (eval echo configure:6226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6242,12 +6285,12 @@ xe_msg_checking="for TIFFOpen in -ltiff" test -n "-ljpeg -lz" && xe_msg_checking="$xe_msg_checking using extra libs -ljpeg -lz" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6246: checking "$xe_msg_checking"" >&5 +echo "configure:6289: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff -ljpeg -lz" cat > conftest.$ac_ext <<EOF -#line 6251 "configure" +#line 6294 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6258,7 +6301,7 @@ TIFFOpen() ; return 0; } EOF -if { (eval echo configure:6262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6285,12 +6328,12 @@ } test -z "$with_imagick" && { echo $ac_n "checking for MogrifyImage in -lMagick""... $ac_c" 1>&6 -echo "configure:6289: checking for MogrifyImage in -lMagick" >&5 +echo "configure:6332: checking for MogrifyImage in -lMagick" >&5 ac_lib_var=`echo Magick'_'MogrifyImage | sed 'y%./+-%__p_%'` xe_check_libs=" -lMagick " cat > conftest.$ac_ext <<EOF -#line 6294 "configure" +#line 6337 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6301,7 +6344,7 @@ MogrifyImage() ; return 0; } EOF -if { (eval echo configure:6305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6337,12 +6380,12 @@ echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6 -echo "configure:6341: checking for XawScrollbarSetThumb in -lXaw" >&5 +echo "configure:6384: checking for XawScrollbarSetThumb in -lXaw" >&5 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 6346 "configure" +#line 6389 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6353,7 +6396,7 @@ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6377,15 +6420,15 @@ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:6381: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6384 "configure" +echo "configure:6424: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6427 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6402,12 +6445,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:6406: checking for XmStringFree in -lXm" >&5 +echo "configure:6449: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 6411 "configure" +#line 6454 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6418,7 +6461,7 @@ XmStringFree() ; return 0; } EOF -if { (eval echo configure:6422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6675,7 +6718,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:6679: checking for Mule-related features" >&5 +echo "configure:6722: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -6692,15 +6735,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6696: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6699 "configure" +echo "configure:6739: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6742 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6731,12 +6774,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:6735: checking for strerror in -lintl" >&5 +echo "configure:6778: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <<EOF -#line 6740 "configure" +#line 6783 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6747,7 +6790,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:6751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6780,19 +6823,19 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:6784: checking for Mule input methods" >&5 +echo "configure:6827: checking for Mule input methods" >&5 test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:6788: checking for XIM" >&5 +echo "configure:6831: checking for XIM" >&5 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:6791: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:6834: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 6796 "configure" +#line 6839 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6803,7 +6846,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:6807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6868,15 +6911,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:6872: checking for XFontSet" >&5 +echo "configure:6915: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:6875: checking for XmbDrawString in -lX11" >&5 +echo "configure:6918: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 6880 "configure" +#line 6923 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6887,7 +6930,7 @@ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:6891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6927,15 +6970,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:6931: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6934 "configure" +echo "configure:6974: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6977 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6960,10 +7003,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6964: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6967 "configure" +echo "configure:7007: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7010 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6986,7 +7029,7 @@ ; return 0; } EOF -if { (eval echo configure:6990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7015,12 +7058,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:7019: checking for crypt in -lcrypt" >&5 +echo "configure:7062: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <<EOF -#line 7024 "configure" +#line 7067 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7031,7 +7074,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:7035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7065,12 +7108,12 @@ fi test -z "$with_wnn" && { echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:7069: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:7112: 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 <<EOF -#line 7074 "configure" +#line 7117 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7081,7 +7124,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:7085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7118,12 +7161,12 @@ fi echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6 -echo "configure:7122: checking for jl_fi_dic_list in -lwnn" >&5 +echo "configure:7165: checking for jl_fi_dic_list in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 7127 "configure" +#line 7170 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7134,7 +7177,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:7138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7166,15 +7209,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:7170: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7173 "configure" +echo "configure:7213: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7216 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7197,12 +7240,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:7201: checking for RkBgnBun in -lRKC" >&5 +echo "configure:7244: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <<EOF -#line 7206 "configure" +#line 7249 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7213,7 +7256,7 @@ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:7217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7236,12 +7279,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:7240: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:7283: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <<EOF -#line 7245 "configure" +#line 7288 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7252,7 +7295,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:7256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7301,12 +7344,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:7305: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:7348: 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 <<EOF -#line 7310 "configure" +#line 7353 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7317,7 +7360,7 @@ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:7321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7390,10 +7433,10 @@ for ac_func in acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset ulimit usleep utimes waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7394: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7397 "configure" +echo "configure:7437: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7440 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7416,7 +7459,7 @@ ; return 0; } EOF -if { (eval echo configure:7420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7453,10 +7496,10 @@ for ac_func in realpath do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7457: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7460 "configure" +echo "configure:7500: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7503 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7479,7 +7522,7 @@ ; return 0; } EOF -if { (eval echo configure:7483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7512,16 +7555,16 @@ esac echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:7516: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 7518 "configure" +echo "configure:7559: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 7561 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:7525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -7541,16 +7584,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:7545: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 7547 "configure" +echo "configure:7588: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 7590 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:7554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7597: \"$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 @@ -7570,11 +7613,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:7574: checking whether localtime caches TZ" >&5 +echo "configure:7617: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 7578 "configure" +#line 7621 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -7609,7 +7652,7 @@ exit (0); } EOF -if { (eval echo configure:7613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then emacs_cv_localtime_cache=no else @@ -7638,9 +7681,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6 -echo "configure:7642: checking whether gettimeofday cannot accept two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 7644 "configure" +echo "configure:7685: checking whether gettimeofday cannot accept two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 7687 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -7662,7 +7705,7 @@ ; return 0; } EOF -if { (eval echo configure:7666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -7684,19 +7727,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:7688: checking for inline" >&5 +echo "configure:7731: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 7693 "configure" +#line 7736 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:7700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -7746,17 +7789,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:7750: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7753 "configure" +echo "configure:7793: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7796 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:7760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -7780,10 +7823,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:7784: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7787 "configure" +echo "configure:7827: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7830 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -7806,7 +7849,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:7810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -7845,10 +7888,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:7849: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7852 "configure" +echo "configure:7892: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7895 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -7872,10 +7915,10 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7876: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7879 "configure" +echo "configure:7919: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7922 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7898,7 +7941,7 @@ ; return 0; } EOF -if { (eval echo configure:7902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7928,10 +7971,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:7932: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7935 "configure" +echo "configure:7975: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7978 "configure" #include "confdefs.h" find_stack_direction () { @@ -7950,7 +7993,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:7954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_stack_direction=1 else @@ -7978,15 +8021,15 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:7982: checking for vfork.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7985 "configure" +echo "configure:8025: checking for vfork.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8028 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8014,10 +8057,10 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:8018: checking for working vfork" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8021 "configure" +echo "configure:8061: checking for working vfork" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8064 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -8112,7 +8155,7 @@ } } EOF -if { (eval echo configure:8116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_vfork_works=yes else @@ -8137,10 +8180,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:8141: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8144 "configure" +echo "configure:8184: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8187 "configure" #include "confdefs.h" #include <string.h> main () @@ -8150,7 +8193,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:8154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -8177,10 +8220,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8181: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8184 "configure" +echo "configure:8224: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8227 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8203,7 +8246,7 @@ ; return 0; } EOF -if { (eval echo configure:8207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8231,10 +8274,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:8235: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8238 "configure" +echo "configure:8278: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8281 "configure" #include "confdefs.h" /* @@ -8289,7 +8332,7 @@ } EOF -if { (eval echo configure:8293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -8315,10 +8358,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:8319: checking for working mmap" >&5 +echo "configure:8362: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 8322 "configure" +#line 8365 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -8351,7 +8394,7 @@ return 1; } EOF -if { (eval echo configure:8355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then have_mmap=yes else @@ -8385,15 +8428,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:8389: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8392 "configure" +echo "configure:8432: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8435 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8436,15 +8479,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:8440: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8443 "configure" +echo "configure:8483: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8486 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8476,10 +8519,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:8480: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8483 "configure" +echo "configure:8523: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8526 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -8502,7 +8545,7 @@ ; return 0; } EOF -if { (eval echo configure:8506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -8517,15 +8560,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:8521: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8524 "configure" +echo "configure:8564: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8567 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8542,15 +8585,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:8546: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8549 "configure" +echo "configure:8589: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8592 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8575,9 +8618,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:8579: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:8622: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 8581 "configure" +#line 8624 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8588,7 +8631,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:8592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN @@ -8619,10 +8662,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:8623: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8626 "configure" +echo "configure:8666: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8669 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -8645,7 +8688,7 @@ ; return 0; } EOF -if { (eval echo configure:8649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -8660,15 +8703,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:8664: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8667 "configure" +echo "configure:8707: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8710 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8685,15 +8728,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:8689: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8692 "configure" +echo "configure:8732: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8735 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8731,15 +8774,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:8735: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8738 "configure" +echo "configure:8778: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8781 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8766,15 +8809,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:8770: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8773 "configure" +echo "configure:8813: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8816 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8807,15 +8850,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:8811: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8814 "configure" +echo "configure:8854: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8857 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8845,7 +8888,7 @@ echo "checking "for sound support"" 1>&6 -echo "configure:8849: checking "for sound support"" >&5 +echo "configure:8892: checking "for sound support"" >&5 case "$with_sound" in native | both ) with_native_sound=yes;; nas | no ) with_native_sound=no;; @@ -8856,15 +8899,15 @@ 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:8860: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8863 "configure" +echo "configure:8903: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8906 "configure" #include "confdefs.h" #include <multimedia/audio_device.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8912,12 +8955,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:8916: checking for ALopenport in -laudio" >&5 +echo "configure:8959: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 8921 "configure" +#line 8964 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8928,7 +8971,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:8932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8959,12 +9002,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:8963: checking for AOpenAudio in -lAlib" >&5 +echo "configure:9006: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <<EOF -#line 8968 "configure" +#line 9011 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8975,7 +9018,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:8979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9013,15 +9056,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:9017: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9020 "configure" +echo "configure:9060: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9063 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9091,7 +9134,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 -#line 9095 "configure" +#line 9138 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -9118,7 +9161,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:9122: checking for TTY-related features" >&5 +echo "configure:9165: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -9134,12 +9177,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:9138: checking for tgetent in -lncurses" >&5 +echo "configure:9181: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <<EOF -#line 9143 "configure" +#line 9186 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9150,7 +9193,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9183,15 +9226,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:9187: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9190 "configure" +echo "configure:9230: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9233 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9213,15 +9256,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:9217: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9220 "configure" +echo "configure:9260: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9263 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9251,15 +9294,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:9255: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9258 "configure" +echo "configure:9298: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9301 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9294,12 +9337,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:9298: checking for tgetent in -l$lib" >&5 +echo "configure:9341: 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 <<EOF -#line 9303 "configure" +#line 9346 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9310,7 +9353,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9341,12 +9384,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:9345: checking for tgetent in -lcurses" >&5 +echo "configure:9388: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <<EOF -#line 9350 "configure" +#line 9393 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9357,7 +9400,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9375,12 +9418,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:9379: checking for tgetent in -ltermcap" >&5 +echo "configure:9422: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <<EOF -#line 9384 "configure" +#line 9427 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9391,7 +9434,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9439,15 +9482,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:9443: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9446 "configure" +echo "configure:9486: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9489 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9470,12 +9513,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:9474: checking for Gpm_Open in -lgpm" >&5 +echo "configure:9517: 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 <<EOF -#line 9479 "configure" +#line 9522 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9486,7 +9529,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:9490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9535,17 +9578,17 @@ echo "checking for database support" 1>&6 -echo "configure:9539: checking for database support" >&5 +echo "configure:9582: checking for database support" >&5 if test "$with_database_gnudbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:9544: checking for dbm_open in -lgdbm" >&5 +echo "configure:9587: 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 <<EOF -#line 9549 "configure" +#line 9592 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9556,7 +9599,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:9560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9578,10 +9621,10 @@ if test "$with_database_gnudbm" != "yes"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:9582: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9585 "configure" +echo "configure:9625: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9628 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -9604,7 +9647,7 @@ ; return 0; } EOF -if { (eval echo configure:9608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -9640,10 +9683,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:9644: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9647 "configure" +echo "configure:9687: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9690 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -9666,7 +9709,7 @@ ; return 0; } EOF -if { (eval echo configure:9670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -9687,12 +9730,12 @@ if test "$need_libdbm" != "no"; then echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:9691: checking for dbm_open in -ldbm" >&5 +echo "configure:9734: 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 <<EOF -#line 9696 "configure" +#line 9739 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9703,7 +9746,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:9707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9740,10 +9783,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:9744: checking for dbopen" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9747 "configure" +echo "configure:9787: checking for dbopen" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9790 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbopen(); below. */ @@ -9766,7 +9809,7 @@ ; return 0; } EOF -if { (eval echo configure:9770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -9787,12 +9830,12 @@ if test "$need_libdb" != "no"; then echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:9791: checking for dbopen in -ldb" >&5 +echo "configure:9834: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 9796 "configure" +#line 9839 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9803,7 +9846,7 @@ dbopen() ; return 0; } EOF -if { (eval echo configure:9807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9827,7 +9870,7 @@ if test "$with_database_berkdb" = "yes"; then for path in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 9831 "configure" +#line 9874 "configure" #include "confdefs.h" #ifdef HAVE_INTTYPES_H #define __BIT_TYPES_DEFINED__ @@ -9845,7 +9888,7 @@ ; return 0; } EOF -if { (eval echo configure:9849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_path="$path"; break else @@ -9897,12 +9940,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:9901: checking for SOCKSinit in -lsocks" >&5 +echo "configure:9944: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <<EOF -#line 9906 "configure" +#line 9949 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9913,7 +9956,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:9917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else
--- a/configure.in Mon Aug 13 10:15:04 2007 +0200 +++ b/configure.in Mon Aug 13 10:15:48 2007 +0200 @@ -330,7 +330,7 @@ dnl BETA NOTE: ! Will you please add to this list? Nonexistent dirs dnl are dropped from the list at runtime, so it is safe to add dnl directories to this list that you don't have at home. -infopath='/usr/local/info:/usr/info:/usr/local/lib/texmf/doc/info:/usr/lib/texmf/doc/info' +infopath='/usr/local/lib/texmf/doc/info:/usr/local/lib/texmf/info:/usr/lib/texmf/doc/info:/usr/lib/texmf/info:/usr/local/info:/usr/info' infopath_user_defined='no' lispdir='${datadir}/xemacs-${version}/lisp' lispdir_user_defined='no' @@ -727,9 +727,10 @@ dnl Finish options processing dnl ------------------------- -if test "$infopath_user_defined" = "no" -a -n "$INFOPATH" ; then - infopath="$INFOPATH" -fi +dnl Personal settings shouldn't affect the configuration process. +dnl if test "$infopath_user_defined" = "no" -a -n "$INFOPATH" ; then +dnl infopath="$INFOPATH" +dnl fi dnl Get the arguments back. See the diatribe on Shell Magic above. eval set x "$quoted_arguments"; shift @@ -1916,6 +1917,7 @@ AC_CHECK_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h) AC_CHECK_HEADERS(utime.h locale.h libgen.h fcntl.h ulimit.h) AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h limits.h) +AC_CHECK_HEADERS(sys/un.h) AC_HEADER_SYS_WAIT AC_HEADER_STDC AC_HEADER_TIME @@ -2091,13 +2093,14 @@ AC_CHECK_LIB(gdi32,main,have_msw=yes) if test "$have_msw" = "yes"; then AC_DEFINE(HAVE_MS_WINDOWS) + XE_APPEND(-lgdi32 -luser32, libs_system) window_system=msw - with_scrollbars=msw + test "$with_scrollbars" != "no" && with_scrollbars=msw && XE_ADD_OBJS(scrollbar-msw.o) + test "$with_menubars" != "no" && with_menubars=msw && XE_ADD_OBJS(menubar-msw.o) with_dialogs=msw - with_menubars=no with_toolbars=no with_tty=no - XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o msw-proc.o scrollbar-msw.o) + XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o msw-proc.o) fi fi
--- a/configure.usage Mon Aug 13 10:15:04 2007 +0200 +++ b/configure.usage Mon Aug 13 10:15:48 2007 +0200 @@ -136,7 +136,7 @@ exist in the runtime environment. The "dir" file in the first existing directory in this list will become the (dir)Top node of the Info tree. - Defaults to the value of `INFOPATH', or: + Defaults to the value of: `/usr/local/info:/usr/info:/usr/local/lib/texmf/doc/info:/usr/lib/texmf/doc/ info'.
--- a/etc/FTP Mon Aug 13 10:15:04 2007 +0200 +++ b/etc/FTP Mon Aug 13 10:15:48 2007 +0200 @@ -14,7 +14,7 @@ ftp://ftp.cenatls.cena.dgac.fr:/pub/Emacs/xemacs/ ftp://ftp.th-darmstadt.de:/pub/editors/xemacs/ ftp://sunsite.doc.ic.ac.uk:/gnu/xemacs/ - ftp://ftp.ibp.fr:/pub/emacs/xemacs/ + ftp://ftp.lip6.fr:/pub/emacs/xemacs/ ftp://uiarchive.cso.uiuc.edu:/pub/packages/xemacs/ ftp://ftp.technion.ac.il:/pub/unsupported/gnu/xemacs/ ftp://thphys.irb.hr:/pub/xemacs/
--- a/lib-src/ChangeLog Mon Aug 13 10:15:04 2007 +0200 +++ b/lib-src/ChangeLog Mon Aug 13 10:15:48 2007 +0200 @@ -1,3 +1,18 @@ +Thu Jan 08 09:42:36 1998 <andyp@parallax.co.uk> + + * gnuserv.h: only set UNIX_DOMAIN_SOCKETS if HAVE_SYS_UN_H is + set. + + * gnuserv.c: tidy up so that it builds when we don't have + UNIX_DOMAIN_SOCKETS. + +1998-01-07 SL Baur <steve@altair.xemacs.org> + + * update-elc.sh (ignore_pattern): Replace -vanilla with `-q + -no-site-file'. + * update-autoloads.sh (dirs): Ditto. + * update-custom.sh (dirs): Ditto. + 1997-12-18 SL Baur <steve@altair.xemacs.org> * update-elc.sh (mule_p): Remove skk's special treatment.
--- a/lib-src/gnuserv.c Mon Aug 13 10:15:04 2007 +0200 +++ b/lib-src/gnuserv.c Mon Aug 13 10:15:48 2007 +0200 @@ -837,14 +837,11 @@ char *argv[]; { int chan; /* temporary channel number */ -#ifdef INTERNET_DOMAIN_SOCKETS - int ils = -1; /* internet domain listen socket */ -#endif -#ifdef UNIX_DOMAIN_SOCKETS - int uls = -1; /* unix domain listen socket */ -#endif #ifdef SYSV_IPC struct msgbuf *msgp; /* message buffer */ +#else + int ils = -1; /* internet domain listen socket */ + int uls = -1; /* unix domain listen socket */ #endif /* SYSV_IPC */ progname = argv[0];
--- a/lib-src/gnuserv.h Mon Aug 13 10:15:04 2007 +0200 +++ b/lib-src/gnuserv.h Mon Aug 13 10:15:48 2007 +0200 @@ -55,8 +55,10 @@ #define INTERNET_DOMAIN_SOCKETS +#ifdef HAVE_SYS_UN_H #define UNIX_DOMAIN_SOCKETS /* #define SYSV_IPC */ +#endif /* * Define additional authentication protocols to be used. These methods will
--- a/lib-src/update-autoloads.sh Mon Aug 13 10:15:04 2007 +0200 +++ b/lib-src/update-autoloads.sh Mon Aug 13 10:15:48 2007 +0200 @@ -76,7 +76,7 @@ # Only use Mule XEmacs to build Mule-specific autoloads & custom-loads. echon "Checking for Mule support..." lisp_prog='(princ (featurep (quote mule)))' -mule_p="`$EMACS -batch -vanilla -eval \"$lisp_prog\"`" +mule_p="`$EMACS -batch -q -no-site-file -eval \"$lisp_prog\"`" if test "$mule_p" = nil ; then echo No ignore_dirs="$ignore_dirs mule leim language skk" @@ -116,12 +116,12 @@ fi done -$EMACS -batch -vanilla -eval '(setq autoload-package-name "Standard")' \ +$EMACS -batch -q -no-site-file -eval '(setq autoload-package-name "Standard")' \ -l autoload -f batch-update-directory lisp # set -x for dir in $dirs; do - $EMACS -batch -vanilla -l autoload -f batch-update-directory $dir + $EMACS -batch -q -no-site-file -l autoload -f batch-update-directory $dir done eval "$make_special_commands"
--- a/lib-src/update-custom.sh Mon Aug 13 10:15:04 2007 +0200 +++ b/lib-src/update-custom.sh Mon Aug 13 10:15:48 2007 +0200 @@ -72,7 +72,7 @@ # Only use Mule XEmacs to build Mule-specific autoloads & custom-loads. echon "Checking for Mule support..." lisp_prog='(princ (featurep (quote mule)))' -mule_p="`$EMACS -batch -vanilla -eval \"$lisp_prog\"`" +mule_p="`$EMACS -batch -q -no-site-file -eval \"$lisp_prog\"`" if test "$mule_p" = nil ; then echo No ignore_dirs="$ignore_dirs mule leim skk" @@ -97,4 +97,4 @@ done echo done -$EMACS -batch -vanilla -l cus-dep -f Custom-make-dependencies $dirs +$EMACS -batch -q -no-site-file -l cus-dep -f Custom-make-dependencies $dirs
--- a/lib-src/update-elc.sh Mon Aug 13 10:15:04 2007 +0200 +++ b/lib-src/update-elc.sh Mon Aug 13 10:15:48 2007 +0200 @@ -61,11 +61,11 @@ fi REAL=`cd \`dirname $EMACS\` ; pwd | sed 's|^/tmp_mnt||'`/`basename $EMACS` -BYTECOMP="$REAL -batch -vanilla " +BYTECOMP="$REAL -batch -q -no-site-file " echo "Recompiling in `pwd|sed 's|^/tmp_mnt||'`" echo " with $REAL..." -$EMACS -batch -vanilla -l `pwd`/lisp/cleantree -f batch-remove-old-elc lisp +$EMACS -batch -q -no-site-file -l `pwd`/lisp/cleantree -f batch-remove-old-elc lisp prune_vc="( -name '.*' -o -name SCCS -o -name RCS -o -name CVS ) -prune -o" @@ -91,7 +91,7 @@ # Only use Mule XEmacs to compile Mule-specific elisp dirs echon "Checking for Mule support..." lisp_prog='(princ (featurep (quote mule)))' -mule_p="`$EMACS -batch -vanilla -eval \"$lisp_prog\"`" +mule_p="`$EMACS -batch -q -no-site-file -eval \"$lisp_prog\"`" if test "$mule_p" = nil ; then echo No ignore_dirs="$ignore_dirs its egg mule language leim skk"
--- a/lisp/ChangeLog Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/ChangeLog Mon Aug 13 10:15:48 2007 +0200 @@ -1,3 +1,121 @@ +1998-01-08 Karl M. Hegbloom <karlheg@bittersweet.inetarena.com> + + * modeline.el (modeline-minor-mode-menu): Add support for :active + (add-minor-mode): Document :active property to TOGGLE. + +1998-01-07 Karl M. Hegbloom <karlheg@bittersweet.inetarena.com> + + * modeline.el (modeline-minor-mode-menu): Add support for an + `:included' predicate in the `toggle-sym' plist. + (add-minor-mode): Document the :included property, format + docstring some more. + (modeline-minor-mode-menu): Documentation string added. + +1998-01-02 Karl M. Hegbloom <karlheg@bittersweet.inetarena.com> + + * modeline.el (modeline-minor-mode-menu): genmenlab the menu + labels from the symbol-names by thwacking off the overly redundant + and overused "mode", parenthesizing "minor", and capitalizing the + resultant strings. Also shortened the menu's title by eliminating + the redundant buffer name. + (add-minor-mode): Beautified the docstring, added mention of the + `:menu-tag' property of TOGGLE. + (modeline-minor-mode-menu): Frinked the `:menu-tag' property on + `toggle-sym' to beatify the mode-life menus. + * (abbrev-mode): (put)'ed a `:menu-tag' on it and + `auto-fill-function'. + +1998-01-02 Karl M. Hegbloom <<karlheg@bittersweet.inetarena.com>> + + * modeline.el (modeline-minor-mode-menu): Changed the string-only + menus to :style 'toggle. + +1997-12-10 Markus Linnala <maage@cs.tut.fi> + + * simple.el: Use mh-user-agent-compose as mh-e-user-agent. + +1997-12-11 Christoph Wedler <wedler@fmi.uni-passau.de> + + * packages/hyper-apropos.el (hyper-apropos-insert-face): Would + only recognize first hyperlink. + (hyper-apropos-highlightify): Deletia, this is already done by + `hyper-apropos-insert-face'. + (hyper-apropos-help-mode): Don't call `hyper-apropos-highlightify. + +1998-01-09 SL Baur <steve@altair.xemacs.org> + + * x-toolbar.el (toolbar-ispell-internal): Use ispell-message for + mail. + (toolbar-mail-reader): Add support for `send'. + From Jonathan Marten <jonathan.marten@UK.Sun.COM> + +1998-01-05 Karl M. Hegbloom <<karlheg@bittersweet.inetarena.com>> + + * info.el (Info-emacs-info-file-name): Add defvar for + `Info-emacs-info-file-name' so that `Info-goto-emacs-command-node' + will function properly. + +1998-01-05 Gary D. Foster <gfoster@ragesoft.com> + + * simple.el: make the backwards delete function called by + `backward-or-forward-delete-char' user configurable. + +1998-01-09 Karl M. Hegbloom <karlheg@bittersweet.inetarena.com> + + * hyper-apropos.el (hyper-apropos-get-doc): Print where a byte + compiled function got loaded from. + +1998-01-09 SL Baur <steve@altair.xemacs.org> + + * term/apollo.el: Synched up with InfoDock 3.6.2. + +1998-01-08 SL Baur <steve@altair.xemacs.org> + + * startup.el (load-init-file): Load autoloads earlier. + (startup-splash-frame): Handle InfoDock logo. + + * x-init.el (init-post-x-win): Don't call init-x-toolbar in + InfoDock. + (x-init-toolbar-from-resources): Move from x-toolbar.el. + + * toolbar.el (init-toolbar-from-resources): InfoDock x-toolbar.el + doesn't have this function. + + * packages.el (locate-data-file): Fix to call `locate-file'. + +1998-01-07 SL Baur <steve@altair.xemacs.org> + + * dumped-lisp.el (preloaded-file-list): InfoDock uses its own + version of version.el. + (preloaded-file-list): Ditto for x-menubar.el and x-toolbar.el. + + * x-menubar.el (default-menubar): Guard reference to + `gnuserv-frame'. + (default-menubar): Guard references to `font-lock-mode'. + (default-menubar): Guard references to font-menu-this-frame-only-p'. + (default-menubar): Guard references to `font-menu-ignore-scaled-fonts'. + + * make-docfile.el: Don't snarf doc strings from autoloads. + + * startup.el (load-init-file): Use algorithm from loaddefs.el for + loading auto-autoloads files. + + * loaddefs.el: Disable dumping autoloads. + +1998-01-05 SL Baur <steve@altair.xemacs.org> + + * lisp-mnt.el: Synch to Emacs 20.2. + + * help.el: Remove manual autoload of `finder-by-keyword'. + + * finder.el (finder-by-keyword): Autoload. + + * help.el: Conditionalize hyperbole setup. + +1998-01-04 SL Baur <steve@altair.xemacs.org> + + * packages.el (package-require): Update to reflect new data format. + 1998-01-02 Didier Verna <verna@inf.enst.fr> * x-menubar.el (default-menubar): make the tutorials available
--- a/lisp/auto-autoloads.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/auto-autoloads.el Mon Aug 13 10:15:48 2007 +0200 @@ -831,6 +831,13 @@ ;;;*** +;;;### (autoloads (finder-by-keyword) "finder" "lisp/finder.el") + +(autoload 'finder-by-keyword "finder" "\ +Find packages matching a given keyword." t nil) + +;;;*** + ;;;### (autoloads (font-lock-set-defaults-1 font-lock-fontify-buffer turn-off-font-lock turn-on-font-lock font-lock-mode) "font-lock" "lisp/font-lock.el") (defcustom font-lock-auto-fontify t "*Whether font-lock should automatically fontify files as they're loaded.\nThis will only happen if font-lock has fontifying keywords for the major\nmode of the file. You can get finer-grained control over auto-fontification\nby using this variable in combination with `font-lock-mode-enable-list' or\n`font-lock-mode-disable-list'." :type 'boolean :group 'font-lock)
--- a/lisp/dumped-lisp.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/dumped-lisp.el Mon Aug 13 10:15:48 2007 +0200 @@ -4,7 +4,9 @@ "packages" ; Bootstrap run-time lisp environment "subr" ; load the most basic Lisp functions "replace" ; match-string used in version.el. - "version.el" ; Ignore compiled-by-mistake version.elc + ; Ignore compiled-by-mistake version.elc + #-infodock "version.el" ; XEmacs + #+infodock "id-version.el" ; InfoDock "cl" "cl-extra" "cl-seq" @@ -52,7 +54,7 @@ ;; (load-gc "hyper-apropos") Soon... #-mule "files-nomule" "files" - #+xemacs "lib-complete" ; InfoDock uses an older version + #-infodock "lib-complete" ; InfoDock uses an older version "format" "indent" "isearch-mode" @@ -152,6 +154,7 @@ #+window-system "mouse" ;; preload the X code, for faster startup. #+(and (not infodock) (or x mswindows) menubar) "x-menubar" + #+(and infodock (or x mswindows) menubar) "id-menus" #+x "x-faces" #+x "x-iso8859-1" #+x "x-mouse" @@ -159,7 +162,7 @@ #+(and x scrollbar) "x-scrollbar" #+x "x-misc" #+x "x-init" - #+(and x toolbar) "x-toolbar" + #+(and (not infodock) x toolbar) "x-toolbar" #+x "x-win-xfree86" #+x "x-win-sun" ;; preload the mswindows code.
--- a/lisp/files.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/files.el Mon Aug 13 10:15:48 2007 +0200 @@ -2336,7 +2336,7 @@ (basic-save-buffer-1)) 'continue-save-buffer)) -(defcustom save-some-buffers-query-display-buffer xemacs-betaname +(defcustom save-some-buffers-query-display-buffer t "*Non-nil makes `\\[save-some-buffers]' switch to the buffer offered for saving." :type 'boolean :group 'editing-basics)
--- a/lisp/finder.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/finder.el Mon Aug 13 10:15:48 2007 +0200 @@ -353,6 +353,8 @@ (goto-char (event-point ev)) (finder-select)) +;; XEmacs change +;;;###autoload (defun finder-by-keyword () "Find packages matching a given keyword." (interactive)
--- a/lisp/help.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/help.el Mon Aug 13 10:15:48 2007 +0200 @@ -87,10 +87,12 @@ ;;; For most people this key binding will work and will be equivalent ;;; to {C-h h}. ;;; -(or (where-is-internal 'hyperbole) - (where-is-internal 'hui:menu) - (define-key help-map "h" 'hyperbole)) -(autoload 'hyperbole "hsite" "Hyperbole info manager menus." t) +(when (featurep 'infodock) ; This isn't used in XEmacs + ;; #### This needs fixing for InfoDock 4.0. + (or (where-is-internal 'hyperbole) + (where-is-internal 'hui:menu) + (define-key help-map "h" 'hyperbole)) + (autoload 'hyperbole "hsite" "Hyperbole info manager menus." t)) (define-key help-map "i" 'info) (define-key help-map '(control i) 'Info-query) @@ -108,8 +110,10 @@ (define-key help-map "n" 'view-emacs-news) (define-key help-map "p" 'finder-by-keyword) -(autoload 'finder-by-keyword "finder" - "Find packages matching a given keyword." t) + +;; Do this right with an autoload cookie in finder.el. +;;(autoload 'finder-by-keyword "finder" +;; "Find packages matching a given keyword." t) (define-key help-map "s" 'describe-syntax)
--- a/lisp/hyper-apropos.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/hyper-apropos.el Mon Aug 13 10:15:48 2007 +0200 @@ -574,14 +574,14 @@ end 'limit) (let ((e (make-extent (match-beginning 1) (match-end 1)))) (set-extent-face e 'hyper-apropos-hyperlink) - (set-extent-property e 'mouse-face 'highlight)) + (set-extent-property e 'mouse-face 'highlight))) (goto-char beg) (while (re-search-forward "M-x \\([-a-zA-Z0-9_][-a-zA-Z0-9_][-a-zA-Z0-9_.]+\\)" end 'limit) (let ((e (make-extent (match-beginning 1) (match-end 1)))) (set-extent-face e 'hyper-apropos-hyperlink) - (set-extent-property e 'mouse-face 'highlight)))))) + (set-extent-property e 'mouse-face 'highlight))))) (defun hyper-apropos-insert-keybinding (keys string) (if keys @@ -711,9 +711,11 @@ (autoload . "autoloaded Lisp ") (lambda . "Lisp ")))) desc - (if (eq symtype 'autoload) - (format ", (autoloaded from \"%s\")" - (nth 1 newsym)))) + (case symtype + ((autoload) (format ", (autoloaded from \"%s\")" + (nth 1 newsym))) + ((bytecode) (format ", (loaded from \"%s\")" + (symbol-file symbol))))) local (current-local-map) global (current-global-map) obsolete (get symbol 'byte-obsolete-info) @@ -996,29 +998,10 @@ major-mode 'hyper-apropos-help-mode mode-name "Hyper-Help") (set-syntax-table emacs-lisp-mode-syntax-table) - (hyper-apropos-highlightify) (use-local-map hyper-apropos-help-map)) ;; ---------------------------------------------------------------------- ;; -(defun hyper-apropos-highlightify () - (save-excursion - (goto-char (point-min)) - (let ((st (point-min)) - sym) - (while (not (eobp)) - (if (zerop (skip-syntax-forward "w_")) - (forward-char 1) - (and (> (- (point) st) 3) - (setq sym (intern-soft (buffer-substring st (point)))) - (or (boundp sym) - (fboundp sym)) - (set-extent-property (make-extent st (point)) - 'mouse-face 'highlight))) - (setq st (point)))))) - -;; ---------------------------------------------------------------------- ;; - (defun hyper-apropos-scroll-up () "Scroll up the \"*Hyper Help*\" buffer if it's visible. Otherwise, scroll the selected window up."
--- a/lisp/info.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/info.el Mon Aug 13 10:15:48 2007 +0200 @@ -395,6 +395,10 @@ :type '(repeat directory) :group 'info) +(defvar Info-emacs-info-file-name "xemacs.info" + "The filename of the XEmacs info for +`Info-goto-emacs-command-node' (`\\<help-mode-map>\\[Info-goto-emacs-command-node]')") + (defvar Info-directory-list (let ((path (getenv "INFOPATH"))) (if path
--- a/lisp/lisp-mnt.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/lisp-mnt.el Mon Aug 13 10:15:48 2007 +0200 @@ -5,10 +5,9 @@ ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Maintainer: Eric S. Raymond <esr@snark.thyrsus.com> ;; Created: 14 Jul 1992 -;; Version: $Id: lisp-mnt.el,v 1.2 1997/12/06 22:26:15 steve Exp $ -;; Keywords: docs -;; X-Modified-by: Bob Weiner <weiner@mot.com>, 4/14/95, to support InfoDock -;; headers. +;; Keywords: docs, maint +;; X-Modified-by: Bob Weiner <weiner@altrasoft.com>, 4/14/95, to support +;; InfoDock headers. ;; X-Bogus-Bureaucratic-Cruft: Gruad will get you if you don't watch out! ;; This file is part of XEmacs. @@ -28,7 +27,7 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: FSF 19.34. +;;; Synched up with: FSF 20.2. ;;; Commentary: @@ -57,15 +56,15 @@ ;; the principal author. ;; ;; If there are multiple authors, they should be listed on continuation -;; lines led by ;;<TAB>, like this: +;; lines led by ;;<TAB><TAB> (or multiple blanks), like this: ;; ;; ;; Author: Ashwin Ram <Ram-Ashwin@cs.yale.edu> -;; ;; Dave Sill <de5@ornl.gov> -;; ;; David Lawrence <tale@pawl.rpi.edu> -;; ;; Noah Friedman <friedman@ai.mit.edu> -;; ;; Joe Wells <jbw@maverick.uswest.com> -;; ;; Dave Brennan <brennan@hal.com> -;; ;; Eric Raymond <esr@snark.thyrsus.com> +;; ;; Dave Sill <de5@ornl.gov> +;; ;; David Lawrence <tale@pawl.rpi.edu> +;; ;; Noah Friedman <friedman@ai.mit.edu> +;; ;; Joe Wells <jbw@maverick.uswest.com> +;; ;; Dave Brennan <brennan@hal.com> +;; ;; Eric Raymond <esr@snark.thyrsus.com> ;; ;; This field may have some special values; notably "FSF", meaning ;; "Free Software Foundation". @@ -119,7 +118,7 @@ ;;; Code: (require 'picture) ; provides move-to-column-force -;(require 'emacsbug) +;(require 'emacsbug) ; XEmacs, not needed for bytecompilation ;;; Variables: @@ -128,7 +127,7 @@ For example, you can write the 1st line synopsis string and headers like this in your Lisp package: - ;; @(#) package.el -- pacakge description + ;; @(#) package.el -- package description ;; ;; @(#) $Maintainer: Person Foo Bar $ @@ -324,7 +323,7 @@ (if (progn (goto-char (point-min)) (re-search-forward - "\\$Id: [^ ]+ [^ ]+ \\([^/]+\\)/\\([^/]+\\)/\\([^ ]+\\) " + "\\$[I]d: [^ ]+ [^ ]+ \\([^/]+\\)/\\([^/]+\\)/\\([^ ]+\\) " (lm-code-mark) t)) (format "%s %s %s" (buffer-substring (match-beginning 3) (match-end 3)) @@ -355,7 +354,7 @@ (goto-char (point-min)) (cond ;; Look for an RCS header - ((re-search-forward "\\$Id: [^ ]+ \\([^ ]+\\) " header-max t) + ((re-search-forward "\\$[I]d: [^ ]+ \\([^ ]+\\) " header-max t) (buffer-substring (match-beginning 1) (match-end 1))) ;; Look for an SCCS header @@ -427,9 +426,9 @@ (defun lm-insert-at-column (col &rest strings) "Insert list of STRINGS, at column COL." - (if (> (current-column) col) (insert "\n")) - (move-to-column-force col) - (apply 'insert strings)) + (if (> (current-column) col) (insert "\n")) + (move-to-column-force col) + (apply 'insert strings)) (defun lm-verify (&optional file showok &optional verb) "Check that the current buffer (or FILE if given) is in proper format. @@ -441,7 +440,7 @@ name ) (if verb - (setq ret "Ok.")) ;init value + (setq ret "Ok.")) ;init value (if (and file (file-directory-p file)) (setq @@ -529,7 +528,7 @@ (switch-to-buffer (get-buffer-create "*lm-verify*")) (erase-buffer) (mapcar - '(lambda (f) + (lambda (f) ; XEmacs - dequote (if (string-match ".*\\.el$" f) (let ((syn (lm-synopsis f))) (if syn
--- a/lisp/loaddefs.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/loaddefs.el Mon Aug 13 10:15:48 2007 +0200 @@ -165,16 +165,14 @@ ;;; Load in generated autoloads (made by autoload.el). -;; (condition-case nil - ;; (load "auto-autoloads") - ;; (file-error nil)) -(let ((dir load-path) - purify-flag) - (while dir - (condition-case nil - (load (concat (car dir) "auto-autoloads")) - (t nil)) - (pop dir))) + +;; (let ((dir load-path) +;; purify-flag) +;; (while dir +;; (condition-case nil +;; (load (concat (car dir) "auto-autoloads")) +;; (t nil)) +;; (pop dir))) ;;; Local Variables: ;;; no-byte-compile: t
--- a/lisp/make-docfile.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/make-docfile.el Mon Aug 13 10:15:48 2007 +0200 @@ -125,18 +125,18 @@ (setq processed (cons arg processed))))) (setq site-load-packages (cdr site-load-packages))))) -(let ((autoloads (packages-list-autoloads-path))) - ;; (print (concat "Autoloads: " (prin1-to-string autoloads))) - (while autoloads - (let ((arg (car autoloads))) - (if (null (member arg processed)) - (progn - ;; (print arg) - (if (and (null docfile-out-of-date) - (file-newer-than-file-p arg docfile)) - (setq docfile-out-of-date t)) - (setq processed (cons arg processed)))) - (setq autoloads (cdr autoloads))))) +;(let ((autoloads (packages-list-autoloads-path))) +; ;; (print (concat "Autoloads: " (prin1-to-string autoloads))) +; (while autoloads +; (let ((arg (car autoloads))) +; (if (null (member arg processed)) +; (progn +; ;; (print arg) +; (if (and (null docfile-out-of-date) +; (file-newer-than-file-p arg docfile)) +; (setq docfile-out-of-date t)) +; (setq processed (cons arg processed)))) +; (setq autoloads (cdr autoloads))))) ;; Now fire up make-docfile and we're done
--- a/lisp/packages.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/packages.el Mon Aug 13 10:15:48 2007 +0200 @@ -83,7 +83,7 @@ (cond ((null pkg) (error "Package %s has not been loaded into this XEmacsen" name)) - ((< (cdr pkg) version) + ((< (package-get-key name :version) version) (error "Need version %g of package %s, got version %g" version name (cdr pkg))) (t t)))) @@ -412,18 +412,11 @@ (defun locate-data-file (name &optional dir-list) "Locate a file in a search path DIR-LIST (a list of directories). -If no DIR-LIST is supplied, it defaults to `data-directory-list'." +If no DIR-LIST is supplied, it defaults to `data-directory-list'. +This function is basically a wrapper over `locate-file'." (unless dir-list (setq dir-list data-directory-list)) - (let (found found-file) - (while (and (null found-file) dir-list) - (setq found (concat (car dir-list) name) - found-file (and (file-exists-p found) - (not (file-directory-p found)))) - (or found-file - (setq found nil)) - (setq dir-list (cdr dir-list))) - found)) + (locate-file name dir-list)) ;; If we are being loaded as part of being dumped, bootstrap the rest of the ;; load-path for loaddefs.
--- a/lisp/simple.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/simple.el Mon Aug 13 10:15:48 2007 +0200 @@ -389,6 +389,15 @@ :type 'boolean :group 'editing-basics) +(defcustom backward-delete-function 'backward-delete-char + "*Function called to delete backwards on a delete keypress. +If `delete-key-deletes-forward' is nil, `backward-or-forward-delete-char' +calls this function to erase one character backwards. Default value +is 'backward-delete-char, with 'backward-delete-char-untabify being a +popular alternate setting." + :type 'function + :group 'editing-basics) + (defun backward-or-forward-delete-char (arg) "Delete either one character backwards or one character forwards. Controlled by the state of `delete-key-deletes-forward' and whether the @@ -400,7 +409,7 @@ (or (eq 'tty (device-type)) (x-keysym-on-keyboard-p "BackSpace"))) (delete-char arg) - (delete-backward-char arg))) + (funcall backward-delete-function arg))) (defun backward-or-forward-kill-word (arg) "Delete either one word backwards or one word forwards. @@ -3062,7 +3071,7 @@ t))) (define-mail-user-agent 'mh-e-user-agent - 'mh-smail-batch 'mh-send-letter 'mh-fully-kill-draft + 'mh-user-agent-compose 'mh-send-letter 'mh-fully-kill-draft 'mh-before-send-letter-hook) (defun compose-mail (&optional to subject other-headers continue
--- a/lisp/startup.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/startup.el Mon Aug 13 10:15:48 2007 +0200 @@ -212,6 +212,8 @@ -no-site-file Do not load the site-specific init file (site-start.el). -no-init-file Do not load the user-specific init file (~/.emacs). -no-packages Do not process the package path. + -no-autoloads Do not load global symbol files (auto-autoloads) at + startup. Also implies `-vanilla'. -vanilla Equivalent to -q -no-site-file -no-packages. -q Same as -no-init-file. -user <user> Load user's init file instead of your own. @@ -467,7 +469,10 @@ (string= arg "--no-packages")) (setq inhibit-package-init t)) ((or (string= arg "-vanilla") - (string= arg "--vanilla")) + (string= arg "--vanilla") + ;; Some work on this one already done in emacs.c. + (string= arg "-no-autoloads") + (string= arg "--no-autoloads")) (setq init-file-user nil site-start-file nil inhibit-package-init t)) @@ -607,6 +612,20 @@ ;;; Load user's init file and default ones. (defun load-init-file () + ;; Disabled for now + (unless inhibit-update-dumped-lisp + (packages-reload-dumped-lisp)) + +;; (unless inhibit-update-autoloads +;; (packages-reload-autoloads)) + (unless inhibit-update-autoloads + (let ((dir load-path)) + (while dir + (condition-case nil + (load (expand-file-name "auto-autoloads" (car dir)) nil t) + (t nil)) + (pop dir)))) + (run-hooks 'before-init-hook) ;; Run the site-start library if it exists. The point of this file is @@ -615,13 +634,6 @@ (when site-start-file (load site-start-file t t)) - ;; Disabled for now - (unless inhibit-update-dumped-lisp - (packages-reload-dumped-lisp)) - - (unless inhibit-update-autoloads - (packages-reload-autoloads)) - ;; Sites should not disable this. Only individuals should disable ;; the startup message. (setq inhibit-startup-message nil) @@ -940,10 +952,13 @@ (defun startup-splash-frame () (let ((p (point)) + (logo (cond ((featurep 'infodock) + (make-glyph (locate-data-file "altrasoft-logo.xpm"))) + (t xemacs-logo))) (cramped-p (eq 'tty (console-type)))) (unless cramped-p (insert "\n")) - (indent-to (startup-center-spaces xemacs-logo)) - (set-extent-begin-glyph (make-extent (point) (point)) xemacs-logo) + (indent-to (startup-center-spaces logo)) + (set-extent-begin-glyph (make-extent (point) (point)) logo) (insert (if cramped-p "\n" "\n\n")) (splash-frame-present-hack (make-extent p (point)) 'about-xemacs))
--- a/lisp/term/apollo.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/term/apollo.el Mon Aug 13 10:15:48 2007 +0200 @@ -1,1 +1,732 @@ -(load "term/vt100" nil t) +;;; apollo.el --- Apollo Graphics Primitive Support Functions + +;; Copyright (C) 1998 by Free Software Foundation, Inc. +;; Copyright (C) 1991 by Lucid, Inc. + +;; Author: Leonard N. Zubkoff <lnz@dandelion.com> +;; Keywords: hardware + +;; This file is part of XEmacs. + +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; XEmacs is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to the Free +;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +;; 02111-1307, USA. + +;;; Synched up with: InfoDock 3.6.2. + +;;; Commentary: + +;; GNU Emacs Apollo GPR Support Functions + +;; Leonard N. Zubkoff + +;; lnz@dandelion.com +;; Lucid, Incorporated +;; 23 January 1991 + +;; This file defines functions that support GNU Emacs using the Apollo +;; Graphics Primitives (GPR). See the file "APOLLO.README" for a description +;; of the key bindings set up by this file. + +;; Acknowledgements + +;; The following people have contributed ideas that have helped make this +;; interface possible: Nathaniel Mishkin, Rob Stanzel, and Mark Weissman of +;; Apollo Computer, Dave Holcomb of CAECO, Vincent Broman of NOSC, and J. W. +;; Peterson of the University of Utah. + +;;; Change Log: +;; Bob Weiner, Motorola, Inc., 2/2/89 + +;; Added section to 'apollo-clean-help-file()' to remove underlining +;; and overstriking (only by the same letter) from Apollo '.hlp' files. +;; Based on the 'nuke-nroff-bs' function in man.el. +;; Changed apollo-mouse-{cut,copy,paste} commands so that they work +;; with the DM paste buffer. This combined with cut,copy,paste +;; bindings of the mouse keys allows quick and easy copying from +;; Emacs windows to DM windows. +;; Added 'unbind-apollo-mouse-button' and 'unbind-apollo-function-key' +;; commands. +;; Added 'apollo-mouse-cut-copy-paste' command which provides a +;; second set of mouse key functions that can be set with one key +;; press and cleared with another key press. Put default mouse key +;; bindings into a command called 'apollo-mouse-defaults' so that +;; they can be used to clear any other mouse bindings. +;; Both these commands affect the DM mouse key bindings as well. +;; Added 'apollo-mouse-cancel-cut-copy-paste' command which resets the mouse +;; key defaults within Emacs and the DM. The variable +;; '*dm-mouse-key-bindings-file*' should be set within an initialization +;; file to the pathname of file that executes a user's default DM mouse +;; key bindings. + +;; Bob Weiner, Motorola, Inc., 2/23/89 + +;; Added ':' as valid character within a filename (if not at the end) +;; in the command 'extract-file-name-around-point'. For remote UNIX +;; operations such as rcp and rsh commands which use the syntax, +;; <host>:<path>. + +;; Bob Weiner, Motorola, Inc., 3/09/89 +;; +;; Modified 'apollo-mouse-find-file' and 'apollo-find-file' so that they +;; recognize buffer names in addition to directory or file paths. A buffer +;; name is recognized before a path name, if the match buffer names flag is +;; enabled. Added the command 'extract-buf-or-file-name-around-point' to +; support this functionality. Added find file in other window option to +;; these two find-file commands. + +;; Bob Weiner, Motorola, Inc., 3/20/89 + +;; Changed (funcall *apollo-key-bindings-hook*) to (run-hooks +;; '*apollo-key-bindings-hook*) which is what it should be. + +;; Bob Weiner, Motorola, Inc., 4/20/89 + +;; Rebound M2D button to perform different functions by buffer and location in +;; buffer. Executes 'smart-key-mouse' command found in smart-key.el. +;; Meta-M2D executes 'smart-key-mouse-meta'. M2U is unbound. + +;; Bob Weiner, Motorola, Inc., 8/1/89 + +;; Fixed 'apollo-mouse-move-point' and 'apollo-mouse-move-mark' so they do +;; not set the mark gratuitously. They are bound to M1D and M1U respectively. + +;; Bob Weiner, Motorola, Inc., 4/11/90 + +;; Bound left and right box arrow keys to scroll right and left, +;; respectively, which most closely emulates their DM functions. + +;;; Code: + +(defvar *dm-mouse-key-bindings-file* "/sys/dm/std_keys3" + "Path of the DM key binding file which sets up a user's default mouse key +bindings. If none exists, this value should be set to one of the +/sys/dm/std_key* files which set up DM key defaults.") + +;;; Set this variable in your ".emacs" to a function to call to set up +;;; additional key bindings. +;;; +(defvar *apollo-key-bindings-hook* nil) + +;;; Set this variable non-NIL in your ".emacs" to enable preemption of normal +;;; Display Manager bindings. +;;; +(defvar *preempt-display-manager-bindings* nil) + + + +;;; Determine whether or not we're running diskless and define +;;; *paste-buffer-directory* to point to the paste buffers directory. + +(defvar *paste-buffer-directory* + (let ((test-directory (concat "/sys/node_data." + (downcase (getenv "NODEID")) + "paste_buffers/"))) + (if (file-directory-p test-directory) + test-directory + "/sys/node_data/paste_buffers/"))) + + +;;; Bind this variable non-NIL to allow apollo-mouse-move-point to leave the +;;; minibuffer area. + +(defvar *apollo-mouse-move-point-allow-minibuffer-exit* nil) + + +;;; Define the Apollo Function Keys. + +(defvar *apollo-function-keys* + '(("ESC" . 0) ("L1" . 1) ("L2" . 2) ("L3" . 3) + ("L1A" . 4) ("L2A" . 5) ("L3A" . 6) ("L4" . 7) + ("L5" . 8) ("L6" . 9) ("L7" . 10) ("L8" . 11) + ("L9" . 12) ("LA" . 13) ("LB" . 14) ("LC" . 15) + ("LD" . 16) ("LE" . 17) ("LF" . 18) ("F0" . 19) + ("F1" . 20) ("F2" . 21) ("F3" . 22) ("F4" . 23) + ("F5" . 24) ("F6" . 25) ("F7" . 26) ("F8" . 27) + ("F9" . 28) ("R1" . 29) ("R2" . 30) ("R3" . 31) + ("R4" . 32) ("R5" . 33) ("R6" . 34) ("NP0" . 35) + ("NP1" . 36) ("NP2" . 37) ("NP3" . 38) ("NP4" . 39) + ("NP5" . 40) ("NP6" . 41) ("NP7" . 42) ("NP8" . 43) + ("NP9" . 44) ("NPA" . 45) ("NPB" . 46) ("NPC" . 47) + ("NPD" . 48) ("NPE" . 49) ("NPF" . 50) ("NPG" . 51) + ("NPP" . 52) ("AL" . 53) ("AR" . 54) ("SHL" . 55) + ("SHR" . 56) ("LCK" . 57) ("CTL" . 58) ("RPT" . 59) + ("TAB" . 60) ("RET" . 61) ("BS" . 62) ("DEL" . 63) + ("ESCS" . 64) ("L1S" . 65) ("L2S" . 66) ("L3S" . 67) + ("L1AS" . 68) ("L2AS" . 69) ("L3AS" . 70) ("L4S" . 71) + ("L5S" . 72) ("L6S" . 73) ("L7S" . 74) ("L8S" . 75) + ("L9S" . 76) ("LAS" . 77) ("LBS" . 78) ("LCS" . 79) + ("LDS" . 80) ("LES" . 81) ("LFS" . 82) ("F0S" . 83) + ("F1S" . 84) ("F2S" . 85) ("F3S" . 86) ("F4S" . 87) + ("F5S" . 88) ("F6S" . 89) ("F7S" . 90) ("F8S" . 91) + ("F9S" . 92) ("R1S" . 93) ("R2S" . 94) ("R3S" . 95) + ("R4S" . 96) ("R5S" . 97) ("R6S" . 98) ("NP0S" . 99) + ("NP1S" . 100) ("NP2S" . 101) ("NP3S" . 102) ("NP4S" . 103) + ("NP5S" . 104) ("NP6S" . 105) ("NP7S" . 106) ("NP8S" . 107) + ("NP9S" . 108) ("NPAS" . 109) ("NPBS" . 110) ("NPCS" . 111) + ("NPDS" . 112) ("NPES" . 113) ("NPFS" . 114) ("NPGS" . 115) + ("NPPS" . 116) ("ALS" . 117) ("ARS" . 118) ("SHLS" . 119) + ("SHRS" . 120) ("LCKS" . 121) ("CTLS" . 122) ("RPTS" . 123) + ("TABS" . 124) ("RETS" . 125) ("BSS" . 126) ("DELS" . 127) + ("ESCC" . 128) ("L1C" . 129) ("L2C" . 130) ("L3C" . 131) + ("L1AC" . 132) ("L2AC" . 133) ("L3AC" . 134) ("L4C" . 135) + ("L5C" . 136) ("L6C" . 137) ("L7C" . 138) ("L8C" . 139) + ("L9C" . 140) ("LAC" . 141) ("LBC" . 142) ("LCC" . 143) + ("LDC" . 144) ("LEC" . 145) ("LFC" . 146) ("F0C" . 147) + ("F1C" . 148) ("F2C" . 149) ("F3C" . 150) ("F4C" . 151) + ("F5C" . 152) ("F6C" . 153) ("F7C" . 154) ("F8C" . 155) + ("F9C" . 156) ("R1C" . 157) ("R2C" . 158) ("R3C" . 159) + ("R4C" . 160) ("R5C" . 161) ("R6C" . 162) ("NP0C" . 163) + ("NP1C" . 164) ("NP2C" . 165) ("NP3C" . 166) ("NP4C" . 167) + ("NP5C" . 168) ("NP6C" . 169) ("NP7C" . 170) ("NP8C" . 171) + ("NP9C" . 172) ("NPAC" . 173) ("NPBC" . 174) ("NPCC" . 175) + ("NPDC" . 176) ("NPEC" . 177) ("NPFC" . 178) ("NPGC" . 179) + ("NPPC" . 180) ("ALC" . 181) ("ARC" . 182) ("SHLC" . 183) + ("SHRC" . 184) ("LCKC" . 185) ("CTLC" . 186) ("RPTC" . 187) + ("TABC" . 188) ("RETC" . 189) ("BSC" . 190) ("DELC" . 191) + ("ESCU" . 192) ("L1U" . 193) ("L2U" . 194) ("L3U" . 195) + ("L1AU" . 196) ("L2AU" . 197) ("L3AU" . 198) ("L4U" . 199) + ("L5U" . 200) ("L6U" . 201) ("L7U" . 202) ("L8U" . 203) + ("L9U" . 204) ("LAU" . 205) ("LBU" . 206) ("LCU" . 207) + ("LDU" . 208) ("LEU" . 209) ("LFU" . 210) ("F0U" . 211) + ("F1U" . 212) ("F2U" . 213) ("F3U" . 214) ("F4U" . 215) + ("F5U" . 216) ("F6U" . 217) ("F7U" . 218) ("F8U" . 219) + ("F9U" . 220) ("R1U" . 221) ("R2U" . 222) ("R3U" . 223) + ("R4U" . 224) ("R5U" . 225) ("R6U" . 226) ("NP0U" . 227) + ("NP1U" . 228) ("NP2U" . 229) ("NP3U" . 230) ("NP4U" . 231) + ("NP5U" . 232) ("NP6U" . 233) ("NP7U" . 234) ("NP8U" . 235) + ("NP9U" . 236) ("NPAU" . 237) ("NPBU" . 238) ("NPCU" . 239) + ("NPDU" . 240) ("NPEU" . 241) ("NPFU" . 242) ("NPGU" . 243) + ("NPPU" . 244) ("ALU" . 245) ("ARU" . 246) ("SHLU" . 247) + ("SHRU" . 248) ("LCKU" . 249) ("CTLU" . 250) ("RPTU" . 251) + ("TABU" . 252) ("RETU" . 253) ("BSU" . 254) ("DELU" . 255) + ("MARK" . "L1") ("LINE_DEL" . "L2") ("CHAR_DEL" . "L3") + ("L_BAR_ARROW" . "L4") ("CMD" . "L5") ("R_BAR_ARROW" . "L6") + ("L_BOX_ARROW" . "L7") ("UP_ARROW" . "L8") ("R_BOX_ARROW" . "L9") + ("LEFT_ARROW" . "LA") ("NEXT_WIN" . "LB") ("RIGHT_ARROW" . "LC") + ("UP_BOX_ARROW" . "LD") ("DOWN_ARROW" . "LE") ("DOWN_BOX_ARROW" . "LF") + ("COPY" . "L1A") ("PASTE" . "L2A") ("GROW" . "L3A") ("INS_MODE" . "L1S") + ("SHELL" . "L5S") ("CUT" . "L1AS") ("UNDO" . "L2AS") ("MOVE" . "L3AS") + ("POP" . "R1") ("AGAIN" . "R2") ("READ" . "R3") ("EDIT" . "R4") + ("EXIT" . "R5") ("HOLD" . "R6") ("SAVE" . "R4S") ("ABORT" . "R5S") + ("UNIXHELP" . "R6S") ("AEGISHELP" . "R6C"))) + + +;;; Define the Apollo Mouse Buttons. + +(defvar *apollo-mouse-buttons* + '(("M1D" . 97) ("M2D" . 98) ("M3D" . 99) ("M4D" . 100) + ("M1S" . 33) ("M2S" . 34) ("M3S" . 35) ("M4S" . 36) + ("M1C" . 1) ("M2C" . 2) ("M3C" . 3) ("M4C" . 4) + ("M1U" . 65) ("M2U" . 66) ("M3U" . 67) ("M4U" . 68))) + + +;;; Define functions to simplify making function key and mouse button bindings. + +(defun bind-apollo-function-key (function-key binding &optional meta-binding) + "Enable an Apollo Function Key and assign a binding to it." + (interactive "sFunction Key: \nCCommand: \nCMeta Command: ") + (let ((numeric-code (cdr (assoc function-key *apollo-function-keys*)))) + (if (null numeric-code) + (error "%s is not a legal Apollo Function Key name" function-key)) + (if (stringp numeric-code) + (setq numeric-code + (cdr (assoc numeric-code *apollo-function-keys*)))) + (enable-apollo-function-key numeric-code) + (let ((normal-sequence + (concat (char-to-string (logior 72 (lsh numeric-code -6))) + (char-to-string (logior 64 (logand numeric-code 63))))) + (meta-sequence + (concat (char-to-string (logior 76 (lsh numeric-code -6))) + (char-to-string (logior 64 (logand numeric-code 63)))))) + (define-key 'apollo-prefix normal-sequence binding) + (define-key 'apollo-prefix meta-sequence (or meta-binding binding))))) + +(defun unbind-apollo-function-key (function-key) + "Disable an Apollo Function Key and return control of it to the DM." + (interactive "sFunction key: ") + (let ((numeric-code (cdr (assoc function-key *apollo-function-keys*)))) + (if (null numeric-code) + (error "%s is not a legal Apollo Function Key name" function-key)) + (if (stringp numeric-code) + (setq numeric-code + (cdr (assoc numeric-code *apollo-function-keys*)))) + (disable-apollo-function-key numeric-code))) + +(defun select-apollo-meta-key (meta-key) + "Select the Function Key used as the Meta Key." + (interactive "sMeta Key: ") + (let ((numeric-code (cdr (assoc meta-key *apollo-function-keys*)))) + (if (null numeric-code) + (error "%s is not a legal Apollo Function Key name" meta-key)) + (if (stringp numeric-code) + (setq numeric-code + (cdr (assoc numeric-code *apollo-function-keys*)))) + (set-apollo-meta-key numeric-code))) + +(defun bind-apollo-mouse-button (mouse-button binding &optional meta-binding) + "Enable an Apollo Mouse Button and assign a binding to it." + (interactive "sMouse Button: \nCCommand: \nCMeta Command: ") + (let ((numeric-code (cdr (assoc mouse-button *apollo-mouse-buttons*)))) + (if (null numeric-code) + (error "%s is not a legal Apollo Mouse Button name" mouse-button)) + (enable-apollo-mouse-button numeric-code) + (let ((normal-sequence (char-to-string numeric-code)) + (meta-sequence (char-to-string (+ numeric-code 16)))) + (define-key 'apollo-prefix normal-sequence binding) + (define-key 'apollo-prefix meta-sequence (or meta-binding binding))))) + +(defun unbind-apollo-mouse-button (mouse-button) + "Disable an Apollo Mouse Button and return control of it to the DM." + (interactive "sMouse Button: ") + (let ((numeric-code (cdr (assoc mouse-button *apollo-mouse-buttons*)))) + (if (null numeric-code) + (error "%s is not a legal Apollo Mouse Button name" mouse-button)) + (disable-apollo-mouse-button numeric-code))) + + +;;; Initialize the Apollo Keymaps. + +(define-prefix-command 'apollo-prefix) +(global-set-key "\C-^" 'apollo-prefix) +(define-prefix-command 'apollo-prefix-1) +(define-prefix-command 'apollo-prefix-2) +(define-prefix-command 'apollo-prefix-3) +(define-prefix-command 'apollo-prefix-4) +(define-prefix-command 'apollo-prefix-5) +(define-prefix-command 'apollo-prefix-6) +(define-prefix-command 'apollo-prefix-7) +(define-prefix-command 'apollo-prefix-8) +(define-key 'apollo-prefix "H" 'apollo-prefix-1) +(define-key 'apollo-prefix "I" 'apollo-prefix-2) +(define-key 'apollo-prefix "J" 'apollo-prefix-3) +(define-key 'apollo-prefix "K" 'apollo-prefix-4) +(define-key 'apollo-prefix "L" 'apollo-prefix-5) +(define-key 'apollo-prefix "M" 'apollo-prefix-6) +(define-key 'apollo-prefix "N" 'apollo-prefix-7) +(define-key 'apollo-prefix "O" 'apollo-prefix-8) + + +;;; Commands to COPY, CUT, and PASTE. + +(defun apollo-copy-region () + "Copy region between point and mark to the default DM paste buffer." + (interactive) + (write-region-to-default-apollo-paste-buffer (mark) (point)) + (message "Region Copied")) + +(defun apollo-cut-region () + "Copy region between point and mark to the default DM paste buffer." + (interactive) + (write-region-to-default-apollo-paste-buffer (mark) (point)) + (kill-region (mark) (point)) + (message "Region Cut")) + +(defun apollo-paste () + "Copy region between point and mark to the default DM paste buffer." + (interactive) + (let ((x (insert-contents-of-default-apollo-paste-buffer))) + (push-mark (+ (point) x))) + (message "Pasted and Mark set")) + + +;;; Miscellaneous Commands. + +(defun minibuffer-prompt-length () + "Returns the length of the current minibuffer prompt." + (let ((window (selected-window)) + length) + (select-window (minibuffer-window)) + (let ((point (point))) + (goto-char (point-min)) + (insert-char ?a 200) + (goto-char (point-min)) + (vertical-motion 1) + (setq length (- (frame-width) (point))) + (goto-char (point-min)) + (delete-char 200) + (goto-char point)) + (select-window window) + length)) + +(defun extract-file-or-buffer-name-around-point (&optional buffer-flag) + (let ((skip-characters (if buffer-flag + "!#-%*-9=?-{}~:<>" + "!#-%*-9=?-{}~:")) + (skip-at-end (if buffer-flag + '(?@ ?. ?, ?: ?<) + '(?* ?@ ?. ?, ?:)))) + (save-excursion + (skip-chars-backward skip-characters) + (let ((start (point))) + (skip-chars-forward skip-characters) + (let* ((filename (buffer-substring start (point))) + (last-char (aref filename (- (length filename) 1)))) + (if (memq last-char skip-at-end) + (substring filename 0 -1) + filename)))))) +(fset 'extract-file-name-around-point + 'extract-file-or-buffer-name-around-point) +(fset 'extract-buf-or-file-name-around-point + 'extract-file-or-buffer-name-around-point) + +(defun apollo-find-file (&optional find-buffer-flag other-window) + "Find the file or buffer whose name the cursor is over. Buffer names are +matched only if the optional argument FIND-BUFFER-FLAG is non-NIL. If the +optional argument OTHER-WINDOW is non-NIL, the file is displayed in the other +window. When matching file names, ignores trailing '*' or '@' as in 'ls -F' +output." + (interactive) + (let* ((file-or-buffer-name + (extract-file-or-buffer-name-around-point find-buffer-flag)) + (buffer (and find-buffer-flag (get-buffer file-or-buffer-name)))) + (if (or buffer (file-exists-p file-or-buffer-name)) + (funcall (if other-window + 'switch-to-buffer-other-window + 'switch-to-buffer) + (or buffer (find-file-noselect file-or-buffer-name))) + (error "Cannot find %s \"%s\"" + (if find-buffer-flag "buffer or file" "file") + file-or-buffer-name)))) + +(defun apollo-grow-emacs-window () + "Grow Emacs's Apollo window with rubberbanding." + (interactive) + (execute-dm-command "WGE")) + +(defun apollo-move-emacs-window () + "Move Emacs's Apollo window with rubberbanding." + (interactive) + (execute-dm-command "WME")) + +(defun apollo-again () + "Copy the remainder of the current line to the end of the buffer." + (interactive) + (set-mark-command nil) + (end-of-line) + (copy-region-as-kill (mark) (point)) + (end-of-buffer) + (yank)) + +(defun apollo-exit () + "Kill current buffer after saving changes." + (interactive) + (save-buffer) + (kill-buffer (current-buffer))) + +(defun apollo-abort () + "Kill current buffer without saving changes." + (interactive) + (kill-buffer (current-buffer))) + +(defun apollo-aegis-help (filename) + "Prompt for topic and find the Apollo help file." + (interactive "sHelp on: ") + (let ((help-file (concat "/sys/help/" filename ".hlp"))) + (with-output-to-temp-buffer "*Help File*" + (buffer-disable-undo standard-output) + (save-excursion + (set-buffer standard-output) + (insert-man-file help-file) + (if (> (buffer-size) 0) + (progn + (message "Cleaning help file entry...") + (apollo-clean-help-file) + (message "")) + (message "No help found in %s" help-file)) + (set-buffer-modified-p nil))))) +(fset 'apollo-help 'apollo-aegis-help) + +;;; Make sure this will be loaded if necessary. + +(autoload 'insert-man-file "man") + +(defun apollo-clean-help-file () + (interactive "*") + ;; Remove underlining and overstriking by the same letter. + (goto-char (point-min)) + (while (search-forward "\b" nil t) + (let ((preceding (char-after (- (point) 2))) + (following (following-char))) + (cond ((= preceding following) ; x\bx + (delete-char -2)) + ((= preceding ?\_) ; _\b + (delete-char -2)) + ((= following ?\_) ; \b_ + (delete-region (1- (point)) (1+ (point))))))) + ;; Remove overstriking and carriage returns before newline. + (goto-char (point-min)) + (while (re-search-forward "\r$" nil t) + (replace-match "")) + (goto-char (point-min)) + (while (re-search-forward "^.*\r" nil t) + (replace-match "")) + ;; Fit in 79 cols rather than 80. + (indent-rigidly (point-min) (point-max) -1) + ;; Delete excess multiple blank lines. + (goto-char (point-min)) + (while (re-search-forward "\n\n\n\n*" nil t) + (replace-match "\n\n")) + ;; Remove blank lines at the beginning. + (goto-char (point-min)) + (skip-chars-forward "\n") + (delete-region (point-min) (point)) + ;; Separate the header from the main subject line. + (end-of-line) + (insert "\n") + (goto-char (point-min))) + +(defun kill-whole-line () + "Kill the line containing point. Try to retain column cursor is on." + (interactive) + (let ((old-column (current-column))) + (beginning-of-line) + (kill-line 1) + (move-to-column old-column))) + +(defun apollo-key-undefined () + "Signal that an Apollo Function Key is undefined." + (interactive) + (error "Apollo Function Key undefined")) + + +;;; Define the mouse commands. + +(defun apollo-mouse-move-point (&optional no-mark) + "Used so that pressing the left mouse button, moving the cursor, and +releasing the left mouse button leaves the mark set to the initial position +and the point set to the final position. Useful for easily marking regions +of text. If the left mouse button is pressed and released at the same place, +the mark is left at the original position of the character cursor. + +Returns (x y) frame coordinates of point in columns and lines." + (interactive) + (let* ((opoint (point)) + (owindow (selected-window)) + (x (- (read-char) 8)) + (y (- (read-char) 8)) + (edges (window-edges)) + (window nil)) + (while (and (not (eq window (selected-window))) + (or (< y (nth 1 edges)) + (>= y (nth 3 edges)) + (< x (nth 0 edges)) + (>= x (nth 2 edges)))) + (setq window (next-window window)) + (setq edges (window-edges window))) + (if (and window (not (eq window (selected-window)))) + (progn + (if (and (not *apollo-mouse-move-point-allow-minibuffer-exit*) + (eq (selected-window) (minibuffer-window))) + (error "Cannot use mouse to leave minibuffer!")) + (if (eq window (minibuffer-window)) + (error "Cannot use mouse to enter minibuffer!")))) + (if window (select-window window)) + (move-to-window-line (- y (nth 1 edges))) + (let* ((width-1 (1- (window-width window))) + (wraps (/ (current-column) width-1)) + (prompt-length (if (eq (selected-window) (minibuffer-window)) + (minibuffer-prompt-length) + 0))) + (move-to-column (+ (- x (nth 0 edges) prompt-length) + (* wraps width-1)))) + (if no-mark + (progn (setq window (selected-window)) + (if (eq owindow window) + (if (equal opoint (point)) + (pop-mark)) + (select-window owindow) + (pop-mark) + (select-window window))) + (set-mark-command nil)) + ;; Return (x y) coords of point in column and frame line numbers. + (list x y))) + +(defun apollo-mouse-move-mark () + "Used so that pressing the left mouse button, moving the cursor, and +releasing the left mouse button leaves the mark set to the initial position +and the point set to the final position. Useful for easily marking regions +of text. If the left mouse button is pressed and released at the same place, +the mark is left at the original position of the character cursor." + (interactive) + (apollo-mouse-move-point) + (if (equal (point) (mark)) + (pop-mark))) + +(defun apollo-mouse-cut () + "Move point to the location of the mouse cursor and +cut the region to the default DM paste buffer." + (interactive) + (apollo-mouse-move-mark) + (apollo-cut-region)) + +(defun apollo-mouse-copy () + "Move point to the location of the mouse cursor and +copy the region to the default DM paste buffer." + (interactive) + (apollo-mouse-move-mark) + (apollo-copy-region)) + +(defun apollo-mouse-paste () + "Move point to the location of the mouse cursor and +paste in the default DM paste buffer." + (interactive) + (apollo-mouse-move-point) + (apollo-paste)) + +(defun apollo-mouse-pop-buffer () + "Used in conjunction with the 'list-buffers' command, moves +point to cursor location and displays buffer named on current line. +Similar to a DM pop window by name to top." + (interactive) + (apollo-mouse-move-point) + (Buffer-menu-select)) + +(defun apollo-mouse-find-file () + "Find the file or buffer whose name the cursor is over. Buffers are only +allowed when in the '*Buffer List*' buffer. When matching file names, ignores +trailing '*' or '@' as in 'ls -F' output." + (interactive) + (apollo-mouse-move-point) + (let ((find-buffer-flag + (equal (buffer-name (current-buffer)) "*Buffer List*"))) + (apollo-find-file find-buffer-flag nil))) + +(defun apollo-mouse-find-file-other-window () + "Find the file or buffer whose name the cursor is over. Buffers are only +allowed when in the '*Buffer List*' buffer. When matching file names, ignores +trailing '*' or '@' as in 'ls -F' output. The file or buffer is displayed in +the other window." + (interactive) + (apollo-mouse-move-point) + (let ((find-buffer-flag + (equal (buffer-name (current-buffer)) "*Buffer List*"))) + (apollo-find-file find-buffer-flag t)) + (other-window 1)) + + +;;; Define and Enable the Mouse Key Bindings. + +(defun apollo-mouse-defaults () +"Set up default Apollo mouse key bindings for GNU Emacs." + (interactive) + (bind-apollo-mouse-button "M1D" 'apollo-mouse-move-point + 'apollo-mouse-move-point) ;MOUSE LEFT DOWN + (bind-apollo-mouse-button "M1U" 'apollo-mouse-move-mark + 'apollo-mouse-copy) ;MOUSE LEFT UP + (bind-apollo-mouse-button "M2D" 'sm-depress + 'sm-depress-meta) ;MOUSE MIDDLE DOWN + (bind-apollo-mouse-button "M2U" 'smart-key-mouse + 'smart-key-mouse-meta) ;MOUSE MIDDLE UP + (bind-apollo-mouse-button "M3D" 'sm-depress-meta) ;MOUSE RIGHT DOWN + (bind-apollo-mouse-button "M3U" 'smart-key-mouse-meta) ;MOUSE RIGHT UP +) +(apollo-mouse-defaults) + +(defun apollo-mouse-cut-copy-paste () + "Sets Apollo mouse keys to perform DM-style cut, copy, and paste. +LEFT MOUSE DOWN moves point to cursor location. LEFT MOUSE UP sets +mark, moves point to cursor location and cuts region. MID MOUSE works +the same way but does a copy. RIGHT MOUSE sets point and pastes at +cursor location. These key bindings are also effective in DM windows +until \\[apollo-mouse-cancel-cut-copy-paste] is executed in the GNU Emacs DM +window." + (interactive) + (bind-apollo-mouse-button "M1D" 'apollo-mouse-move-point) ;MOUSE LEFT DOWN + (bind-apollo-mouse-button "M1U" 'apollo-mouse-cut) ;MOUSE LEFT UP + (bind-apollo-mouse-button "M2D" 'apollo-mouse-move-point) ;MOUSE MIDDLE DOWN + (bind-apollo-mouse-button "M2U" 'apollo-mouse-copy) ;MOUSE MIDDLE UP + (bind-apollo-mouse-button "M3D" 'apollo-mouse-paste) ;MOUSE RIGHT DOWN + (unbind-apollo-mouse-button "M3U") ;MOUSE RIGHT UP + (message "Mouse Edit Mode: left=cut, mid=copy, right=paste") + (execute-dm-command "msg 'Mouse Edit Mode: left=cut, mid=copy, right=paste';kd m1 dr;echo ke;kd m1u xd ke;kd m2 dr;echo ke;kd m2u xc ke; kd m3 xp ke;kd m3u ke") +) + +(defun apollo-mouse-cancel-cut-copy-paste () + "Sets Apollo mouse keys back to defaults with GNU Emacs and personal +settings within the DM." + (interactive) + (apollo-mouse-defaults) + (message "Default mouse key bindings set") + (execute-dm-command + (concat "msg 'Mouse Edit Mode canceled; personal mouse keys restored';" + "cmdf " *dm-mouse-key-bindings-file*)) +) + +;;; Define and Enable the Function Key Bindings. + +(bind-apollo-function-key "TABS" "\C-I") ;Shift TAB +(bind-apollo-function-key "TABC" "\C-I") ;Control TAB +(bind-apollo-function-key "RETS" "\C-M") ;Shift RET +(bind-apollo-function-key "RETC" "\C-M") ;Control RET +(bind-apollo-function-key "LINE_DEL" 'kill-whole-line) ;LINE DEL +(bind-apollo-function-key "CHAR_DEL" "\C-D") ;CHAR DEL +(bind-apollo-function-key "L_BAR_ARROW" "\C-A") ;LEFT BAR ARROW +(bind-apollo-function-key "R_BAR_ARROW" "\C-E") ;RIGHT BAR ARROW +(bind-apollo-function-key "L_BOX_ARROW" "\C-x>") ;LEFT BOX ARROW +(bind-apollo-function-key "UP_ARROW" "\C-P") ;UP ARROW +(bind-apollo-function-key "L8S" "\M-1\M-V") ;Shift UP ARROW + +;;; RIGHT BOX ARROW is the Default Meta Key. If the Meta Key is changed with +;;; SELECT-APOLLO-META-KEY, then RIGHT BOX ARROW signals an error. + +(select-apollo-meta-key "R1") ; Make POP the META key instead. +(bind-apollo-function-key "R_BOX_ARROW" "\C-x<") ;RIGHT BOX ARROW +(bind-apollo-function-key "LEFT_ARROW" "\C-B") ;LEFT ARROW +(bind-apollo-function-key "RIGHT_ARROW" "\C-F") ;RIGHT ARROW +(bind-apollo-function-key "DOWN_ARROW" "\C-N") ;DOWN ARROW +(bind-apollo-function-key "LES" "\M-1\C-V") ;Shift DOWN ARROW +(bind-apollo-function-key "R3S" 'apollo-find-file) ;Shift READ +(bind-apollo-function-key "MARK" 'set-mark-command) ;MARK +(bind-apollo-function-key "INS_MODE" 'overwrite-mode) ;INS MODE +(bind-apollo-function-key "L2S" "\C-Y") ;Shift LINE DEL +(bind-apollo-function-key "L3S" "\C-D") ;Shift CHAR DEL +(bind-apollo-function-key "COPY" 'apollo-copy-region) ;COPY +(bind-apollo-function-key "CUT" 'apollo-cut-region) ;CUT +(bind-apollo-function-key "PASTE" 'apollo-paste) ;PASTE +(bind-apollo-function-key "UNDO" 'undo) ;UNDO +(bind-apollo-function-key "GROW" 'apollo-grow-emacs-window) ;GROW +(bind-apollo-function-key "MOVE" 'apollo-move-emacs-window) ;MOVE +(bind-apollo-function-key "LAS" "\M-B") ;Shift LEFT ARROW +(bind-apollo-function-key "LCS" "\M-F") ;Shift RIGHT ARROW +(bind-apollo-function-key "UP_BOX_ARROW" "\M-V") ;UP BOX ARROW +(bind-apollo-function-key "LDS" "\M-<") ;Shift UP BOX ARROW +(bind-apollo-function-key "DOWN_BOX_ARROW" "\C-V") ;DOWN BOX ARROW +(bind-apollo-function-key "LFS" "\M->") ;Shift DOWN BOX ARROW +(bind-apollo-function-key "AGAIN" 'apollo-again) ;AGAIN +(bind-apollo-function-key "EXIT" 'apollo-exit) ;EXIT +(bind-apollo-function-key "ABORT" 'apollo-abort) ;ABORT +(bind-apollo-function-key "SAVE" 'save-buffer) ;SAVE +(bind-apollo-function-key "HOLD" 'apollo-key-undefined) ;HOLD + +(defun install-apollo-dm-preemptive-key-bindings () + (bind-apollo-function-key "L4S" "\M-<") ;Shift LEFT BAR ARROW + (bind-apollo-function-key "L5" 'execute-dm-command) ;CMD + (bind-apollo-function-key "L6S" "\M->") ;Shift RIGHT BAR ARROW + (bind-apollo-function-key "LB" 'other-window) ;NEXT WNDW + (bind-apollo-function-key "LBS" 'delete-window) ;Shift NEXT WNDW + (bind-apollo-function-key "READ" 'find-file-read-only) ;READ + (bind-apollo-function-key "EDIT" 'find-file) ;EDIT + (bind-apollo-function-key "SHELL" 'shell) ;SHELL + (bind-apollo-function-key "UNIXHELP" 'manual-entry) ;HELP + (bind-apollo-function-key "AEGISHELP" 'apollo-aegis-help)) ;HELP + +(if *preempt-display-manager-bindings* + (install-apollo-dm-preemptive-key-bindings)) + +(run-hooks '*apollo-key-bindings-hook*) + +(provide 'apollo) + +;;; apollo.el ends here
--- a/lisp/toolbar.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/toolbar.el Mon Aug 13 10:15:48 2007 +0200 @@ -68,6 +68,7 @@ (defun init-toolbar-from-resources (locale) (if (and (featurep 'x) + (not (featurep 'infodock)) (or (eq locale 'global) (eq 'x (device-or-frame-type locale)))) (x-init-toolbar-from-resources locale)))
--- a/lisp/version.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/version.el Mon Aug 13 10:15:48 2007 +0200 @@ -40,18 +40,22 @@ (format "%d.%d %s%s%s" emacs-major-version emacs-minor-version - (if xemacs-codename + (if (and xemacs-codename (not (featurep 'infodock))) (concat "\"" xemacs-codename "\"") "") (concat " XEmacs " - (if (not (featurep 'infodock)) +;; (if (not (featurep 'infodock)) " Lucid" - "")) +;; "")) + ) (if xemacs-betaname (concat " " xemacs-betaname) ""))) "Version numbers of this version of XEmacs.") +(if (featurep 'infodock) + (require 'id-vers)) + ;; Moved to C code as of XEmacs 20.3 ;(defconst emacs-major-version ; (progn (or (string-match "^[0-9]+" emacs-version)
--- a/lisp/x-compose.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/x-compose.el Mon Aug 13 10:15:48 2007 +0200 @@ -72,8 +72,9 @@ ;; have any modifier bits associated with it. This exact command may not ;; work, depending on what system and keyboard you are using. If it ;; doesn't, you'll have to read the man page for xmodmap. You might want -;; to get the "xkeycaps" program from the host export.lcs.mit.edu in the -;; file contrib/xkeycaps.tar.Z, which is a graphical front end to xmodmap +;; to get the "xkeycaps" program from +;; <URL:http://people.netscape.com/jwz/xkeycaps/>, +;; which is a graphical front end to xmodmap ;; that hides xmodmap's arcane syntax from you. ;; If for some reason you don't want to have a dedicated compose key on your
--- a/lisp/x-init.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/x-init.el Mon Aug 13 10:15:48 2007 +0200 @@ -237,6 +237,33 @@ (x-win-init-xfree86))))) +;; Moved from x-toolbar.el, since InfoDock doesn't dump a x-toolbar.el. +(defun x-init-toolbar-from-resources (locale) + (x-init-specifier-from-resources + top-toolbar-height 'natnum locale + '("topToolBarHeight" . "TopToolBarHeight")) + (x-init-specifier-from-resources + bottom-toolbar-height 'natnum locale + '("bottomToolBarHeight" . "BottomToolBarHeight")) + (x-init-specifier-from-resources + left-toolbar-width 'natnum locale + '("leftToolBarWidth" . "LeftToolBarWidth")) + (x-init-specifier-from-resources + right-toolbar-width 'natnum locale + '("rightToolBarWidth" . "RightToolBarWidth")) + (x-init-specifier-from-resources + top-toolbar-border-width 'natnum locale + '("topToolBarBorderWidth" . "TopToolBarBorderWidth")) + (x-init-specifier-from-resources + bottom-toolbar-border-width 'natnum locale + '("bottomToolBarBorderWidth" . "BottomToolBarBorderWidth")) + (x-init-specifier-from-resources + left-toolbar-border-width 'natnum locale + '("leftToolBarBorderWidth" . "LeftToolBarBorderWidth")) + (x-init-specifier-from-resources + right-toolbar-border-width 'natnum locale + '("rightToolBarBorderWidth" . "RightToolBarBorderWidth"))) + (defvar pre-x-win-initted nil) (defun init-pre-x-win () @@ -278,8 +305,10 @@ ;; We can't load this until after the initial X device is created ;; because the icon initialization needs to access the display to get ;; any toolbar-related color resources. - (if (featurep 'toolbar) + (if (and (not (featurep 'infodock)) (featurep 'toolbar)) (init-x-toolbar)) + (if (and (featurep 'infodock) (featurep 'toolbar)) + (require 'id-x-toolbar)) (if (featurep 'mule) (init-mule-x-win)) ;; these are only ever called if zmacs-regions is true.
--- a/lisp/x-menubar.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/x-menubar.el Mon Aug 13 10:15:48 2007 +0200 @@ -369,7 +369,8 @@ 'new (selected-frame))) :style radio - :selected (equal gnuserv-frame (selected-frame))] + :selected (and (boundp 'gnuserv-frame) + (equal gnuserv-frame (selected-frame)))] ) "-----" @@ -417,7 +418,8 @@ (font-lock-recompute-variables)) :style radio :active (and (boundp 'font-lock-mode) font-lock-mode) - :selected (and font-lock-mode + :selected (and (boundp 'font-lock-mode) + font-lock-mode (or (and (not (integerp font-lock-maximum-decoration)) (not (eq t font-lock-maximum-decoration))) (and (integerp font-lock-maximum-decoration) @@ -429,7 +431,8 @@ (font-lock-recompute-variables)) :style radio :active (and (boundp 'font-lock-mode) font-lock-mode) - :selected (and font-lock-mode + :selected (and (boundp 'font-lock-mode) + font-lock-mode (integerp font-lock-maximum-decoration) (= 1 font-lock-maximum-decoration))] ["Even More" (if (and (integerp font-lock-maximum-decoration) @@ -439,7 +442,8 @@ (font-lock-recompute-variables)) :style radio :active (and (boundp 'font-lock-mode) font-lock-mode) - :selected (and font-lock-mode + :selected (and (boundp 'font-lock-mode) + font-lock-mode (integerp font-lock-maximum-decoration) (= 2 font-lock-maximum-decoration))] ["Most" (if (or (eq font-lock-maximum-decoration t) @@ -450,7 +454,8 @@ (font-lock-recompute-variables)) :style radio :active (and (boundp 'font-lock-mode) font-lock-mode) - :selected (and font-lock-mode + :selected (and (boundp 'font-lock-mode) + font-lock-mode (or (eq font-lock-maximum-decoration t) (and (integerp font-lock-maximum-decoration) (>= font-lock-maximum-decoration 3))))] @@ -546,7 +551,8 @@ :selected (and (boundp 'blink-cursor-mode) blink-cursor-mode)] ["Frame-Local Font Menu" (setq font-menu-this-frame-only-p (not font-menu-this-frame-only-p)) - :style toggle :selected font-menu-this-frame-only-p] + :style toggle :selected (and (boundp 'font-menu-this-frame-only-p) + font-menu-this-frame-only-p)] ; ["Line Numbers" (line-number-mode nil) ; :style toggle :selected line-number-mode] ) @@ -595,7 +601,8 @@ "---" ["Ignore Scaled Fonts" (setq font-menu-ignore-scaled-fonts (not font-menu-ignore-scaled-fonts)) - :style toggle :selected font-menu-ignore-scaled-fonts] + :style toggle :selected (and (boundp 'font-menu-ignore-scaled-fonts) + font-menu-ignore-scaled-fonts)] ) ,@(if (featurep 'toolbar) '(("Toolbar Appearance"
--- a/lisp/x-toolbar.el Mon Aug 13 10:15:04 2007 +0200 +++ b/lisp/x-toolbar.el Mon Aug 13 10:15:48 2007 +0200 @@ -154,9 +154,11 @@ (defun toolbar-ispell-internal () (interactive) - (if (region-active-p) - (ispell-region (region-beginning) (region-end)) - (ispell-buffer))) + (cond + ((region-active-p) (ispell-region (region-beginning) (region-end))) + ((eq major-mode 'mail-mode) (ispell-message)) + ((eq major-mode 'message-mode) (ispell-message)) + (t (ispell-buffer)))) (defcustom toolbar-ispell-function 'toolbar-ispell-internal "*Function to call when the ispell icon is selected." @@ -190,7 +192,8 @@ (elm . (toolbar-external "xterm" "-e" "elm")) (mutt . (toolbar-external "xterm" "-e" "mutt")) (exmh . (toolbar-external "exmh")) - (netscape . (toolbar-external "netscape" "mailbox:"))) + (netscape . (toolbar-external "netscape" "mailbox:")) + (send . mail)) "*Alist of mail readers and their commands. The car of each alist element is the mail reader, and the cdr is the form used to start it." @@ -203,11 +206,12 @@ The legal values are the keys from `toolbar-mail-command-alist', which should be used to add new mail readers. Mail readers known by default are vm, gnus, rmail, mh, pine, elm, - mutt, exmh and netscape." + mutt, exmh, netscape and send." :type '(choice (const :tag "Not Configured" not-configured) (const vm) (const gnus) (const rmail) (const mh) (const pine) (const elm) (const mutt) (const exmh) (const netscape) + (const send) (symbol :tag "Other" :validate (lambda (wid) (if (assq (widget-value wid)
--- a/lwlib/xlwmenu.c Mon Aug 13 10:15:04 2007 +0200 +++ b/lwlib/xlwmenu.c Mon Aug 13 10:15:48 2007 +0200 @@ -1639,7 +1639,7 @@ if (val->enabled) gc = mw->menu.highlight_gc; else - gc = mw->menu.inactive_button_gc; + gc = mw->menu.inactive_gc; } else if (menu_pb) { @@ -2505,11 +2505,7 @@ /* Memorize the previously selected item to be able to refresh it */ old_selection = last_same + 1 < old_depth ? old_stack [last_same + 1] : NULL; - if (old_selection && !old_selection->enabled) - old_selection = NULL; new_selection = last_same + 1 < new_depth ? new_stack [last_same + 1] : NULL; - if (new_selection && !new_selection->enabled) - new_selection = NULL; /* updates old_state from new_state. It has to be done now because display_menu (called below) uses the old_stack to know what to display. */
--- a/nt/config.h Mon Aug 13 10:15:04 2007 +0200 +++ b/nt/config.h Mon Aug 13 10:15:48 2007 +0200 @@ -422,7 +422,7 @@ /* To eliminate use of `const' in the XEmacs sources, do `#define CONST_IS_LOSING' */ -#define CONST_IS_LOSING +/* #define CONST_IS_LOSING hell, const works with VC! - kkm */ # undef CONST # ifdef CONST_IS_LOSING
--- a/nt/inc/sys/socket.h Mon Aug 13 10:15:04 2007 +0200 +++ b/nt/inc/sys/socket.h Mon Aug 13 10:15:48 2007 +0200 @@ -14,6 +14,7 @@ #define MUST_REDEF_SELECT #endif +#if 0 /* What's wrong with winsock.h version ? - kkm */ /* avoid clashing with our version of FD_SET if already defined */ #ifdef FD_SET #undef FD_SET @@ -24,6 +25,7 @@ /* allow us to provide our own version of fd_set */ #define fd_set ws_fd_set +#endif /* 0 */ /* avoid duplicate definition of timeval */ #ifdef HAVE_TIMEVAL @@ -38,6 +40,7 @@ #undef MUST_REDEF_SELECT #endif +#if 0 /* What's wrong with winsock.h version ? - kkm */ /* revert to our version of FD_SET */ #undef FD_SET #undef FD_CLR @@ -45,6 +48,7 @@ #undef FD_ZERO #undef fd_set #include "nt.h" +#endif /* 0 */ #ifdef HAVE_TIMEVAL #undef timeval
--- a/src/ChangeLog Mon Aug 13 10:15:04 2007 +0200 +++ b/src/ChangeLog Mon Aug 13 10:15:48 2007 +0200 @@ -1,3 +1,99 @@ +Sat Jan 10 11:36:11 1998 <andyp@parallax.co.uk> + + * config.h.in: undef HAVE_SYS_UN_H so that it gets defined by + configure for gnuserv with UNIX_DOMAIN_SOCKETS. + +1998-01-09 SL Baur <steve@altair.xemacs.org> + + * buffer.c (reset_buffer_local_variables): Synch case-table + resetting stuffs from Emacs 20.2. + Suggested by Aki Vehtari <Aki.Vehtari@hut.fi> + + * src/symbols.c (Fsetq_default): Fix docstring. + From Didier Verna <verna@inf.enst.fr> + +1998-01-07 Kirill M. Katsnelson <kkm@kis.ru> + + * msw-proc.c (mswindows_wnd_proc): Calls to redisplay() from out + of WM_SIZE handler limited to the case of dragging frame borders. + + * redisplay-msw.c (mswindows_bevel_modeline): Added support for + negative modeline height. + (mswindows_output_cursor): Added bar cursor drawing + (mswindows_flash): Flash frame by inverting client area. + +1998-01-08 Andy Piper <andyp@parallax.co.uk> + + * lread.c: guess load path if its not set just like the dumped + version does. + + * doc.c: guess doc path if its not set just like the dumped + version does + +Thu Jan 08 09:42:36 1998 Andy Piper <andyp@parallax.co.uk> + + * emacs.c: don't load loadup.el when CANNOT_DUMP is set, this + is almost never right on XEmacs. + + * s/cygwin32.h: add comments about how to buid. Move some + variables into configure so that we don't have to set them. + + * config.h.in: define HAVE_WINDOW_SYSTEM if HAVE_MS_WINDOWS is + set. + +1998-01-06 Kirill M. Katsnelson <kkm@kis.ru> + + * lread.c (Fload_internal): On Win32, this reopened the file + without first closing the handle. This caused running out of + handles. + + * nt.c (sys_open): This one made big mess when opening a handle + next after MAXDESC-1. Fixed. + +1998-01-06 Kirill M. Katsnelson <kkm@kis.ru> + + * objects-msw.c (mswindows_string_to_color): Patched not to modify + const char* parameter. + (hexval): Modified to accept uppercase hex digits. + + * ntproc.c (sys_spawnve): char* arguments made CONST, to comply + with standard header declaration. + + * sysdep.c: Fixed ugly prototypes copied from system headers. Who + says the solution is as ugly, is right. + Added a couple of #include directives to avoid undefined functions. + (struct save_signal): Added parameter to function pointer + prototype when compiled under ANSI C. + (save_signal_handlers): Ditto + + * s/windowsnt.h: Added prototypes for functions defined via + sys_<name> which are not found or differ on Win32: pipe, sleep, + spawnve, wait, kill + Macros created from former nt.c functions: random srandom setpgrp + Defined HAVE_STRCASECMP, and strcasecmp defined to _stricmp which + is provided by the compiler. + Removed hack which prevented winsock.h from including. + + * nt.c (random): Removed and made a macro in s/windowsnt.h + (srandom): Ditto + (setpgrp): Ditto + (unrequest_sigio): #if0'ed. It is unreferenced; in XEmacs, calls + to it seem to be controlled by HAVE_SIGIO. + (request_sigio): Ditto + + * nt.h: Removed FD_* macros. Rely on definitions in winsock.h. + Changed EMACSDEBUG references to DEBUG_XEMACS + + * event-msw.c (mswindows_cancel_dispatch_event): Returns Qnil when + event not found in the queue. Used to return undefined value. + +1998-01-07 SL Baur <steve@altair.xemacs.org> + + * emacs.c (main_1): Add `-no-autoloads' to suppress loading + autoloads at startup. + + * Makefile.in.in (xemacs): Fix call to list load-path shadows. + 1998-01-02 Charles G. Waldman <cgw@pgt.com> * frame.h: fix erroneous FRAME_RIGHT_BORDER_START macro.
--- a/src/buffer.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/buffer.c Mon Aug 13 10:15:48 2007 +0200 @@ -685,6 +685,7 @@ } #endif /* 0 */ + static void reset_buffer_local_variables (struct buffer *b, int first_time) @@ -704,6 +705,28 @@ } #include "bufslots.h" #undef MARKED_SLOT +#if 0 +#define STRING256_P(obj) \ + (STRINGP (obj) && string_char_length (XSTRING (obj)) == 256) + /* If the standard case table has been altered and invalidated, + fix up its insides first. */ + if (!(STRING256_P(Vascii_upcase_table) && + STRING256_P(Vascii_canon_table) && + STRING256_P(Vascii_eqv_table))) + { + Fset_standard_case_table (Vascii_downcase_table); + } + b->downcase_table = Vascii_downcase_table; + b->upcase_table = Vascii_upcase_table; + b->case_canon_table = Vascii_canon_table; + b->case_eqv_table = Vascii_eqv_table; +#ifdef MULE + b->mirror_downcase_table = Vmirror_ascii_downcase_table; + b->mirror_upcase_table = Vmirror_ascii_upcase_table; + b->mirror_case_canon_table = Vmirror_ascii_canon_table; + b->mirror_case_eqv_table = Vmirror_ascii_eqv_table; +#endif +#endif }
--- a/src/config.h.in Mon Aug 13 10:15:04 2007 +0200 +++ b/src/config.h.in Mon Aug 13 10:15:48 2007 +0200 @@ -94,6 +94,9 @@ /* Compile in TTY support? */ #undef HAVE_TTY +/* Compile in support for MS windows? */ +#undef HAVE_MS_WINDOWS + /* Compile in support for the X window system? */ #undef HAVE_X_WINDOWS @@ -118,7 +121,7 @@ #endif /* HAVE_X_WINDOWS */ /* Define HAVE_WINDOW_SYSTEM if any windowing system is available. */ -#if defined (HAVE_X_WINDOWS) /* || defined (HAVE_NEXTSTEP) */ +#if defined (HAVE_X_WINDOWS) || defined(HAVE_MS_WINDOWS) /* || defined (HAVE_NEXTSTEP) */ #define HAVE_WINDOW_SYSTEM #endif @@ -166,6 +169,7 @@ #undef HAVE_LINUX_VERSION_H #undef HAVE_INTTYPES_H #undef HAVE_LIMITS_H +#undef HAVE_SYS_UN_H #undef STDC_HEADERS #undef TIME_WITH_SYS_TIME #undef WORDS_BIGENDIAN
--- a/src/doc.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/doc.c Mon Aug 13 10:15:48 2007 +0200 @@ -428,16 +428,22 @@ CHECK_STRING (filename); -#ifndef CANNOT_DUMP - name = (char *) alloca (XSTRING_LENGTH (filename) + 14); - strcpy (name, "../lib-src/"); -#else /* CANNOT_DUMP */ - CHECK_STRING (Vdoc_directory); - name = (char *) alloca (XSTRING_LENGTH (filename) - + XSTRING_LENGTH (Vdoc_directory) - + 1); - strcpy (name, (char *) XSTRING_DATA (Vdoc_directory)); +#ifdef CANNOT_DUMP + if (!NILP(Vdoc_directory)) + { + CHECK_STRING (Vdoc_directory); + name = (char *) alloca (XSTRING_LENGTH (filename) + + XSTRING_LENGTH (Vdoc_directory) + + 1); + strcpy (name, (char *) XSTRING_DATA (Vdoc_directory)); + } + else #endif /* CANNOT_DUMP */ + { + name = (char *) alloca (XSTRING_LENGTH (filename) + 14); + strcpy (name, "../lib-src/"); + } + strcat (name, (char *) XSTRING_DATA (filename)); fd = open (name, O_RDONLY, 0);
--- a/src/emacs.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/emacs.c Mon Aug 13 10:15:48 2007 +0200 @@ -310,7 +310,7 @@ { if (i == 0 || i > skip_args) { -#ifdef _WIN32 +#ifdef WINDOWSNT if (i == 0) { /* Do not trust to what crt0 has stuffed into argv[0] */ @@ -641,8 +641,9 @@ noninteractive = 1; } - /* Partially handle -no-packages and -vanilla. Packages are searched */ - /* prior to the rest of the command line being parsed in startup.el */ + /* Partially handle -no-autoloads, -no-packages and -vanilla. Packages */ + /* are searched prior to the rest of the command line being parsed in */ + /* startup.el */ if (argmatch (argv, argc, "-no-packages", "--no-packages", 6, NULL, &skip_args)) { @@ -653,6 +654,14 @@ 7, NULL, &skip_args)) { inhibit_package_init = 1; + skip_args--; + } + + if (argmatch (argv, argc, "-no-autoloads", "--no-autoloads", + 7, NULL, &skip_args)) + { + /* Inhibit everything */ + inhibit_package_init = 1; inhibit_update_autoloads = 1; inhibit_update_dumped_lisp = 1; skip_args--; @@ -1510,7 +1519,7 @@ /* Handle -l loadup-and-dump, args passed by Makefile. */ if (argc > 2 + skip_args && !strcmp (argv[1 + skip_args], "-l")) load_me = build_string (argv[2 + skip_args]); -#ifdef CANNOT_DUMP +#if 0 /* CANNOT_DUMP - this can never be right in XEmacs --andyp */ /* Unless next switch is -nl, load "loadup.el" first thing. */ if (!(argc > 1 + skip_args && !strcmp (argv[1 + skip_args], "-nl"))) load_me = build_string ("loadup.el"); @@ -1563,6 +1572,7 @@ { "-unmapped", 0, 50, 0 }, { "-no-init-file", 0, 50, 0 }, { "-vanilla", "--vanilla", 50, 0 }, + { "-no-autoloads", "--no-autoloads", 50, 0 }, { "-no-site-file", "--no-site-file", 40, 0 }, { "-no-packages", "--no-packages", 35, 0 }, { "-u", "--user", 30, 1 },
--- a/src/event-msw.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/event-msw.c Mon Aug 13 10:15:48 2007 +0200 @@ -201,6 +201,7 @@ } previous_event = event; } + return Qnil; } static Lisp_Object
--- a/src/lread.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/lread.c Mon Aug 13 10:15:48 2007 +0200 @@ -675,7 +675,23 @@ encounter most of the time. If we're loading a .el, we need to reopen it in text mode. */ if (!reading_elc) - fd = open (foundstr, O_RDONLY | O_TEXT); + { + /* #### I would simply call _setmode (fd, O_RDONLY | O_TEXT). + This is ok on NT but maybe breaks DOS. Is there + any "DOS" still alive? - kkm */ + close (fd); + fd = open (foundstr, O_RDONLY | O_TEXT); + if (fd < 0) + { + if (NILP (no_error)) + signal_file_error ("Cannot open load file", file); + else + { + UNGCPRO; + return Qnil; + } + } + } #endif /* DOS_NT */ } @@ -2970,14 +2986,12 @@ Vload_path = decode_env_path ("EMACSLOADPATH", normal); /* Vdump_load_path = Qnil; */ -#ifndef CANNOT_DUMP if (purify_flag && NILP (Vload_path)) { /* loadup.el will frob this some more. */ /* #### unix-specific */ Vload_path = Fcons (build_string ("../lisp/"), Vload_path); } -#endif /* not CANNOT_DUMP */ load_in_progress = 0; Vload_descriptor_list = Qnil;
--- a/src/msw-proc.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/msw-proc.c Mon Aug 13 10:15:48 2007 +0200 @@ -537,7 +537,7 @@ pixel_to_char_size (frame, rect.right, rect.bottom, &columns, &rows); change_frame_size (frame, rows, columns, 1); - if (mswindows_dynamic_frame_resize) + if (msframe->sizing && mswindows_dynamic_frame_resize) redisplay (); } }
--- a/src/nt.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/nt.c Mon Aug 13 10:15:48 2007 +0200 @@ -38,6 +38,7 @@ #include "config.h" #include "systime.h" #include "syssignal.h" +#include "sysproc.h" #undef access #undef chdir @@ -300,19 +301,6 @@ CloseHandle (token); } -int -random () -{ - /* rand () on NT gives us 15 random bits...hack together 30 bits. */ - return ((rand () << 15) | rand ()); -} - -void -srandom (int seed) -{ - srand (seed); -} - /* Normalize filename by converting all path separators to the specified separator. Also conditionally convert upper case path name components to lower case. */ @@ -557,13 +545,7 @@ /* Routines that are no-ops on NT but are defined to get Emacs to compile. */ -int -setpgrp (int pid, int gid) -{ - return 0; -} - - +#if 0 /* #### We do not need those, do we? -kkm */ int unrequest_sigio (void) { @@ -575,6 +557,7 @@ { return 0; } +#endif /* 0 */ #define REG_ROOT "SOFTWARE\\GNU\\XEmacs" @@ -829,6 +812,9 @@ } #endif +/* #### This is an evil dirty hack. We must get rid of it. + Word "munging" is not in XEmacs lexicon. - kkm */ + /* Internal MSVC data and functions for low-level descriptor munging */ #if (_MSC_VER == 900) extern char _osfile[]; @@ -1447,10 +1433,18 @@ int sys_open (const char * path, int oflag, int mode) { - int fd; + int fd; /* Force all file handles to be non-inheritable. */ fd = _open (map_win32_filename (path, NULL), oflag | _O_NOINHERIT, mode); + + if (fd >= MAXDESC) + { + _close (fd); + errno = EMFILE; + return -1; + } + if (fd >= 0) { fd_info[fd].cp = 0;
--- a/src/nt.h Mon Aug 13 10:15:04 2007 +0200 +++ b/src/nt.h Mon Aug 13 10:15:48 2007 +0200 @@ -25,9 +25,8 @@ /* Sync'ed with Emacs 19.34.6 by Marc Paquette <marcpa@cam.org> */ /* #define FULL_DEBUG */ -#define EMACSDEBUG -#ifdef EMACSDEBUG +#ifdef DEBUG_XEMACS #define DebPrint(stuff) _DebPrint stuff #else #define DebPrint(stuff) @@ -40,6 +39,9 @@ /* File descriptor set emulation. */ +#if 0 /* These are defined in winsock.h. + FD_SETSIZE is defined 64. Let's not full the runtime. */ + /* The MSVC multithreaded statically-linked runtime library has limit of 256 descriptors by default (the single-threaded static library has a limit of 64 descriptors, and the DLL versions both have a @@ -66,6 +68,9 @@ #define FD_ZERO(p) memset((p), 0, sizeof(fd_set)) #define SELECT_TYPE fd_set +#define MAXDESC FD_SETSIZE + +#endif /* 0 */ /* ------------------------------------------------------------------------- */ @@ -94,7 +99,6 @@ char chr; } child_process; -#define MAXDESC FD_SETSIZE #define MAX_CHILDREN MAXDESC/2 #define CHILD_ACTIVE(cp) ((cp)->char_avail != NULL)
--- a/src/ntproc.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/ntproc.c Mon Aug 13 10:15:48 2007 +0200 @@ -40,8 +40,10 @@ #undef kill #include <windows.h> +#include <sys/socket.h> #include "lisp.h" +#include "sysproc.h" #include "nt.h" #include "ntheap.h" /* From 19.34.6 */ #include "systime.h" @@ -89,13 +91,12 @@ Lisp_Object Qhigh, Qlow; -#ifndef SYS_SIGLIST_DECLARED -extern char *sys_siglist[]; +#ifndef DEBUG_XEMACS +__inline #endif - -#ifdef EMACSDEBUG void _DebPrint (const char *fmt, ...) { +#ifdef DEBUG_XEMACS char buf[1024]; va_list args; @@ -103,8 +104,8 @@ vsprintf (buf, fmt, args); va_end (args); OutputDebugString (buf); +#endif } -#endif /* sys_signal moved to nt.c. It's now called msw_signal... */ @@ -675,7 +676,8 @@ /* When a new child process is created we need to register it in our list, so intercept spawn requests. */ int -sys_spawnve (int mode, char *cmdname, char **argv, char **envp) +sys_spawnve (int mode, CONST char *cmdname, + CONST char * CONST *argv, CONST char *CONST *envp) { Lisp_Object program, full; char *cmdline, *env, *parg, **targ; @@ -712,14 +714,16 @@ return -1; } cmdname = XSTRING_DATA (full); - argv[0] = cmdname; + /* #### KLUDGE */ + *(char**)(argv[0]) = cmdname; } UNGCPRO; /* make sure argv[0] and cmdname are both in DOS format */ strcpy (cmdname = alloca (strlen (cmdname) + 1), argv[0]); unixtodos_filename (cmdname); - argv[0] = cmdname; + /* #### KLUDGE */ + *(char**)(argv[0]) = cmdname; /* Determine whether program is a 16-bit DOS executable, or a Win32 executable that is implicitly linked to the Cygnus dll (implying it
--- a/src/objects-msw.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/objects-msw.c Mon Aug 13 10:15:48 2007 +0200 @@ -724,7 +724,10 @@ { if (c >= 'a' && c <= 'f') return c-'a' + 10; - return c-'0'; + else if (c >= 'A' && c <= 'Z') + return c-'A' + 10; + else + return c-'0'; } @@ -744,7 +747,6 @@ { if (!isxdigit(name[i])) return(-1); - name[i] = tolower(name[i]); } r = hexval(name[1]) * 16 + hexval(name[2]); g = hexval(name[3]) * 16 + hexval(name[4]);
--- a/src/redisplay-msw.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/redisplay-msw.c Mon Aug 13 10:15:48 2007 +0200 @@ -311,7 +311,6 @@ struct face_cachel *cachel; Lisp_Object font = Qnil; int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d)); - HBRUSH brush; HDC hdc = FRAME_MSWINDOWS_DC (f); int real_char_p = (rb->type == RUNE_CHAR && rb->object.chr.ch != '\n'); char *p_char = NULL; @@ -321,10 +320,9 @@ xpos + width, dl->ypos + dl->descent - dl->clip}; -#if 0 /* XXX FIXME: Whar about the bar_cursor? */ - Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor, - WINDOW_BUFFER (w)); -#endif + Lisp_Object bar = symbol_value_in_buffer (Qbar_cursor, + WINDOW_BUFFER (w)); + int bar_p = !NILP (bar); if (real_char_p) { @@ -335,37 +333,53 @@ font = FACE_CACHEL_FONT (cachel, Vcharset_ascii); } - - if (focus && real_char_p) + if ((focus || bar_p) && real_char_p) { p_char = (char*) &rb->object.chr.ch; n_char = 1; } + /* Use cursor fg/bg for block cursor, or character fg/bg for the bar. + Output nothing at eol if bar cursor */ cachel = WINDOW_FACE_CACHEL (w, - get_builtin_face_cache_index (w, Vtext_cursor_face)); + (bar_p + ? rb->findex + : get_builtin_face_cache_index (w, Vtext_cursor_face))); mswindows_update_gc (hdc, font, cachel->foreground, cachel->background, Qnil, Qnil); ExtTextOut (FRAME_MSWINDOWS_DC (f), xpos, dl->ypos, ETO_OPAQUE, &rect, p_char, n_char, NULL); - if (focus) - return; - - InflateRect (&rect, -1, -1); - - if (real_char_p) + if (focus && bar_p) + { + rect.right = rect.left + (EQ (bar, Qt) ? 1 : 2); + cachel = WINDOW_FACE_CACHEL (w, + get_builtin_face_cache_index (w, Vtext_cursor_face)); + mswindows_update_gc (hdc, Qnil, Qnil, + cachel->background, Qnil, Qnil); + ExtTextOut (FRAME_MSWINDOWS_DC (f), xpos, dl->ypos, ETO_OPAQUE, + &rect, NULL, 0, NULL); + } + else if (!focus) { - p_char = (char*) &rb->object.chr.ch; - n_char = 1; - } + /* Now have real character drawn in its own color. We defalte + the rectangle so character cell will be bounded by the + previously drawn cursor shape */ + InflateRect (&rect, -1, -1); - cachel = WINDOW_FACE_CACHEL (w, (real_char_p ? rb->findex - : get_builtin_face_cache_index (w, Vdefault_face))); - mswindows_update_gc (hdc, Qnil, cachel->foreground, - cachel->background, Qnil, Qnil); - ExtTextOut (FRAME_MSWINDOWS_DC (f), xpos, dl->ypos, ETO_OPAQUE | ETO_CLIPPED, - &rect, p_char, n_char, NULL); + if (real_char_p) + { + p_char = (char*) &rb->object.chr.ch; + n_char = 1; + } + + cachel = WINDOW_FACE_CACHEL (w, (real_char_p ? rb->findex + : get_builtin_face_cache_index (w, Vdefault_face))); + mswindows_update_gc (hdc, Qnil, cachel->foreground, + cachel->background, Qnil, Qnil); + ExtTextOut (FRAME_MSWINDOWS_DC (f), xpos, dl->ypos, ETO_OPAQUE | ETO_CLIPPED, + &rect, p_char, n_char, NULL); + } } @@ -481,8 +495,8 @@ * to by PRC, and paints only the intersection */ static void -mswindows_redisplay_deadbox_maybe (CONST struct window *w, - CONST RECT* prc) +mswindows_redisplay_deadbox_maybe (struct window *w, + CONST RECT* prc) { int sbh = window_scrollbar_height (w); int sbw = window_scrollbar_width (w); @@ -658,24 +672,24 @@ dl->ypos - dl->ascent - shadow_width, WINDOW_MODELINE_RIGHT (w), dl->ypos + dl->descent + shadow_width}; - + UINT edge; color = WINDOW_FACE_CACHEL_BACKGROUND (w, MODELINE_INDEX); mswindows_update_gc(FRAME_MSWINDOWS_DC(f), Qnil, Qnil, color, Qnil, Qnil); -#if 0 /* XXX Eh? */ - if (shadow_width < 0) - { - GC temp; + if (XINT (w->modeline_shadow_thickness) < 0) + shadow_width = -shadow_width; - temp = top_shadow_gc; - top_shadow_gc = bottom_shadow_gc; - bottom_shadow_gc = temp; - } -#endif - - DrawEdge (FRAME_MSWINDOWS_DC(f), &rect, shadow_width==1 ? BDR_RAISEDINNER : - EDGE_RAISED, BF_RECT); + if (shadow_width < -1) + edge = EDGE_SUNKEN; + else if (shadow_width < 0) + edge = BDR_SUNKENINNER; + else if (shadow_width == 1) + edge = BDR_RAISEDINNER; + else + edge = EDGE_RAISED; + + DrawEdge (FRAME_MSWINDOWS_DC(f), &rect, edge, BF_RECT); } @@ -741,10 +755,15 @@ mswindows_flash (struct device *d) { struct frame *f = device_selected_frame (d); + RECT rc; - /* XXX FIXME: Do something more visible here, maybe involving a timer */ - FlashWindow (FRAME_MSWINDOWS_HANDLE (f), TRUE); - FlashWindow (FRAME_MSWINDOWS_HANDLE (f), FALSE); + GetClientRect (FRAME_MSWINDOWS_HANDLE (f), &rc); + InvertRect (FRAME_MSWINDOWS_DC (f), &rc); + GdiFlush (); + Sleep (25); + InvertRect (FRAME_MSWINDOWS_DC (f), &rc); + + return 1; } static void @@ -982,7 +1001,6 @@ struct frame *f = XFRAME (w->frame); Lisp_Object color; RECT rect; - HBRUSH brush; int shadow_width = MODELINE_SHADOW_THICKNESS (w); /* We don't use the normal gutter measurements here because the
--- a/src/s/cygwin32.h Mon Aug 13 10:15:04 2007 +0200 +++ b/src/s/cygwin32.h Mon Aug 13 10:15:48 2007 +0200 @@ -1,4 +1,4 @@ -/* System description file for Windows NT. +/* System description file for cygwin32. Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -18,42 +18,64 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Synched up with: FSF 19.31. */ +/* Building under cygwin + * + * The approach I have taken with this port is to use primarily the UNIX + * code base adding stuff that is MS-Windows specific. This works quite + * well, and is in keeping with my perception of the cygwin philosophy. + * Note that if you make changes to this file you do NOT want to define + * WINDOWSNT, I repeat - do not define this, it will break everything + * horribly. What does get defined is HAVE_MS_WINDOWS, but this is + * done by configure and only applies to the window system. + * + * The important thing about building is that it is done on a binary + * mounted filesystem. i.e. something mounted like: mount -b c: + * /binary. If you do not do this then compilation of el files will + * produce garbage. Make sure you have installed cygwin32 b18 + + * patched dll (which can be found at http://www.lexa.ru/sos or on my + * home page. Alternatively when b19 comes out the patched dll will be + * unnecessary. Also make sure your HOME path is unix style - + * i.e. without a drive letter. + * + * once you have done this, configure and make. The + * undump phase will fail but that is to be expected. To run you need + * to set EMACSLOADPATH, EMACSDOC, EMACSDATA etc appropriately and then do: + * temacs -batch -l loadup.el run-temacs + * + * What I want to do + * + * the fileio stuff merely uses the unix system calls this means that + * the mount type of your fs will determine how files are edited. This + * is fine except in the instance that you want to convert one to the + * other. In this instance I would like to bring the buffer_file_type + * code into the picture without all the other windows-nt cruft. + * + * Also the undumped version should be able to do path guessing, I + * don't know why it doesn't currently. + * + * Ideally a dumped version would be done but I'm not sure I am up to + * the task. + * + * Andy Piper <andyp@parallax.co.uk> 8/1/98 + * http://parallax.co.uk/~andyp + */ -/* -#ifndef WINDOWSNT -#define WINDOWSNT -#endif - -#ifndef DOS_NT -#define DOS_NT -#endif -*/ /* Need the win32 api */ #ifndef NOT_C_CODE #ifdef CONST #undef CONST -#endif +#endif /* Start and end of text and data. */ extern void* _data_start__; extern void* _data_end__; -#include <windows.h> -#endif - -#ifndef HAVE_MS_WINDOWS -#define HAVE_MS_WINDOWS +#include <windows.h> #endif -/*#ifndef HAVE_SCROLLBARS -#define HAVE_SCROLLBARS -#endif*/ - -#ifndef HAVE_NTGUI #define HAVE_NTGUI -#endif +#define HAVE_FACES #ifndef ORDINARY_LINK #define ORDINARY_LINK @@ -73,8 +95,6 @@ #define NO_LIM_DATA #define HAVE_TEXT_START -#define LIBS_SYSTEM "-luser32 -lgdi32" - #undef MAIL_USE_SYSTEM_LOCK /* Define NO_ARG_ARRAY if you cannot take the address of the first of a @@ -136,7 +156,7 @@ /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ -#define SYSTEM_TYPE "cygwin32" +#define SYSTEM_TYPE "windows-nt" #define NO_MATHERR @@ -162,10 +182,6 @@ #define COFF -/* NT supports Winsock which is close enough (with some hacks) */ - -#define HAVE_SOCKETS - /* define MAIL_USE_FLOCK if the mailer uses flock to interlock access to /usr/spool/mail/$USER. The alternative is that a lock file named @@ -200,22 +216,6 @@ #define NULL_DEVICE "NUL:" #define EXEC_SUFFIXES ".exe:.com:.bat:.cmd:" -#if 0 -#define HAVE_RENAME - -#define HAVE_TZNAME - -#define HAVE_LONG_FILE_NAMES - -#define HAVE_BCOPY -#define HAVE_BCMP - -#define HAVE_MOUSE -#endif - -#define HAVE_WINDOW_SYSTEM -#define HAVE_FACES - #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B") /* For integration with MSDOS support. @@ -223,12 +223,6 @@ #define getdefdir(_drv, _buf) _getdcwd (_drv, _buf, MAXPATHLEN) */ -/* Define this so that winsock.h definitions don't get included when windows.h - is... I don't know if they do the right thing for emacs. For this to - have proper effect, config.h must always be included before windows.h. -#define _WINSOCKAPI_ 1 -*/ - /* Defines size_t and alloca (). */ /* We need a little extra space, see ../../lisp/loadup.el */
--- a/src/s/windowsnt.h Mon Aug 13 10:15:04 2007 +0200 +++ b/src/s/windowsnt.h Mon Aug 13 10:15:48 2007 +0200 @@ -34,9 +34,11 @@ #endif typedef unsigned short mode_t; -typedef long ptrdiff_t; +/* typedef long ptrdiff_t; -kkm */ typedef int pid_t; +#include <stddef.h> + /* If you are compiling with a non-C calling convention but need to declare vararg routines differently, put it here */ #define _VARARGS_ __cdecl @@ -165,12 +167,21 @@ #define HAVE_MOUSE #define HAVE_H_ERRNO +#define HAVE_STRUCT_UTIMBUF #ifdef HAVE_NTGUI #define HAVE_WINDOW_SYSTEM #define HAVE_FACES #endif +#define HAVE_STRCASECMP + +/* Compatibility macros. Some used to be routines in nt.c */ +#define strcasecmp(x,y) _stricmp(x,y) +#define random() (rand() << 15 | rand()) +#define srandom(seed) (srand(seed)) +#define setpgrp(pid,gid) + #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B") /* get some redefinitions in place */ @@ -219,15 +230,23 @@ /* IO calls that are emulated or shadowed */ #define pipe sys_pipe +int sys_pipe (int * phandles); #ifndef HAVE_X_WINDOWS #define sleep sys_sleep +void sleep (int seconds); #endif /* subprocess calls that are emulated */ #define spawnve sys_spawnve +int spawnve (int mode, CONST char *cmdname, + CONST char * CONST *argv, CONST char *CONST *envp); + #define wait sys_wait +int wait (int *status); + #define kill sys_kill +int kill (int pid, int sig); #define select sys_select @@ -251,7 +270,7 @@ #define pclose _pclose #define putw _putw #define umask _umask -#define utime _utime +/* #define utime _utime */ #define index strchr #define rindex strrchr #define read _read @@ -290,10 +309,12 @@ #define EMACS_CONFIGURATION get_emacs_configuration () #define EMACS_CONFIG_OPTIONS "NT" /* Not very meaningful yet. */ +#if 0 /* they do. -kkm */ /* Define this so that winsock.h definitions don't get included when windows.h is... I don't know if they do the right thing for emacs. For this to have proper effect, config.h must always be included before windows.h. */ #define _WINSOCKAPI_ 1 +#endif /* 0 */ /* Defines size_t and alloca (). */ #include <malloc.h>
--- a/src/symbols.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/symbols.c Mon Aug 13 10:15:48 2007 +0200 @@ -1936,7 +1936,7 @@ } DEFUN ("setq-default", Fsetq_default, 2, UNEVALLED, 0, /* -Set the default value of variable SYN to VALUE. +Set the default value of variable SYM to VALUE. SYM, the variable name, is literal (not evaluated); VALUE is an expression and it is evaluated. The default value of a variable is seen in buffers
--- a/src/sysdep.c Mon Aug 13 10:15:04 2007 +0200 +++ b/src/sysdep.c Mon Aug 13 10:15:48 2007 +0200 @@ -30,6 +30,17 @@ #define DONT_ENCAPSULATE #include <config.h> + +#ifdef WINDOWSNT +#include <direct.h> +/* <process.h> should not conflict with "process.h", as per ANSI definition. + This is not true though with visual c though. The trick below works with + VC4.2b and with VC5.0. It assumes that VC is installed in a kind of + standard way, so include files get to what/ever/path/include. +*/ +#include <../include/process.h> +#endif /* WINDOWSNT */ + #include "lisp.h" #include <stddef.h> @@ -69,16 +80,11 @@ #ifndef WINDOWSNT #include <sys/times.h> #endif - -#if defined(WINDOWSNT) -#include <direct.h> -/* In process.h which conflicts with the local copy. */ -#define _P_WAIT 0 -int _CRTAPI1 _spawnlp (int, const char *, const char *, ...); -int _CRTAPI1 _getpid (void); +#ifdef WINDOWSNT +#include <sys/utime.h> +#include "ntheap.h" #endif - /* ------------------------------- */ /* TTY definitions */ /* ------------------------------- */ @@ -517,11 +523,17 @@ #if !defined (SIGTSTP) && !defined (USG_JOBCTRL) +#if defined(__STDC__) || defined(_MSC_VER) +#define SIG_PARAM_TYPE int +#else +#define SIG_PARAM_TYPE +#endif + /* Record a signal code and the handler for it. */ struct save_signal { int code; - SIGTYPE (*handler) (); + SIGTYPE (*handler) (SIG_PARAM_TYPE); }; static void @@ -530,7 +542,7 @@ while (saved_handlers->code) { saved_handlers->handler - = (SIGTYPE (*) ()) signal (saved_handlers->code, SIG_IGN); + = (SIGTYPE (*) (SIG_PARAM_TYPE)) signal (saved_handlers->code, SIG_IGN); saved_handlers++; } }