sad/firehol
1
0
Fork 0
mirror of https://github.com/firehol/firehol.git synced 2024-06-30 19:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a requirement for pandoc version

Browse Source
This commit is contained in:
Phil Whineray 2014-04-23 20:34:47 +01:00
parent bf47948c09
commit 3073ff1ffb
3 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -23,6 +23,7 @@ AX_PROG_XMLLINT([--nonet])
AX_PROG_PANDOC([ -f markdown --toc -N],
[ -f markdown -t html --toc -c firehol-manual.css],
[ -f markdown -t man -s])
AX_CHECK_PANDOC_MIN([1.9.1.1],[],[AC_MSG_ERROR(could not find required version of pandoc)])
AC_MSG_NOTICE(***************************************************)
fi

99
m4/ax_check_pandoc_min.m4 Normal file
View File

@ -0,0 +1,99 @@
dnl =============================================================================
dnl
dnl =============================================================================
dnl
dnl SYNOPSIS
dnl
dnl AX_CHECK_PANDOC_MIN([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl
dnl DESCRIPTION
dnl
dnl Check that the version of pandoc is at least version MINIMUM-VERSION.
dnl If the test is successful, $PANDOC_VERSION will be set to the Pandoc
dnl version and ACTION-IF-FOUND is performed; if not, it will be set to 'no'
dnl and ACTION-IF-NOT-FOUND is performed.
dnl
dnl Example:
dnl
dnl AX_CHECK_PANDOC_MIN([1.9.4.2])
dnl if test "x$PANDOC_VERSION" = "xno"; then
dnl ...
dnl
dnl NOTE: This macros is based upon the original AX_CHECK_DOCBOOK_XSLT_MIN macro
dnl from Dustin J. Mitchell <dustin@zmanda.com>
dnl
dnl LICENSE
dnl
dnl Copyright (c) 2014 Phil Whineray <phil@sanewall.org>
dnl
dnl This program is free software; you can redistribute it and/or modify it
dnl under the terms of the GNU General Public License as published by the
dnl Free Software Foundation; either version 2 of the License, or (at your
dnl option) any later version.
dnl
dnl This program is distributed in the hope that it will be useful, but
dnl WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
dnl Public License for more details.
dnl
dnl You should have received a copy of the GNU General Public License along
dnl with this program. If not, see <http://www.gnu.org/licenses/>.
dnl
dnl As a special exception, the respective Autoconf Macro's copyright owner
dnl gives unlimited permission to copy, distribute and modify the configure
dnl scripts that are the output of Autoconf when processing the Macro. You
dnl need not follow the terms of the GNU General Public License when using
dnl or distributing such scripts, even though portions of the text of the
dnl Macro appear in them. The GNU General Public License (GPL) does govern
dnl all other use of the material that constitutes the Autoconf Macro.
dnl
dnl This special exception to the GPL applies to versions of the Autoconf
dnl Macro released by the Autoconf Archive. When you make and distribute a
dnl modified version of the Autoconf Macro, you may extend this special
dnl exception to the GPL to apply to your modified version as well.
dnl
AU_ALIAS([AC_CHECK_PANDOC_MIN], [AX_CHECK_PANDOC_MIN])
AC_DEFUN([AX_CHECK_PANDOC_MIN],
[
AC_REQUIRE([AX_PROG_PANDOC])
AC_CACHE_CHECK([for pandoc version], [ac_cv_pandoc_version],
[
ac_cv_pandoc_version=no
if test -n "$PANDOC"; then
ac_cv_pandoc_version=$($PANDOC -v 2> /dev/null | head -n 1 | cut -d' ' -f2)
if test "$?" != 0; then
ac_cv_pandoc_version='no'
fi
fi
])
min_pandoc_version=ifelse([$1], ,1.9.4.2,$1)
PANDOC_VERSION="$ac_cv_pandoc_version"
AC_MSG_CHECKING([whether pandoc version is $min_pandoc_version or newer])
if test x"$ac_cv_pandoc_version" = xno ; then
AC_MSG_RESULT([no])
PANDOC_VERSION='no'
ifelse([$3], , :, [$3])
else
ac_cv_pandoc_compare_answer=yes
AX_COMPARE_VERSION([$PANDOC_VERSION],[lt],[$min_pandoc_version],[ac_cv_pandoc_compare_answer=no])
if test x"$ac_cv_pandoc_compare_answer" = xno ; then
AC_MSG_RESULT([no ($PANDOC_VERSION)])
PANDOC_VERSION='no'
ifelse([$3], , :, [$3])
else
AC_MSG_RESULT([yes ($PANDOC_VERSION)])
ifelse([$2], , :, [$2])
fi
unset ac_cv_pandoc_compare_answer
fi
])
dnl
dnl

3
packaging/git-build
View File

@ -13,7 +13,8 @@ then
if [ "$1" != "-ok" ]
then
echo "Warning: this script runs: git clean -d -f -x"
echo " ensure all new files are checked in and re-run with '-ok'"
echo " ensure all required ?? files are added, then re-run with '-ok'"
git status -s | grep '^?'
exit 1
fi
fi