[svn-commits] pcadach: branch pcadach/chan_h323-live r41180 - in /team/pcadach/chan_h323-li...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Sat Aug 26 10:07:08 MST 2006


Author: pcadach
Date: Sat Aug 26 12:07:07 2006
New Revision: 41180

URL: http://svn.digium.com/view/asterisk?rev=41180&view=rev
Log:
1) Provide compatibility for OpenH323 older than 1.17.3 to make bindaddr
   working for outgoing connections;
2) Update make subsystem to allow building from multiple C++ sources;
3) Update version checking of PWLib/OpenH323 in configure script;
4) Revert 3.60 requirement of autoconf back for 3.59

Added:
    team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp   (with props)
    team/pcadach/chan_h323-live/channels/h323/compat_h323.h   (with props)
Modified:
    team/pcadach/chan_h323-live/acinclude.m4
    team/pcadach/chan_h323-live/channels/h323/   (props changed)
    team/pcadach/chan_h323-live/channels/h323/Makefile
    team/pcadach/chan_h323-live/channels/h323/Makefile.in
    team/pcadach/chan_h323-live/channels/h323/ast_h323.cpp
    team/pcadach/chan_h323-live/channels/h323/ast_h323.h
    team/pcadach/chan_h323-live/configure
    team/pcadach/chan_h323-live/configure.ac

Modified: team/pcadach/chan_h323-live/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/acinclude.m4?rev=41180&r1=41179&r2=41180&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/acinclude.m4 (original)
+++ team/pcadach/chan_h323-live/acinclude.m4 Sat Aug 26 12:07:07 2006
@@ -327,23 +327,13 @@
 		$2_MINOR_VERSION=`cat ${$2DIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
 		$2_BUILD_NUMBER=`cat ${$2DIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
 		$2_VERSION="${$2_MAJOR_VERSION}.${$2_MINOR_VERSION}.${$2_BUILD_NUMBER}"
+		let $2_VER=${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}
+		let $2_REQ=$3*10000+$4*100+$5
 
 		AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323)
-		if test ${$2_MAJOR_VERSION} -lt $3; then
+		if test ${$2_VER} -lt ${$2_REQ}; then
+			AC_MSG_RESULT(no)
 			unset HAS_$2
-		elif test ${$2_MAJOR_VERSION} -gt $3; then
-			test
-		elif test ${$2_MINOR_VERSION} -lt $4; then
-			unset HAS_$2
-		elif test ${$2_MINOR_VERSION} -gt $4; then
-			test
-		elif test ${$2_BUILD_NUMBER} -lt $5; then
-			unset HAS_$2
-		elif test ${$2_BUILD_NUMBER} -gt $5; then
-			test
-		fi
-		if test "${HAS_$2:-unset}" = "unset"; then
-			AC_MSG_RESULT(no)
 		else
 			AC_MSG_RESULT(yes)
 		fi

Propchange: team/pcadach/chan_h323-live/channels/h323/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 26 12:07:07 2006
@@ -1,6 +1,6 @@
 .depend
 Makefile.ast
-ast_h323.dep
-ast_h323.cxx
-ast_h323.o
-libchanh323.a
+*.dep
+*.cxx
+*.o
+*.a

Modified: team/pcadach/chan_h323-live/channels/h323/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/Makefile?rev=41180&r1=41179&r2=41180&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/Makefile (original)
+++ team/pcadach/chan_h323-live/channels/h323/Makefile Sat Aug 26 12:07:07 2006
@@ -4,7 +4,7 @@
 # Make file for OpenH323 support layer
 #
 
-.PHONY: Makefile.ast
+.PHONY: Makefile.ast clean
 
 default::	opt
 
@@ -16,7 +16,7 @@
 CFLAGS		= -pipe
 TARGET		= libchanh323.a
 TARGET		+= Makefile.ast
-SOURCES		= ast_h323.cxx
+SOURCES		= ast_h323.cxx compat_h323.cxx
 OBJDIR		= .
 OBJS		=
 
@@ -26,11 +26,20 @@
 
 include $(OPENH323DIR)/openh323u.mak
 
