As we do in other modules, default to --disable-gtk-doc, and run the check

Thu Mar  7 14:42:50 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: As we do in other modules, default to
        --disable-gtk-doc, and run the check we used to do
        for the default when the --enable-gtk-doc is specified.
        (Alain Rouge)

8 files changed, 51 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 93187f4c..63031e56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Mar  7 14:42:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: As we do in other modules, default to
+	--disable-gtk-doc, and run the check we used to do
+	for the default when the --enable-gtk-doc is specified.
+	(Alain Rouge)
+
 Thu Mar  7 10:51:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Fix some problems with setting 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 93187f4c..63031e56 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,10 @@
+Thu Mar  7 14:42:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: As we do in other modules, default to
+	--disable-gtk-doc, and run the check we used to do
+	for the default when the --enable-gtk-doc is specified.
+	(Alain Rouge)
+
 Thu Mar  7 10:51:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Fix some problems with setting 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 93187f4c..63031e56 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Thu Mar  7 14:42:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: As we do in other modules, default to
+	--disable-gtk-doc, and run the check we used to do
+	for the default when the --enable-gtk-doc is specified.
+	(Alain Rouge)
+
 Thu Mar  7 10:51:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Fix some problems with setting 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 93187f4c..63031e56 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Thu Mar  7 14:42:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: As we do in other modules, default to
+	--disable-gtk-doc, and run the check we used to do
+	for the default when the --enable-gtk-doc is specified.
+	(Alain Rouge)
+
 Thu Mar  7 10:51:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Fix some problems with setting 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 93187f4c..63031e56 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Thu Mar  7 14:42:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: As we do in other modules, default to
+	--disable-gtk-doc, and run the check we used to do
+	for the default when the --enable-gtk-doc is specified.
+	(Alain Rouge)
+
 Thu Mar  7 10:51:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Fix some problems with setting 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 93187f4c..63031e56 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Thu Mar  7 14:42:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: As we do in other modules, default to
+	--disable-gtk-doc, and run the check we used to do
+	for the default when the --enable-gtk-doc is specified.
+	(Alain Rouge)
+
 Thu Mar  7 10:51:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Fix some problems with setting 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 93187f4c..63031e56 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Thu Mar  7 14:42:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: As we do in other modules, default to
+	--disable-gtk-doc, and run the check we used to do
+	for the default when the --enable-gtk-doc is specified.
+	(Alain Rouge)
+
 Thu Mar  7 10:51:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Fix some problems with setting 
diff --git a/configure.in b/configure.in
index 27e1caad..caea1aa6 100644
--- a/configure.in
+++ b/configure.in
@@ -516,9 +516,9 @@ AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
 
 dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc        use gtk-doc to build documentation [default=no]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
+AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc        use gtk-doc to build documentation [default=no]], enable_gtk_doc="$enableval", enable_gtk_doc=no)
 
-if test x$enable_gtk_doc = xauto ; then
+if test x$enable_gtk_doc = xyes ; then
   if test x$GTKDOC = xtrue ; then
     enable_gtk_doc=yes
   else