Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/ChangeLog,v
retrieving revision 1.95
diff -u -r1.95 ChangeLog
--- ChangeLog	15 Jan 2004 12:44:14 -0000	1.95
+++ ChangeLog	15 Jan 2004 21:29:29 -0000
@@ -1,6 +1,8 @@
 2004-01-15  Geert Stappers <stappers@stappers.nl>
 
-	* configure.in: Added "fr" to ALL_LINGUAS.
+	* configure.in:
+	 - Added "fr" to ALL_LINGUAS.
+	 - Disabled the gtk-doc stuff (introducing Bugzilla#131600)
 
 2004-01-13  Laurent Dhima  <laurenti@alblinux.net>
 
Index: configure.in
===================================================================
RCS file: /cvs/gnome/conglomerate/configure.in,v
retrieving revision 1.83
diff -u -r1.83 configure.in
--- configure.in	15 Jan 2004 12:44:14 -0000	1.83
+++ configure.in	15 Jan 2004 21:29:29 -0000
@@ -205,42 +205,45 @@
 
 ##################################################
 # Check for gtk-doc.
+#  for the time being disabed
+#  http://bugzilla.gnome.org/show_bug.cgi?id=131600
 ##################################################
-GTK_DOC_CHECK
-
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-
-AC_SUBST(HTML_DIR)
-
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
-  AC_MSG_RESULT(yes)
-  GTKDOC=true
-else
-  AC_MSG_RESULT(no)
-  GTKDOC=false
-fi
-
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=yes]], enable_gtk_doc="$enableval", enable_gtk_doc=yes)
-
-dnl if test x$enable_gtk_doc = xauto ; then
-dnl   if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-dnl   else
-dnl     enable_gtk_doc=no
-dnl   fi
-dnl fi
-
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-
+#GTK_DOC_CHECK
+#
+#AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
+#
+#if test "x$with_html_dir" = "x" ; then
+#  HTML_DIR='${datadir}/gtk-doc/html'
+#else
+#  HTML_DIR=$with_html_dir
+#fi
+#
+#AC_SUBST(HTML_DIR)
+#
+#gtk_doc_min_version=1.0
+#AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
+#if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
+#  AC_MSG_RESULT(yes)
+#  GTKDOC=true
+#else
+#  AC_MSG_RESULT(no)
+#  GTKDOC=false
+#fi
+#
+#dnl Let people disable the gtk-doc stuff.
+#AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=yes]], enable_gtk_doc="$enableval", enable_gtk_doc=yes)
+#
+#dnl if test x$enable_gtk_doc = xauto ; then
+#dnl   if test x$GTKDOC = xtrue ; then
+#    enable_gtk_doc=yes
+#dnl   else
+#dnl     enable_gtk_doc=no
+#dnl   fi
+#dnl fi
+#
+#AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+#
+enable_gtk_doc=no
 
 dnl --- Output ---
 
@@ -255,8 +258,6 @@
 	  doc/Makefile
 	  doc/devel/Makefile
 	  doc/C/Makefile
-	  doc/reference/Makefile
-	  doc/reference/version.xml
 	  glade/Makefile
 	  pixmaps/Makefile
 	  examples/Makefile 
Index: doc/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/ChangeLog,v
retrieving revision 1.3
diff -u -r1.3 ChangeLog
--- doc/ChangeLog	26 Sep 2003 15:17:32 -0000	1.3
+++ doc/ChangeLog	15 Jan 2004 21:29:29 -0000
@@ -1,3 +1,8 @@
+2004-01-15  Geert Stappers <stappers@stappers.nl>
+
+	* Makefile.am
+	Disabled the reference directory (introducing bug #131600)
+
 2003-09-26  David Malcolm <david@davemalcolm.demon.co.uk>
 
 	* Makefile.am
Index: doc/Makefile.am
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- doc/Makefile.am	9 Oct 2003 13:34:35 -0000	1.5
+++ doc/Makefile.am	15 Jan 2004 21:29:29 -0000
@@ -1 +1,3 @@
-SUBDIRS = devel C reference
+##SUBDIRS = devel C reference
+## http://bugzilla.gnome.org/show_bug.cgi?id=131600
+SUBDIRS = C devel
