Remove the config.h kludge and override vasprintf detection via HAVE_VASPRINTF.

lib/cb_util.c

@@ -34,10 +34,6 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "xbps_api_impl.h"
 
 #ifdef __clang__

lib/external/dewey.c

@@ -37,9 +37,6 @@
 #include <ctype.h>
 
 #include "xbps_api_impl.h"
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #define PKG_PATTERN_MAX 1024
 

lib/external/fexec.c

@@ -29,13 +29,15 @@
 
 #define _BSD_SOURCE	/* for vfork and chroot */
 #include <sys/types.h>
+#include <unistd.h>
+
 #include <sys/wait.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
+#undef _BSD_SOURCE
 #include "xbps_api_impl.h"
 
 static int

lib/fetch/common.c

@@ -30,9 +30,8 @@
  * $FreeBSD: common.c,v 1.53 2007/12/19 00:26:36 des Exp $
  */
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "compat.h"
+
 #ifndef NETBSD
 #include <nbcompat.h>
 #endif

lib/fetch/fetch.c

@@ -30,9 +30,8 @@
  * $FreeBSD: fetch.c,v 1.41 2007/12/19 00:26:36 des Exp $
  */
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "compat.h"
+
 #ifndef NETBSD
 #include <nbcompat.h>
 #endif

lib/fetch/file.c

@@ -30,9 +30,8 @@
  * $FreeBSD: file.c,v 1.18 2007/12/14 10:26:58 des Exp $
  */
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "compat.h"
+
 #ifndef NETBSD
 #include <nbcompat.h>
 #endif

lib/fetch/ftp.c

@@ -57,9 +57,8 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "compat.h"
+
 #ifndef NETBSD
 #include <nbcompat.h>
 #endif

lib/fetch/http.c

@@ -63,9 +63,8 @@
  * SUCH DAMAGE.
  */
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "compat.h"
+
 #ifndef NETBSD
 #include <nbcompat.h>
 #endif

lib/package_configure.c

@@ -29,7 +29,6 @@
 #include <errno.h>
 
 #include "xbps_api_impl.h"
-
 /**
  * @file lib/package_configure.c
  * @brief Package configuration routines

lib/package_unpack.c

@@ -23,10 +23,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdbool.h>

lib/portableproplib/prop_object.c

@@ -29,9 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "compat.h"
 
 #include <prop/prop_object.h>
 #include "prop_object_impl.h"

lib/util.c

@@ -27,10 +27,6 @@
 # define _GNU_SOURCE	/* for vasprintf(3) */
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>