diff options
| -rw-r--r-- | varnishapi.m4 | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/varnishapi.m4 b/varnishapi.m4 index 6e47ae7..1d1107b 100644 --- a/varnishapi.m4 +++ b/varnishapi.m4 | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ## Autoconf macros for writing Varnish modules | 1 | ## Autoconf macros for writing Varnish modules |
| 2 | ## Copyright (C) 2016,2017 Sergey Poznyakoff | 2 | ## Copyright (C) 2016-2020 Sergey Poznyakoff |
| 3 | ## | 3 | ## |
| 4 | ## This program is free software; you can redistribute it and/or modify | 4 | ## This program is free software; you can redistribute it and/or modify |
| 5 | ## it under the terms of the GNU General Public License as published by | 5 | ## it under the terms of the GNU General Public License as published by |
| @@ -14,7 +14,7 @@ | |||
| 14 | ## You should have received a copy of the GNU General Public License | 14 | ## You should have received a copy of the GNU General Public License |
| 15 | ## along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | ## along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | 16 | ||
| 17 | ## serial 2 | 17 | ## serial 3 |
| 18 | 18 | ||
| 19 | ## VAPI_CHECK_VER([MAJOR], [MINOR], [PATCH]) - Check version | 19 | ## VAPI_CHECK_VER([MAJOR], [MINOR], [PATCH]) - Check version |
| 20 | ## | 20 | ## |
| @@ -62,12 +62,14 @@ m4_define([VAPI_CHECK_VER],[ | |||
| 62 | ## VMODDIR the path of the varnish module directory. | 62 | ## VMODDIR the path of the varnish module directory. |
| 63 | ## VARNISH_MAJOR, VARNISH_MINOR, and VARNISH_PATCH | 63 | ## VARNISH_MAJOR, VARNISH_MINOR, and VARNISH_PATCH |
| 64 | ## the corresponding numbers of the varnish API version. | 64 | ## the corresponding numbers of the varnish API version. |
| 65 | ## VARNISHD full pathname of the varnishd binary | 65 | ## VARNISHD full pathname of the varnishd binary. |
| 66 | ## VARNISHTEST full pathname of the varnishtest binary | 66 | ## VARNISHTEST full pathname of the varnishtest binary. |
| 67 | ## VARNISHAPI_PKGDATADIR | 67 | ## VARNISHAPI_PKGDATADIR |
| 68 | ## varnish API package data directory | 68 | ## varnish API package data directory. |
| 69 | ## VARNISHAPI_VMODTOOL | 69 | ## VARNISHAPI_VMODTOOL |
| 70 | ## full pathname of the vmodtool.py script | 70 | ## full pathname of the vmodtool.py script. |
| 71 | ## PYTHON full pathname of the python 3 binary. | ||
| 72 | ## RST2MAN full pathname of the rst2man or rst2man.py script. | ||
| 71 | ## | 73 | ## |
| 72 | AC_DEFUN([AM_VARNISHAPI], | 74 | AC_DEFUN([AM_VARNISHAPI], |
| 73 | [ # Check for pkg-config | 75 | [ # Check for pkg-config |
| @@ -76,11 +78,11 @@ AC_DEFUN([AM_VARNISHAPI], | |||
| 76 | # Check for python | 78 | # Check for python |
| 77 | AM_PATH_PYTHON([3.5]) | 79 | AM_PATH_PYTHON([3.5]) |
| 78 | 80 | ||
| 79 | # Varnish source tree (deprecated) | 81 | # Check for rst2man.py or rst2man |
| 80 | AC_ARG_WITH([varnish-source], | 82 | AC_PATH_PROGS(RST2MAN, [rst2man.py rst2man], |
| 81 | [], | 83 | [\$(abs_top_srcdir)/build-aux/missing rst2man.py]) |
| 82 | [AC_MSG_ERROR([the --with-varnish-source option has been withdrawn])]) | 84 | AC_SUBST([RST2MAN]) |
| 83 | 85 | ||
| 84 | # pkg-config | 86 | # pkg-config |
| 85 | PKG_PROG_PKG_CONFIG | 87 | PKG_PROG_PKG_CONFIG |
| 86 | PKG_CHECK_MODULES([VARNISHAPI], [varnishapi]) | 88 | PKG_CHECK_MODULES([VARNISHAPI], [varnishapi]) |