gtk-doc config bits... * autogen.sh: call aclocal first * configure.ac: enable GTK_DO...

diff --git a/ChangeLog b/ChangeLog
index 3b18490..99b8f7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-04  Luc Pionchon  <luc.pionchon@nokia.com>
+
+       gtk-doc config bits...
+       * autogen.sh: call aclocal first
+       * configure.ac: enable GTK_DOC_CHECK
+       * doc/Makefile.am: really "include". "-include" is not followed by
+       automake, as a result gtk-doc.make would not be processed.
+       
+
 2006-05-03  Luc Pionchon  <luc.pionchon@nokia.com>
 
        N#27000 (additional fixes to patch from 2006-05-01)

diff --git a/autogen.sh b/autogen.sh
index 5decc35..6fa1c08 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 set -x
+aclocal-1.7 || aclocal
 libtoolize --automake
 gtkdocize --copy
-aclocal-1.7 || aclocal
 autoconf
 autoheader
 automake-1.7 --add-missing --foreign || automake --add-missing --foreign

diff --git a/configure.ac b/configure.ac
index 59481da..2a17474 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT
 # Check for gtk-doc.
 ##################################################
 #ifdef(GTK_DOC_CHECK, GTK_DOC_CHECK([1.0]))
-#GTK_DOC_CHECK([1.0])
+GTK_DOC_CHECK([1.0])
 
 AC_CHECK_PROG(DOXYGEN_FOUND, doxygen, yes, no)
 AM_CONDITIONAL(HAVE_DOXYGEN, [test "$DOXYGEN_FOUND" = "yes"])

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e6b7b09..17bb2a3 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -56,6 +56,6 @@ HTML_IMAGES =
 # Extra options to supply to gtkdoc-fixref.
 FIXXREF_OPTIONS=
 
--include $(top_srcdir)/gtk-doc.make
+include $(top_srcdir)/gtk-doc.make