From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 18 Jan 2009 19:22:22 +0000 (-0500)
Subject: Rely on the compiler's include search path to find config.h files.
X-Git-Tag: v2.7.0~415
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2430e1eef8a3898d938cfa1854f6e49aa9f174c;p=thirdparty%2Flibarchive.git

Rely on the compiler's include search path to find config.h files.
This works much better when building with a variety of build systems;
all of them can edit the include path but not all of them put the
built configure files in the same place.

SVN-Revision: 443
---

diff --git a/cpio/test/test.h b/cpio/test/test.h
index 431d5d7c4..b2af8e43f 100644
--- a/cpio/test/test.h
+++ b/cpio/test/test.h
@@ -33,13 +33,13 @@
  */
 #if defined(HAVE_CONFIG_H)
 /* Most POSIX platforms use the 'configure' script to build config.h */
-#include "../../config.h"
+#include "config.h"
 #elif defined(__FreeBSD__)
 /* Building as part of FreeBSD system requires a pre-built config.h. */
-#include "../config_freebsd.h"
+#include "config_freebsd.h"
 #elif defined(_WIN32)
 /* Win32 can't run the 'configure' script. */
-#include "../config_windows.h"
+#include "config_windows.h"
 #else
 /* Warn if the library hasn't been (automatically or manually) configured. */
 #error Oops: No config.h and no pre-built configuration in test.h.
diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index 3d2d9f2b9..f610fa0fd 100644
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -33,13 +33,13 @@
  */
 #if defined(HAVE_CONFIG_H)
 /* Most POSIX platforms use the 'configure' script to build config.h */
-#include "../../config.h"
+#include "config.h"
 #elif defined(__FreeBSD__)
 /* Building as part of FreeBSD system requires a pre-built config.h. */
-#include "../config_freebsd.h"
+#include "config_freebsd.h"
 #elif defined(_WIN32)
 /* Win32 can't run the 'configure' script. */
-#include "../config_windows.h"
+#include "config_windows.h"
 #else
 /* Warn if the library hasn't been (automatically or manually) configured. */
 #error Oops: No config.h and no pre-built configuration in test.h.
diff --git a/tar/test/test.h b/tar/test/test.h
index 276c37eb8..f050004ab 100644
--- a/tar/test/test.h
+++ b/tar/test/test.h
@@ -33,13 +33,13 @@
  */
 #if defined(HAVE_CONFIG_H)
 /* Most POSIX platforms use the 'configure' script to build config.h */
-#include "../../config.h"
+#include "config.h"
 #elif defined(__FreeBSD__)
 /* Building as part of FreeBSD system requires a pre-built config.h. */
-#include "../config_freebsd.h"
+#include "config_freebsd.h"
 #elif defined(_WIN32)
 /* Win32 can't run the 'configure' script. */
-#include "../config_windows.h"
+#include "config_windows.h"
 #else
 /* Warn if the library hasn't been (automatically or manually) configured. */
 #error Oops: No config.h and no pre-built configuration in test.h.