From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Sun, 8 Sep 2013 20:29:51 +0000 (-0700)
Subject: Merge branch 'master' into Gtk.
X-Git-Tag: mit-scheme-pucked-9.2.12~481
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=dab8b5bb452152315aed9bdd619005756c0aabe9;p=mit-scheme.git

Merge branch 'master' into Gtk.
---

dab8b5bb452152315aed9bdd619005756c0aabe9
diff --cc src/Makefile.in
index 90da94245,4ce49f754..ffafd55f4
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -62,10 -62,9 +62,9 @@@ mkinstalldirs = $(SHELL) $(top_srcdir)/
  
  LIARC_BOOT_BUNDLES = compiler cref sf star-parser
  LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin ffi imail sos ssp xml
- FFIS = @FFIS@
  
 -SUBDIRS = $(INSTALLED_SUBDIRS) 6001 compiler rcs win32 xdoc
 +SUBDIRS = $(INSTALLED_SUBDIRS) 6001 rcs win32 xdoc
- INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES) $(FFIS)
+ INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES)
  
  MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
  AUXDIR_NAME = @AUXDIR_NAME@
diff --cc src/configure.ac
index eb830d550,601a4bd9a..c2ad66a9f
--- a/src/configure.ac
+++ b/src/configure.ac
@@@ -155,25 -149,8 +155,24 @@@ 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+-3.0 2>/dev/null; then
 +	AC_MSG_RESULT([yes])
 +	with_gtk=yes
 +    else
 +	AC_MSG_RESULT([no Gtk 3.0... no])
 +	with_gtk=no
 +    fi
 +fi
 +
  AC_SUBST([DEFAULT_TARGET])
  AC_SUBST([ALL_TARGET])
- AC_SUBST([FFIS])
  AC_SUBST([INSTALL_COM])
  AC_SUBST([INSTALL_LIARC_BUNDLES])
  AC_SUBST([MIT_SCHEME_EXE])