From 7b86d3912635487ad63d787888edd6ff33e4f56b Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 4 Feb 2010 08:25:31 +0000 Subject: [PATCH] Forcing use of /usr/local on FreeBSD by LDFLAGS and CPPFLAGS --- libisoburn/trunk/acinclude.m4 | 11 +++++++++++ libisoburn/trunk/configure.ac | 2 ++ libisoburn/trunk/xorriso/configure_ac.txt | 2 ++ libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libisoburn/trunk/acinclude.m4 b/libisoburn/trunk/acinclude.m4 index 0b2c9af1..5551bb8d 100644 --- a/libisoburn/trunk/acinclude.m4 +++ b/libisoburn/trunk/acinclude.m4 @@ -1,3 +1,14 @@ +AC_DEFUN([LIBBURNIA_SET_FLAGS], +[ +case $target_os in +freebsd*) + LDFLAGS="$LDFLAGS -L/usr/local/lib" + CPPFLAGS="$CPPFLAGS -I/usr/local/include" + ;; +esac +]) + + AC_DEFUN([TARGET_SHIZZLE], [ ARCH="" diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index 0d205bdb..752ddb9e 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -5,6 +5,8 @@ dnl AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST AC_CANONICAL_TARGET +LIBBURNIA_SET_FLAGS + AM_INIT_AUTOMAKE([subdir-objects]) dnl Hint: Search list for version code aspects: diff --git a/libisoburn/trunk/xorriso/configure_ac.txt b/libisoburn/trunk/xorriso/configure_ac.txt index 0de83fd0..d0922e6e 100644 --- a/libisoburn/trunk/xorriso/configure_ac.txt +++ b/libisoburn/trunk/xorriso/configure_ac.txt @@ -5,6 +5,8 @@ dnl AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST AC_CANONICAL_TARGET +LIBBURNIA_SET_FLAGS + AM_INIT_AUTOMAKE([subdir-objects]) BURN_MAJOR_VERSION=0 diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index edd0ce22..6173fce7 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.01.25.142705" +#define Xorriso_timestamP "2010.02.04.082710"