update openh323 to version 1.10.4

list of changes isn't readily available
remove BROKEN tag, since it builds Just Fine nowadays; more tests need
  be done to confirm it really works with pth, tho

Partially based upon pkg/17983 by Wojciech Puchar

6 files changed, 213 insertions, 132 deletions

diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index b9280c9a337..6e220a29444 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,25 +1,21 @@
-# $NetBSD: Makefile,v 1.9 2002/12/02 15:14:08 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/12/03 21:48:17 jdolecek Exp $
 #
 
-DISTNAME=	openh323_1.1beta3
-PKGNAME=	openh323-1.1beta3
+DISTNAME=	openh323_1.10.4
+PKGNAME=	openh323-1.10.4
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.au.openh323.org/bin/ \
-		http://www.au2.openh323.org/bin/ \
 		http://www.us1.openh323.org/bin/ \
 		http://www.us2.openh323.org/bin/ \
-		http://www.ru.openh323.org/bin/ \
 		http://www.de.openh323.org/bin/ \
 		http://www.at.openh323.org/bin/ \
-		http://www.cz.openh323.org/bin/ \
-		http://www.pl.openh323.org/bin/
+		http://www.cz.openh323.org/bin/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.openh323.org/
 COMMENT=	Open H.323 library
 
-DEPENDS=	pwlib>=1.1:../../devel/pwlib
+DEPENDS=	pwlib>=1.4.4nb2:../../devel/pwlib
 
 WRKSRC=		${WRKDIR}/openh323
 
@@ -29,15 +25,28 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 ALL_TARGET=	opt
 
-BROKEN=		Package has problems with libtool and pthreads
-
-pre-build:
+post-patch:
 		-${MKDIR} ${WRKSRC}/lib; cd ${WRKSRC}/lib; ${LN} -s ${PREFIX}/lib/libpt.la
-
-post-install:
-		cd ${WRKSRC}/include; for f in \*.h ; \
-			do ${INSTALL_DATA} $$f ${PREFIX}/include; done
+		cd ${WRKSRC}/include; ${LN} -s . openh323
+		${_PKG_SILENT}cd ${WRKSRC};			\
+		for f in openh323u.mak; do			\
+			${SED} ${FILES_SUBST_SED} $$f > $$f.sed;\
+			${MV} -f $$f.sed $$f;			\
+		done
+
+# override the openh323 install - it uses cp -d, and isn't libtool-aware
+do-install:
+		cd ${WRKSRC}/src; ${MAKE_ENV} ${GMAKE} install
+		${INSTALL_DATA_DIR} ${PREFIX}/include/openh323
+		cd ${WRKSRC}/include;				\
+                 for f in \*.h ; \
+			do ${INSTALL_DATA} $$f ${PREFIX}/include/openh323; done
+		${INSTALL_PROGRAM} ${WRKDIR}/openh323/samples/simple/obj_*/simph323 \
+		${PREFIX}/bin/simph323
 		-${INSTALL_DATA_DIR} ${PREFIX}/share/openh323
 		cd ${WRKSRC}; ${INSTALL_DATA} openh323u.mak ${PREFIX}/share/openh323
 
+.include "../../mk/pthread.buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
+
diff --git a/net/openh323/PLIST b/net/openh323/PLIST
index 44134ee2eb9..580325319e6 100644
--- a/net/openh323/PLIST
+++ b/net/openh323/PLIST
@@ -1,39 +1,72 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:13 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/03 21:48:17 jdolecek Exp $
 lib/libh323.la
 lib/libh323.a
 lib/libh323.so
 lib/libh323.so.1
-lib/libh323.so.1.1
+lib/libh323.so.1.10
 bin/simph323
