tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

asciidoc: remove unused config file path from m4 detection 

refs #3230
This commit is contained in:
Michael Friedrich 2013-02-07 17:40:45 +01:00
parent bff540b359
commit 73f84c6095
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -45,7 +45,7 @@ DX_XML_FEATURE(OFF)
DX_PDF_FEATURE(OFF) DX_PDF_FEATURE(OFF)
DX_PS_FEATURE(OFF) DX_PS_FEATURE(OFF)
DX_INIT_DOXYGEN([icinga], [docs/Doxyfile], [docs/dev]) DX_INIT_DOXYGEN([icinga], [docs/Doxyfile], [docs/dev])
AD_INIT_ASCIIDOC([icinga], [], [docs]) AD_INIT_ASCIIDOC([icinga], [docs])
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)

7
m4/ax_prog_asciidoc.m4
View File

@ -4,7 +4,7 @@
# #
# SYNOPSIS # SYNOPSIS
# #
# AD_INIT_ASCIIDOC(PROJECT-NAME, DOXYFILE-PATH, [OUTPUT-DIR]) # AD_INIT_ASCIIDOC(PROJECT-NAME, [OUTPUT-DIR])
# AD_ASCIIDOC_FEATURE(ON|OFF) # AD_ASCIIDOC_FEATURE(ON|OFF)
# #
# DESCRIPTION # DESCRIPTION
@ -122,15 +122,14 @@ fi
# ----------------------------- # -----------------------------
AC_DEFUN([AD_ASCIIDOC_FEATURE], [AC_DEFUN([AD_FEATURE_asciidoc], [$1])]) AC_DEFUN([AD_ASCIIDOC_FEATURE], [AC_DEFUN([AD_FEATURE_asciidoc], [$1])])
# AD_INIT_ASCIIDOC(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR]) # AD_INIT_ASCIIDOC(PROJECT, [OUTPUT-DOC-DIR])
# --------------------------------------------------------- # ---------------------------------------------------------
# PROJECT also serves as the base name for the documentation files. # PROJECT also serves as the base name for the documentation files.
AC_DEFUN([AD_INIT_ASCIIDOC], [ AC_DEFUN([AD_INIT_ASCIIDOC], [
# Files: # Files:
AC_SUBST([AD_PROJECT], [$1]) AC_SUBST([AD_PROJECT], [$1])
AC_SUBST([AD_CONFIG], [ifelse([$2], [], [], [$2])]) AC_SUBST([AD_DOCDIR], [ifelse([$2], [], docs, [$2])])
AC_SUBST([AD_DOCDIR], [ifelse([$3], [], docs, [$3])])
# Asciidoc itself: # Asciidoc itself:
AD_ARG_ABLE(doc, [generate any asciidoc documentation], AD_ARG_ABLE(doc, [generate any asciidoc documentation],