Punt on building with older gtk-doc; version skew in gtk-doc.make makes patching...

We'll just require 1.12, which is the version fixed to work with shave.

diff --git a/autogen.sh b/autogen.sh
index e267695..1e8abe3 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -43,4 +43,3 @@ if test -z "$gnome_autogen" ; then
 fi
 
 GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . $gnome_autogen
-patch -N -f -p0 -i gtk-doc-shave.patch
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index c81b00e..5487e75 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,7 @@ GIREPO_CFLAGS="$GIREPO_CFLAGS $FFI_CFLAGS"
 GIREPO_CFLAGS="$GIREPO_CFLAGS $GCOV_CFLAGS"
 
 # gtk-doc
-GTK_DOC_CHECK([1.11])
+GTK_DOC_CHECK([1.12])
 
 # Checks for header files.
 AC_HEADER_STDC

diff --git a/gtk-doc-shave.patch b/gtk-doc-shave.patch
deleted file mode 100644 (file)
index eb89252..0000000
--- a/gtk-doc-shave.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gtk-doc.make       2009-02-23 15:07:24.000000000 -0500
-+++ gtk-doc.make.patched       2009-02-23 15:07:21.000000000 -0500
-@@ -5,8 +5,8 @@
- ####################################
- 
- if GTK_DOC_USE_LIBTOOL
--GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(LIBTOOL) --mode=compile --tag=cc $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link --tag=cc $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
- GTKDOC_RUN = $(LIBTOOL) --mode=execute
- else
- GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)