From 54cdf5fe9116577071c8e464f46353df6ba761c1 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 17 Nov 2012 21:05:42 +0100
Subject: [PATCH 1/2] Truly fix build without gtk-doc

The gtk-doc.m4 was not merged to 'master' but we don't need it. It's
better to generate it.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 .gitignore | 2 ++
 autogen.sh | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9681eb5ab..f5dc71808 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
+
+m4/gtk-doc.m4
diff --git a/autogen.sh b/autogen.sh
index f4ff2019d..7cb335c54 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
-type -p gtkdocize > /dev/null && gtkdocize --docdir docs
+if type -p gtkdocize > /dev/null; then
+	gtkdocize --docdir docs
+else
+	echo 'AC_DEFUN([GTK_DOC_CHECK], [AM_CONDITIONAL([ENABLE_GTK_DOC], [FALSE])])' > m4/gtk-doc.m4
+fi
 
 autoreconf -f -i

From 8b75afdbc2c0302da3110fbc2b33bc896c39a66e Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 17 Nov 2012 21:07:58 +0100
Subject: [PATCH 2/2] Fix build when gtk-doc is enabled

Looks like gtk-doc.make is meant for automake, not make.

Some previous changes need to be reverted.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 .gitignore               | 1 +
 autogen.sh               | 1 +
 docs/gudev/Makefile.am   | 6 ++----
 docs/libudev/Makefile.am | 6 ++----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5dc71808..f7cb506dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ m4/ltversion.m4
 m4/lt~obsolete.m4
 
 m4/gtk-doc.m4
+docs/gtk-doc.make
diff --git a/autogen.sh b/autogen.sh
index 7cb335c54..26f4160c5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,7 @@
 if type -p gtkdocize > /dev/null; then
 	gtkdocize --docdir docs
 else
+	echo 'EXTRA_DIST =' > docs/gtk-doc.make
 	echo 'AC_DEFUN([GTK_DOC_CHECK], [AM_CONDITIONAL([ENABLE_GTK_DOC], [FALSE])])' > m4/gtk-doc.m4
 fi
 
diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am
index e0039e760..57334b6dd 100644
--- a/docs/gudev/Makefile.am
+++ b/docs/gudev/Makefile.am
@@ -94,11 +94,8 @@ GTKDOC_LIBS = \
 	$(GLIB_LIBS) \
 	$(top_builddir)/libgudev-1.0.la
 
-if ENABLE_GTK_DOC
-EXTRA_DIST=
-
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
--include $(top_srcdir)/docs/gtk-doc.make
+include $(top_srcdir)/docs/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
@@ -110,6 +107,7 @@ EXTRA_DIST += version.xml.in
 #DISTCLEANFILES +=
 
 # Comment this out if you want your docs-status tested during 'make check'
+if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(top_srcdir)
 TESTS = $(GTKDOC_CHECK)
 endif
diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am
index 7899bd114..c6d7b8ca2 100644
--- a/docs/libudev/Makefile.am
+++ b/docs/libudev/Makefile.am
@@ -88,11 +88,8 @@ override LDFLAGS=
 GTKDOC_CFLAGS=
 GTKDOC_LIBS=
 
-if ENABLE_GTK_DOC
-EXTRA_DIST=
-
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
--include $(top_srcdir)/docs/gtk-doc.make
+include $(top_srcdir)/docs/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
@@ -104,6 +101,7 @@ EXTRA_DIST += version.xml.in
 #DISTCLEANFILES +=
 
 # Comment this out if you want your docs-status tested during 'make check'
+if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(top_srcdir)
 TESTS = $(GTKDOC_CHECK)
 endif