diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index 04c9da0fba..f3206a1a68 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -3,7 +3,8 @@ rm -f config.cache
 
 AC_INIT([eina], [0.0.1], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.60])
-AC_CONFIG_SRCDIR(configure.ac)
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
diff --git a/legacy/eina/doc/Makefile.am b/legacy/eina/doc/Makefile.am
index d1fd867697..26b1922613 100644
--- a/legacy/eina/doc/Makefile.am
+++ b/legacy/eina/doc/Makefile.am
@@ -7,7 +7,7 @@ if EFL_BUILD_DOC
 
 doc: all
 	rm -rf html/ latex/ man/
-	$(DOXYGEN)
+	$(efl_doxygen)
 
 else
 
diff --git a/legacy/eina/m4/efl_doxygen.m4 b/legacy/eina/m4/efl_doxygen.m4
index 49a3dfa0c4..0c1452fee0 100644
--- a/legacy/eina/m4/efl_doxygen.m4
+++ b/legacy/eina/m4/efl_doxygen.m4
@@ -5,79 +5,89 @@ dnl Macro that check if doxygen is available or not.
 
 dnl EFL_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for the doxygen program
-dnl Defines DOXYGEN
+dnl Defines efl_doxygen
 dnl Defines the automake conditionnal EFL_BUILD_DOC
 dnl
 AC_DEFUN([EFL_CHECK_DOXYGEN],
 [
 
-DOXYGEN="doxygen"
-
 dnl
 dnl Disable the build of the documentation
 dnl
 AC_ARG_ENABLE([doc],
-   AC_HELP_STRING(
-      [--disable-doc],
-      [Disable the build of the documentation]),
-   [if test "${disable_doc}" = "yes" ; then
-       enable_doc="no"
+   [AC_HELP_STRING(
+       [--disable-doc],
+       [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
-AC_ARG_WITH([doxygen],
-   AC_HELP_STRING(
-      [--with-doxygen=FILE],
-      [doxygen program to use @<:@default=doxygen@:>@]),
-   dnl
-   dnl Check the given doxygen program.
-   dnl
-   [DOXYGEN=${withval}
-    AC_CHECK_PROG([BUILD_DOCS],
-       [${DOXYGEN}],
-       [yes],
-       [no])
-    if test "x${BUILD_DOCS}" = "xno" ; then
-       echo "WARNING:"
-       echo "The doxygen program you specified:"
-       echo "$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}],
-       [yes],
-       [no])
-    if test "x${BUILD_DOCS}" = "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."
-       echo ""
-       echo "If this is the case make sure you have the packages installed, AND"
-       echo "that the doxygen program is in your execute path (see your"
-       echo "shell manual page on setting the \$PATH environment variable), OR"
-       echo "alternatively, specify the program to use with --with-doxygen."
-       AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
-    fi
-   ]
-)
+
+   efl_doxygen="doxygen"
+
+   AC_ARG_WITH([doxygen],
+      [AC_HELP_STRING(
+          [--with-doxygen=FILE],
+          [doxygen program to use @<:@default=doxygen@:>@])],
+dnl
+dnl Check the given doxygen program.
+dnl
+      [efl_doxygen=${withval}
+       AC_CHECK_PROG([efl_have_doxygen],
+          [${efl_doxygen}],
+          [yes],
+          [no])
+       if test "x${efl_have_doxygen}" = "xno" ; then
+          echo "WARNING:"
+          echo "The doxygen program you specified:"
+          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([efl_have_doxygen],
+          [${efl_doxygen}],
+          [yes],
+          [no])
+       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."
+          echo ""
+          echo "If this is the case make sure you have the packages installed, AND"
+          echo "that the doxygen program is in your execute path (see your"
+          echo "shell manual page on setting the \$PATH environment variable), OR"
+          echo "alternatively, specify the program to use with --with-doxygen."
+          AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
+       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])