From: Andreas Rottmann <a.rottmann@gmx.at>
Subject: [PATCH] Build fixes

- Remove acinclude.m4, which just hosted a stale copy of
  GTK_DOC_CHECK, which in turn broke "make distcheck" when used in
  combination with the gtk-doc.make installed by newer gtkdocize.

- Fix #include in soup-path-map.h.

---
 acinclude.m4            |   49 -----------------------------------------------
 libsoup/soup-path-map.h |    2 +-
 2 files changed, 1 insertions(+), 50 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 25ecb75..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-    have_gtk_doc=yes
-  fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-  [gtk_doc_min_version=$1
-  if test "$have_gtk_doc" = yes; then
-    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-      have_gtk_doc=no
-    fi
-  fi
-])
-  if test x$enable_gtk_doc = xyes; then
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
diff --git a/libsoup/soup-path-map.h b/libsoup/soup-path-map.h
index 37b5fb9..f5a8ba8 100644
--- a/libsoup/soup-path-map.h
+++ b/libsoup/soup-path-map.h
@@ -6,7 +6,7 @@
 #ifndef SOUP_PATH_MAP_H
 #define SOUP_PATH_MAP_H 1
 
-#include <soup-types.h>
+#include <libsoup/soup-types.h>
 
 typedef struct SoupPathMap SoupPathMap;
 
-- 
tg: (ad981db..) t/build-fixes (depends on: master)
