aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@src.gnome.org>2001-06-20 01:26:04 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2001-06-20 01:26:04 +0800
commit4583098b34dfc46701ec05531bba90a7c59d8d92 (patch)
tree2c00fba88a8ba20ae218fe68f679958bbf963e2d /configure.in
parent2e156596a6e8099c3f540ca362b1415613ed30dd (diff)
downloadgsoc2013-evolution-4583098b34dfc46701ec05531bba90a7c59d8d92.tar
gsoc2013-evolution-4583098b34dfc46701ec05531bba90a7c59d8d92.tar.gz
gsoc2013-evolution-4583098b34dfc46701ec05531bba90a7c59d8d92.tar.bz2
gsoc2013-evolution-4583098b34dfc46701ec05531bba90a7c59d8d92.tar.lz
gsoc2013-evolution-4583098b34dfc46701ec05531bba90a7c59d8d92.tar.xz
gsoc2013-evolution-4583098b34dfc46701ec05531bba90a7c59d8d92.tar.zst
gsoc2013-evolution-4583098b34dfc46701ec05531bba90a7c59d8d92.zip
Sync - Federico
svn path=/trunk/; revision=10293
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in38
1 files changed, 30 insertions, 8 deletions
diff --git a/configure.in b/configure.in
index 11fe3a5977..ed08144297 100644
--- a/configure.in
+++ b/configure.in
@@ -857,13 +857,36 @@ else
msg_ssl="no"
fi
-dnl ******************************
-dnl gtk-doc
-dnl ******************************
+##################################################
+# Check for gtk-doc.
+##################################################
+
+AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
+
+if test "x$with_html_dir" = "x" ; then
+ HTML_DIR='${datadir}/gnome/html'
+else
+ HTML_DIR=$with_html_dir
+fi
+
+AC_SUBST(HTML_DIR)
AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
-AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
-AC_SUBST(HAVE_GTK_DOC)
+
+gtk_doc_min_version=0.6
+if $GTKDOC ; then
+ gtk_doc_version=`gtkdoc-mkdb --version`
+ AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
+ if perl <<EOF ; then
+ exit (("$gtk_doc_version" =~ /^[[0-9]]+\.[[0-9]]+$/) &&
+ ("$gtk_doc_version" >= "$gtk_doc_min_version") ? 0 : 1);
+EOF
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ GTKDOC=false
+ fi
+fi
dnl Let people disable the gtk-doc stuff.
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
@@ -872,12 +895,10 @@ if test x$enable_gtk_doc = xauto ; then
if test x$GTKDOC = xtrue ; then
enable_gtk_doc=yes
else
- enable_gtk_doc=no
+ enable_gtk_doc=no
fi
fi
-dnl NOTE: We need to use a separate automake conditional for this
-dnl to make this work with the tarballs.
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
dnl ********
@@ -1017,6 +1038,7 @@ views/Makefile
views/addressbook/Makefile
views/mail/Makefile
views/tasks/Makefile
+views/calendar/Makefile
tools/Makefile
doc/Makefile
doc/C/Makefile