diff options
| author | Simon Josefsson <simon@josefsson.org> | 2011-11-20 21:40:48 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2011-11-20 22:01:36 +0100 |
| commit | 83db2be6d126aafcd3641cec42cbfb3c76ff76e6 (patch) | |
| tree | b383069e49bab15bfca9e7851c6b3fb0b7f469f9 /m4 | |
| parent | f1744a0b833fa8f4792c01a11d82b6525b237d3c (diff) | |
| download | libtasn1-83db2be6d126aafcd3641cec42cbfb3c76ff76e6.tar.gz libtasn1-83db2be6d126aafcd3641cec42cbfb3c76ff76e6.tar.bz2 libtasn1-83db2be6d126aafcd3641cec42cbfb3c76ff76e6.zip | |
Update GTK-DOC infrastructure.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gtk-doc.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 index 2cfa1e7..0ada151 100644 --- a/m4/gtk-doc.m4 +++ b/m4/gtk-doc.m4 @@ -6,6 +6,7 @@ dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) AC_DEFUN([GTK_DOC_CHECK], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first @@ -33,6 +34,11 @@ AC_DEFUN([GTK_DOC_CHECK], AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + fi fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) |