+STDCCFLAGS += -D_PWLIB_VERSION=$(shell let x=`cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`*10000+`cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`*100+`cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`; echo $$x)
+STDCCFLAGS += -D_OPENH323_VERSION=$(shell let x=`cat ${OPENH323DIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`*10000+`cat ${OPENH323DIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`*100+`cat ${OPENH323DIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`; echo $$x)
+
 notrace::
 	$(MAKE) NOTRACE=1 opt
 
-$(SOURCES)::	$(SOURCES:.cxx=.cpp)
-	ln -f $(patsubst %.cxx, %.cpp, $@) $@
+define module_cxx_template
+$(1)::	$(2)
+	ln -f $(2) $(1)
+endef
+
+$(foreach mod,$(SOURCES),$(eval $(call module_cxx_template,$(mod),$(mod:.cxx=.cpp))))
+#$(SOURCES)::	$(SOURCES:.cxx=.cpp)
+#	ln -f $(patsubst %.cxx, %.cpp, $@) $@
 
 $(SOURCES)::	Makefile ../../Makefile
 	touch $@
@@ -45,4 +54,4 @@
 	@if [ -r $@ ] && cmp -s $@ $@.tmp; then rm -f $@.tmp; else mv -f $@.tmp $@; fi
 
 clean::
-	rm -f ast_h323.cxx libchanh323.a Makefile.ast *.dep
+	rm -f $(SOURCES) $(TARGET) $(OBJS) Makefile.ast *.dep

Modified: team/pcadach/chan_h323-live/channels/h323/Makefile.in
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/Makefile.in?rev=41180&r1=41179&r2=41180&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/Makefile.in (original)
+++ team/pcadach/chan_h323-live/channels/h323/Makefile.in Sat Aug 26 12:07:07 2006
@@ -4,7 +4,7 @@
 # Make file for OpenH323 support layer
 #
 
-.PHONY: Makefile.ast
+.PHONY: Makefile.ast clean
 
 default::	@OPENH323_BUILD@
 
@@ -16,7 +16,7 @@
 CFLAGS		= -pipe
 TARGET		= libchanh323.a
 TARGET		+= Makefile.ast
-SOURCES		= ast_h323.cxx
+SOURCES		= ast_h323.cxx compat_h323.cxx
 OBJDIR		= .
 OBJS		=
 
@@ -26,11 +26,20 @@
 
 include $(OPENH323DIR)/openh323u.mak
 
+STDCCFLAGS += -D_PWLIB_VERSION=$(shell let x=`cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`*10000+`cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`*100+`cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`; echo $$x)
+STDCCFLAGS += -D_OPENH323_VERSION=$(shell let x=`cat ${OPENH323DIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`*10000+`cat ${OPENH323DIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`*100+`cat ${OPENH323DIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`; echo $$x)
+
 notrace::
 	$(MAKE) NOTRACE=1 opt
 
-$(SOURCES)::	$(SOURCES:.cxx=.cpp)
-	ln -f $(patsubst %.cxx, %.cpp, $@) $@
+define module_cxx_template
+$(1)::	$(2)
+	ln -f $(2) $(1)
+endef
+
+$(foreach mod,$(SOURCES),$(eval $(call module_cxx_template,$(mod),$(mod:.cxx=.cpp))))
+#$(SOURCES)::	$(SOURCES:.cxx=.cpp)
+#	ln -f $(patsubst %.cxx, %.cpp, $@) $@
 
 $(SOURCES)::	Makefile ../../Makefile
 	touch $@
@@ -45,4 +54,4 @@
 	@if [ -r $@ ] && cmp -s $@ $@.tmp; then rm -f $@.tmp; else mv -f $@.tmp $@; fi
 
 clean::
-	rm -f ast_h323.cxx libchanh323.a Makefile.ast *.dep
+	rm -f $(SOURCES) $(TARGET) $(OBJS) Makefile.ast *.dep

Modified: team/pcadach/chan_h323-live/channels/h323/ast_h323.cpp
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/ast_h323.cpp?rev=41180&r1=41179&r2=41180&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/ast_h323.cpp (original)
+++ team/pcadach/chan_h323-live/channels/h323/ast_h323.cpp Sat Aug 26 12:07:07 2006
@@ -59,17 +59,17 @@
 #define BUILD_NUMBER  0
 
 /** Counter for the number of connections */
-int channelsOpen;
+static int channelsOpen;
 
 /**
  * We assume that only one endPoint should exist.
  * The application cannot run the h323_end_point_create() more than once
  * FIXME: Singleton this, for safety
  */
