[Libreoffice-commits] core.git: configure.ac

[Lionel Elie Mamane]

 configure.ac |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 214e1c17e712cc5d27743c5f8e9d5f05c14ee8bd
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Jun 23 23:37:01 2013 +0200

    Complain about too old doxygen only when there is one
    
    Change-Id: I6c460375945eac8dccddca196f67b8d224e0d34e

diff --git a/configure.ac b/configure.ac
index b9810f3..765bf72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7147,10 +7147,12 @@ else
             DOXYGEN=$with_doxygen
             AC_MSG_RESULT([$DOXYGEN])
         fi
-        DOXYGEN_VERSION=`$DOXYGEN --version 2>/dev/null`
-        DOXYGEN_NUMVERSION=`echo $DOXYGEN_VERSION | $AWK -F. '{ print \$1*10000 + \$2*100 + \$3 }'`
-        if ! test "$DOXYGEN_NUMVERSION" -ge "10804" ; then
-            AC_MSG_ERROR([found doxygen is too old; need at least version 1.8.4 or specify --without-doxygen])
+        if test -n "$DOXYGEN"; then
+           DOXYGEN_VERSION=`$DOXYGEN --version 2>/dev/null`
+           DOXYGEN_NUMVERSION=`echo $DOXYGEN_VERSION | $AWK -F. '{ print \$1*10000 + \$2*100 + \$3 }'`
+           if ! test "$DOXYGEN_NUMVERSION" -ge "10804" ; then
+              AC_MSG_ERROR([found doxygen is too old; need at least version 1.8.4 or specify --without-doxygen])
+           fi
         fi
     fi
 fi