Changeset 3798

Timestamp:

Apr 27, 2019, 11:36:43 AM (4 years ago)

Author:

Peter

Message:

allow user to turn off doxygen

Location:

branches/0.16-stable

Files:

• README (modified) (1 diff)
• configure.ac (modified) (3 diffs)

branches/0.16-stable/README

@@ -208 +208 @@
 [http://www.doxygen.org/ Doxygen] 1.5 (or newer) is required for
 generation of the API documentation. If doxygen application is
-missing, generation of API documentation is disabled.
+missing, generation of API documentation is disabled. You can turn off
+doxygen usage with
+
+  #> ./configure DOXYGEN=no
 
 = Documentation =

branches/0.16-stable/configure.ac

@@ -138 +138 @@
 AX_COMPILER_VENDOR
 
+AC_ARG_VAR([DOXYGEN], [path to doxygen program])
 have_doxygen=no
-AC_PATH_PROG([DOXYGEN], [doxygen], [no])
-if test "$DOXYGEN" = "no"; then
+
+# Let the user turn off usage of doxygen
+AS_VAR_IF([DOXYGEN], [no], [
+  have_doxygen=notwanted
+], [
+  AC_PATH_PROG([DOXYGEN], [doxygen], [no])
+  AS_VAR_IF([DOXYGEN], [no], [
    AC_MSG_WARN([unable to find doxygen application])
-else
+  ], [ # if we found doxygen look that it's new enough
    doxygen_min_version=1.5
    AC_MSG_CHECKING([if doxygen is at least $doxygen_min_version])
@@ -149 +155 @@
                       [have_doxygen=yes], [have_doxygen=old])
    AC_MSG_RESULT([$doxygen_version])
-fi
+ ])
+])
 
 AC_SUBST(have_doxygen)
@@ -679 +686 @@
         [no], [doxygen_message="no (doxygen not found)"],
         [old], [doxygen_message="no (\`$DOXYGEN' too old)"],
+        [notwanted], [doxygen_message="no"],
         [AC_MSG_WARN([unexpected value \$have_doxygen: '$have_doxygen'])
          AS_BOX([Report this to ]AC_PACKAGE_BUGREPORT)