X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aclocal.m4;h=a9d3a662597bd25949b39862999b6d8416b56a26;hb=bd26755d6208ce93e12d701e9f0b4ac72180bacd;hp=682b6b1bd15e22504106c520493900346a541f34;hpb=6c323bc1bb27a79f687f5f3f3ed6b105aad24caa;p=lilypond.git

diff --git a/aclocal.m4 b/aclocal.m4
index 682b6b1bd1..a9d3a66259 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,5 @@
 dnl aclocal.m4   -*-shell-script-*-
-dnl StepMake subroutines for configure.in
+dnl StepMake subroutines for configure.ac
 
 
 ### mostly interal macros
@@ -140,7 +140,7 @@ AC_DEFUN(STEPMAKE_CHECK_VERSION_UNSUPPORTED, [
     fi
 ])
 
-### Macros to build configure.in
+### Macros to build configure.ac
 
 
 AC_DEFUN(STEPMAKE_BIBTEX2HTML, [
@@ -304,9 +304,6 @@ AC_DEFUN(STEPMAKE_GXXCODEGENBUG, [
 
 
 AC_DEFUN(STEPMAKE_DATADIR, [
-    if test "$datadir" = "\${prefix}/share"; then
-	    datadir='${prefix}/share'
-    fi
     presome=${prefix}
     if test "$prefix" = "NONE"; then
 	presome=${ac_default_prefix}
@@ -314,7 +311,7 @@ AC_DEFUN(STEPMAKE_DATADIR, [
     
     build_package_datadir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/share/$package
     
-    DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${prefix}/share!"`
+    DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${presome}/share!"`
     DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
@@ -327,11 +324,14 @@ AC_DEFUN(STEPMAKE_DATADIR, [
 
 ## ugh: cut & paste programming from datadir. 
 AC_DEFUN(STEPMAKE_LIBDIR, [
-
-    if test "$libdir" = "\${exec_prefix}/lib"; then
- 	libdir='${exec_prefix}/lib'
+    presome=${exec_prefix}
+    if test "$presome" = "NONE"; then
+	    presome=${prefix}
     fi
-    presome=$exec_prefix
+    if test "$presome" = "NONE"; then
+	    presome=${ac_default_prefix}
+    fi
+
     build_package_libdir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/lib/$package
     
     LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"`
@@ -377,7 +377,7 @@ AC_DEFUN(STEPMAKE_END, [
     
     if test -n "$OPTIONAL"; then
 	echo
-        echo "WARNING: Please consider installing optional programs: $OPTIONAL"
+        echo "WARNING: Please consider installing optional programs or files: $OPTIONAL"
     fi
 
     if test -n "$REQUIRED"; then
@@ -1083,8 +1083,18 @@ void *p = v.data ();
 
 
 AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
-    # ugh
-    STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL)
+    STEPMAKE_PROGS(KPSEWHICH, kpsewhich, $1)
+
+    AC_MSG_CHECKING(for metapost required files)
+    if test "$MFPLAIN_MP" = ""; then
+        MFPLAIN_MP=`kpsewhich -format=mp mfplain`
+    fi
+    if test "$MFPLAIN_MP" = ""; then
+        AC_MSG_RESULT(no)
+        STEPMAKE_ADD_ENTRY($1,['metapost CTAN package (texlive-metapost)'])
+    else
+        AC_MSG_RESULT(yes)
+    fi
 ])
 
 AC_DEFUN(STEPMAKE_TEXMF, [