svn commit: r660324 - in /incubator/qpid/trunk/qpid/cpp: configure.ac docs/api/Makefile.am docs/man/Makefile.am

[ac...@apache.org]

Author: aconway
Date: Mon May 26 15:18:27 2008
New Revision: 660324

URL: http://svn.apache.org/viewvc?rev=660324&view=rev
Log:

Make help2man and doxygen dependencies optional.

Modified:
    incubator/qpid/trunk/qpid/cpp/configure.ac
    incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
    incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?rev=660324&r1=660323&r2=660324&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Mon May 26 15:18:27 2008
@@ -24,15 +24,36 @@
 AC_USE_SYSTEM_EXTENSIONS
 AC_LANG([C++])	
 
-# AM_MISSING_PROG([HELP2MAN], [help2man])
+# Check for optional use of help2man
 AC_CHECK_PROG([HELP2MAN], [help2man], [help2man])
-test -z "$HELP2MAN" && AC_MSG_ERROR([Missing help2man installation (try "yum install help2man").])
+AC_ARG_WITH([help2man],
+  [AS_HELP_STRING([--with-help2man], [Use help2man to generate man pages.])],
+  [case "$withval" in
+    yes) test -z "$HELP2MAN" && AC_MSG_ERROR([help2man not found.]) ;;
+    no) HELP2MAN="" ;;
+    *)   AC_MSG_ERROR([Bad value ${withval} for --with-help2man.]) ;;
+   esac])
+AM_CONDITIONAL([HAVE_HELP2MAN], [test -n "$HELP2MAN"])
+
+# Check for optional use of doxygen
+AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
+AC_ARG_WITH([doxygen],
+  [AS_HELP_STRING([--with-doxygen], [Use doxygen to generate API documentation.])],
+  [case "$withval" in
+    yes) test -z "$DOXYGEN" && AC_MSG_ERROR([doxygen not found.]) ;;
+    no) DOXYGEN="" ;;
+    *)   AC_MSG_ERROR([Bad value ${withval} for --with-doxygen.]) ;;
+   esac])
+AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
+
+# Check for use of CPG
+AM_CONDITIONAL([CPG], [test x$with_CPG = xyes])
 
 AC_ARG_ENABLE(warnings,
 [  --enable-warnings   turn on lots of compiler warnings (recommended)],
 [case "${enableval}" in
    yes|no) ;;
-   *)      AC_MSG_ERROR([bad value ${enableval} for warnings option]) ;;
+   *)  AC_MSG_ERROR([bad value ${enableval} for warnings option]) ;;
  esac],
  [enableval=yes])
 

Modified: incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am?rev=660324&r1=660323&r2=660324&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am Mon May 26 15:18:27 2008
@@ -6,6 +6,8 @@
 # TODO aconway 2007-04-12: html should have a
 # dependency on source/header files.
 
+if HAVE_DOXYGEN
+
 EXTRA_DIST = html user.doxygen developer.doxygen html.timestamp
 
 html: html.timestamp
@@ -16,3 +18,5 @@
 
 clean-local:
 	rm -rf html html-dev html.timestamp
+
+endif

Modified: incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am?rev=660324&r1=660323&r2=660324&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am Mon May 26 15:18:27 2008
@@ -1,3 +1,5 @@
+if HAVE_HELP2MAN
+
 dist_man_MANS = qpidd.1
 
 man_aux = $(dist_man_MANS:.1=.x) 
@@ -18,3 +20,7 @@
 	$(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t ../../src/$*
 	@chmod a-w $@-t
 	@mv $@-t $@
+
+CLEANFILES=qpidd.1
+
+endif