From d663db3ac19da1c2cd49406d53761edac2813114 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 9 Aug 2020 12:54:10 +0100
Subject: [PATCH] m4/: Reformat to match current m4/shell style.

---
 m4/mdw-define-paths.m4         | 19 +++++++------------
 m4/mdw-dir-texmf.m4            | 19 +++++++++----------
 m4/mdw-libtool-version-info.m4 | 12 +++++-------
 m4/mdw-manext.m4               | 10 +++++-----
 m4/mdw-silent-rules.m4         | 11 ++++-------
 5 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/m4/mdw-define-paths.m4 b/m4/mdw-define-paths.m4
index 2894522..ff5dc08 100644
--- a/m4/mdw-define-paths.m4
+++ b/m4/mdw-define-paths.m4
@@ -67,17 +67,12 @@ test "$exec_prefix" = "NONE" && exec_prefix=$prefix
 $1
 prefix=$mdw_prefix exec_prefix=$mdw_exec_prefix])
 
-AC_DEFUN([mdw_PROG], [$(echo "$1"|sed "$mdw_transform")])
-AC_DEFUN([mdw_PATH], [dnl
-$(t="$1"; dnl
-while :; do dnl
-case "$t" in dnl
-*\$[]*) eval t=\"$t\";; dnl
-*) break;; dnl
-esac; done; dnl
+AC_DEFUN([mdw_PROG], [$(echo "$1" | sed "$mdw_transform")])
+AC_DEFUN([mdw_PATH],
+[$(t="$1"; dnl
+while :; do case "$t" in *\$[]*) eval t=\"$t\" ;; *) break ;; esac; done; dnl
 echo "$t")])
 AC_DEFUN([mdw_DEFINE_PROG],
-	 [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.])])
+  [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.])])
diff --git a/m4/mdw-dir-texmf.m4 b/m4/mdw-dir-texmf.m4
index ff9314c..1d9f60a 100644
--- a/m4/mdw-dir-texmf.m4
+++ b/m4/mdw-dir-texmf.m4
@@ -49,11 +49,12 @@ dnl -*-autoconf-*-
 ###   exception to the GPL to apply to your modified version as well.
 
 # serial 1
-AC_DEFUN([mdw_DIR_TEXMF],[
-AC_ARG_WITH([texmfdir],
-[AS_HELP_STRING([--with-texmfdir=DIR],
-		[set the TeX install directory to DIR])],
-[texmfdir=$withval], [texmfdir=guess])
+AC_DEFUN([mdw_DIR_TEXMF],
+[AC_ARG_WITH([texmfdir],
+	     [AS_HELP_STRING([--with-texmfdir=DIR],
+			     [set the TeX install directory to DIR])],
+	     [texmfdir=$withval],
+	     [texmfdir=guess])
 case $texmfdir in
   guess)
     AC_MSG_CHECKING([where to put installed TeX files])
@@ -61,11 +62,9 @@ case $texmfdir in
       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
+	'${prefix}/texmf' '${libdir}/lib/texmf'
+      do
+	if test -d "mdw_PATH([$d])"; then texmfdir=$d; break; fi
       done])
     AC_MSG_RESULT([$texmfdir])
     ;;
diff --git a/m4/mdw-libtool-version-info.m4 b/m4/mdw-libtool-version-info.m4
index dc9fe05..a4932b2 100644
--- a/m4/mdw-libtool-version-info.m4
+++ b/m4/mdw-libtool-version-info.m4
@@ -41,10 +41,8 @@ dnl -*-autoconf-*-
 ###   exception to the GPL to apply to your modified version as well.
 
 # serial 1
-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:'
-  )
-  LIBTOOL_VERSION_INFO="$(expr $[]1 + $[]2):$[]3:$[]2"
-  AC_SUBST([LIBTOOL_VERSION_INFO])
-])
+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:')
+LIBTOOL_VERSION_INFO="$(expr $[]1 + $[]2):$[]3:$[]2"
+AC_SUBST([LIBTOOL_VERSION_INFO])])
diff --git a/m4/mdw-manext.m4 b/m4/mdw-manext.m4
index df71dbc..868d6b5 100644
--- a/m4/mdw-manext.m4
+++ b/m4/mdw-manext.m4
@@ -43,9 +43,9 @@ dnl -*-autoconf-*-
 ###   exception to the GPL to apply to your modified version as well.
 
 # serial 1
-AC_DEFUN([mdw_MANEXT], [
-AC_ARG_WITH([man-ext],
-[AS_HELP_STRING([--with-man-ext=EXT],
-		[give manpages the EXT extension (e.g., foo.3EXT)])],
-[manext=$withval], [manext="$1"])
+AC_DEFUN([mdw_MANEXT],
+[AC_ARG_WITH([man-ext],
+	     [AS_HELP_STRING([--with-man-ext=EXT],
+			     [give manpages the EXT extension (e.g., foo.3EXT)])],
+	     [manext=$withval], [manext="$1"])
 AC_SUBST(manext)])
diff --git a/m4/mdw-silent-rules.m4 b/m4/mdw-silent-rules.m4
index c3fe927..23442b5 100644
--- a/m4/mdw-silent-rules.m4
+++ b/m4/mdw-silent-rules.m4
@@ -39,10 +39,7 @@ dnl -*-autoconf-*-
 ###   exception to the GPL to apply to your modified version as well.
 
 # serial 1
-AC_DEFUN([mdw_SILENT_RULES], [
-  m4_ifdef([AM_SILENT_RULES], [
-    AM_SILENT_RULES([yes])
-  ], [
-    AC_SUBST([AM_DEFAULT_VERBOSITY], [1])
-  ])
-])
+AC_DEFUN([mdw_SILENT_RULES],
+  [m4_ifdef([AM_SILENT_RULES],
+	      [AM_SILENT_RULES([yes])],
+	      [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])])
-- 
2.11.0