Merge branch 'master' into Gtk

diff --cc src/Makefile.in
index 97986f42804878d0dbca7f8c4d3432572fcff8da,115573aa1a4916a78fe1032e9153693adc512278..68b9a5e7d0f061f098648bc00e056f917b4f7250
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -85,10 -87,10 +87,10 @@@ all-native: compile-microcod
  all-svm: microcode/svm1-defns.h
        $(MAKE) compile-microcode
        @$(top_srcdir)/etc/compile-svm.sh "$(MIT_SCHEME_EXE)"
 -      $(MAKE) build-bands #build-ffis
 +      $(MAKE) build-bands build-ffis
  
  microcode/svm1-defns.h: compiler/machines/svm/svm1-defns.h
-       if cmp compiler/machines/svm/svm1-defns.h microcode/svm1-defns.h; \
+       if ! cmp compiler/machines/svm/svm1-defns.h microcode/svm1-defns.h; \
        then cp compiler/machines/svm/svm1-defns.h microcode/svm1-defns.h; fi
  
  compiler/machines/svm/svm1-defns.h: \
@@@ -204,8 -206,8 +206,8 @@@ install-auxdir-top
        $(INSTALL_DATA) $(top_srcdir)/etc/optiondb.scm $(DESTDIR)$(AUXDIR)/.
        $(INSTALL_DATA) lib/*.com $(DESTDIR)$(AUXDIR)/.
  
- .PHONY: all all-native all-liarc all-svm macosx-app
+ .PHONY: default-target all all-native all-liarc all-svm macosx-app
 -.PHONY: compile-microcode build-bands
 +.PHONY: compile-microcode build-bands build-ffis
  .PHONY: liarc-dist compile-liarc-bundles install-liarc-bundles
  .PHONY: mostlyclean clean distclean maintainer-clean c-clean clean-boot-root
  .PHONY: tags TAGS subdir-list install install-standard install-auxdir-top

diff --cc src/README.txt
Simple merge

diff --cc src/configure.ac
index 2a37feb801ca0c5dbc7b4a330def4087dee0e002,fb7558d24a300e7feec10fb121761d494d9ae4f4..fdeb6311ebed69832f53e20772a35cecab940699
--- 1/src/configure.ac
--- 2/src/configure.ac
+++ b/src/configure.ac
@@@ -42,18 -48,27 +48,33 @@@ AC_ARG_ENABLE([native-code]
  AC_ARG_ENABLE([host-scheme-test],
      AS_HELP_STRING([--enable-host-scheme-test],
        [Test for working scheme on build host [[if necessary]]]))
- if test -f lib/all.com; then
-   : ${enable_host_scheme_test=no}
+ if test x"${IS_NATIVE_RELEASE}" = xyes || test -f lib/all.com; then
+     : ${enable_host_scheme_test=no}
  else
-   : ${enable_host_scheme_test=yes}
+     : ${enable_host_scheme_test=yes}
  fi
  
+ AC_ARG_WITH([default-target],
+     AS_HELP_STRING([--with-default-target],
+       [Set the default make target [[all]]]))
+ if test x"${IS_NATIVE_RELEASE}" = xyes; then
+     : ${with_default_target=compile-microcode}
+ else
+     : ${with_default_target=all}
+ fi
+ DEFAULT_TARGET=${with_default_target}
+ 
+ AC_ARG_WITH([default-target],
+     AS_HELP_STRING([--with-default-target],
+       [Set the default make target [[all]]]))
+ DEFAULT_TARGET=${with_default_target=all}
+ 
 +AC_ARG_WITH([gtk],
 +    [AS_HELP_STRING([--with-gtk],
 +      [Support the GNOME Toolkits [[auto]]])],
 +    [],
 +    [with_gtk=auto])
 +
  AC_CANONICAL_HOST
  
  MIT_SCHEME_NATIVE_CODE([${enable_native_code}],[${host_cpu}])
@@@ -139,22 -154,7 +160,23 @@@ directory, which is usually \`/usr/loca
      fi
  fi
  
 +AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes])
 +AC_MSG_CHECKING([for gtk])
 +if test "${with_gtk}" = "yes"; then
 +    AC_MSG_RESULT([by request... yes])
 +elif test "${with_gtk}" = "no"; then
 +    AC_MSG_RESULT([by request... no])
 +elif test "${with_gtk}" = "auto"; then
 +    if pkg-config --exists gtk+-2.0 2>/dev/null; then
 +      AC_MSG_RESULT([yes])
 +      with_gtk=yes
 +    else
 +      AC_MSG_RESULT([no Gtk 2.0... no])
 +      with_gtk=no
 +    fi
 +fi
 +
+ AC_SUBST([DEFAULT_TARGET])
  AC_SUBST([ALL_TARGET])
  AC_SUBST([FFIS])
  AC_SUBST([INSTALL_COM])

diff --cc src/microcode/uxio.c
Simple merge

diff --cc src/runtime/ffi.scm
Simple merge

diff --cc src/runtime/runtime.pkg
Simple merge

diff --cc src/runtime/string.scm
Simple merge