2009-05-22 Antonio Gomes <antonio.gomes@openbossa.org>

        Reviewed by Gustavo Noronha.

        Make Gtk build not bail out if gtk-doc-tools is not installed.

        Warning message dumped instead.

        * autogen.sh:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@44054 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d75c60f..23f001f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-22  Antonio Gomes   <antonio.gomes@openbossa.org>
+
+        Reviewed by Gustavo Noronha.
+
+        Make Gtk build not bail out if gtk-doc-tools is not installed.
+
+        Warning message dumped instead.
+
+        * autogen.sh:
+
 2009-05-22  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 
         Reviewed by Xan Lopez.

diff --git a/autogen.sh b/autogen.sh
index d32b73e..97beb20 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,14 +15,6 @@ AUTOMAKE_FLAGS="--foreign --add-missing"
 
 DIE=0
 
-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have gtkdocize installed to compile $PROJECT."
-    echo "Install the appropriate package for your distribution,"
-    echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-    DIE=1
-}
-
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have autoconf installed to compile $PROJECT."
@@ -59,7 +51,7 @@ rm -rf $top_srcdir/autom4te.cache
 
 touch README INSTALL
 
-gtkdocize $GTKDOCIZE_FLAGS || exit $?
+gtkdocize $GTKDOCIZE_FLAGS > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
 aclocal $ACLOCAL_FLAGS || exit $?
 $LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
 autoheader || exit $?