Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index d5b9bf540079d581f33206d3144a07a29579ef35..d8f1199f23311d847de6c213b59771d0f8a78a5c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -76,7 +76,7 @@ else
       NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:' | grep -v "\.ttf"`
 
       NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
-      NCSB_FILE=`$PYTHON "$srcdir/buildscripts/readlink.py" $NCSB_FILE`
+      NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE`
       NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
     done
   else
@@ -164,7 +164,7 @@ AC_MSG_RESULT($reloc_b)
 
 AC_MSG_CHECKING(for rpath linkage)
 if test "$rpath_b" = "yes"; then
-    LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,\\\$\$ORIGIN"
+    LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,\\\$\$ORIGIN/../lib"
 elif test "$rpath_b" != "no"; then
     LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,$rpath_b"
 fi
@@ -189,7 +189,7 @@ STEPMAKE_GUILE(OPTIONAL)
 STEPMAKE_PERL(OPTIONAL)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
-STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.79)
+STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.80)
 
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")