X-Git-Url: https://git.distorted.org.uk/~mdw/cfd/blobdiff_plain/6888a15853e52c8992ee427f78d2c1f068873cea..282625e1b87743236f1cb8c70c2762edd413c6b0:/aclocal.glob diff --git a/aclocal.glob b/aclocal.glob index c20cfac..8aa3fcc 100644 --- a/aclocal.glob +++ b/aclocal.glob @@ -34,7 +34,7 @@ dnl dnl Arguments: --- dnl dnl Use: Defines an m4 macro AUTO_VERSION which contains the current -dnl version number, worked out in some clever way. +dnl version number, worked out in some clever way. AC_DEFUN([mdw_AUTO_VERSION], [nobody cares...]) m4_define([mdw_AUTO_VERSION], [m4_define([AUTO_VERSION], m4_esyscmd([ @@ -57,12 +57,12 @@ dnl dnl Arguments: --- dnl dnl Use: Decodes the PACKAGE_VERSION variable as a libtool -dnl version-info string. Strictly speaking, this is very +dnl version-info string. Strictly speaking, this is very dnl naughty. AC_DEFUN([mdw_LIBTOOL_VERSION_INFO], [ set -- $(echo $PACKAGE_VERSION | - sed 's:[^.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$]:\1 \2 \3:' + sed 's:[^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$]:\1 \2 \3:' ) LIBTOOL_VERSION_INFO="$(expr $[]1 + $[]2):$[]3:$[]2" AC_SUBST([LIBTOOL_VERSION_INFO]) @@ -111,7 +111,7 @@ AC_DEFUN([mdw_DECL_ENVIRON], #endif], [mdw_cv_environ=yes], [mdw_cv_environ=no])]) if test $mdw_cv_environ = yes; then AC_DEFINE([DECL_ENVIRON], [1], - [Define if you have the `environ' vector of environment variables.]) + [Define if you have the `environ' vector of environment variables.]) fi]) dnl --- *@-mdw_DEFINE_PATHS-@* @@ -154,10 +154,10 @@ case "$t" in dnl esac; done; dnl echo "$t"`]) AC_DEFUN([mdw_DEFINE_PROG], - [AC_DEFINE_UNQUOTED([$1], ["mdw_PROG([$2])"], - [Program name for $2.])]) + [AC_DEFINE_UNQUOTED([$1], ["mdw_PROG([$2])"], + [Program name for $2.])]) AC_DEFUN([mdw_DEFINE_PATH], [AC_DEFINE_UNQUOTED([$1], ["mdw_PATH([$2])"], - [Pathname for $2.])]) + [Pathname for $2.])]) dnl --- *@-mdw_MANEXT-@* --- dnl @@ -175,4 +175,33 @@ AC_ARG_WITH([man-ext], [manext=$withval], [manext=mLib]) AC_SUBST(manext)]) +dnl --- *@-mdw_DIR_TEXMF-@* --- +dnl +dnl Author: Mark Wooding +dnl +dnl Synopsis: mdw_DIR_TEXMF +dnl +dnl Arguments: --- +dnl +dnl Use: Sets the substitution `texmfdir' as a sensible TeX install +dnl tree. + +AC_DEFUN([mdw_DIR_TEXMF], [ +AC_ARG_WITH([texmfdir], +[ --with-texmfdir=DIR set the TeX install directory to DIR], +[texmfdir=$withval], +[AC_MSG_CHECKING([where to put installed TeX files]) +mdw_DEFINE_PATHS([ +texmfdir='${datadir}/texmf' +for d in \ + '${datadir}/texmf' '${prefix}/lib/texmf' \ + '${prefix}/texmf' '${libdir}/lib/texmf'; do + if test -d "mdw_PATH([$d])"; then + texmfdir=$d + break + fi +done +AC_MSG_RESULT([$texmfdir])])]) +AC_SUBST(texmfdir)]) + dnl----- That's all, folks --------------------------------- *@--GLOB-END--@*