-MyH323EndPoint *endPoint = NULL;
+static MyH323EndPoint *endPoint = NULL;
 
 /** PWLib entry point */
-MyProcess *localProcess = NULL;
+static MyProcess *localProcess = NULL;
 
 static int _timerChangePipe[2];
 
@@ -380,11 +380,13 @@
   *					transport = ip.
   *					port = 1720.
   */
-int MyH323EndPoint::MakeCall(const PString & dest, PString & token, unsigned int *callReference, call_options_t *opts)
+int MyH323EndPoint::MyMakeCall(const PString & dest, PString & token, void *_callReference, void *_opts)
 {
 	PString fullAddress;
 	MyH323Connection * connection;
 	H323Transport *transport = NULL;
+	unsigned int *callReference = (unsigned int *)_callReference;
+	call_options_t *opts = (call_options_t *)_opts;
 
 	/* Determine whether we are using a gatekeeper or not. */
 	if (GetGatekeeper()) {
@@ -407,7 +409,7 @@
 					cout << "Using " << addr << " for outbound call" << endl;
 				/* Create own transport for specific addresses only */
 				if (addr) {
-					transport = new H323TransportTCP(*this, addr);
+					transport = new MyH323TransportTCP(*this, addr);
 					if (!transport)
 						cout << "Unable to create transport for outgoing call" << endl;
 				}
@@ -1176,7 +1178,7 @@
 	return connectionState != ShuttingDownConnection;
 }
 
-void MyH323Connection::SetCapabilities(int cap, int dtmf_mode, struct ast_codec_pref *prefs, int pref_codec)
+void MyH323Connection::SetCapabilities(int cap, int dtmf_mode, void *_prefs, int pref_codec)
 {
 	int g711Frames = 20;
 	int gsmFrames  = 4;
@@ -1185,6 +1187,7 @@
 	int codec;
 	int x, y;
 	char caps_str[1024];
+	struct ast_codec_pref *prefs = (struct ast_codec_pref *)_prefs;
 	
 	localCapabilities.RemoveAll();
 
@@ -1297,7 +1300,7 @@
 	if (addr) {
 		if (h323debug)
 			cout << "Using " << addr << " for outbound H.245 transport" << endl;
-		controlChannel = new H323TransportTCP(endpoint, addr);
+		controlChannel = new MyH323TransportTCP(endpoint, addr);
 	} else
 		controlChannel = new H323TransportTCP(endpoint);
 	if (!controlChannel->SetRemoteAddress(h245Address)) {
@@ -1652,7 +1655,7 @@
 		return 1;
 	}
 
-	res = endPoint->MakeCall(host, token, &cd->call_reference, call_options);
+	res = endPoint->MyMakeCall(host, token, &cd->call_reference, call_options);
 	memcpy((char *)(cd->call_token), (const unsigned char *)token, token.GetLength());
 	return res;
 };

Modified: team/pcadach/chan_h323-live/channels/h323/ast_h323.h
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/ast_h323.h?rev=41180&r1=41179&r2=41180&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/ast_h323.h (original)
+++ team/pcadach/chan_h323-live/channels/h323/ast_h323.h Sat Aug 26 12:07:07 2006
@@ -28,6 +28,8 @@
 
 #ifndef AST_H323_H
 #define AST_H323_H
+
+#define VERSION(a,b,c) ((a)*10000+(b)*100+(c))
 
 #if 0
 /**  These need to be redefined here because the C++
@@ -163,7 +165,7 @@
 
 	public:
 	MyH323EndPoint();
-	int MakeCall(const PString &, PString &, unsigned int *, call_options_t *opts);
+	int MyMakeCall(const PString &, PString &, void *_callReference, void *_opts);
 	BOOL ClearCall(const PString &, H323Connection::CallEndReason reason);
 	BOOL ClearCall(const PString &);
 
@@ -208,7 +210,7 @@
 	BOOL OnReceivedProgress(const H323SignalPDU &);
 	void OnSendCapabilitySet(H245_TerminalCapabilitySet &);
 	void OnSetLocalCapabilities();
-	void SetCapabilities(int, int, ast_codec_pref*, int);
+	void SetCapabilities(int, int, void *, int);
 	BOOL OnReceivedCapabilitySet(const H323Capabilities &, const H245_MultiplexCapability *,
 				     H245_TerminalCapabilitySetReject &);
 	void SetCause(int _cause) { cause = _cause; };
@@ -273,4 +275,6 @@
 	void Main(); 
 };
 
+#include "compat_h323.h"
+
 #endif /* !defined AST_H323_H */

Added: team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp?rev=41180&view=auto
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp (added)
+++ team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp Sat Aug 26 12:07:07 2006
@@ -1,0 +1,91 @@
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+/*
+ * ast_h323.cpp
+ *
+ * OpenH323 Channel Driver for ASTERISK PBX.
+ *			By  Jeremy McNamara
+ *			For The NuFone Network
+ * 
+ * chan_h323 has been derived from code created by
+ *               Michael Manousos and Mark Spencer
+ *
+ * This file is part of the chan_h323 driver for Asterisk
+ *
+ * chan_h323 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version. 
+ *
+ * chan_h323 is distributed WITHOUT ANY WARRANTY; without even 
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE. See the GNU General Public License for more details. 
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ * Version Info: $Id$
+ */
+#include <ptlib.h>
+#include <h323.h>
+
+#include "ast_h323.h"
+
+#if _OPENH323_VERSION < VERSION(1,17,3)
+MyH323TransportTCP::MyH323TransportTCP(
+      H323EndPoint & endpoint,
+      PIPSocket::Address binding,
+      BOOL listen
+    ) : H323TransportTCP(endpoint, binding, listen)
+{
+}
+
+BOOL MyH323TransportTCP::Connect()
+{
+  if (IsListening())
+    return TRUE;
+
+  PTCPSocket * socket = new PTCPSocket(remotePort);
+  Open(socket);
+
+  channelPointerMutex.StartRead();
+
+  socket->SetReadTimeout(10000/*endpoint.GetSignallingChannelConnectTimeout()*/);
+
+  localPort = endpoint.GetNextTCPPort();
+  WORD firstPort = localPort;
+  for (;;) {
+    PTRACE(4, "H323TCP\tConnecting to "
+           << remoteAddress << ':' << remotePort
+           << " (local port=" << localPort << ')');
+    if (socket->Connect(localAddress, localPort, remoteAddress))
+      break;
+
+    int errnum = socket->GetErrorNumber();
+    if (localPort == 0 || (errnum != EADDRINUSE && errnum != EADDRNOTAVAIL)) {
+      PTRACE(1, "H323TCP\tCould not connect to "
+                << remoteAddress << ':' << remotePort
+                << " (local port=" << localPort << ") - "
+                << socket->GetErrorText() << '(' << errnum << ')');
+      channelPointerMutex.EndRead();
+      return SetErrorValues(socket->GetErrorCode(), errnum);
+    }
+
+    localPort = endpoint.GetNextTCPPort();
+    if (localPort == firstPort) {
+      PTRACE(1, "H323TCP\tCould not bind to any port in range " <<
+                endpoint.GetTCPPortBase() << " to " << endpoint.GetTCPPortMax());
+      channelPointerMutex.EndRead();
+      return SetErrorValues(socket->GetErrorCode(), errnum);
+    }
+  }
+
+  socket->SetReadTimeout(PMaxTimeInterval);
+
+  channelPointerMutex.EndRead();
+
+  return OnOpen();
+}
+#endif

Propchange: team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp
------------------------------------------------------------------------------
    svn:keywords = 'Author D te Id Revision'

Propchange: team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: team/pcadach/chan_h323-live/channels/h323/compat_h323.h
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/compat_h323.h?rev=41180&view=auto
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/compat_h323.h (added)
+++ team/pcadach/chan_h323-live/channels/h323/compat_h323.h Sat Aug 26 12:07:07 2006
@@ -1,0 +1,27 @@
+#ifndef COMPAT_H323_H
+#define COMPAT_H323_H
+
+#if _OPENH323_VERSION < VERSION(1,17,3)
+/**
+ *  Workaround for broken (less than 1.17.3) OpenH323 stack to be able to
+ *  make TCP connections from specific address
+ */
+class MyH323TransportTCP : public H323TransportTCP
+{
+	PCLASSINFO(MyH323TransportTCP, H323TransportTCP);
+
+	public:
+	MyH323TransportTCP(
+		H323EndPoint & endpoint,    ///<  H323 End Point object
+		PIPSocket::Address binding = PIPSocket::GetDefaultIpAny(), ///<  Local interface to use
+		BOOL listen = FALSE         ///<  Flag for need to wait for remote to connect
+	);
+	/**Connect to the remote party.
+	 */
+	virtual BOOL Connect();
+};
+#else
+#define MyH323TransportTCP H323TransportTCP
+#endif /* <VERSION(1,17,3) */
+
+#endif /* !defined AST_H323_H */

Propchange: team/pcadach/chan_h323-live/channels/h323/compat_h323.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/pcadach/chan_h323-live/channels/h323/compat_h323.h
------------------------------------------------------------------------------
    svn:keywords = 'Author D te Id Revision'

Propchange: team/pcadach/chan_h323-live/channels/h323/compat_h323.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: team/pcadach/chan_h323-live/configure
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure?rev=41180&r1=41179&r2=41180&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Sat Aug 26 12:07:07 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 40954 .
+# From configure.ac Revision: 41097 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -20922,25 +20922,15 @@
 		PWLIB_MINOR_VERSION=`cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
 		PWLIB_BUILD_NUMBER=`cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
 		PWLIB_VERSION="${PWLIB_MAJOR_VERSION}.${PWLIB_MINOR_VERSION}.${PWLIB_BUILD_NUMBER}"
+		let PWLIB_VER=${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}
+		let PWLIB_REQ=1*10000+10*100+0
 
 		echo "$as_me:$LINENO: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5
 echo $ECHO_N "checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323... $ECHO_C" >&6
-		if test ${PWLIB_MAJOR_VERSION} -lt 1; then
-			unset HAS_PWLIB
-		elif test ${PWLIB_MAJOR_VERSION} -gt 1; then
-			test
-		elif test ${PWLIB_MINOR_VERSION} -lt 10; then
-			unset HAS_PWLIB
-		elif test ${PWLIB_MINOR_VERSION} -gt 10; then
-			test
-		elif test ${PWLIB_BUILD_NUMBER} -lt 0; then
-			unset HAS_PWLIB
-		elif test ${PWLIB_BUILD_NUMBER} -gt 0; then
-			test
-		fi
-		if test "${HAS_PWLIB:-unset}" = "unset"; then
+		if test ${PWLIB_VER} -lt ${PWLIB_REQ}; then
 			echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
+			unset HAS_PWLIB
 		else
 			echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -21331,25 +21321,15 @@
 		OPENH323_MINOR_VERSION=`cat ${OPENH323DIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
 		OPENH323_BUILD_NUMBER=`cat ${OPENH323DIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
 		OPENH323_VERSION="${OPENH323_MAJOR_VERSION}.${OPENH323_MINOR_VERSION}.${OPENH323_BUILD_NUMBER}"
+		let OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}
+		let OPENH323_REQ=1*10000+18*100+0
 
 		echo "$as_me:$LINENO: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5
 echo $ECHO_N "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... $ECHO_C" >&6
-		if test ${OPENH323_MAJOR_VERSION} -lt 1; then
-			unset HAS_OPENH323
-		elif test ${OPENH323_MAJOR_VERSION} -gt 1; then
-			test
-		elif test ${OPENH323_MINOR_VERSION} -lt 18; then
-			unset HAS_OPENH323
-		elif test ${OPENH323_MINOR_VERSION} -gt 18; then
-			test
-		elif test ${OPENH323_BUILD_NUMBER} -lt 0; then
-			unset HAS_OPENH323
-		elif test ${OPENH323_BUILD_NUMBER} -gt 0; then
-			test
-		fi
-		if test "${HAS_OPENH323:-unset}" = "unset"; then
+		if test ${OPENH323_VER} -lt ${OPENH323_REQ}; then
 			echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
+			unset HAS_OPENH323
 		else
 			echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6

Modified: team/pcadach/chan_h323-live/configure.ac
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure.ac?rev=41180&r1=41179&r2=41180&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure.ac (original)
+++ team/pcadach/chan_h323-live/configure.ac Sat Aug 26 12:07:07 2006
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.60)
+AC_PREREQ(2.59)
 
 m4_define([PBX_VERSION],
           m4_bpatsubst(m4_esyscmd([build_tools/make_version .]),



More information about the svn-commits mailing list