[Asterisk-cvs] asterisk/channels/h323 Makefile, 1.23, 1.24 README, 1.29, 1.30

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels/h323
In directory mongoose.digium.com:/tmp/cvs-serv18148

Modified Files:
	Makefile README 
Log Message:
Force the use of specific versions of OpenH.323 and PWlib (Bug #3386 with mods)

Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	18 Jan 2005 16:21:54 -0000	1.23
+++ Makefile	28 Jan 2005 16:45:06 -0000	1.24
@@ -16,6 +16,16 @@
 ASTETCDIR=/etc/asterisk
 endif
 
+PWLIB_MAJOR_VERSION=$(shell cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
+PWLIB_MINOR_VERSION=$(shell cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
+PWLIB_BUILD_NUMBER=$(shell cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' ')
+PWLIB_VERSION="${PWLIB_MAJOR_VERSION}.${PWLIB_MINOR_VERSION}.${PWLIB_BUILD_NUMBER}"
+
+OPENH323_MAJOR_VERSION=$(shell cat ${OPENH323DIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
+OPENH323_MINOR_VERSION=$(shell cat ${OPENH323DIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
+OPENH323_BUILD_NUMBER=$(shell cat ${OPENH323DIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' ')
+OPENH323_VERSION="${OPENH323_MAJOR_VERSION}.${OPENH323_MINOR_VERSION}.${OPENH323_BUILD_NUMBER}"
+
 #
 # This needs to be updated to deal with more than just little endian machines
 #
@@ -46,7 +56,7 @@
 CFLAGS += -I$(PWLIBDIR)/include 
 CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes
 
-all:	depend libchanh323.a
+all:	checkversion depend libchanh323.a
 
 samples: 
 	if [ -f $(ASTETCDIR)/h323.conf ]; then \
@@ -82,4 +92,24 @@
 .depend:
 	../../mkdep $(CFLAGS) `ls *.cpp`
 
-
+checkversion:
+	@echo -n "PWLib version is ${PWLIB_VERSION}... "
+	@if [ ${PWLIB_VERSION} == "1.8.1" ]; then \
+		echo "ok" ; \
+	else \
+		echo "BAD" ; \
+		echo ; \
+		echo "Please read README for further details!" ; \
+		echo ; \
+		exit 1 ; \
+	fi
+	@echo -n "OpenH323 version is ${OPENH323_VERSION}... "
+	@if [ ${OPENH323_VERSION} == "1.15.1" ]; then \
+		echo "ok" ; \
+	else \
+		echo "BAD" ; \
+		echo ; \
+		echo "Please read README for further details!" ; \
+		echo ; \
+		exit 1 ; \
+	fi

Index: README
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/README,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- README	10 Oct 2004 12:45:13 -0000	1.29
+++ README	28 Jan 2005 16:45:06 -0000	1.30
@@ -9,13 +9,11 @@
 	       			expat-1.95+
 	       			expat-dev-1.95+
 
-This code was recently updated to deal with Open H.323 v1.14.4 and PWLib
-v1.7.5. Not much testing has been done, please test and report your findings.
-
+You must run Open H.323 v1.15.1 and PWLib v1.8.1. All other versions are not supported.
 You can find the Open H.323 source here: http://www.sf.net/projects/openh323/
 
 NOTICE: Whatever you do, DO NOT USE distrubution specific installs
-of Open H.323 and PWLib. In fact you should check to make sure 
+of Open H.323 and PWLib. In fact, you should check to make sure 
 your distro did not install them for you without your knowledge.