Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/mit-scheme into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 22 May 2011 20:45:25 +0000 (13:45 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 22 May 2011 20:45:25 +0000 (13:45 -0700)
1  2 
doc/Makefile.in
doc/configure.ac
src/Setup.sh
src/configure.ac
src/etc/create-makefiles.sh
src/etc/optiondb.scm
src/microcode/osio.h
src/microcode/prosio.c

diff --cc doc/Makefile.in
Simple merge
Simple merge
diff --cc src/Setup.sh
Simple merge
index 4a596e9e0c8c2594b7948531059ce684c14d5099,004413ab2a25129ef830a4db0a9331be0ed563ec..2a37feb801ca0c5dbc7b4a330def4087dee0e002
@@@ -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])
Simple merge
Simple merge
Simple merge
Simple merge