[icinga-checkins] icinga.org: icinga2/master: asciidoc: remove unused config file path from m4 detection

git at icinga.org git at icinga.org
Thu Feb 7 17:40:25 CET 2013


Module: icinga2
Branch: master
Commit: 73f84c6095525a4a3f2cca157cbc6aef4485e8f4
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=73f84c6095525a4a3f2cca157cbc6aef4485e8f4

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Thu Feb  7 17:40:45 2013 +0100

asciidoc: remove unused config file path from m4 detection

refs #3230

---

 configure.ac           |    2 +-
 m4/ax_prog_asciidoc.m4 |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index f00141b..792af69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ DX_XML_FEATURE(OFF)
 DX_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
 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)
 
diff --git a/m4/ax_prog_asciidoc.m4 b/m4/ax_prog_asciidoc.m4
index ba178bf..2fef343 100644
--- a/m4/ax_prog_asciidoc.m4
+++ b/m4/ax_prog_asciidoc.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AD_INIT_ASCIIDOC(PROJECT-NAME, DOXYFILE-PATH, [OUTPUT-DIR])
+#   AD_INIT_ASCIIDOC(PROJECT-NAME, [OUTPUT-DIR])
 #   AD_ASCIIDOC_FEATURE(ON|OFF)
 #
 # DESCRIPTION
@@ -122,15 +122,14 @@ fi
 # -----------------------------
 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.
 AC_DEFUN([AD_INIT_ASCIIDOC], [
 
 # Files:
 AC_SUBST([AD_PROJECT], [$1])
-AC_SUBST([AD_CONFIG], [ifelse([$2], [], [], [$2])])
-AC_SUBST([AD_DOCDIR], [ifelse([$3], [], docs, [$3])])
+AC_SUBST([AD_DOCDIR], [ifelse([$2], [], docs, [$2])])
 
 # Asciidoc itself:
 AD_ARG_ABLE(doc, [generate any asciidoc documentation],





More information about the icinga-checkins mailing list