-include/QTIoctl.h
-include/acmcodec.h
-include/channels.h
-include/codecs.h
-include/gkclient.h
-include/gsmcodec.h
-include/h261codec.h
-include/h323.h
-include/h323caps.h
-include/h323neg.h
-include/h323pdu.h
-include/h323rtp.h
-include/ixjDefs.h
-include/ixjlid.h
-include/jitter.h
-include/lid.h
-include/lpc10codec.h
-include/q931.h
-include/rtp.h
-include/transports.h
-include/videoio.h
-include/vpbapi.h
-include/vpblid.h
-include/x224.h
-include/h225.h
-include/h235.h
-include/h245.h
-include/mcspdu.h
-include/gccpdu.h
-include/ldap.h
+include/openh323/QTIoctl.h
+include/openh323/channels.h
+include/openh323/codecs.h
+include/openh323/cu30codec.h
+include/openh323/g7231codec.h
+include/openh323/g726codec.h
+include/openh323/g729codec.h
+include/openh323/gccpdu.h
+include/openh323/gkclient.h
+include/openh323/gkserver.h
+include/openh323/gsmcodec.h
+include/openh323/guid.h
+include/openh323/h225.h
+include/openh323/h225ras.h
+include/openh323/h235.h
+include/openh323/h235auth.h
+include/openh323/h245.h
+include/openh323/h261codec.h
+include/openh323/h263codec.h
+include/openh323/h323.h
+include/openh323/h323caps.h
+include/openh323/h323con.h
+include/openh323/h323ep.h
+include/openh323/h323neg.h
+include/openh323/h323pdu.h
+include/openh323/h323rtp.h
+include/openh323/h323t120.h
+include/openh323/h323t38.h
+include/openh323/h4501.h
+include/openh323/h45010.h
+include/openh323/h45011.h
+include/openh323/h4502.h
+include/openh323/h4504.h
+include/openh323/h4506.h
+include/openh323/h450pdu.h
+include/openh323/ixjDefs.h
+include/openh323/ixjidb.h
+include/openh323/ixjlid.h
+include/openh323/jitter.h
+include/openh323/ldap_asn.h
+include/openh323/ldapapi.h
+include/openh323/lid.h
+include/openh323/lpc10codec.h
+include/openh323/mcspdu.h
+include/openh323/mediafmt.h
+include/openh323/mscodecs.h
+include/openh323/opalvxml.h
+include/openh323/opalwavfile.h
+include/openh323/q931.h
+include/openh323/rfc2833.h
+include/openh323/rtp.h
+include/openh323/rtp2wav.h
+include/openh323/speexcodec.h
+include/openh323/t120proto.h
+include/openh323/t38.h
+include/openh323/t38proto.h
+include/openh323/transports.h
+include/openh323/vblasterlid.h
+include/openh323/videoio.h
+include/openh323/vpblid.h
+include/openh323/x224.h
+include/openh323/x880.h
 share/openh323/openh323u.mak
 @dirrm share/openh323
+@dirrm include/openh323
diff --git a/net/openh323/distinfo b/net/openh323/distinfo
index c97fd8d7c53..f24ee02f499 100644
--- a/net/openh323/distinfo
+++ b/net/openh323/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/04/09 10:55:01 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/12/03 21:48:17 jdolecek Exp $
 
-SHA1 (openh323_1.1beta3.tar.gz) = d58580966069f017102d8e0c9512a6000e5def0a
-Size (openh323_1.1beta3.tar.gz) = 1058817 bytes
-SHA1 (patch-aa) = 108e9c54ba0f685e27e0f6388ac0fc9afd8a5918
-SHA1 (patch-ab) = 4519059c4d69fac1f5cc097b7af8d81dccad7d2a
-SHA1 (patch-ac) = b91879fb293c92334d5b58fe508d11197311c40a
+SHA1 (openh323_1.10.4.tar.gz) = 2884944d64b6b129ced05a8df2a17bc581e63532
+Size (openh323_1.10.4.tar.gz) = 1881298 bytes
+SHA1 (patch-aa) = d91734cd073549f6a8199cc0ca8b355e68d1445b
+SHA1 (patch-ac) = 985ed16a87ed719d1b768d8d3901c4527f1736e4
diff --git a/net/openh323/patches/patch-aa b/net/openh323/patches/patch-aa
index ee8f96fdbd1..21133c5e5de 100644
--- a/net/openh323/patches/patch-aa
+++ b/net/openh323/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2002/04/09 10:55:01 agc Exp $
+$NetBSD: patch-aa,v 1.3 2002/12/03 21:48:18 jdolecek Exp $
 
---- src/Makefile.orig	Fri Jul 14 13:38:56 2000
-+++ src/Makefile	Tue Apr  9 11:42:33 2002
-@@ -97,7 +97,7 @@
- PWLIBDIR=$(HOME)/pwlib
- endif
- 
--include $(PWLIBDIR)/make/unix.mak
-+include $(PWLIBDIR)/share/pwlib/make/unix.mak
- 
- ifndef OPENH323DIR
- OPENH323DIR=$(HOME)/openh323
-@@ -322,13 +322,13 @@
+--- src/Makefile.orig	Wed Nov  6 23:58:29 2002
++++ src/Makefile	Tue Dec  3 17:11:38 2002
+@@ -704,7 +704,7 @@
  
  ####################################################
  
@@ -20,61 +11,83 @@ $NetBSD: patch-aa,v 1.2 2002/04/09 10:55:01 agc Exp $
  
  ####################################################
  
