* configure.in (LINK_GXX_STATICALLY): use readlink.py to resolve links.

* buildscripts/readlink.py: add  file.

diff --git a/ChangeLog b/ChangeLog
index b300dac2c45508d6e9614709cb2385b03dd0ce7e..52aa30b76148b82513074d1bfd700c7c6880b307 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-06  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * configure.in (LINK_GXX_STATICALLY): use readlink.py to resolve links.
+
+       * buildscripts/readlink.py: add  file.
+
 2006-06-06  Joe Neeman  <joeneeman@gmail.com>
 
        * lily/tuplet-number.cc (print): prevent stencil from being

diff --git a/buildscripts/readlink.py b/buildscripts/readlink.py
new file mode 100644 (file)
index 0000000..41be20b
--- /dev/null
+++ b/buildscripts/readlink.py
@@ -0,0 +1,6 @@
+#!/usr/bin/python
+import os
+import sys
+
+for i in sys.argv[1:]:
+  print os.path.realpath(i)

diff --git a/configure.in b/configure.in
index ce169f0d668b57ac6a886b98f121889a7fe33349..00f3e75e5ce380fdfe71a3290a28a53209ad1681 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -53,6 +53,8 @@ AC_SUBST(LINK_GXX_STATICALLY)
 # must come before any header checks
 STEPMAKE_COMPILE
 
+# os.path.realpath() requires python 2.2 and unix
+STEPMAKE_PYTHON(REQUIRED, 2.2)
 AC_CHECK_PROG(FCMATCH, fc-match, fc-match)
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
 AC_SUBST(NCSB_SOURCE_FILES)
@@ -71,7 +73,7 @@ else
       NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:'`
 
       NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
-      NCSB_FILE=`readlink -f $NCSB_FILE`
+      NCSB_FILE=`$PYTHON buildscripts/readlink.py $NCSB_FILE`
       NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
     done
   else