From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Sun, 22 May 2011 20:45:25 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/mit-scheme into Gtk
X-Git-Tag: 20110609-Gtk~15
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=225dc352ad3b554c866a9e1349c4b3c0f9227207;p=mit-scheme.git

Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/mit-scheme into Gtk
---

225dc352ad3b554c866a9e1349c4b3c0f9227207
diff --cc src/configure.ac
index 4a596e9e0,004413ab2..2a37feb80
--- a/src/configure.ac
+++ b/src/configure.ac
@@@ -41,15 -41,13 +41,19 @@@ 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 [[no]]]))
- : ${enable_host_scheme_test=no}
+ 	[Test for working scheme on build host [[if necessary]]]))
+ if test -f lib/all.com; then
+   : ${enable_host_scheme_test=no}
+ else
+   : ${enable_host_scheme_test=yes}
+ fi
  
 +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}])
@@@ -101,25 -131,8 +137,24 @@@ MITSCHEME_LIBRARY_PATH to the pathname 
  directory, which is usually \`/usr/local/lib/mit-scheme-${mit_scheme_native_code}'.
  ])
      fi
-     AC_MSG_RESULT([yes])
  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([ALL_TARGET])
  AC_SUBST([FFIS])
  AC_SUBST([INSTALL_COM])