X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/b20e5e2658691754756e99829e578f8e2df3aaa9..016f25e4b5f5edb3b478cd87947b176f871f201c:/configure.ac

diff --git a/configure.ac b/configure.ac
index 66cdc51..765924a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,21 +42,25 @@ dnl--------------------------------------------------------------------------
 dnl Convert the version number for ASDF.
 
 ## This is surprisingly awful.  The convention for official version numbers
-## is that they look like MAJOR.MINOR.PATCH[.BPB][-N-gHEX[+]].  ASDF
-## insists on simple numeric things separated by dots.  If there's no Git
-## thing on the end, then the main version number will do fine.  If there
-## is, then we insert /two/ `0's in, followed by N and the HEX converted to
-## decimal.  Why two?  Because if there's no brown-paper-bag number, we
-## want to make sure that the first BPB release is higher than any of the
-## preceding Git revisions.
+## is that they look like [MAJOR.MINOR.PATCH~]MAJOR.MINOR.PATCH[.BPB]
+## [-N-gHEX[+]].  ASDF insists on simple numeric things separated by dots.
+## If there's no interim-version thing on the front or Git thing on the end,
+## then the main version number will do fine.  If there is, then we insert
+## /two/ `0's in, followed by N and the HEX converted to decimal.  Why two?
+## Because if there's no brown-paper-bag number, we want to make sure that
+## the first BPB release is higher than any of the preceding Git revisions.
 ver=AC_PACKAGE_VERSION
 case $ver in
   *-*-g*)
-    base=${ver%%-*} tail=${ver#*-}
+    case $ver in
+      *~*) pre=${ver%%~*}. tail=${ver#*~} ;;
+      *) pre= tail=$ver ;;
+    esac
+    base=${tail%%-*} tail=${tail#*-}
     n=${tail%%-*} tail=${tail#*-g}
-    case $tail in *+) grubby=.1 tail=${tail%+} ;; *) grubby= ;; esac
+    case $tail in *+) grubby=.0.1 tail=${tail%+} ;; *) grubby= ;; esac
     rev=$(( 0x$tail ))
-    ASDF_VERSION=$base.0.0.$n.$rev$grubby
+    ASDF_VERSION=$pre$base.0.0.$n.$rev$grubby
     ;;
   *)
     ASDF_VERSION=$ver
@@ -133,11 +137,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 +150,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 +186,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 +204,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.