summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Config/defs.mk.in6
-rw-r--r--configure.ac9
3 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d367d9dc..8aa84e0c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-16  Wayne Davison  <wayned@users.sourceforge.net>
+
+	* unposted: Config/defs.mk.in, configure.ac: use the -L option
+	with yodl 3.x.
+
 2011-01-16  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 28631: gi1242+zsh@gmail.com (as in 28633):
@@ -14134,5 +14139,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5185 $
+* $Revision: 1.5186 $
 *****************************************************
diff --git a/Config/defs.mk.in b/Config/defs.mk.in
index 69edf7005..cd3afa6c4 100644
--- a/Config/defs.mk.in
+++ b/Config/defs.mk.in
@@ -73,9 +73,9 @@ IMPOPT          = @IMPOPT@
 # utilities
 AWK             = @AWK@
 ANSI2KNR        = @ANSI2KNR@
-YODL            = @YODL@
-YODL2TXT        = $(YODL)2txt
-YODL2HTML       = $(YODL)2html
+YODL            = @YODL@ @YODL_OPTIONS@
+YODL2TXT        = @YODL@2txt
+YODL2HTML       = @YODL@2html
 PDFETEX		= @PDFETEX@
 TEXI2PDF	= @TEXI2PDF@
 
diff --git a/configure.ac b/configure.ac
index a93eb5115..91e169ce5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -539,6 +539,15 @@ AC_PROG_AWK                 dnl Check for mawk,gawk,nawk, then awk.
 AC_PROG_LN                  dnl Check for working ln, for "make install"
 AC_PROG_EGREP               dnl sets $EGREP to grep -E or egrep
 AC_CHECK_PROGS([YODL], [yodl], [: yodl])
+
+YODL_OPTIONS=''
+if test "x$ac_cv_prog_YODL" = xyodl; then
+    case `yodl --version` in
+      *"version 3."*) YODL_OPTIONS='-L' ;;
+    esac
+fi
+AC_SUBST(YODL_OPTIONS)
+
 AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex])
 AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [])
 AC_CHECK_PROGS([TEXI2HTML], [texi2html], [])