configure: Fix the disabling of doxygen when building from tarballs

We check if we are in a developer tree, display the result, but do nothing with it.
Add the relevant code to update enable_doxygen accordingly if it wasn't forced
on the command-line.

This was unnoticed for a long time because we distribute hwloc.tag,
which causes tarball-builds not to regenerate the doc.
But they will regenerate it as soon as a dependency changes.

Now doxygen is entirely disabled properly in tarball-builds for real
as long as --enable-doxygen is not given.

diff --git a/config/hwloc_internal.m4 b/config/hwloc_internal.m4
index bfc3f36284d199e88360c1eb5e0f545da0129671..ab03f70a025811f76a26ac873fcefaafc2438d46 100644 (file)
--- a/config/hwloc_internal.m4
+++ b/config/hwloc_internal.m4
@@ -1,6 +1,6 @@
 dnl -*- Autoconf -*-
 dnl
-dnl Copyright (c) 2009-2012 Inria.  All rights reserved.
+dnl Copyright (c) 2009-2014 Inria.  All rights reserved.
 dnl Copyright (c) 2009, 2011 Université Bordeaux 1
 dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 dnl                         University Research and Technology
@@ -117,8 +117,10 @@ EOF
 
     AC_MSG_CHECKING([if this is a developer build])
     AS_IF([test ! -d "$srcdir/.hg" -a ! -d "$srcdir/.git"],
-          [AC_MSG_RESULT([no (doxygen generation is optional)])],
-          [AC_MSG_RESULT([yes])])
+          [AC_MSG_RESULT([no (doxygen generation is optional)])
+          test "x$enable_doxygen" = x && enable_doxygen=no],
+          [AC_MSG_RESULT([yes])
+          test "x$enable_doxygen" = x && enable_doxygen=yes])
     
     # Generating the doxygen output requires a few tools.  If we
     # don't have all of them, refuse the build the docs.