* doc/Makefile.am: use "-include" for gtk-doc.make (ignore included Makefile if missing).

* configure.ac: temporarily disable GTK_DOC_CHECK (problem in
	integration environement)

	* configure.ac: print configuration summary after processing

diff --git a/ChangeLog b/ChangeLog
index 30deefe..76bc75e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-25  Luc Pionchon  <luc.pionchon@nokia.com>
+
+       * doc/Makefile.am: use "-include" for gtk-doc.make (ignore
+       included Makefile if missing).
+
+       * configure.ac: temporarily disable GTK_DOC_CHECK (problem in
+       integration environement)
+
+       * configure.ac: print configuration summary after processing
+
 2006-04-24  Marius Vollmer  <marius.vollmer@nokia.com>
 
         From Murray Cumming  <murrayc@murrayc.com>, M#183.

diff --git a/configure.ac b/configure.ac
index 4df7c91..248c389 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,8 @@ AM_GLIB_GNU_GETTEXT
 ##################################################
 # Check for gtk-doc.
 ##################################################
-GTK_DOC_CHECK([1.0])
+#ifdef(GTK_DOC_CHECK, 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"])
@@ -84,9 +85,20 @@ AC_SUBST(REBUILD)
 
 AC_OUTPUT(Makefile \
        hildon-widgets/Makefile \
-        timer/Makefile \
+       timer/Makefile \
        ut/Makefile \
        po/Makefile \
        po/porules.mk \
        doc/Makefile \
        hildon-libs.pc)
+
+
+echo "
+######################################
+Configuration:
+
+- Compiler...........: ${CC}
+- gtk-doc support....: ${enable_gtk_doc}
+
+######################################
+"
\ No newline at end of file

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 17bb2a3..e6b7b09 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