diff options
| author | Richard Braun <rbraun@sceen.net> | 2017-04-29 22:33:41 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2017-04-29 22:33:41 +0200 |
| commit | 0cca3fe1f195b38cd7f51d25a7dd35e0a923bb63 (patch) | |
| tree | d6cee4c3617fb686a8999b2bc34fb96c45bde7f8 | |
| parent | 5a207346dd1b7ef10c4cf7bc5d801e7369bb7004 (diff) | |
Rename custom autoconf macros from ax_check_xxx to ax_prog_xxx
With those names, the macros better conform with those found in the
Autoconf Archive.
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tools/m4/ax_prog_a2x.m4 (renamed from tools/m4/ax_check_a2x.m4) | 2 | ||||
| -rw-r--r-- | tools/m4/ax_prog_asciidoc.m4 (renamed from tools/m4/ax_check_asciidoc.m4) | 2 | ||||
| -rw-r--r-- | tools/m4/ax_prog_highlight.m4 (renamed from tools/m4/ax_check_highlight.m4) | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 54b0e25b..be21f3d2 100644 --- a/configure.ac +++ b/configure.ac @@ -20,10 +20,10 @@ AC_PROG_CC AM_PROG_AS AM_PROG_CC_C_O -AX_CHECK_ASCIIDOC([AC_MSG_NOTICE([asciidoc not found, not building html documentation])]) -AX_CHECK_HIGHLIGHT([AS_IF([test x"$ASCIIDOC" != x], - [AC_MSG_NOTICE([highlight not found, not building html documentation])])]) -AX_CHECK_A2X([AC_MSG_NOTICE([a2x not found, not building man pages])]) +AX_PROG_ASCIIDOC([AC_MSG_NOTICE([asciidoc not found, not building html documentation])]) +AX_PROG_HIGHLIGHT([AS_IF([test x"$ASCIIDOC" != x], + [AC_MSG_NOTICE([highlight not found, not building html documentation])])]) +AX_PROG_A2X([AC_MSG_NOTICE([a2x not found, not building man pages])]) # Disable PIE if enabled by default AX_APPEND_COMPILE_FLAGS([-no-pie -fno-pie]) diff --git a/tools/m4/ax_check_a2x.m4 b/tools/m4/ax_prog_a2x.m4 index 438e2478..e1214810 100644 --- a/tools/m4/ax_check_a2x.m4 +++ b/tools/m4/ax_prog_a2x.m4 @@ -1,4 +1,4 @@ -AC_DEFUN([AX_CHECK_A2X], +AC_DEFUN([AX_PROG_A2X], [AC_ARG_VAR([A2X], [path to a2x command]) AC_CHECK_PROG([A2X], [a2x], [a2x]) AS_IF([test x"$A2X" = x], [$1]) diff --git a/tools/m4/ax_check_asciidoc.m4 b/tools/m4/ax_prog_asciidoc.m4 index 5f6132ac..fb4f00f9 100644 --- a/tools/m4/ax_check_asciidoc.m4 +++ b/tools/m4/ax_prog_asciidoc.m4 @@ -1,4 +1,4 @@ -AC_DEFUN([AX_CHECK_ASCIIDOC], +AC_DEFUN([AX_PROG_ASCIIDOC], [AC_ARG_VAR([ASCIIDOC], [path to asciidoc command]) AC_CHECK_PROG([ASCIIDOC], [asciidoc], [asciidoc]) AS_IF([test x"$ASCIIDOC" = x], [$1]) diff --git a/tools/m4/ax_check_highlight.m4 b/tools/m4/ax_prog_highlight.m4 index c72f1281..c98316c8 100644 --- a/tools/m4/ax_check_highlight.m4 +++ b/tools/m4/ax_prog_highlight.m4 @@ -1,4 +1,4 @@ -AC_DEFUN([AX_CHECK_HIGHLIGHT], +AC_DEFUN([AX_PROG_HIGHLIGHT], [AC_ARG_VAR([HIGHLIGHT], [path to highlight command]) AC_CHECK_PROG([HIGHLIGHT], [highlight], [highlight]) AS_IF([test x"$HIGHLIGHT" = x], [$1]) |