From 113fdcccdaa050a8422750f0ecd2df52f217957f Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Thu, 31 Oct 2013 12:45:10 -0700 Subject: [PATCH] gtk: Simplify configure.ac and fix its copyright notices. --- src/gtk/configure.ac | 37 ++++++------------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) diff --git a/src/gtk/configure.ac b/src/gtk/configure.ac index 37eda064e..c9863bc08 100644 --- a/src/gtk/configure.ac +++ b/src/gtk/configure.ac @@ -8,12 +8,9 @@ AC_CONFIG_SRCDIR([gtk.pkg]) AC_CONFIG_HEADERS([config.h]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Massachusetts - Institute of Technology +[Copyright (C) 2013 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of an extension to MIT/GNU Scheme. MIT/GNU Scheme is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,10 +30,7 @@ USA. AH_TOP([/* -Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Massachusetts - Institute of Technology +Copyright (C) 2013 Matthew Birkholz This file is part of MIT/GNU Scheme. @@ -57,34 +51,15 @@ USA. */]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk], - [Support the GNOME Toolkits [[auto]]])], - [], - [with_gtk=auto]) - 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 -if test "${with_gtk}" = "yes"; then - AC_CONFIG_FILES([Makefile]) +if ! pkg-config --exists gtk+-3.0 2>/dev/null; then + AC_MSG_ERROR([Gtk 3.0 not found.]) fi AC_SUBST([CFLAGS]) AC_SUBST([CPPFLAGS]) AC_SUBST([LDFLAGS]) AC_SUBST([LIBS]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- 2.25.1