From: Patrick McCarty <pnorcks@gmail.com>
Date: Wed, 5 May 2010 20:29:24 +0000 (-0700)
Subject: Build: Remove obsolete GTK2 checks.
X-Git-Tag: release/2.13.21-1~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=66860b8747bb2790adceecb1f81b0b6bda4595be;p=lilypond.git

Build: Remove obsolete GTK2 checks.
---

diff --git a/config.make.in b/config.make.in
index 71530a30c0..eb472a5662 100644
--- a/config.make.in
+++ b/config.make.in
@@ -12,7 +12,6 @@ package-depth = @package_depth@
 ################################################################
 
 FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
-GTK2_CFLAGS = @GTK2_CFLAGS@
 GUILE_CFLAGS = @GUILE_CFLAGS@
 PANGO_FT2_CFLAGS = @PANGO_FT2_CFLAGS@
 
@@ -24,7 +23,6 @@ CONFIG_CXXFLAGS = @CXXFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS) $(PANGO_FT2_CFL
 
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 GUILE_LIBS = @GUILE_LDFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
 PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
 
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 605916ccf9..c99639762c 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1139,28 +1139,6 @@ AC_DEFUN(STEPMAKE_FREETYPE2, [
     fi
 ])
 
-AC_DEFUN(STEPMAKE_GTK2, [
-    PKG_CHECK_MODULES(GTK2, $1 >= $3, have_gtk2=yes, true)
-    if test "$have_gtk2" = yes ; then
-	AC_DEFINE(HAVE_GTK2)
-	# Do not pollute user-CPPFLAGS with configure-CPPFLAGS
-        save_CPPFLAGS="$CPPFLAGS"
-        save_LIBS="$LIBS"
-	CPPFLAGS="$GTK2_CFLAGS $CPPFLAGS"
-	LIBS="$GTK2_LIBS $LIBS"
-	AC_SUBST(GTK2_CFLAGS)
-	AC_SUBST(GTK2_LIBS)
-	CPPFLAGS="$save_CPPFLAGS"
-	LIBS="$save_LIBS"
-    else
-	# UGR
-     	# r="lib$1-dev or $1-devel"
-     	r="libgtk2.0-dev or gtk2-devel"
-     	ver="`pkg-config --modversion $1`"
-     	STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
-    fi
-])
-
 AC_DEFUN(STEPMAKE_PANGO, [
     PKG_CHECK_MODULES(PANGO, $1 >= $3, have_pango16=yes, true)
     if test "$have_pango16" = yes ; then