From: Alberto Garcia <agarcia@igalia.com>
Date: Thu, 11 Jun 2009 15:09:19 +0000 (+0200)
Subject: Remove m4/gtk-doc.m4, as it already comes with gtk-doc-tools
X-Git-Tag: 2.1.82-1~8
X-Git-Url: http://git.maemo.org/git/?p=hildon;a=commitdiff_plain;h=694e8d990a47a101120528a63e3ed8542845339b

Remove m4/gtk-doc.m4, as it already comes with gtk-doc-tools

Fixes: MB#4616 (Compiling libhildon requires gtk-doc but does not
use gtk-doc support)
---

diff --git a/ChangeLog b/ChangeLog
index aa303c2..e274f89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-06-11  Alberto Garcia  <agarcia@igalia.com>
 
+	Remove m4/gtk-doc.m4, as it already comes with gtk-doc-tools
+
+	Fixes: MB#4616 (Compiling libhildon requires gtk-doc but does not
+	use gtk-doc support)
+
+2009-06-11  Alberto Garcia  <agarcia@igalia.com>
+
 	* hildon/hildon-code-dialog.c
 	* hildon/hildon-date-editor.c
 	* hildon/hildon-number-editor.c
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
deleted file mode 100644
index af73800..0000000
--- a/m4/gtk-doc.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test x$enable_gtk_doc = xyes; then
-    if test -z "$PKG_CONFIG"; then
-      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-    fi
-    if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-      have_gtk_doc=yes
-    fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-    [gtk_doc_min_version=$1
-    if test "$have_gtk_doc" = yes; then
-      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)
-      else
-        AC_MSG_RESULT(no)
-        have_gtk_doc=no
-      fi
-    fi
-])
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])