Hi!

Here are some some small fixes for the unix 2.8pre2 vm:

1) autoconf does not find a libffi installed in /usr/lib

   FIX: aclocal.m4, line 91 should be

      test -f /usr/include/ffi.h && ac_ffi_path="-I/usr/include" 

2) It was not possible to compile a Headless VM (only some #defines missing)
   FIX:  patch1  (attached)

    
     Marcus


-- 
Marcus Denker marcus at ira.uka.de phone at home:(0721)6649375 @work:(0721)6082749      
-------------- next part --------------
--- sqXWindow.c	Mon Aug 28 17:11:37 2000
+++ sqXWindow.c.new	Mon Aug 28 15:36:06 2000
@@ -212,8 +212,8 @@
 char		*stDisplayBitmap= 0;
 int              secure= 0;		/* true if running as a browser plugin */
 Window           browserWindow= 0;      /* parent window */
-int		 headless= 0;
 #endif  /* !HEADLESS */
+int		 headless= 0;
 
 #define SqueakWhite	0
 #define SqueakBlack	1
@@ -1514,8 +1514,9 @@
 
 int ioGetKeystroke(void)
 {
+#ifndef HEADLESS
   int keystate;
-
+#endif
   ioProcessEvents();  /* process all pending events */
 #ifdef HEADLESS
   return -1;  /* keystroke buffer is empty */
@@ -3162,25 +3163,35 @@
   printf("       %s [<option>...] -- [<argument>...]\n\n", progName);
   printf("<option> can be:\n");
   printf("  -align <n>           align functions at n-bytes (jit)\n");
+#ifndef HEADLESS
   printf("  -browserWindow <id>  run as Netscape plugin in window <id>\n");
   printf("  -display <dpy>       display on <dpy> (default: $DISPLAY)\n");
   printf("  -fullscreen          occupy the entire screen\n");
   printf("  -headless            run in headless (no window) mode\n");
+#endif
   printf("  -help                print this help message, then exit\n");
+#ifndef HEADLESS
   printf("  -lazy                go to sleep when main window unmapped\n");
+#endif
   printf("  -memory <size>[mk]   set initial memory size (default: %dm)\n",
 	 DefaultHeapSize);
   printf("  -nojit               disable the dynamic (runtime) compiler\n");
+#ifndef HEADLESS
   printf("  -notitle             disable the Squeak window title bar\n");
   printf("  -secure              enable file sandbox\n");
+#endif
   printf("  -spy                 enable the system spy (jit)\n");
   printf("  -version             print version information, then exit\n");
+#ifndef HEADLESS
   printf("  -xasync              don't serialize display updates\n");
   printf("  -xshm                use X shared memory extension\n");
+#endif
   printf("\nNotes:\n");
+#ifndef HEADLESS
   printf("  <imageName> defaults to `Squeak"SQ_VERSION".image'.\n");
   printf("  Using `unix:0' for <dpy> may improve local display performance.\n");
   printf("  -xshm only works when Squeak is running on the X server host.\n");
+#endif
   printf("  <argument>s are ignored, but are processed by the Squeak image.\n");
   printf("  The first <argument> normally names a Squeak `script' to execute.\n");
   printf("  Precede <arguments> by `--' to use default image.\n");
@@ -3271,9 +3282,11 @@
   if (getenv("SQUEAK_LAZY"))		sleepWhenUnmapped= 1;
   if (getenv("SQUEAK_NOJIT"))		noJitter= 1;
   if (getenv("SQUEAK_SPY"))		withSpy= 1;
+#ifndef HEADLESS
   if (getenv("SQUEAK_NOTITLE"))		noTitle= 1;
   if (getenv("SQUEAK_FULLSCREEN"))	fullScreen= 1;
   if (getenv("SQUEAK_SECURE"))		secure= 1;
+#endif 
 # if defined(USE_XSHM) && !defined(HEADLESS)
   if (getenv("SQUEAK_XSHM"))		useXshm= 1;
   if (getenv("SQUEAK_XASYNC"))		asyncUpdate= 1;
@@ -3302,12 +3315,14 @@
       else if (!strcmp(arg, "-xshm"))		useXshm= 1;
       else if (!strcmp(arg, "-xasync"))		asyncUpdate= 1;
 #     endif
+#ifndef HEADLESS
       else if (!strcmp(arg, "-lazy"))		sleepWhenUnmapped= 1;
       else if (!strcmp(arg, "-notitle"))	noTitle= 1;
+      else if (!strcmp(arg, "-fullscreen"))     fullScreen= 1;
+      else if (!strcmp(arg, "-secure"))         secure= true;      
+#endif
       else if (!strcmp(arg, "-nojit"))		noJitter= 1;
       else if (!strcmp(arg, "-spy"))		withSpy= 1;
-      else if (!strcmp(arg, "-fullscreen"))	fullScreen= 1;
-      else if (!strcmp(arg, "-secure"))		secure= true;
       else if (!strcmp(arg, "-version"))	versionInfo();
       else
 	{
@@ -3321,8 +3336,6 @@
 	    }
 #         if !defined(HEADLESS)
 	  else if (!strcmp(arg, "-display"))	displayName= saveArg();
-#         endif
-	  else if (!strcmp(arg, "-memory"))	initialHeapSize= strtobkm(saveArg());
 	  else if (!strcmp(arg, "-browserWindow"))
 	    {
 	      sscanf(saveArg(), "%li", &browserWindow);
@@ -3332,7 +3345,9 @@
 		  exit(1);
 		}
 	      secure= true;
-	    }
+	  }  
+#         endif
+	  else if (!strcmp(arg, "-memory"))     initialHeapSize= strtobkm(saveArg());             
 	  else
 	    usage();
 	} /* option with argument */