Changeset 1157 for trunk

Timestamp:

05/29/09 12:29:02 (3 years ago)

Author:

alonbl

Message:

Make build work again after last api-doc change.

Location:

trunk

Files:

• configure.ac (modified) (3 diffs)
• doc/Makefile.am (modified) (1 diff)

trunk/configure.ac

@@ -232 +232 @@
 )
 
-AC_CHECK_PROGS([DOXYGEN],[doxygen])
-test "${enable_api_doc}" = "yes" -a -z "${DOXYGEN}" && AC_MSG_ERROR([doxygen is required for api doc])
-
 dnl These required for svn checkout
 AC_ARG_VAR([XSLTPROC], [xsltproc utility])
@@ -241 +238 @@
 AC_ARG_VAR([WGET_OPTS], [wget options])
 AC_ARG_VAR([TR], [tr utility])
+AC_ARG_VAR([DOXYGEN], [tr utility])
 AC_CHECK_PROGS([XSLTPROC],[xsltproc])
 AC_CHECK_PROGS([SVN],[svn])
 AC_CHECK_PROGS([WGET],[wget])
 AC_CHECK_PROGS([TR],[tr])
+AC_CHECK_PROGS([DOXYGEN],[doxygen])
+
 test -z "${WGET_OPTS}" && WGET_OPTS="-nv"
 
@@ -255 +255 @@
                 if test "${enable_doc}" = "yes"; then
                         AC_MSG_ERROR([Missing XSLTPROC svn build with doc])
+                else
+                        AC_MSG_WARN(["make dist" will not work])
+                fi
+        fi
+
+        AC_MSG_CHECKING([DOXYGEN requirement])
+        if test -n "${DOXYGEN}"; then
+                AC_MSG_RESULT([ok])
+        else
+                if test "${enable_api_doc}" = "yes"; then
+                        AC_MSG_ERROR([Missing DOXYGEN svn build with api doc])
                 else
                         AC_MSG_WARN(["make dist" will not work])

trunk/doc/Makefile.am

@@ -8 +8 @@
 dist_doc_DATA = README
 dist_noinst_DATA = $(srcdir)/doxygen-footer.html $(srcdir)/*.gif
+if ENABLE_API_DOC
 dist_apidoc_DATA=api.out/html/*
+else
+dist_noinst_DATA+=api.out/html/*
+endif
 
-if ENABLE_API_DOC
-
+if SVN_CHECKOUT
 api.out/html/*: api.out
 api.out:        $(top_srcdir)/src/include/openct/*.h \