Bug #4652 - Take two

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6065 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 76d601942b823c7bc59a37974f0593dd5fe7f6f8..0ea71fc4b8d47daa06d617e1874018bc34026077 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -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

diff --git a/channel.c b/channel.c
index 692e814a7232cd9d0665a27d96d8fe0c58514a99..5fb7db61b1ae58fc9b0cc95d08ada12bc7a29a41 100755 (executable)
--- a/channel.c
+++ b/channel.c
@@ -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