From 4e158e372c3405c91a943f80b186935fbabf6b6d Mon Sep 17 00:00:00 2001
From: Jeremy McNamara <jj@nufone.net>
Date: Fri, 28 Jan 2005 16:45:06 +0000
Subject: [PATCH] Force the use of specific versions of OpenH.323 and PWlib
(Bug #3386 with mods)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/h323/Makefile | 34 ++++++++++++++++++++++++++++++++--
channels/h323/README | 6 ++----
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/channels/h323/Makefile b/channels/h323/Makefile
index 204cb5165a..f5203907c9 100755
--- a/channels/h323/Makefile
+++ b/channels/h323/Makefile
@@ -16,6 +16,16 @@ ifndef ASTETCDIR
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../../include
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: .depend
.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
diff --git a/channels/h323/README b/channels/h323/README
index b85fc5f6fa..475a2ccb36 100755
--- a/channels/h323/README
+++ b/channels/h323/README
@@ -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.
--
GitLab