--- ./configure.in~ Wed Jul 10 21:34:40 1996 +++ ./configure.in Sat Nov 13 23:44:30 1999 @@ -24,7 +24,6 @@ *-linux* ) machine=linux AC_DEFINE(LINUX) - LIBS="-L/usr/X11R6/lib ${LIBS}" ;; alpha-*-* ) @@ -109,6 +108,12 @@ AC_CHECK_LIB(ipc, ipc_chains) dnl Checks for X11 libraries. +if test x$x_includes != x ; then + CFLAGS="${CFLAGS} -I${x_includes}" +fi +if test x$x_libraries != x ; then + LIBS="-L${x_libraries} ${LIBS}" +fi AC_CHECK_LIB(X11, XSendEvent) AC_CHECK_LIB(Xpm, _XpmFreeXpmImage) AC_CHECK_LIB(ICE, IceProcessMessages) @@ -117,7 +122,7 @@ AC_CHECK_LIB(Xt, XtAppMainLoop) AC_CHECK_LIB(Xmu, _XEditResCheckMessages) AC_CHECK_LIB(Xm, XmCreatePushButton, [ -AC_DEFINE(MOTIF) +AC_DEFINE(MOTIF) LIBS="-lXm ${LIBS}" ]) @@ -176,14 +181,27 @@ fi dnl Now we think we got it so lets check AC_TRY_LINK([#include - #include "jpeglib.h"], + #include "jpeglib.h"], [jpeg_read_raw_data(NULL, NULL, 0)], [AC_DEFINE(HAVE_JPEG) - AC_MSG_RESULT(found)], + AC_MSG_RESULT(found) + have_jpeg="yes"], [AC_MSG_RESULT(not found) AC_MSG_ERROR(Couldn't find jpeg stuff in ${withval})]) ], [ +dnl Try the default location + LIBS="${LIBS} -ljpeg" + AC_TRY_LINK([#include + #include ], + [jpeg_read_raw_data(NULL, NULL, 0)], + [AC_DEFINE(HAVE_JPEG) + AC_MSG_RESULT(found) + have_jpeg="yes"], + [AC_MSG_RESULT(not found)]) +]) + +if test "${have_jpeg}" != "yes" ; then echo "" echo "Uh oh, you didn't include jpeg. Doing this will greatly" echo "increase your surfing pleasure. You can get it from these places:" @@ -207,7 +225,7 @@ exit ;; esac -]) +fi dnl Before we check for png lets make sure we can find libz AC_MSG_CHECKING(for libz) @@ -246,7 +264,16 @@ ], [ -AC_MSG_RESULT(not) +dnl Try the default location + + LIBS="${LIBS} -lz" + libz="-lz" + AC_TRY_LINK([#include], + [inflate();], + [AC_DEFINE(HAVE_PNG) + AC_MSG_RESULT(got it) + have_z="yes"], + [AC_MSG_RESULT(not found)]) ]) LIBS=${lib_save} @@ -292,8 +319,16 @@ AC_MSG_ERROR(Couldn't find png stuff in ${withval})]) ], [ -AC_MSG_RESULT(not found) -have_png='no' +dnl Try the default location + + LIBS="${LIBS} ${libz} -lpng" + AC_TRY_LINK([#include], + [inflate();], + [AC_DEFINE(HAVE_PNG) + AC_MSG_RESULT(got it) + have_png="yes"], + [AC_MSG_RESULT(not found) + have_png="no"]) ]) else have_png='no' @@ -365,7 +400,7 @@ dnl [ AC_TRY_LINK( [ - #include + #include ], [ int dummy=XmNpositionIndex; --- ./config.guess~ Tue Jun 25 04:33:20 1996 +++ ./config.guess Sat Nov 13 21:19:17 1999 @@ -316,7 +316,13 @@ echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; *:Linux:*:*) - # The BFD linker knows what the default object file format is, so + # uname on the ARM produces all sorts of strangeness, and we need to + # filter it out. + case "$UNAME_MACHINE" in + arm* | sa110*) UNAME_MACHINE="arm" ;; + esac + + # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` if echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then --- ./libnut/system.c~ Wed Jun 26 21:08:52 1996 +++ ./libnut/system.c Wed Oct 27 00:33:23 1999 @@ -101,7 +101,7 @@ extern char *strdup(char *str); #endif -#ifndef VMS +#if !defined(VMS) && !defined(__arm__) extern int sys_nerr; extern char *sys_errlist[]; extern int errno; --- ./libwww2/HTTCP.c~ Wed Jun 26 20:22:48 1996 +++ ./libwww2/HTTCP.c Wed Oct 27 00:26:38 1999 @@ -72,8 +72,10 @@ extern int errno; #endif /* errno */ +#ifndef __arm__ extern char *sys_errlist[]; /* see man perror on cernvax */ extern int sys_nerr; +#endif /* Report Internet Error ** --------------------- --- ./libwww2/HTInit.c~ Wed Jun 26 20:22:34 1996 +++ ./libwww2/HTInit.c Wed Oct 27 01:00:48 1999 @@ -445,6 +445,7 @@ HTSetSuffix(".htm", "text/html", "binary", 1.0); HTSetSuffix(".html", "text/html", "binary", 1.0); + HTSetSuffix(".shtml", "text/html", "binary", 1.0); /* SAM */ HTSetSuffix(".text", "text/plain", "binary", 1.0); HTSetSuffix(".c", "text/plain", "binary", 1.0); --- ./src/Makefile.in~ Fri Jun 28 01:42:15 1996 +++ ./src/Makefile.in Sat Nov 13 23:58:57 1999 @@ -199,7 +199,7 @@ cciBindings2.o: toolbar.h prefs.h prefs_defs.h gui.h cci.h port.h cciBindings2.o: cciBindings2.h cciServer.h list.h memStuffForPipSqueeks.h cciBindings2.o: ../libwww2/HTFormat.h ../libwww2/HTUtils.h -cciBindings2.o: ../libwww2/HTString.h /usr/include/stdarg.h +cciBindings2.o: ../libwww2/HTString.h #/usr/include/stdarg.h cciBindings2.o: ../libwww2/HTStream.h ../libwww2/HTAtom.h ../libwww2/HTList.h cciBindings2.o: ../libwww2/HTAnchor.h @@ -207,7 +207,7 @@ bla.o: cciServer.h cci.h port.h list.h bla.o: memStuffForPipSqueeks.h ../libwww2/HTPlain.h ../libwww2/HTStream.h -bla.o: ../libwww2/HTUtils.h ../libwww2/HTString.h /usr/include/stdarg.h +bla.o: ../libwww2/HTUtils.h ../libwww2/HTString.h #/usr/include/stdarg.h bla.o: ../libwww2/HTAnchor.h ../libwww2/HTList.h ../libwww2/HTAtom.h bla.o: ../libwww2/HTFormat.h ../libwww2/HText.h ../libwww2/HTFile.h bla.o: ../libwww2/HTAccess.h ../libwww2/tcp.h ../libwww2/HTML.h --- ./src/gui-dialogs.c~ Thu Jul 18 03:49:41 1996 +++ ./src/gui-dialogs.c Wed Oct 27 00:36:35 1999 @@ -87,9 +87,11 @@ /*swp -- for ~ expansion*/ #include +#ifndef __arm__ extern int sys_nerr; extern char *sys_errlist[]; extern int errno; +#endif #define __MAX_HOME_LEN__ 256 int pathEval(char *dest, char *src); char *getFileName(char *file_src); --- ./src/readPNG.c~ Sun Jun 30 08:30:00 1996 +++ ./src/readPNG.c Wed Oct 27 00:47:21 1999 @@ -158,8 +158,10 @@ return 0; } +#ifndef __arm__ /* SWP -- Hopefully to fix cores on bad PNG files */ png_set_message_fn(png_ptr,png_get_msg_ptr(png_ptr),NULL,NULL); +#endif /* initialize the structures */ png_info_init(info_ptr); --- ./src/gui.c~ Thu Jul 18 15:26:56 1996 +++ ./src/gui.c Wed Oct 27 00:45:43 1999 @@ -3963,7 +3963,7 @@ return 0; else { -{char ans[10]; printf("Press RETURN\n"); gets(ans);} +{char ans[10]; printf("Press RETURN\n"); fgets(ans, 10, stdin);} /* All other errors are 'fatal'. */ XGetErrorText (dsp, event->error_code, buf, 128); fprintf (stderr, "X Error: %s\n", buf); --- ./src/readJPEG.c~ Wed Jun 26 18:57:16 1996 +++ ./src/readJPEG.c Wed Oct 27 00:47:21 1999 @@ -127,7 +127,7 @@ fprintf(stderr,"cinfo.actual_number_of_colors=%d\n",cinfo.actual_number_of_colors); fprintf(stderr,"colrs[0].red=%d colrs[99].red=%d\n",colrs[0].red,colrs[99].red); fprintf(stderr,"cinfo.colormap[0][0]=%d\n",cinfo.colormap[0][0]); - {char dummy[80]; fprintf(stderr,"RETURN\n"); gets(dummy);} + {char dummy[80]; fprintf(stderr,"RETURN\n"); fgets(dummy, 80, stdin);} } #endif --- ./src/comment.c~ Wed Jun 26 18:56:41 1996 +++ ./src/comment.c Wed Oct 27 00:49:35 1999 @@ -62,6 +62,7 @@ #include "../config.h" #include "mosaic.h" #include "gui.h" +#define _COMMENT_C #include "comment.h" --- ./src/comment.h~ Thu Jun 6 16:01:43 1996 +++ ./src/comment.h Wed Oct 27 00:49:35 1999 @@ -67,6 +67,7 @@ #ifndef _COMMENT_H #define _COMMENT_H +#ifdef _COMMENT_C char *comment_card_html_top= \ "\n" \ " Comment Card for Mosaic 2.6\n" \ @@ -293,6 +294,7 @@ "\n" \ "</form>\n" \ "\n"; +#endif #endif --- ./libhtmlw/HTML.c~ Thu Jul 18 03:49:21 1996 +++ ./libhtmlw/HTML.c Sun Nov 14 00:13:27 1999 @@ -355,13 +355,13 @@ { WbNbodyColors, WbCBodyColors, XtRBoolean, sizeof (Boolean), XtOffset (HTMLWidget, html.body_colors), - XtRString, "True" + XtRString, "False" }, { WbNbodyImages, WbCBodyImages, XtRBoolean, sizeof (Boolean), XtOffset (HTMLWidget, html.body_images), - XtRString, "True" + XtRString, "False" }, { WbNanchorUnderlines,