* m4/efl_doxygen.m4:

fix logic in efl_doxygen.m4



SVN revision: 38880

legacy/evil/ChangeLog

@@ -1,3 +1,8 @@
+2009-02-01  Vincent Torri  <doursse at users dot sf dot net>
+
+	* m4/efl_doxygen.m4:
+	fix logic in efl_doxygen.m4
+
 2009-01-24  Vincent Torri  <doursse at users dot sf dot net>
 
 	* src/lib/evil_fcntl.c:

legacy/evil/m4/efl_doxygen.m4

@@ -11,52 +11,57 @@ dnl
 AC_DEFUN([EFL_CHECK_DOXYGEN],
 [
 
-DOXYGEN="doxygen"
-
 dnl
 dnl Disable the build of the documentation
 dnl
 AC_ARG_ENABLE([doc],
-   AC_HELP_STRING(
+   [AC_HELP_STRING(
        [--disable-doc],
-      [Disable the build of the documentation]),
-   [if test "${disable_doc}" = "yes" ; then
-       enable_doc="no"
+       [Disable documentation build @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       efl_enable_doc="yes"
     else
-       enable_doc="yes"
-    fi],
-   [enable_doc="yes"]
+       efl_enable_doc="no"
+    fi
+   ],
+   [efl_enable_doc="yes"]
 )
 
+if test "x${efl_enable_doc}" = "xyes" ; then
+
 dnl
 dnl Specify the full file name, with path
 dnl
+
+   efl_doxygen="doxygen"
+
    AC_ARG_WITH([doxygen],
-   AC_HELP_STRING(
+      [AC_HELP_STRING(
           [--with-doxygen=FILE],
-      [doxygen program to use @<:@default=doxygen@:>@]),
+          [doxygen program to use @<:@default=doxygen@:>@])],
 dnl
 dnl Check the given doxygen program.
 dnl
       [DOXYGEN=${withval}
-    AC_CHECK_PROG([BUILD_DOCS],
-       [${DOXYGEN}],
+       AC_CHECK_PROG([efl_have_doxygen],
+          [${efl_doxygen}],
           [yes],
           [no])
-    if test "x${BUILD_DOCS}" = "xno" ; then
+       if test "x${efl_have_doxygen}" = "xno" ; then
           echo "WARNING:"
           echo "The doxygen program you specified:"
-       echo "$DOXYGEN"
+          echo "$efl_doxygen"
           echo "was not found.  Please check the path and make sure "
           echo "the program exists and is executable."
           AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
        fi
       ],
-   [AC_CHECK_PROG([BUILD_DOCS],
-       [${DOXYGEN}],
+      [AC_CHECK_PROG([efl_have_doxygen],
+          [${efl_doxygen}],
           [yes],
           [no])
-    if test "x${BUILD_DOCS}" = "xno" ; then
+       if test "x${efl_have_doxygen}" = "xno" ; then
           echo "WARNING:"
           echo "The doxygen program was not found in your execute"
           echo "You may have doxygen installed somewhere not covered by your path."
@@ -69,15 +74,20 @@ AC_ARG_WITH([doxygen],
        fi
       ]
    )
+fi
 
 dnl
 dnl Substitution
 dnl
-AC_SUBST([DOXYGEN])
+AC_SUBST([efl_doxygen])
 
-AM_CONDITIONAL(EFL_BUILD_DOC, test "x${BUILD_DOCS}" = "xyes")
+if ! test "x${efl_have_doxygen}" = "xyes" ; then
+   efl_enable_doc="no"
+fi
 
-if test "x${BUILD_DOCS}" = "xyes" ; then
+AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes")
+
+if test "x${efl_enable_doc}" = "xyes" ; then
   ifelse([$1], , :, [$1])
 else
   ifelse([$2], , :, [$2])