Author: baggins Date: Thu Jul 14 12:34:42 2005 GMT
Module: pam Tag: HEAD
---- Log message:
- --with-doc almost finished
---- Files affected:
pam:
Makefile.am (1.14 -> 1.15) , configure.in (1.62 -> 1.63)
---- Diffs:
================================================================
Index: pam/Makefile.am
diff -u pam/Makefile.am:1.14 pam/Makefile.am:1.15
--- pam/Makefile.am:1.14 Mon Jul 11 18:00:30 2005
+++ pam/Makefile.am Thu Jul 14 14:34:37 2005
@@ -1,6 +1,10 @@
-SUBDIRS = pamcrypt modules libpam libpamc libpam_misc
modules/pam_selinux/check doc conf
+SUBDIRS = pamcrypt modules libpam libpamc libpam_misc
modules/pam_selinux/check conf
-DIST_SUBDIRS = $(SUBDIRS) examples dynamic
+DIST_SUBDIRS = $(SUBDIRS) doc examples dynamic
+
+if WITH_DOC
+SUBDIRS += doc
+endif
noinst_SCRIPTS = autogen.sh
================================================================
Index: pam/configure.in
diff -u pam/configure.in:1.62 pam/configure.in:1.63
--- pam/configure.in:1.62 Thu Jul 14 00:21:12 2005
+++ pam/configure.in Thu Jul 14 14:34:37 2005
@@ -546,22 +546,28 @@
AC_PATH_PROG(pser, sgml2latex, false)
AC_PATH_PROG(pdfer, ps2pdf, false)
AC_MSG_CHECKING([whether to create txt, html and ps documentation])
-AC_ARG_WITH(docs, [ --with-docs Create documentation [default=yes]],
- if test "$enableval" = "yes" -o "$docs" = "yes"; then
+AC_ARG_WITH(doc, [ --with-doc Create documentation [default=yes]],
+ if test "$withval" = "yes" -o "$doc" = "yes"; then
if test "$txter" = "false" -o "$htmler" = "false" -o "$pser" = "false";
then
AC_MSG_RESULT([no])
AC_MSG_ERROR(Cannot find programs required to build documentation!)
else
AC_MSG_RESULT([yes])
+ with_doc=true
fi
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN(txt html and ps documentation will not be build!)
fi,
if test "$txter" = "false" -o "$htmler" = "false" -o "$pser" = "false"; then
AC_MSG_RESULT([no])
AC_MSG_WARN(Cannot find programs required to build documentation!)
else
AC_MSG_RESULT([yes])
+ with_doc=true
fi
)
+AM_CONDITIONAL(WITH_DOC, test x$with_doc = xtrue)
AM_CONFIG_HEADER(config.h)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pam/Makefile.am?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/pam/configure.in?r1=1.62&r2=1.63&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
