aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-09-27 22:51:51 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-09-27 22:51:51 +0800
commit80dd682b542b9740670abcb9470185b7db8d49b8 (patch)
tree5deb789501a42826c2d27ae72a3d978a03fd7201
parent770c2204aeabf662b3a2123a88c3acef3f3ef84c (diff)
downloadgsoc2013-evolution-80dd682b542b9740670abcb9470185b7db8d49b8.tar
gsoc2013-evolution-80dd682b542b9740670abcb9470185b7db8d49b8.tar.gz
gsoc2013-evolution-80dd682b542b9740670abcb9470185b7db8d49b8.tar.bz2
gsoc2013-evolution-80dd682b542b9740670abcb9470185b7db8d49b8.tar.lz
gsoc2013-evolution-80dd682b542b9740670abcb9470185b7db8d49b8.tar.xz
gsoc2013-evolution-80dd682b542b9740670abcb9470185b7db8d49b8.tar.zst
gsoc2013-evolution-80dd682b542b9740670abcb9470185b7db8d49b8.zip
Remove the --enable-gtk-doc configure option since we don't ship any
2007-09-27 Matthew Barnes <mbarnes@redhat.com> * configure.in: Remove the --enable-gtk-doc configure option since we don't ship any Gtk-Doc content (#476926). svn path=/trunk/; revision=34321
-rw-r--r--ChangeLog6
-rw-r--r--configure.in62
2 files changed, 6 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index 58d2728012..f29e452213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-27 Matthew Barnes <mbarnes@redhat.com>
+
+ * configure.in:
+ Remove the --enable-gtk-doc configure option since we don't
+ ship any Gtk-Doc content (#476926).
+
2007-09-17 Srinivasa Ragavan <sragavan@novell.com>
* NEWS, configure.in: Evolution 2.12.0 release
diff --git a/configure.in b/configure.in
index a3050059a3..8ee3782aad 100644
--- a/configure.in
+++ b/configure.in
@@ -1789,55 +1789,6 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
fi
fi
-##################################################
-# Check for gtk-doc.
-##################################################
-
-AC_ARG_WITH([html-dir],
- AC_HELP_STRING([--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)
-
-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],
- AC_HELP_STRING([--enable-gtk-doc],
- [Use gtk-doc to build documentation [default=auto]]),
- [enable_gtk_doc=$enableval],[enable_gtk_doc=auto])
-
-if test x$enable_gtk_doc = xauto ; then
- if test x$GTKDOC = xtrue ; then
- enable_gtk_doc=yes
- else
- enable_gtk_doc=no
- fi
-fi
-
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-
dnl ***********
dnl GConf stuff
dnl ***********
@@ -2063,17 +2014,4 @@ echo "\
SSL support: $msg_ssl
SMIME support: $msg_smime
Plugins: $msg_plugins
- Gtk-doc: $enable_gtk_doc
DBus API version $DBUS_VERSION"
-
-if test x$enable_gtk_doc = xyes; then
-echo "
- Programming documentation files will be built automatically.
-"
-else
-echo "
- Programming documentation files will not be built.
- You may want to install the gtk-doc package
- so that you will get the Evolution Developer's Guide.
-"
-fi