From: Karel Zak <kzak@redhat.com>
Date: Fri, 6 Nov 2009 22:59:54 +0000 (+0100)
Subject: Revert "build-sys: check for gtk-doc by default"
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38a1717fa1944f42f8cffdf4ced51b40396d850e;p=util-linux

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.
---

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)