diff -ur bush-080915.orig/configure bush-080915/configure
--- bush-080915.orig/configure	2008-09-10 22:19:55.000000000 +0200
+++ bush-080915/configure	2009-03-05 13:37:09.205734271 +0100
@@ -78,7 +78,10 @@
 sleep 1
 echo
 echo -n "checking for locate command... "
-locate --help >/dev/null 2>/dev/null
+LOCATE=`which locate`
+if [ $? -ne 0 ] ; then
+   LOCATE=`which glocate`
+fi
 if [ $? -ne 0 ] ; then
    echo "Could not run locate"
    echo
@@ -213,6 +216,18 @@
          exit 1
       fi
    fi
+elif [ "$OS" = "SunOS" ] ; then
+   echo -n "Solaris"
+   if test -r bush_os.ads ; then
+      echo " (cached, make distclean to remove)";
+   else
+      echo
+      cp bush_solaris.ads bush_os.ads
+      if [ $? -ne 0 ] ; then
+         echo "Unable to find appropriate bush_os source files"
+         exit 1
+      fi
+   fi
 else
    echo "unknown"
    echo
@@ -296,9 +311,9 @@
    if [ -z "$TMP" ] ; then
       echo "no"
       echo -n "checking for static libgnat.a only (e.g. Slackware)... "
-      TMP=`/usr/bin/locate adalib/libgnat`
+      TMP=`$LOCATE adalib/libgnat`
       if [ $? -eq 0 ] ; then
-         TMP2=`/usr/bin/locate adalib/libgnat.a`
+         TMP2=`$LOCATE adalib/libgnat.a`
       else
          TMP2="fail-me"
       fi
diff -ur bush-080915.orig/src/GNUmakefile.orig bush-080915/src/GNUmakefile.orig
--- bush-080915.orig/src/GNUmakefile.orig	2008-09-13 21:26:02.000000000 +0200
+++ bush-080915/src/GNUmakefile.orig	2009-03-05 13:58:29.035265978 +0100
@@ -97,8 +97,7 @@
 	@echo
 	$(GNATMAKE) -c -i -O1 $(CPU_FLAG)=$(CPU) -gnatfaon -fstack-check -c $(INCLUDE) bush
 	@rm -f libbush.a
-	ar cr libbush.a *.o adacgi-1.6/*.o ADAVOX-0.51/main/*.o ADAVOX-0.51/wc/cglue.o apq-2.1/*.o
-	ar tv libbush.a
+	ar cr libbush.a *.o adacgi-1.6/*.o
 
 #apq-2.1/Makeincl:
 #	@echo "---------------------------------------------------------------"
diff -ur bush-080915.orig/src/parser_db.adb.orig bush-080915/src/parser_db.adb.orig
--- bush-080915.orig/src/parser_db.adb.orig	2008-07-13 23:43:52.000000000 +0200
+++ bush-080915/src/parser_db.adb.orig	2009-03-05 13:42:55.847481735 +0100
@@ -169,7 +169,7 @@
   expect( db_engine_of_t );
   if isExecutingCommand then
      begin
-       result := to_unbounded_string( integer'image( Database_Type'pos( Engine_Of( C ) ) ) );
+       result := to_unbounded_string( integer'image( APQ.Database_Type'pos( Engine_Of( C ) ) ) );
        if length( result ) > 0 then
           if element( result, 1 ) = ' ' then
              delete( result, 1, 1 );
diff -ur bush-080915.orig/src/parser_pen.adb.orig bush-080915/src/parser_pen.adb.orig
--- bush-080915.orig/src/parser_pen.adb.orig	2008-07-13 23:43:52.000000000 +0200
+++ bush-080915/src/parser_pen.adb.orig	2009-03-05 13:45:07.986825163 +0100
@@ -1084,7 +1084,9 @@
   declareProcedure( pen_clip_rect_t, "clip_rect" );
   stopNamespace( "pen" );
 
+#if SDL
   discard := is_SDL_OK;
+#end if;
 
   -- Pen.StartupPen;
 end StartupPen;