* 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 fabdd03bbcdfa71569469b6e72d16b53ea2aeb44..ba16420e3c7cc284a3ac141714928ab347ebbf17 100644 (file)
--- 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 fd4387871fdcd59908866f938baf286295bf8dc0..80fc82950679c9fbe9de98e75a19ed6ed7b6a088 100644 (file)
--- 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