[Asterisk-cvs] asterisk Makefile,1.174,1.175 channel.c,1.213,1.214

[malcolmd at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv27983

Modified Files:
	Makefile channel.c 
Log Message:
Bug #4652 - Take two


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- Makefile	8 Jul 2005 21:54:07 -0000	1.174
+++ Makefile	9 Jul 2005 12:18:59 -0000	1.175
@@ -183,7 +183,7 @@
 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

Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- channel.c	8 Jul 2005 21:54:07 -0000	1.213
+++ channel.c	9 Jul 2005 12:18:59 -0000	1.214
@@ -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