From 237acc79a157eff318f196d5f159c03fcf3d90ad Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 9 Aug 2020 13:14:17 +0100
Subject: [PATCH] m4/mdw-dir-texmf.m4: Pull `texmf' path guesswork out of
 `AC_ARG_WITH'.

Unfortunate tangling of responsibilities.  Instead, leave a flag so that
top-level code can decide to do the guesswork.
---
 m4/mdw-dir-texmf.m4 | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/m4/mdw-dir-texmf.m4 b/m4/mdw-dir-texmf.m4
index 2d12db8..9406273 100644
--- a/m4/mdw-dir-texmf.m4
+++ b/m4/mdw-dir-texmf.m4
@@ -53,17 +53,21 @@ AC_DEFUN([mdw_DIR_TEXMF],[
 AC_ARG_WITH([texmfdir],
 [AS_HELP_STRING([--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])])])
+[texmfdir=$withval], [texmfdir=guess])
+case $texmfdir in
+  guess)
+    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])])
+    ;;
+esac
 AC_SUBST(texmfdir)])
-- 
2.11.0