diff -Naur xdvik-22.40q/CHANGES xdvik-22.40r/CHANGES --- xdvik-22.40q/CHANGES Sun Nov 10 15:52:25 2002 +++ xdvik-22.40r/CHANGES Thu Nov 14 22:53:50 2002 @@ -12,9 +12,15 @@ Only major changes are listed (mostly those visible to the user); for a more detailed list of changes, see the CVS logs. + * 22.40r: + + Prevent the magnifier from popping up in the button panel. + + Removed vsnprintf() from wwwfetch.c. + + Fixed return value in xdvi_exit(). + * 22.40q: + Fixed broken configure check for memicmp(). - + Fixed routine declaration with display postscript. + + Fixed a glitch in the fontname hash table lookup. + + Fixed a broken prototype with display postscript. * 22.40p: + Fixed --version and --help options (#626569) diff -Naur xdvik-22.40q/CVS/Entries xdvik-22.40r/CVS/Entries --- xdvik-22.40q/CVS/Entries Sun Nov 10 16:32:16 2002 +++ xdvik-22.40r/CVS/Entries Thu Nov 14 23:01:52 2002 @@ -1,6 +1,6 @@ /.indent.pro/1.1.1.1/Wed Apr 18 14:23:08 2001//Txdvik_22_40_STABLE /BUGS/1.1.1.1/Wed Apr 18 14:23:07 2001//Txdvik_22_40_STABLE -/CHANGES/1.1.6.18/Sun Nov 10 15:52:25 2002//Txdvik_22_40_STABLE +/CHANGES/1.1.6.20/Thu Nov 14 22:53:50 2002//Txdvik_22_40_STABLE /INSTALL/1.4.6.3/Tue Aug 20 22:33:23 2002//Txdvik_22_40_STABLE /Makefile.in/1.5.6.1/Sat Sep 14 00:24:46 2002//Txdvik_22_40_STABLE /README/1.3.8.5/Mon Sep 23 19:48:38 2002//Txdvik_22_40_STABLE diff -Naur xdvik-22.40q/texk/xdvik/CVS/Entries xdvik-22.40r/texk/xdvik/CVS/Entries --- xdvik-22.40q/texk/xdvik/CVS/Entries Sun Nov 10 16:32:16 2002 +++ xdvik-22.40r/texk/xdvik/CVS/Entries Thu Nov 14 23:01:52 2002 @@ -3,27 +3,27 @@ /BUGS/1.1.1.1/Wed Apr 18 14:24:38 2001//Txdvik_22_40_STABLE /FAQ/1.1.1.1/Wed Apr 18 14:24:38 2001//Txdvik_22_40_STABLE /MAKE-VMS.COM/1.1.1.1/Wed Apr 18 14:24:38 2001//Txdvik_22_40_STABLE -/Makefile.in/1.8.4.7/Fri Oct 18 23:15:20 2002//Txdvik_22_40_STABLE +/Makefile.in/1.8.4.8/Thu Nov 14 22:33:07 2002//Txdvik_22_40_STABLE /README.VMS/1.1.1.1/Wed Apr 18 14:24:39 2001//Txdvik_22_40_STABLE /README.src-specials/1.1.6.2/Thu Aug 1 23:40:08 2002//Txdvik_22_40_STABLE /README.t1fonts/1.2.4.6/Sat Oct 12 14:51:16 2002//Txdvik_22_40_STABLE /VMS-C.OPT/1.1.1.1/Wed Apr 18 14:24:39 2001//Txdvik_22_40_STABLE /XDVI.RNH/1.1.1.1/Wed Apr 18 14:24:39 2001//Txdvik_22_40_STABLE /acconfig.h/1.1.4.2/Fri Nov 1 21:23:08 2002//Txdvik_22_40_STABLE -/aclocal.m4/1.2.6.4/Fri Nov 1 12:48:39 2002//Txdvik_22_40_STABLE +/aclocal.m4/1.2.6.5/Thu Nov 14 22:33:07 2002//Txdvik_22_40_STABLE /alloc-debug.h/1.1.1.1/Wed Apr 18 14:24:39 2001//Txdvik_22_40_STABLE /alloca.c/1.1.1.1.6.2/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE /app-defaults-xdvik/1.1.1.1.6.2/Fri Aug 30 23:49:40 2002//Txdvik_22_40_STABLE -/c-auto.in/1.6.4.7/Fri Nov 1 21:23:09 2002//Txdvik_22_40_STABLE +/c-auto.in/1.6.4.8/Thu Nov 14 22:33:07 2002//Txdvik_22_40_STABLE /c-openmx.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/configure/1.6.4.15/Fri Nov 1 12:48:39 2002//Txdvik_22_40_STABLE -/configure.in/1.7.4.10/Fri Nov 1 12:48:40 2002//Txdvik_22_40_STABLE +/configure/1.6.4.16/Thu Nov 14 22:33:07 2002//Txdvik_22_40_STABLE +/configure.in/1.7.4.11/Thu Nov 14 22:33:08 2002//Txdvik_22_40_STABLE /depend.mk/1.6.4.5/Wed Oct 16 22:26:23 2002//Txdvik_22_40_STABLE -/dvi-draw.c/1.33.4.51/Thu Oct 31 23:46:44 2002//Txdvik_22_40_STABLE +/dvi-draw.c/1.33.4.52/Sun Nov 10 17:11:13 2002//Txdvik_22_40_STABLE /dvi-init.c/1.22.4.17/Mon Oct 21 23:25:17 2002//Txdvik_22_40_STABLE /dvi.h/1.1.1.1/Wed Apr 18 14:24:42 2001//Txdvik_22_40_STABLE /dvips.c/1.3.6.3/Thu Oct 10 18:38:21 2002//Txdvik_22_40_STABLE -/events.c/1.10.4.37/Wed Oct 23 21:41:51 2002//Txdvik_22_40_STABLE +/events.c/1.10.4.38/Mon Nov 11 23:39:39 2002//Txdvik_22_40_STABLE /font-open.c/1.3.6.8/Sat Oct 12 16:52:20 2002//Txdvik_22_40_STABLE /gf.c/1.1.1.1.6.1/Thu Sep 19 23:10:04 2002//Txdvik_22_40_STABLE /gs/1.1.1.1/Wed Apr 18 14:24:43 2001//Txdvik_22_40_STABLE @@ -33,6 +33,8 @@ /message-window.h/1.3.4.2/Tue Aug 6 23:40:26 2002//Txdvik_22_40_STABLE /mime.c/1.5.4.3/Fri Oct 18 23:15:20 2002//Txdvik_22_40_STABLE /mksedscript/1.1.1.1.6.3/Tue Apr 30 17:35:57 2002//Txdvik_22_40_STABLE +/my-snprintf.c/1.1.2.1/Thu Nov 14 22:33:09 2002//Txdvik_22_40_STABLE +/my-snprintf.h/1.1.2.1/Thu Nov 14 22:33:09 2002//Txdvik_22_40_STABLE /my-vsnprintf.c/1.1.1.1.6.3/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE /my-vsnprintf.h/1.1.1.1.6.3/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE /pk.c/1.1.1.1.6.2/Thu Sep 19 23:10:04 2002//Txdvik_22_40_STABLE @@ -47,7 +49,7 @@ /sfinternal.h/1.1.1.1.6.1/Sun Oct 6 15:26:47 2002//Txdvik_22_40_STABLE /special.c/1.5.4.15/Tue Oct 29 20:09:41 2002//Txdvik_22_40_STABLE /squeeze.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/stamp-auto.in/1.2.6.2/Fri Nov 1 21:23:10 2002//Txdvik_22_40_STABLE +/stamp-auto.in/1.2.6.3/Thu Nov 14 22:33:09 2002//Txdvik_22_40_STABLE /startxdvi/1.1.6.2/Tue Aug 6 23:47:53 2002//Txdvik_22_40_STABLE /statusline.c/1.3.6.8/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE /statusline.h/1.1.1.1/Wed Apr 18 14:24:46 2001//Txdvik_22_40_STABLE @@ -57,10 +59,10 @@ /t1mapper.1/1.1.2.3/Mon Mar 4 17:35:11 2002//Txdvik_22_40_STABLE /tfmload.c/1.5.4.1/Sat Sep 14 23:18:44 2002//Txdvik_22_40_STABLE /util.c/1.12.4.20/Mon Nov 4 10:51:01 2002//Txdvik_22_40_STABLE -/version.h/1.7.4.33/Sun Nov 10 14:12:28 2002//Txdvik_22_40_STABLE +/version.h/1.7.4.35/Thu Nov 14 22:46:56 2002//Txdvik_22_40_STABLE /vf.c/1.1.1.1.6.2/Thu Oct 10 18:38:22 2002//Txdvik_22_40_STABLE /withenable.ac/1.4.4.3/Sat Aug 24 16:10:05 2002//Txdvik_22_40_STABLE -/wwwfetch.c/1.9.4.11/Sat Oct 12 23:59:36 2002//Txdvik_22_40_STABLE +/wwwfetch.c/1.9.4.12/Wed Nov 13 23:57:21 2002//Txdvik_22_40_STABLE /xdvi-config.h/1.3.6.2/Fri Oct 18 23:15:21 2002//Txdvik_22_40_STABLE /xdvi-search.el/1.2.4.4/Thu Sep 12 22:04:29 2002//Txdvik_22_40_STABLE /xdvi-sh/1.1.1.1.6.2/Mon Mar 4 20:03:41 2002//Txdvik_22_40_STABLE diff -Naur xdvik-22.40q/texk/xdvik/Makefile.in xdvik-22.40r/texk/xdvik/Makefile.in --- xdvik-22.40q/texk/xdvik/Makefile.in Fri Oct 18 23:15:20 2002 +++ xdvik-22.40r/texk/xdvik/Makefile.in Thu Nov 14 22:33:07 2002 @@ -43,7 +43,8 @@ # we avoid buggy versions in -lPW or -lucb. ALLOCA = alloca.o -objects = xdvi.o dvi-draw.o dvi-init.o events.o font-open.o string-utils.o my-vsnprintf.o \ +objects = xdvi.o dvi-draw.o dvi-init.o events.o font-open.o \ + string-utils.o my-snprintf.o my-vsnprintf.o \ help-window.o message-window.o statusline.o xserver-info.o \ gf.o pk.o psdps.o psgs.o psheader.o psnews.o special.o util.o vf.o sfDir.o \ sfDraw.o sfPath.o sfSelFile.o hypertex.o mime.o wwwfetch.o \ diff -Naur xdvik-22.40q/texk/xdvik/aclocal.m4 xdvik-22.40r/texk/xdvik/aclocal.m4 --- xdvik-22.40q/texk/xdvik/aclocal.m4 Fri Nov 1 12:48:39 2002 +++ xdvik-22.40r/texk/xdvik/aclocal.m4 Thu Nov 14 22:33:07 2002 @@ -84,16 +84,16 @@ AC_DEFINE(SUNOS4) fi]) -dnl ### Check for vsnprintf() added by SU 2000/03/07 -AC_DEFUN(AC_FUNC_VSNPRINTF, -[AC_CACHE_CHECK([for vsnprintf], xdvi_cv_vsnprintf, -[AC_TRY_LINK( -[#include -], [(void)vsnprintf((char *)NULL, 0, (char *)NULL, NULL);], -xdvi_cv_vsnprintf=yes, xdvi_cv_vsnprintf=no)]) -if test $xdvi_cv_vsnprintf = yes; then - AC_DEFINE(HAVE_VSNPRINTF) -fi]) +dnl dnl ### Check for vsnprintf() added by SU 2000/03/07 +dnl AC_DEFUN(AC_FUNC_VSNPRINTF, +dnl [AC_CACHE_CHECK([for vsnprintf], xdvi_cv_vsnprintf, +dnl [AC_TRY_LINK( +dnl [#include +dnl ], [(void)vsnprintf((char *)NULL, 0, (char *)NULL, NULL);], +dnl xdvi_cv_vsnprintf=yes, xdvi_cv_vsnprintf=no)]) +dnl if test $xdvi_cv_vsnprintf = yes; then +dnl AC_DEFINE(HAVE_VSNPRINTF) +dnl fi]) dnl ### Check for memicmp(), which some installations have in string.h AC_DEFUN(AC_FUNC_MEMICMP, @@ -106,16 +106,16 @@ AC_DEFINE(HAVE_MEMICMP) fi]) -dnl ### Check for realpath() added by SU 2002/04/10 -AC_DEFUN(AC_FUNC_REALPATH, -[AC_CACHE_CHECK([for realpath], xdvi_cv_realpath, -[AC_TRY_LINK( -[#include -], [(void)realpath((const char *)NULL, NULL);], -xdvi_cv_realpath=yes, xdvi_cv_realpath=no)]) -if test $xdvi_cv_realpath = yes; then - AC_DEFINE(HAVE_REALPATH) -fi]) +dnl dnl ### Check for realpath() added by SU 2002/04/10 +dnl AC_DEFUN(AC_FUNC_REALPATH, +dnl [AC_CACHE_CHECK([for realpath], xdvi_cv_realpath, +dnl [AC_TRY_LINK( +dnl [#include +dnl ], [(void)realpath((const char *)NULL, NULL);], +dnl xdvi_cv_realpath=yes, xdvi_cv_realpath=no)]) +dnl if test $xdvi_cv_realpath = yes; then +dnl AC_DEFINE(HAVE_REALPATH) +dnl fi]) dnl SU: the following is copied from gnome/compiler-flags.m4: turn on warnings for gcc diff -Naur xdvik-22.40q/texk/xdvik/c-auto.in xdvik-22.40r/texk/xdvik/c-auto.in --- xdvik-22.40q/texk/xdvik/c-auto.in Fri Nov 1 21:23:09 2002 +++ xdvik-22.40r/texk/xdvik/c-auto.in Thu Nov 14 22:33:07 2002 @@ -100,14 +100,13 @@ /* Define to compile in t1lib */ #undef T1LIB +/* Define if your C compiler can do string concatenation */ #undef HAVE_CC_CONCAT -#undef HAVE_VSNPRINTF - +/* Define if the memicmp() function is in */ #undef HAVE_MEMICMP -#undef HAVE_REALPATH - +/* Define if you want to compile without toolkit. */ #undef NOTOOL /* Define if you have the fchdir function. */ @@ -128,12 +127,18 @@ /* Define if you have the mkstemp function. */ #undef HAVE_MKSTEMP +/* Define if you have the realpath function. */ +#undef HAVE_REALPATH + /* Define if you have the setenv function. */ #undef HAVE_SETENV /* Define if you have the sigaction function. */ #undef HAVE_SIGACTION +/* Define if you have the snprintf function. */ +#undef HAVE_SNPRINTF + /* Define if you have the strchr function. */ #undef HAVE_STRCHR @@ -142,6 +147,9 @@ /* Define if you have the ulltostr function. */ #undef HAVE_ULLTOSTR + +/* Define if you have the vsnprintf function. */ +#undef HAVE_VSNPRINTF /* Define if you have the waitpid function. */ #undef HAVE_WAITPID diff -Naur xdvik-22.40q/texk/xdvik/configure xdvik-22.40r/texk/xdvik/configure --- xdvik-22.40q/texk/xdvik/configure Fri Nov 1 12:48:39 2002 +++ xdvik-22.40r/texk/xdvik/configure Thu Nov 14 22:33:07 2002 @@ -1734,46 +1734,14 @@ fi # begin additions SU, 2000/03/07 -echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:1739: checking for vsnprintf" >&5 -if eval "test \"`echo '$''{'xdvi_cv_vsnprintf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < - -int main() { -(void)vsnprintf((char *)NULL, 0, (char *)NULL, NULL); -; return 0; } -EOF -if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - xdvi_cv_vsnprintf=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - xdvi_cv_vsnprintf=no -fi -rm -f conftest* -fi - -echo "$ac_t""$xdvi_cv_vsnprintf" 1>&6 -if test $xdvi_cv_vsnprintf = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_VSNPRINTF 1 -EOF - -fi +# AC_FUNC_VSNPRINTF echo $ac_n "checking for memicmp""... $ac_c" 1>&6 -echo "configure:1772: checking for memicmp" >&5 +echo "configure:1740: checking for memicmp" >&5 if eval "test \"`echo '$''{'xdvi_cv_memicmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1781,7 +1749,7 @@ (void)memicmp((char *)NULL, (char *)NULL, 0); ; return 0; } EOF -if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xdvi_cv_memicmp=yes else @@ -1800,55 +1768,23 @@ EOF fi -echo $ac_n "checking for realpath""... $ac_c" 1>&6 -echo "configure:1805: checking for realpath" >&5 -if eval "test \"`echo '$''{'xdvi_cv_realpath'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < - -int main() { -(void)realpath((const char *)NULL, NULL); -; return 0; } -EOF -if { (eval echo configure:1818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - xdvi_cv_realpath=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - xdvi_cv_realpath=no -fi -rm -f conftest* -fi - -echo "$ac_t""$xdvi_cv_realpath" 1>&6 -if test $xdvi_cv_realpath = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_REALPATH 1 -EOF - -fi +# AC_FUNC_REALPATH # 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:1840: checking for working alloca.h" >&5 +echo "configure:1776: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1869,12 +1805,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1873: checking for alloca" >&5 +echo "configure:1809: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1934,12 +1870,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1938: checking whether alloca needs Cray hooks" >&5 +echo "configure:1874: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1968: checking for $ac_func" >&5 +echo "configure:1904: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2019,7 +1955,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2023: checking stack direction for C alloca" >&5 +echo "configure:1959: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2027,7 +1963,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2069,7 +2005,7 @@ # end additions SU echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2073: checking for 8-bit clean memcmp" >&5 +echo "configure:2009: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2077,7 +2013,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2105,12 +2041,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2109: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2045: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2126,7 +2062,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2147,12 +2083,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2151: checking return type of signal handlers" >&5 +echo "configure:2087: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2169,7 +2105,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2188,14 +2124,14 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2192: checking whether byte ordering is bigendian" >&5 +echo "configure:2128: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -2206,11 +2142,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:2210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2146: \"$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 < #include @@ -2221,7 +2157,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2241,7 +2177,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2284,7 +2220,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:2288: checking for X" >&5 +echo "configure:2224: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -2346,12 +2282,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2420,14 +2356,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2535,17 +2471,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:2539: checking whether -R must be followed by a space" >&5 +echo "configure:2475: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2561,14 +2497,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -2606,7 +2542,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2610: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2546: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2614,7 +2550,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2647,7 +2583,7 @@ 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:2651: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2587: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2655,7 +2591,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2695,12 +2631,12 @@ # 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:2699: checking for gethostbyname" >&5 +echo "configure:2635: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2744,7 +2680,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2748: checking for gethostbyname in -lnsl" >&5 +echo "configure:2684: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2752,7 +2688,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2793,12 +2729,12 @@ # -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:2797: checking for connect" >&5 +echo "configure:2733: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2842,7 +2778,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2846: checking for connect in -lsocket" >&5 +echo "configure:2782: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2850,7 +2786,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2885,12 +2821,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2889: checking for remove" >&5 +echo "configure:2825: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2934,7 +2870,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2938: checking for remove in -lposix" >&5 +echo "configure:2874: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2942,7 +2878,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2977,12 +2913,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2981: checking for shmat" >&5 +echo "configure:2917: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -3026,7 +2962,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3030: checking for shmat in -lipc" >&5 +echo "configure:2966: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3034,7 +2970,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3078,7 +3014,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3082: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3018: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3086,7 +3022,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3122,12 +3058,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3126: checking for size_t" >&5 +echo "configure:3062: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3157,12 +3093,12 @@ # XDVI checks by Paul Vojta echo $ac_n "checking whether C compiler supports string concatenation""... $ac_c" 1>&6 -echo "configure:3161: checking whether C compiler supports string concatenation" >&5 +echo "configure:3097: checking whether C compiler supports string concatenation" >&5 if eval "test \"`echo '$''{'xdvi_cc_concat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3171,7 +3107,7 @@ ; return 0; } EOF -if { (eval echo configure:3175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xdvi_cc_concat=yes else @@ -3191,7 +3127,7 @@ fi echo $ac_n "checking for integer type to use in bitmaps""... $ac_c" 1>&6 -echo "configure:3195: checking for integer type to use in bitmaps" >&5 +echo "configure:3131: checking for integer type to use in bitmaps" >&5 if eval "test \"`echo '$''{'xdvi_cv_bitmap_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3199,7 +3135,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -3217,7 +3153,7 @@ exit(0); } EOF -if { (eval echo configure:3221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then xdvi_cv_bitmap_type="`cat conftestval`" else @@ -3242,12 +3178,12 @@ echo "$ac_t""unsigned $BMTYPE, size = $BMBYTES" 1>&6 echo $ac_n "checking for stropts.h and isastream()""... $ac_c" 1>&6 -echo "configure:3246: checking for stropts.h and isastream()" >&5 +echo "configure:3182: checking for stropts.h and isastream()" >&5 if eval "test \"`echo '$''{'xdvi_cv_sys_streams'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3259,7 +3195,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xdvi_cv_sys_streams=yes else @@ -3279,7 +3215,7 @@ fi echo $ac_n "checking for SunOS 4""... $ac_c" 1>&6 -echo "configure:3283: checking for SunOS 4" >&5 +echo "configure:3219: checking for SunOS 4" >&5 if eval "test \"`echo '$''{'xdvi_cv_sys_sunos_4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3298,12 +3234,12 @@ fi echo $ac_n "checking for poll.h and poll()""... $ac_c" 1>&6 -echo "configure:3302: checking for poll.h and poll()" >&5 +echo "configure:3238: checking for poll.h and poll()" >&5 if eval "test \"`echo '$''{'xdvi_cv_func_poll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3311,7 +3247,7 @@ poll((struct pollfd *) 0, 0, 0); ; return 0; } EOF -if { (eval echo configure:3315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xdvi_cv_func_poll=yes else @@ -3334,17 +3270,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3338: checking for $ac_hdr" >&5 +echo "configure:3274: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3384,7 +3320,7 @@ echo $ac_n "checking what warning flags to pass to the C compiler""... $ac_c" 1>&6 -echo "configure:3388: checking what warning flags to pass to the C compiler" >&5 +echo "configure:3324: checking what warning flags to pass to the C compiler" >&5 warnCFLAGS= if test "x$GCC" != xyes; then enable_compile_warnings=no @@ -3419,7 +3355,7 @@ echo $ac_n "checking what language compliance flags to pass to the C compiler""... $ac_c" 1>&6 -echo "configure:3423: checking what language compliance flags to pass to the C compiler" >&5 +echo "configure:3359: checking what language compliance flags to pass to the C compiler" >&5 complCFLAGS= if test "x$enable_iso_c" != "xno"; then if test "x$GCC" = "xyes"; then @@ -3447,15 +3383,15 @@ # AC_TYPE_OFF_T # AC_HEADER_TIME -for ac_func in mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr fchdir getcwd lstat +for ac_func in mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr fchdir getcwd lstat snprintf vsnprintf realpath do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3454: checking for $ac_func" >&5 +echo "configure:3390: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3508,17 +3444,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3512: checking for $ac_hdr" >&5 +echo "configure:3448: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3691,7 +3627,7 @@ # Extract the first word of "pwd", so it can be a program name with args. set dummy pwd; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3695: checking for $ac_word" >&5 +echo "configure:3631: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BINPWD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3840,7 +3776,7 @@ # Extract the first word of "$libwww_config", so it can be a program name with args. set dummy $libwww_config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3844: checking for $ac_word" >&5 +echo "configure:3780: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LIBWWW_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3916,17 +3852,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3920: checking for $ac_hdr" >&5 +echo "configure:3856: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3971,7 +3907,7 @@ LDLIBWWW=-lwww libwww_libdir_found=yes echo $ac_n "checking for HTParse in -lwww""... $ac_c" 1>&6 -echo "configure:3975: checking for HTParse in -lwww" >&5 +echo "configure:3911: checking for HTParse in -lwww" >&5 ac_lib_var=`echo www'_'HTParse | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3979,7 +3915,7 @@ ac_save_LIBS="$LIBS" LIBS="-lwww $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4092,7 +4028,7 @@ if test "$with_system_t1lib" = yes; then echo $ac_n "checking for T1_AddFont in -lt1""... $ac_c" 1>&6 -echo "configure:4096: checking for T1_AddFont in -lt1" >&5 +echo "configure:4032: checking for T1_AddFont in -lt1" >&5 ac_lib_var=`echo t1'_'T1_AddFont | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4100,7 +4036,7 @@ ac_save_LIBS="$LIBS" LIBS="-lt1 -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4138,13 +4074,13 @@ LDFLAGS="$LDFLAGS $EXTRA_LIBT1_LIBDIR -lt1 -lm" if test "$with_system_t1lib" = yes; then echo $ac_n "checking whether installed T1 lib is >= v 1.3.1 ""... $ac_c" 1>&6 -echo "configure:4142: checking whether installed T1 lib is >= v 1.3.1 " >&5 +echo "configure:4078: checking whether installed T1 lib is >= v 1.3.1 " >&5 if test "$cross_compiling" = yes; then ac_compile_t1lib=1 ] else cat > conftest.$ac_ext < @@ -4175,7 +4111,7 @@ } EOF -if { (eval echo configure:4179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_compile_t1lib=0 else @@ -4228,7 +4164,7 @@ XLFLAG= fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:4232: checking for XextCreateExtension in -lXext" >&5 +echo "configure:4168: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4236,7 +4172,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4303,7 +4239,7 @@ echo "$ac_t""adding DPS includes and libraries for Solaris" 1>&6 X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11" echo $ac_n "checking for isinf in -lsunmath""... $ac_c" 1>&6 -echo "configure:4307: checking for isinf in -lsunmath" >&5 +echo "configure:4243: checking for isinf in -lsunmath" >&5 ac_lib_var=`echo sunmath'_'isinf | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4311,7 +4247,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsunmath $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4349,12 +4285,12 @@ for ac_func in isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4353: checking for $ac_func" >&5 +echo "configure:4289: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4405,17 +4341,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4409: checking for $ac_hdr" >&5 +echo "configure:4345: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4453,7 +4389,7 @@ # needed for web2c later than 7.3.4: echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:4457: checking for main in -lm" >&5 +echo "configure:4393: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4461,14 +4397,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff -Naur xdvik-22.40q/texk/xdvik/configure.in xdvik-22.40r/texk/xdvik/configure.in --- xdvik-22.40q/texk/xdvik/configure.in Fri Nov 1 12:48:40 2002 +++ xdvik-22.40r/texk/xdvik/configure.in Thu Nov 14 22:33:08 2002 @@ -15,9 +15,9 @@ AC_FUNC_VFORK AC_FUNC_VPRINTF # begin additions SU, 2000/03/07 -AC_FUNC_VSNPRINTF +# AC_FUNC_VSNPRINTF AC_FUNC_MEMICMP -AC_FUNC_REALPATH +# AC_FUNC_REALPATH AC_FUNC_ALLOCA # end additions SU AC_FUNC_MEMCMP @@ -44,7 +44,7 @@ # AC_TYPE_OFF_T # AC_HEADER_TIME -AC_CHECK_FUNCS(mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr fchdir getcwd lstat) +AC_CHECK_FUNCS(mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr fchdir getcwd lstat snprintf vsnprintf realpath) # is for ISC 4.0, to define fd_set in psgs.c. AC_CHECK_HEADERS(netdb.h sys/bsdtypes.h sys/time.h X11/Xosdefs.h sys/fcntl.h) diff -Naur xdvik-22.40q/texk/xdvik/dvi-draw.c xdvik-22.40r/texk/xdvik/dvi-draw.c --- xdvik-22.40q/texk/xdvik/dvi-draw.c Thu Oct 31 23:46:44 2002 +++ xdvik-22.40r/texk/xdvik/dvi-draw.c Sun Nov 10 17:11:13 2002 @@ -3620,7 +3620,6 @@ struct geom_info g_info; int test = dvi_file_changed(); - fprintf(stderr, "DVI FILE changed: %d\n", test); if (test > 1) return; diff -Naur xdvik-22.40q/texk/xdvik/events.c xdvik-22.40r/texk/xdvik/events.c --- xdvik-22.40q/texk/xdvik/events.c Wed Oct 23 21:41:51 2002 +++ xdvik-22.40r/texk/xdvik/events.c Mon Nov 11 23:39:39 2002 @@ -442,6 +442,7 @@ #if !MOTIF {XtNborderWidth, (XtArgVal) 0}, {XtNfromHoriz, (XtArgVal) NULL}, + {XtNtranslations, (XtArgVal) NULL}, {XtNtop, (XtArgVal) XtChainTop}, {XtNbottom, (XtArgVal) XtChainBottom}, {XtNleft, (XtArgVal) XtChainRight}, @@ -590,6 +591,10 @@ line_widget = XtCreateWidget("line", widgetClass, form_widget, line_args, XtNumber(line_args)); panel_args[1].value = (XtArgVal) line_widget; + /* to prevent the magnifier from popping up in the panel */ + if (panel_args[2].value == (XtArgVal)NULL) { + panel_args[2].value = (XtArgVal)XtParseTranslationTable("#augment :"); + } panel_widget = XtCreateWidget("panel", PANEL_WIDGET_CLASS, form_widget, panel_args, XtNumber(panel_args)); diff -Naur xdvik-22.40q/texk/xdvik/my-snprintf.c xdvik-22.40r/texk/xdvik/my-snprintf.c --- xdvik-22.40q/texk/xdvik/my-snprintf.c Thu Jan 1 00:00:00 1970 +++ xdvik-22.40r/texk/xdvik/my-snprintf.c Thu Nov 14 22:33:09 2002 @@ -0,0 +1,42 @@ +/*------------------------------------------------------------ + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL PAUL VOJTA OR ANY OTHER AUTHOR OF THIS SOFTWARE BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------*/ + +#include +#include + +#include "xdvi-config.h" +#include "xdvi.h" +#include "my-vsnprintf.h" +#include "my-snprintf.h" + +#ifndef HAVE_SNPRINTF +int my_snprintf(char *str, size_t size, const char *format, ...) +{ + va_list args; + int retVal; + + va_start (args, format); + retVal = VSNPRINTF (str, size, format, args); + va_end (args); + + return retVal; +} +#endif diff -Naur xdvik-22.40q/texk/xdvik/my-snprintf.h xdvik-22.40r/texk/xdvik/my-snprintf.h --- xdvik-22.40q/texk/xdvik/my-snprintf.h Thu Jan 1 00:00:00 1970 +++ xdvik-22.40r/texk/xdvik/my-snprintf.h Thu Nov 14 22:33:09 2002 @@ -0,0 +1,36 @@ +/*------------------------------------------------------------ + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL PAUL VOJTA OR ANY OTHER AUTHOR OF THIS SOFTWARE BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------*/ + +#ifndef MY_SNPRINTF_H_ +#define MY_SNPRINTF_H_ + +#ifdef HAVE_SNPRINTF + +#define SNPRINTF snprintf + +#else + +#define SNPRINTF my_snprintf +int SNPRINTF(char *str, size_t size, const char *format, ...); + +#endif /* HAVE_SNPRINTF */ +#endif /* MY_VSNPRINTF_H_ */ + diff -Naur xdvik-22.40q/texk/xdvik/stamp-auto.in xdvik-22.40r/texk/xdvik/stamp-auto.in --- xdvik-22.40q/texk/xdvik/stamp-auto.in Fri Nov 1 21:23:10 2002 +++ xdvik-22.40r/texk/xdvik/stamp-auto.in Thu Nov 14 22:33:09 2002 @@ -1 +1 @@ -Fri Nov 1 21:10:01 GMT 2002 +Thu Nov 14 22:32:20 GMT 2002 diff -Naur xdvik-22.40q/texk/xdvik/version.h xdvik-22.40r/texk/xdvik/version.h --- xdvik-22.40q/texk/xdvik/version.h Sun Nov 10 14:12:28 2002 +++ xdvik-22.40r/texk/xdvik/version.h Thu Nov 14 22:46:56 2002 @@ -1,4 +1,4 @@ -#define XDVERSION "22.40q" +#define XDVERSION "22.40r" #ifdef Omega #define TVERSION XDVERSION" for Omega" #else diff -Naur xdvik-22.40q/texk/xdvik/wwwfetch.c xdvik-22.40r/texk/xdvik/wwwfetch.c --- xdvik-22.40q/texk/xdvik/wwwfetch.c Sat Oct 12 23:59:36 2002 +++ xdvik-22.40r/texk/xdvik/wwwfetch.c Wed Nov 13 23:57:21 2002 @@ -171,17 +171,12 @@ { HTParentAnchor *anchor = HTRequest_anchor(request); char *uri = HTAnchor_address((HTAnchor*) anchor); + char *msg = HTDialog_progressMessage(request, op, msgnum, dfault, input); XEvent event; - char buf[2048]; -/* size_t offset; */ - char *msg = HTDialog_progressMessage(request, op, msgnum, dfault, input); UNUSED(reply); - - /* TODO: add some fancy animation here ... */ - snprintf(buf, 2048, "Retrieving \"%s\": %s", uri, msg); - print_statusline(STATUS_LONG, buf); + print_statusline(STATUS_LONG, "Retrieving \"%s\": %s", uri, msg); free(uri); free(msg);