(LINK_GXX_STATICALLY): fix for ncsb detection.

diff --git a/ChangeLog b/ChangeLog
index 7b1564894c5d4f2ede982b5c9f55a414cadef144..d59f8f9330523793bc4a82bcf3f41e1278da0561 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-05-04  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * configure.in (LINK_GXX_STATICALLY): fix for ncsb detection.
+
        * lily/include/constrained-breaking.hh: GCC 4 fix.
 
 2006-05-04  Joe Neeman  <joeneeman@gmail.com>

diff --git a/configure.in b/configure.in
index 7d2307a134861e2f4d57b2118b5fd282aaf2a4b8..1a52aced05c45edc7c6e8ad24b6008a1337cf3b3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -53,6 +53,36 @@ AC_SUBST(LINK_GXX_STATICALLY)
 # must come before any header checks
 STEPMAKE_COMPILE
 
+AC_CHECK_PROG(FCMATCH, fc-match, fc-match)
+AC_MSG_CHECKING([New Century Schoolbook PFB files])
+AC_SUBST(NCSB_SOURCE_FILES)
+if test "$NCSB_DIR" != "" ;  then
+  NCSB_SOURCE_FILES=""
+  for f in c059013l c059016l c059033l c059036l; do
+    if test ! -f "$NCSB_DIR/$f.pfb"; then
+      AC_MSG_WARN($NCSB_DIR does not contain $f.pfb.)
+    else
+      NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES"
+    fi
+  done
+else
+  if test "$FCMATCH" != ""; then
+    for style in Roman Italic "Bold Italic" Bold; do
+      NCSB_FILE=`$FCMATCH --verbose 'Century Schoolbook L:style=$style' | grep 'file:'`
+
+      NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
+      NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
+    done
+  else
+    AC_MSG_RESULT(not found)
+    echo "Can't find Century Schoolbook files. Install FontConfig's fc-match,"
+    echo "or use --with-ncsb-dir"
+  fi
+fi
+AC_MSG_RESULT($NCSB_SOURCE_FILES)
+
+
+
 STEPMAKE_PYTHON(REQUIRED, 2.3)
 STEPMAKE_GCC(REQUIRED, 4.0)
 STEPMAKE_CXX(REQUIRED)
@@ -103,32 +133,6 @@ if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
 fi
 
-AC_CHECK_PROG(FCMATCH, fc-match, fc-match)
-AC_MSG_CHECKING([New Century Schoolbook PFB files])
-AC_SUBST(NCSB_SOURCE_FILES)
-if test "$NCSB_DIR" != "" ;  then
-  NCSB_SOURCE_FILES=""
-  for f in c059013l c059016l c059033l c059036l; do
-    if test ! -f "$NCSB_DIR/$f.pfb"; then
-      AC_MSG_WARN($NCSB_DIR does not contain $f.pfb.)
-    else
-      NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES"
-    fi
-  done
-else
-  if test "$FCMATCH" != ""; then
-    echo $FCMATCH
-    for style in Roman Italic "Bold Italic" Bold; do
-      NCSB_FILE=`$FCMATCH --verbose 'Century Schoolbook L:style=$(1)' | grep 'file:' | sed 's/.*"\([^"]*\)".*/\1/g'`
-      NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
-    done
-  else
-    AC_MSG_RESULT(not found)
-    echo "Can't find Century Schoolbook files. Install FontConfig's fc-match,"
-    echo "or use --with-ncsb-dir"
-  fi
-fi
-AC_MSG_RESULT($NCSB_SOURCE_FILES)
 
 HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)