From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 11 Dec 2004 12:31:35 +0000 (+0000)
Subject: * configure.in (PKG_CONFIG_PATH): Remove stray `i'.  Check for
X-Git-Tag: release/2.5.14~458
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b7d51e16e71beb60a39e5e023f70a91a24b1db02;p=lilypond.git

* configure.in (PKG_CONFIG_PATH): Remove stray `i'.  Check for
GTK2 before checking for pango.  Fixes -fgnome.

* configure.in: Require makeinfo 4.7 (needed for @ifdocbook).
---

diff --git a/ChangeLog b/ChangeLog
index fabdd03bbc..ba16420e3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* configure.in (PKG_CONFIG_PATH): Remove stray `i'.  Check for
+	GTK2 before checking for pango.  Fixes -fgnome.
+
 	* lily/font-metric.cc (LY_DEFINE): Also rename C name to match
 	Scheme name.
 
diff --git a/configure.in b/configure.in
index fd4387871f..80fc829506 100644
--- a/configure.in
+++ b/configure.in
@@ -95,13 +95,13 @@ PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig:$PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$HOME/usr/pkg/gnome/lib/pkgconfig:$PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$HOME/usr/pkg/pango/lib/pkgconfig:$PKG_CONFIG_PATH
 
-STEPMAKE_FREETYPE2
-STEPMAKE_PANGO
-i
 if test "$gui_b" = "yes"; then
     STEPMAKE_GTK2
 fi
 
+STEPMAKE_FREETYPE2
+STEPMAKE_PANGO
+
 ## Optional tools for building documentation, website, extra fonts.
 
 # guile executable for some scripts