From 15e37555ae6e29cd73b535976ab7af310b4c6411 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 1 Nov 2006 17:19:37 +0000 Subject: [PATCH] Repaired broken macro settings during Linux build --- bootstrap | 5 ++++- cdrskin/cdrskin_timestamp.h | 2 +- configure.ac | 6 +++++- test/libburner.c | 13 +++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bootstrap b/bootstrap index a0b6469..86709bf 100755 --- a/bootstrap +++ b/bootstrap @@ -3,5 +3,8 @@ aclocal libtoolize --copy --force autoconf -autoheader + +# ts A61101 : libburn is not prepared for config.h +# autoheader + automake --foreign --add-missing --copy --include-deps diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 3998fba..8a90910 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2006.11.01.163934" +#define Cdrskin_timestamP "2006.11.01.172004" diff --git a/configure.ac b/configure.ac index d7784f8..29113dd 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,11 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([subdir-objects]) -AM_CONFIG_HEADER(config.h) +dnl A61101 This breaks Linux build (makes 32 bit off_t) +dnl http://sourceware.org/autobook/autobook/autobook_96.html says +dnl one must include some config.h and this was a pitfall. +dnl So why dig the pit at all ? +dnl AM_CONFIG_HEADER(config.h) dnl Making releases: dnl BURN_MICRO_VERSION += 1; diff --git a/test/libburner.c b/test/libburner.c index 1f14190..e89637e 100644 --- a/test/libburner.c +++ b/test/libburner.c @@ -35,17 +35,10 @@ */ -/* We shall prepare for times when more than 2 GB of data are to be handled. - This gives POSIX-ly 64 bit off_t */ -#ifndef _LARGEFILE_SOURCE -#define _LARGEFILE_SOURCE 1 -#endif -#ifndef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif - /** See this for the decisive API specs . libburn.h is The Original */ -#include +/* For using the installed header file : #include */ +/* This program insists in the own headerfile. */ +#include "../libburn/libburn.h" /* libburn is intended for Linux systems with kernel 2.4 or 2.6 for now */ #include