- LIB_BASENAME	=	$(OH323_FILE)
+@@ -717,7 +717,7 @@
+ LIB_BASENAME=$(OH323_BASE)
+ LIB_FILENAME=$(OH323_FILE)
  
 -include $(PWLIBDIR)/make/lib.mak
 +include $(PWLIBDIR)/share/pwlib/make/lib.mak
  
  ####################################################
  
-@@ -339,8 +339,8 @@
- ASNPARSE = $(ASNPARSE_DIR)/obj_$(PLATFORM_TYPE)_r/asnparser 
- ASNPARSE += -x $(ASN_EXCLUDE)
- else
--ASNPARSE_DIR = $(PWLIBDIR)/tools/asnparser
--ASNPARSE = $(ASNPARSE_DIR)/obj_$(PLATFORM_TYPE)_r/asnparser 
-+ASNPARSE_DIR = 
-+ASNPARSE = ${PREFIX}/bin/asnparser
- endif
+@@ -746,15 +746,7 @@
+ 
+ # If we're cross compiling, we want the host's asnparser
+ # otherwise use the one for the current platform
+-ASNPARSE_DIR = $(HOSTPWLIBDIR)/tools/asnparser
+-ASNPARSER = $(ASNPARSE_DIR)/obj_$(HOST_PLATFORM_TYPE)_r/asnparser
+-
+-
+-# If not cross compiling then make sure asnparser is built
+-ifeq ($(PLATFORM_TYPE),$(HOST_PLATFORM_TYPE))
+-$(ASNPARSER):
+-	$(MAKE) -C $(ASNPARSE_DIR) opt
+-endif
++ASNPARSER = $(PREFIX)/bin/asnparser
  
- #### h245
-@@ -413,45 +413,45 @@
+ 
+ ifdef ASN_EXCLUDE
+@@ -906,68 +898,68 @@
  
  $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.cxx
  	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
 -	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
