nss-pam-ldapd branch master updated. 0.9.1-15-g58d50bf

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nss-pam-ldapd".

The branch, master has been updated
       via  58d50bf0b3c3d0a29941eb5473a9b3cfbb7d6f35 (commit)
      from  ce95b418bd1454a078ab1e659d8382b9298c051c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=58d50bf0b3c3d0a29941eb5473a9b3cfbb7d6f35

commit 58d50bf0b3c3d0a29941eb5473a9b3cfbb7d6f35
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Sun Sep 8 12:42:51 2013 +0200

    Add configure check to see whether to install manual pages
    
    This also reworks the manual page generation check in the configure
    script and avoids build errors if no tool for generating manual pages is
    present when working on a Git checkout.

diff --git a/configure.ac b/configure.ac
index 56d02ae..c51c770 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,12 +63,33 @@ AC_PROG_LN_S
 AM_PROG_AR
 
 # checks for tool to convert docbook to man
+genman="no"
 AC_PATH_PROGS(DOCBOOK2X_MAN, docbook2x-man)
-if test "x${DOCBOOK2X_MAN}" = x
+AC_MSG_CHECKING([for tool to (re)generate man pages])
+if test "x${DOCBOOK2X_MAN}" != x
 then
-  AC_MSG_WARN([docbook2x-man not found: not generating man pages])
+  genman="${DOCBOOK2X_MAN}"
+fi
+AC_MSG_RESULT($genman)
+AM_CONDITIONAL([GENMAN], [test "x${genman}" != "xno"])
+if test "x${genman}" = "xno"
+then
+  AC_MSG_WARN([docbook2x-man not found: not (re)generating man pages])
+fi
+
+# check whether to install manual pages
+AC_MSG_CHECKING([whether to install man pages])
+instman="no"
+if [test "x${genman}" != "xno" || ls  "${srcdir}/man/"*.? > /dev/null 2>&1]
+then
+  instman="yes"
+fi
+AC_MSG_RESULT($instman)
+AM_CONDITIONAL([INSTMAN], [test "x${instman}" != "xno"])
+if test "x${instman}" = "xno"
+then
+  AC_MSG_WARN([not installing man pages (no generator and not pre-generated)])
 fi
-AM_CONDITIONAL([GENMAN], [test "x${DOCBOOK2X_MAN}" != x])
 
 # check for Python and modules
 AM_PATH_PYTHON(2.5,, [:])
diff --git a/man/Makefile.am b/man/Makefile.am
index 85c148d..636d68c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -24,6 +24,7 @@ PYNSLCD_MANS = pynslcd.8
 ALL_MANS = $(PAM_MANS) $(UTILS_MANS) $(NSLCD_MANS) $(PYNSLCD_MANS)
 
 # figure out which manual pages to install
+if INSTMAN
 man_MANS =
 if ENABLE_PAM
   man_MANS += $(PAM_MANS)
@@ -42,6 +43,7 @@ endif
 endif
 noinst_DATA = $(ALL_MANS)
 EXTRA_DIST = $(ALL_MANS) $(ALL_MANS:=.xml)
+endif
 
 if GENMAN
 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac    |   27 ++++++++++++++++++++++++---
 man/Makefile.am |    2 ++
 2 files changed, 26 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
nss-pam-ldapd
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/