add back in libs.private/requires to pc files with some fixes for

[framework/uifw/embryo.git] / m4 / efl_doxygen.m4

diff --git a/m4/efl_doxygen.m4 b/m4/efl_doxygen.m4
index eaac993..d83ed68 100644 (file)
--- a/m4/efl_doxygen.m4
+++ b/m4/efl_doxygen.m4
@@ -5,7 +5,7 @@ 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 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],
 dnl Defines the automake conditionnal EFL_BUILD_DOC
 dnl
 AC_DEFUN([EFL_CHECK_DOXYGEN],


@@ -25,14 +25,14 @@ AC_ARG_ENABLE([doc],
        efl_enable_doc="no"
     fi
    ],
        efl_enable_doc="no"
     fi
    ],

-   [efl_enable_doc="yes"]
-)
+   [efl_enable_doc="yes"])
+
+AC_MSG_CHECKING([whether to build documentation])
+AC_MSG_RESULT([${efl_enable_doc}])

 
 if test "x${efl_enable_doc}" = "xyes" ; then
 
 
 if test "x${efl_enable_doc}" = "xyes" ; then
 

-dnl
-dnl Specify the full file name, with path
-dnl
+dnl Specify the file name, without path

 
    efl_doxygen="doxygen"
 
 
    efl_doxygen="doxygen"
 


@@ -40,10 +40,10 @@ dnl
       [AC_HELP_STRING(
           [--with-doxygen=FILE],
           [doxygen program to use @<:@default=doxygen@:>@])],
       [AC_HELP_STRING(
           [--with-doxygen=FILE],
           [doxygen program to use @<:@default=doxygen@:>@])],

-dnl
+

 dnl Check the given doxygen program.
 dnl Check the given doxygen program.

-dnl
-      [DOXYGEN=${withval}
+
+      [efl_doxygen=${withval}

        AC_CHECK_PROG([efl_have_doxygen],
           [${efl_doxygen}],
           [yes],
        AC_CHECK_PROG([efl_have_doxygen],
           [${efl_doxygen}],
           [yes],


@@ -51,10 +51,10 @@ dnl
        if test "x${efl_have_doxygen}" = "xno" ; then
           echo "WARNING:"
           echo "The doxygen program you specified:"
        if test "x${efl_have_doxygen}" = "xno" ; then
           echo "WARNING:"
           echo "The doxygen program you specified:"

-          echo "$efl_doxygen"
+          echo "${efl_doxygen}"

           echo "was not found.  Please check the path and make sure "
           echo "the program exists and is executable."
           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])
+          AC_MSG_WARN([no doxygen detected. Documentation will not be built])

        fi
       ],
       [AC_CHECK_PROG([efl_have_doxygen],
        fi
       ],
       [AC_CHECK_PROG([efl_have_doxygen],


@@ -63,17 +63,16 @@ dnl
           [no])
        if test "x${efl_have_doxygen}" = "xno" ; then
           echo "WARNING:"
           [no])
        if test "x${efl_have_doxygen}" = "xno" ; then
           echo "WARNING:"

-          echo "The doxygen program was not found in your execute"
+          echo "The doxygen program was not found in your execute path."

           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."
           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])
+          AC_MSG_WARN([no doxygen detected. Documentation will not be built])

        fi
        fi

-      ]
-   )
+      ])

 fi
 
 dnl
 fi
 
 dnl


@@ -88,11 +87,11 @@ fi
 AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes")
 
 if test "x${efl_enable_doc}" = "xyes" ; then
 AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes")
 
 if test "x${efl_enable_doc}" = "xyes" ; then

-  ifelse([$1], , :, [$1])
+  m4_default([$1], [:])

 else
 else

-  ifelse([$2], , :, [$2])
+  m4_default([$2], [:])

 fi
 
 ])
 
 fi
 
 ])
 

-dnl End of doxygen.m4
+dnl End of efl_doxygen.m4