diff options
author | Malcolm Davenport <malcolmd@digium.com> | 2005-07-09 12:18:59 +0000 |
---|---|---|
committer | Malcolm Davenport <malcolmd@digium.com> | 2005-07-09 12:18:59 +0000 |
commit | fe7c0b0cce29965c4f68222c567aea033c7e1bdf (patch) | |
tree | 8a0c1269efaa3ff0ef46717c39afe92fc9602899 | |
parent | d36d51f732458611f2a4d0db2236a99bd9af790d (diff) |
Bug #4652 - Take two
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | Makefile | 2 | ||||
-rwxr-xr-x | channel.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -183,7 +183,7 @@ CFLAGS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h ]; then ec ifeq (${OSARCH},FreeBSD) OSVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) +LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -L$(CROSS_COMPILE_TARGET)/usr/local/lib INCLUDE+=-I$(CROSS_COMPILE_TARGET)/usr/local/include CFLAGS+=$(shell if [ -d $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp ]; then echo "-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp"; fi) MPG123TARG=freebsd @@ -33,7 +33,7 @@ #endif #ifdef __FreeBSD__ #include <strfunc.h> -#ifndef __STRFUNC_H__ +#if (!defined(__STRFUNC_H__) || (!defined(STRFUNC_H)) #error "Please install the strfunc library located in the ports collection at /usr/ports/devel/libstrfunc" #endif #endif |