summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2009-01-22 21:14:12 +0000
committerVincent Torri <vincent.torri@gmail.com>2009-01-22 21:14:12 +0000
commit62ca2f49f21d2422a9e7ab69685dc222f1cab2fc (patch)
tree2dc12433d78dea09cee4b50d7bf62f3297a29691 /legacy
parent185d9ae9b5e145ed9169ff225bb585b08da2b79f (diff)
fix logic in efl_doxygen.m4
SVN revision: 38700
Diffstat (limited to '')
-rw-r--r--legacy/eet/configure.ac2
-rw-r--r--legacy/eet/doc/Makefile.am4
-rw-r--r--legacy/eet/m4/efl_doxygen.m453
3 files changed, 33 insertions, 26 deletions
diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac
index 375543b6ca..8df66dcc5c 100644
--- a/legacy/eet/configure.ac
+++ b/legacy/eet/configure.ac
@@ -365,7 +365,7 @@ echo " Openssl..............: ${have_openssl}"
365echo " Cipher support.....: ${have_cipher}" 365echo " Cipher support.....: ${have_cipher}"
366echo " Signature..........: ${have_signature}" 366echo " Signature..........: ${have_signature}"
367echo 367echo
368echo " Documentation........: ${enable_doc}" 368echo " Documentation........: ${build_doc}"
369echo " Tests................: ${enable_tests}" 369echo " Tests................: ${enable_tests}"
370echo " Coverage.............: ${enable_coverage}" 370echo " Coverage.............: ${enable_coverage}"
371echo 371echo
diff --git a/legacy/eet/doc/Makefile.am b/legacy/eet/doc/Makefile.am
index edaffcbd2f..aa9668cad1 100644
--- a/legacy/eet/doc/Makefile.am
+++ b/legacy/eet/doc/Makefile.am
@@ -10,8 +10,8 @@ if EFL_BUILD_DOC
10doc-clean: 10doc-clean:
11 rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar* 11 rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
12 12
13doc: all doc-clean 13doc: doc-clean
14 $(DOXYGEN) 14 $(efl_doxygen)
15 cp img/* html/ 15 cp img/* html/
16 rm -rf $(PACKAGE_DOCNAME).tar* 16 rm -rf $(PACKAGE_DOCNAME).tar*
17 mkdir -p $(PACKAGE_DOCNAME)/doc 17 mkdir -p $(PACKAGE_DOCNAME)/doc
diff --git a/legacy/eet/m4/efl_doxygen.m4 b/legacy/eet/m4/efl_doxygen.m4
index 49a3dfa0c4..37acb3acc2 100644
--- a/legacy/eet/m4/efl_doxygen.m4
+++ b/legacy/eet/m4/efl_doxygen.m4
@@ -11,52 +11,55 @@ dnl
11AC_DEFUN([EFL_CHECK_DOXYGEN], 11AC_DEFUN([EFL_CHECK_DOXYGEN],
12[ 12[
13 13
14DOXYGEN="doxygen"
15
16dnl 14dnl
17dnl Disable the build of the documentation 15dnl Disable the build of the documentation
18dnl 16dnl
19AC_ARG_ENABLE([doc], 17AC_ARG_ENABLE([doc],
20 AC_HELP_STRING( 18 [AC_HELP_STRING(
21 [--disable-doc], 19 [--disable-doc],
22 [Disable the build of the documentation]), 20 [Disable documentation build @<:@default=enabled@:>@])],
23 [if test "${disable_doc}" = "yes" ; then 21 [
24 enable_doc="no" 22 if test "x${enableval}" = "xyes" ; then
23 efl_enable_doc="yes"
25 else 24 else
26 enable_doc="yes" 25 efl_enable_doc="no"
27 fi], 26 fi
28 [enable_doc="yes"] 27 ],
28 [efl_enable_doc="yes"]
29) 29)
30 30
31dnl 31dnl
32dnl Specify the full file name, with path 32dnl Specify the full file name, with path
33dnl 33dnl
34
35efl_doxygen="doxygen"
36
34AC_ARG_WITH([doxygen], 37AC_ARG_WITH([doxygen],
35 AC_HELP_STRING( 38 [AC_HELP_STRING(
36 [--with-doxygen=FILE], 39 [--with-doxygen=FILE],
37 [doxygen program to use @<:@default=doxygen@:>@]), 40 [doxygen program to use @<:@default=doxygen@:>@])],
38 dnl 41 dnl
39 dnl Check the given doxygen program. 42 dnl Check the given doxygen program.
40 dnl 43 dnl
41 [DOXYGEN=${withval} 44 [DOXYGEN=${withval}
42 AC_CHECK_PROG([BUILD_DOCS], 45 AC_CHECK_PROG([efl_have_doxygen],
43 [${DOXYGEN}], 46 [${efl_doxygen}],
44 [yes], 47 [yes],
45 [no]) 48 [no])
46 if test "x${BUILD_DOCS}" = "xno" ; then 49 if test "x${efl_have_doxygen}" = "xno" ; then
47 echo "WARNING:" 50 echo "WARNING:"
48 echo "The doxygen program you specified:" 51 echo "The doxygen program you specified:"
49 echo "$DOXYGEN" 52 echo "$efl_doxygen"
50 echo "was not found. Please check the path and make sure " 53 echo "was not found. Please check the path and make sure "
51 echo "the program exists and is executable." 54 echo "the program exists and is executable."
52 AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built]) 55 AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
53 fi 56 fi
54 ], 57 ],
55 [AC_CHECK_PROG([BUILD_DOCS], 58 [AC_CHECK_PROG([efl_have_doxygen],
56 [${DOXYGEN}], 59 [${efl_doxygen}],
57 [yes], 60 [yes],
58 [no]) 61 [no])
59 if test "x${BUILD_DOCS}" = "xno" ; then 62 if test "x${efl_have_doxygen}" = "xno" ; then
60 echo "WARNING:" 63 echo "WARNING:"
61 echo "The doxygen program was not found in your execute" 64 echo "The doxygen program was not found in your execute"
62 echo "You may have doxygen installed somewhere not covered by your path." 65 echo "You may have doxygen installed somewhere not covered by your path."
@@ -73,11 +76,15 @@ AC_ARG_WITH([doxygen],
73dnl 76dnl
74dnl Substitution 77dnl Substitution
75dnl 78dnl
76AC_SUBST([DOXYGEN]) 79AC_SUBST([efl_doxygen])
80
81if ! test "x${efl_have_doxygen}" = "xyes" ; then
82 efl_enable_doc="no"
83fi
77 84
78AM_CONDITIONAL(EFL_BUILD_DOC, test "x${BUILD_DOCS}" = "xyes") 85AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes")
79 86
80if test "x${BUILD_DOCS}" = "xyes" ; then 87if test "x${efl_enable_doc}" = "xyes" ; then
81 ifelse([$1], , :, [$1]) 88 ifelse([$1], , :, [$1])
82else 89else
83 ifelse([$2], , :, [$2]) 90 ifelse([$2], , :, [$2])