X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/d27fd5f3469dc5e39711b8a2d94568b8a9741e5e..d892b0c37404b40ef9f80c755e4fcb743e44c22d:/configure.ac

diff --git a/configure.ac b/configure.ac
index 66cdc51..5e121cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,11 +133,12 @@ AC_ARG_ENABLE([manual], [AS_HELP_STRING([--enable-manual])],
 
 dnl Make sure the TeX programs we need are available.
 case $sod_have_latex in maybe)
+AC_CHECK_PROGS([TEX], [tex], [none])
 AC_CHECK_PROGS([PDFLATEX], [pdflatex], [none])
 AC_CHECK_PROGS([KPSEWHICH], [kpsewhich], [none])
 AC_CHECK_PROGS([BIBTEX], [bibtex], [none])
 AC_CHECK_PROGS([MAKEINDEX], [makeindex], [none])
-case ,$PDFLATEX,$KPSEWHICH,$BIBTEX,$MAKEINDX, in
+case ,$TEX,$PDFLATEX,$KPSEWHICH,$BIBTEX,$MAKEINDX, in
   *,none,*)
     AC_MSG_WARN([Necessary TeX programs not found: can't build manual!])
     sod_have_latex=no
@@ -145,6 +146,7 @@ case ,$PDFLATEX,$KPSEWHICH,$BIBTEX,$MAKEINDX, in
 esac
 ;; esac
 
+sod_have_custom_bib=no
 case $sod_have_latex in maybe)
 SOD_CHECK_LATEX_FILE([strayman.cls], [], [sod_have_latex=no])
 SOD_CHECK_LATEX_FILE([fontenc.sty], [], [sod_have_latex=no])
@@ -180,6 +182,8 @@ SOD_CHECK_LATEX_FILE([phvr8r.tfm], [], [sod_have_latex=no])
 SOD_CHECK_LATEX_FILE([phvb8r.tfm], [], [sod_have_latex=no])
 SOD_CHECK_LATEX_FILE([pcrr8rn.tfm], [], [sod_have_latex=no])
 
+SOD_CHECK_LATEX_FILE([merlin.mbs], [sod_have_custom_bib=yes], [:])
+
 case $sod_have_latex in
   no)
     AC_MSG_WARN([Necessary LaTeX packages not found: can't build manual!])
@@ -196,6 +200,7 @@ case $sod_want_latex,$sod_have_latex in
     ;;
 esac
 AM_CONDITIONAL([HAVE_LATEX], [test "$sod_have_latex" = "yes"])
+AM_CONDITIONAL([HAVE_CUSTOM_BIB], [test "$sod_have_custom_bib" = "yes"])
 
 dnl--------------------------------------------------------------------------
 dnl Output.