diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 30 | ||||
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | help/ChangeLog | 4 | ||||
| -rw-r--r-- | help/Makefile.am | 2 |
6 files changed, 46 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2000-07-17 Federico Mena Quintero <federico@helixcode.com> + + * configure.in (AC_OUTPUT): Added the doc/devel Makefiles. + (EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir. + Added checks for gtk-doc. + 2000-07-12 Federico Mena Quintero <federico@helixcode.com> * configure.in: Make gnome-print-0.20 mandatory. We will bail out diff --git a/configure.in b/configure.in index da4f2523e8..26f9d571f2 100644 --- a/configure.in +++ b/configure.in @@ -462,11 +462,38 @@ AC_SUBST(KRB4_LDFLAGS) dnl ****************************** +dnl gtk-doc +dnl ****************************** + +AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) +AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC) +AC_SUBST(HAVE_GTK_DOC) + +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) + +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 + +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 ****************************** dnl Makefiles dnl ****************************** AC_CONFIG_SUBDIRS(libical) +EVOLUTION_DIR=`(cd srcdir; pwd)` +AC_SUBST(EVOLUTION_DIR) + AC_OUTPUT([ Makefile evolution.spec @@ -533,4 +560,7 @@ default_user/local/Trash/Makefile tools/Makefile doc/Makefile doc/C/Makefile +doc/devel/Makefile +doc/devel/calendar/Makefile +doc/devel/calendar/cal-client/Makefile ]) diff --git a/doc/ChangeLog b/doc/ChangeLog index bcca8be7e5..ffc357b892 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2000-07-17 Federico Mena Quintero <federico@helixcode.com> + + * Makefile.am (SUBDIRS): Added the devel directory. + 2000-06-28 Peter Williams <peterw@curious-george.helixcode.com> * C/Makefile.am (SGML_FILES): Don't depend on the newly-removed diff --git a/doc/Makefile.am b/doc/Makefile.am index 42ffacc264..7b5420fee8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1 +1 @@ -SUBDIRS = C +SUBDIRS = C devel diff --git a/help/ChangeLog b/help/ChangeLog index bcca8be7e5..ffc357b892 100644 --- a/help/ChangeLog +++ b/help/ChangeLog @@ -1,3 +1,7 @@ +2000-07-17 Federico Mena Quintero <federico@helixcode.com> + + * Makefile.am (SUBDIRS): Added the devel directory. + 2000-06-28 Peter Williams <peterw@curious-george.helixcode.com> * C/Makefile.am (SGML_FILES): Don't depend on the newly-removed diff --git a/help/Makefile.am b/help/Makefile.am index 42ffacc264..7b5420fee8 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1 +1 @@ -SUBDIRS = C +SUBDIRS = C devel |