Date: Sun, 8 Mar 2009 05:24:37 +0000 (UTC) From: Tim Kientzle <kientzle@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r189515 - in head/usr.bin/tar: . test Message-ID: <200903080524.n285ObBO073064@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kientzle Date: Sun Mar 8 05:24:37 2009 New Revision: 189515 URL: http://svn.freebsd.org/changeset/base/189515 Log: Merge r435,r443 from libarchive.googlecode.com: Let the compiler options determine how to read config.h. Modified: head/usr.bin/tar/bsdtar_platform.h head/usr.bin/tar/test/test.h Modified: head/usr.bin/tar/bsdtar_platform.h ============================================================================== --- head/usr.bin/tar/bsdtar_platform.h Sun Mar 8 05:22:50 2009 (r189514) +++ head/usr.bin/tar/bsdtar_platform.h Sun Mar 8 05:24:37 2009 (r189515) @@ -39,7 +39,7 @@ #include PLATFORM_CONFIG_H #elif defined(HAVE_CONFIG_H) /* Most POSIX platforms use the 'configure' script to build config.h */ -#include "../config.h" +#include "config.h" #else /* Warn if bsdtar hasn't been (automatically or manually) configured. */ #error Oops: No config.h and no built-in configuration in bsdtar_platform.h. Modified: head/usr.bin/tar/test/test.h ============================================================================== --- head/usr.bin/tar/test/test.h Sun Mar 8 05:22:50 2009 (r189514) +++ head/usr.bin/tar/test/test.h Sun Mar 8 05:24:37 2009 (r189515) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903080524.n285ObBO073064>