From dcd3845fa2896945de87acded38b43d8ce83e152 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 2 May 2014 09:10:38 +0000 Subject: [PATCH] Added -I/usr/pkg/include und -L/usr/pkg/lib for NetBSD --- acinclude.m4 | 6 +++++- releng/auto_cxx | 4 +++- xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 8bbf35c5..299dbdcb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,10 +1,14 @@ AC_DEFUN([LIBBURNIA_SET_FLAGS], [ case $target_os in -freebsd* | netbsd*) +freebsd*) LDFLAGS="$LDFLAGS -L/usr/local/lib" CPPFLAGS="$CPPFLAGS -I/usr/local/include" ;; +netbsd*) + LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/pkg/lib" + CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/pkg/include" + ;; solaris*) LDFLAGS="$LDFLAGS -L/usr/local/lib" esac diff --git a/releng/auto_cxx b/releng/auto_cxx index 0de7feb7..71ed53fe 100755 --- a/releng/auto_cxx +++ b/releng/auto_cxx @@ -47,10 +47,12 @@ else mkdir "${GEN_DATA_DIR}" fi +INCLUDE_DIRS="-I../ -I../../libburn -I../../libisofs -I/usr/local/include -I/usr/pkg/include" + # process sample code tests for SMPL in `ls "${SAMPLE_CODE_DIR}"/*.cpp`; do # CMD_CPL="${CC} -I../ -L ../libisoburn/.libs/ ${CFLAGS} -lisoburn -o ${SMPL}.obj ${SMPL}" - CMD_CPL="${CC} -c -I../ -I../../libburn -I../../libisofs ${CFLAGS} -o ${SMPL}.obj ${SMPL}" + CMD_CPL="${CC} -c ${INCLUDE_DIRS} ${CFLAGS} -o ${SMPL}.obj ${SMPL}" printf "${SELF}: ${CMD_CPL}" set +e ${CMD_CPL} diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 6370a897..d4750739 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2014.04.29.174832" +#define Xorriso_timestamP "2014.05.02.090851"