Permalink
Browse files

m4macros: Delete gtk-doc.m4, gtkdocize gives us a symlink

  • Loading branch information...
1 parent d120209 commit 53596f708d49d68639711669000be0f27e6adfec Martin Nordholts committed Jun 19, 2010
Showing with 3 additions and 58 deletions.
  1. +3 −4 acinclude.m4
  2. +0 −1 m4macros/Makefile.am
  3. +0 −53 m4macros/gtk-doc.m4
View
@@ -1,6 +1,5 @@
-m4_include([m4macros/detectcflags.m4])
-m4_include([m4macros/pythondev.m4])
-m4_include([m4macros/gimpprint.m4])
m4_include([m4macros/alsa.m4])
-m4_include([m4macros/gtk-doc.m4])
m4_include([m4macros/binreloc.m4])
+m4_include([m4macros/detectcflags.m4])
+m4_include([m4macros/gimpprint.m4])
+m4_include([m4macros/pythondev.m4])
@@ -7,7 +7,6 @@ uinstalled_m4 = \
binreloc.m4 \
detectcflags.m4 \
gimpprint.m4 \
- gtk-doc.m4 \
pythondev.m4
EXTRA_DIST = $(installed_m4) $(uninstalled_m4)
View
@@ -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")
-])

0 comments on commit 53596f7

Please sign in to comment.