From 82fa8b21cf69e49755f3df1923b76b1605a37580 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Tue, 13 Dec 2016 12:14:08 -0600
Subject: [PATCH] libpkgconf: separate config.h from the actual API headers

---
 Makefile.am             | 1 +
 libpkgconf/libpkgconf.h | 1 -
 libpkgconf/pkg.c        | 1 +
 main.c                  | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 40d8a12..7ce260c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,6 +95,7 @@ libpkgconf_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^pkgconf_'
 dist_man_MANS    = pkgconf.1
 pkgconf_LDADD    = libpkgconf.la
 pkgconf_SOURCES  = main.c getopt_long.c
+pkgconf_CPPFLAGS = -Ilibpkgconf
 noinst_HEADERS   = getopt_long.h
 
 dist_doc_DATA = README.md AUTHORS
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
index 70ed9e5..10ed872 100644
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@@ -16,7 +16,6 @@
 #ifndef LIBPKGCONF__LIBPKGCONF_H
 #define LIBPKGCONF__LIBPKGCONF_H
 
-#include <libpkgconf/config.h>
 #include <libpkgconf/stdinc.h>
 #include <libpkgconf/iter.h>
 #include <libpkgconf/bsdstubs.h>
diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c
index 62151f1..53dae53 100644
--- a/libpkgconf/pkg.c
+++ b/libpkgconf/pkg.c
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/config.h>
 #include <libpkgconf/libpkgconf.h>
 
 bool
diff --git a/main.c b/main.c
index 17bf2d3..b33843c 100644
--- a/main.c
+++ b/main.c
@@ -14,6 +14,7 @@
  */
 
 #include <libpkgconf/libpkgconf.h>
+#include "config.h"
 #include "getopt_long.h"
 
 #define PKG_CFLAGS_ONLY_I		(((uint64_t) 1) << 2)