-+	${LIBTOOL} --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
  
  $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.c
  	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
 -	$(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
-+	${LIBTOOL} --tag=CC $(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --tag=CC $(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
  
  $(DEPDIR)/%.dep : $(VIC_DIR)/%.c
  	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
  	@printf %s $(OH323_OBJDIR)/ > $@
 -	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
-+	${LIBTOOL} --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
++	$(LIBTOO) --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
  
  $(DEPDIR)/%.dep : $(VIC_DIR)/%.cxx
  	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
  	@printf %s $(OH323_OBJDIR)/ > $@
 -	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
-+	${LIBTOOL} --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
++	$(LIBTOO) --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
  
  
  # Build rules for the GSM codec
  
  $(OH323_OBJDIR)/%.o : $(GSM_SRCDIR)/%.c
  	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
--	$(CC) -ansi -I$(GSM_INCDIR) -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
-+	${LIBTOOL} --tag=CC $(CC) -ansi -I$(GSM_INCDIR) -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+-	$(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --tag=CC $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
  
  $(DEPDIR)/%.dep : $(GSM_SRCDIR)/%.c
  	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
  	@printf %s $(OH323_OBJDIR)/ > $@
--	$(CC) -ansi -I$(GSM_INCDIR) -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
-+	${LIBTOOL} --tag=CC $(CC) -ansi -I$(GSM_INCDIR) -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
+-	$(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
++	$(LIBTOOL) --tag=CC $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
+ 
+ 
+ # Build rules for the G.726 codec
+ 
+ $(OH323_OBJDIR)/%.o : $(G726_DIR)/%.c
+ 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --tag=CC $(CC) $(CFLAGS) -c $< -o $@
+ 
+ $(DEPDIR)/%.dep : $(G726_DIR)/%.c
+ 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
+ 	@printf %s $(OH323_OBJDIR)/ > $@
+-	$(CC) $(CFLAGS) -M $< >> $@
++	$(LIBTOOL) --tag=CC $(CC) $(CFLAGS) -M $< >> $@
  
  
  # Build rules for the LPC10 codec
@@ -82,13 +95,26 @@ $NetBSD: patch-aa,v 1.2 2002/04/09 10:55:01 agc Exp $
  $(OH323_OBJDIR)/%.o : $(LPC10_SRCDIR)/%.c
  	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
 -	$(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
-+	${LIBTOOL} --tag=CC $(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --tag=CC $(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
  
  $(DEPDIR)/%.dep : $(LPC10_SRCDIR)/%.c
  	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
  	@printf %s $(OH323_OBJDIR)/ > $@
 -	$(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@
-+	${LIBTOOL} --tag=CC $(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@
++	$(LIBTOOL) --tag=CC $(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@
+ 
+ # Build rules for the Speex codec
+ 
+ $(OH323_OBJDIR)/%.o : $(SPEEX_SRCDIR)/%.c
+ 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
+-	$(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --tag=CC $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+ 
+ $(DEPDIR)/%.dep : $(SPEEX_SRCDIR)/%.c
+ 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
+ 	@printf %s $(OH323_OBJDIR)/ > $@
+-	$(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(CFLAGS) -M $< >> $@
++	$(LIBTOOL) --tag=CC $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(CFLAGS) -M $< >> $@
  
  
- # Pass through commands to the subdirectory for test app
+ notrace::
diff --git a/net/openh323/patches/patch-ab b/net/openh323/patches/patch-ab
deleted file mode 100644
index bbf821990a1..00000000000
--- a/net/openh323/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/08/25 16:11:14 mjl Exp $
-
---- samples/simple/Makefile.orig	Thu Aug 24 17:31:34 2000
-+++ samples/simple/Makefile	Thu Aug 24 17:31:57 2000
-@@ -33,7 +33,7 @@
- PWLIBDIR=$(HOME)/pwlib
- endif
- 
--include $(PWLIBDIR)/make/ptlib.mak
-+include $(PWLIBDIR)/share/pwlib/make/ptlib.mak
- 
- ifndef OPENH323DIR
- OPENH323DIR=$(HOME)/openh323
diff --git a/net/openh323/patches/patch-ac b/net/openh323/patches/patch-ac
index be3d00f2fbc..17e76340edb 100644
--- a/net/openh323/patches/patch-ac
+++ b/net/openh323/patches/patch-ac
@@ -1,30 +1,57 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/08/25 16:11:14 mjl Exp $
+$NetBSD: patch-ac,v 1.2 2002/12/03 21:48:18 jdolecek Exp $
 
-*** openh323u.mak.orig	Thu Aug 24 19:59:26 2000
---- openh323u.mak	Thu Aug 24 20:17:31 2000
-***************
-*** 3,13 ****
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  OH323_OBJDIR = $(OH323_LIBDIR)/$(PT_OBJBASE)
-  
-! OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-  OH323_FILE  = lib$(OH323_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
-  
-! LDFLAGS	    += -L$(OH323_LIBDIR)
-! LDLIBS	    := -l$(OH323_BASE)$(LIB_TYPE) $(LDLIBS)
-  
-  #OH323_SUPPRESS_H235	= 1
-  
---- 3,14 ----
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  OH323_OBJDIR = $(OH323_LIBDIR)/$(PT_OBJBASE)
-  
-! # OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-! OH323_BASE  = h323
-  OH323_FILE  = lib$(OH323_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
-  
-! LDFLAGS	    += 
-! LDLIBS	    := ../../lib/lib$(OH323_BASE)$(LIB_TYPE).la $(LDLIBS)
-  
-  #OH323_SUPPRESS_H235	= 1
-  
+--- openh323u.mak.orig	Tue Nov  5 03:18:03 2002
++++ openh323u.mak	Tue Dec  3 22:01:59 2002
+@@ -107,19 +107,19 @@
+ ifneq (,$(wildcard $(HOME)/pwlib))
+ PWLIBDIR=$(HOME)/pwlib
+ else
+-PWLIBDIR=/usr/local/pwlib
++PWLIBDIR= @PREFIX@
+ endif
+ endif
+ endif
+ 
+ 
+ ifdef LIBRARY_MAKEFILE
+-include $(PWLIBDIR)/make/unix.mak
++include $(PWLIBDIR)/share/pwlib/make/unix.mak
+ else
+ ifdef NOTRACE
+ OBJDIR_SUFFIX := n
+ endif
+-include $(PWLIBDIR)/make/ptlib.mak
++include $(PWLIBDIR)/share/pwlib/make/ptlib.mak
+ endif
+ 
+ 
+@@ -129,7 +129,7 @@
+ 
+ 
+ OH323_SRCDIR = $(OPENH323DIR)/src
+-OH323_INCDIR = $(OPENH323DIR)/include
++OH323_INCDIR = $(OPENH323DIR)/include/openh323
+ OH323_LIBDIR = $(OPENH323DIR)/lib
+ 
+ 
+@@ -152,7 +152,7 @@
+ 
+ 
+ 
+-OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
++OH323_BASE  = h323
+ OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
+ 
+ LDFLAGS	    += -L$(OH323_LIBDIR)
+@@ -187,6 +187,11 @@
+ STDCCFLAGS += -DHAS_OSS
+ endif
+ 
++ifneq (,$(wildcard $(SYSINCDIR)/soundcard.h))
++HAS_OSS	    = 1
++STDCCFLAGS += -DHAS_OSS
++endif
++
+ #Allow disabling of speex codec
+ ifdef NO_SPEEX
+ STDCCFLAGS += -DNO_SPEEX