← Back to branch summary

~ubuntu-branches/ubuntu/precise/ubuntuone-client/precise-201201132228

« back to all changes in this revision

Viewing changes to m4/gtk-doc.m4

  • Committer: Package Import Robot
  • Author(s): Rodney Dawes
  • Date: 2011-12-21 15:46:25 UTC
  • mfrom: (1.1.56)
  • Revision ID: package-import@ubuntu.com-20111221154625-ujvunri4frsecj2k
Tags: 2.99.0-0ubuntu1
https://launchpad.net/bugs/692597
https://launchpad.net/bugs/869920
* New upstream release.
  - Verify timestamp to avoid invalid auth failures (LP: #692597)
  - Files in new UDFs not uploaded due to filtering (LP: #869920)
* debian/patches:
  - Remove upstreamed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/gtk-doc.m4
6
6
dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
7
7
AC_DEFUN([GTK_DOC_CHECK],
8
8
[
 
9
  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
9
10
  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
10
11
  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
11
12
 
33
34
                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
34
35
      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
35
36
                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
 
37
    dnl don't check for glib if we build glib
 
38
    if test "x$PACKAGE_NAME" != "xglib"; then
 
39
      dnl don't fail if someone does not have glib
 
40
      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
 
41
    fi
36
42
  fi
37
43
 
38
44
  AC_MSG_CHECKING([whether to build gtk-doc documentation])