diff options
| author | Karel Zak <kzak@redhat.com> | 2009-11-06 23:59:54 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2009-11-06 23:59:54 +0100 |
| commit | 38a1717fa1944f42f8cffdf4ced51b40396d850e (patch) | |
| tree | bc27b2827d42e381234ee791ba7c0ba62549b757 /m4/gtk-doc.m4 | |
| parent | e42b25eb1536697ba283772f5452e7495cb4024b (diff) | |
| download | util-linux-old-38a1717fa1944f42f8cffdf4ced51b40396d850e.tar.gz | |
Revert "build-sys: check for gtk-doc by default"
The gtt-doc.make is not required for "make dist" now. So
gtk-doc is completely optional now.
Let's keep gtk-doc disabled by default.
This reverts commit 57facddbc561f86f26cb70e9c5a4391bcf42ff11.
Diffstat (limited to 'm4/gtk-doc.m4')
| -rw-r--r-- | m4/gtk-doc.m4 | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 index 0ef81e52..bfdfa1da 100644 --- a/m4/gtk-doc.m4 +++ b/m4/gtk-doc.m4 @@ -17,28 +17,18 @@ AC_DEFUN([GTK_DOC_CHECK], dnl enable/disable documentation building AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--disable-gtk-doc], - [don't use gtk-doc to build documentation]),, - [enable_gtk_doc=check]) + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) - if test x$enable_gtk_doc = xno; then - has_gtk_doc=no - else + if test x$enable_gtk_doc = xyes; then ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],has_gtk_doc=yes,has_gtk_doc=no)], - [PKG_CHECK_EXISTS([gtk-doc >= $1],has_gtk_doc=yes,has_gtk_doc=no)]) + [PKG_CHECK_EXISTS([gtk-doc],, + 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 gtk-doc]))]) fi - case $enable_gtk_doc:$has_gtk_doc in - yes:no) - ifelse([$1],[], - [AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested])], - [AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc])]) - ;; - esac - - enable_gtk_doc=$has_gtk_doc - AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) |