[asterisk-commits] pcadach: branch pcadach/chan_h323-live r42856 - in /team/pcadach/chan_h323-li...

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Tue Sep 12 15:06:15 2006
New Revision: 42856

URL: http://svn.digium.com/view/asterisk?rev=42856&view=rev
Log:
Try to solve FreeBSD's shell problem with duplicating result of let expression value

Modified:
    team/pcadach/chan_h323-live/channels/h323/Makefile
    team/pcadach/chan_h323-live/channels/h323/Makefile.in
    team/pcadach/chan_h323-live/configure

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=42856&r1=42855&r2=42856&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/Makefile (original)
+++ team/pcadach/chan_h323-live/channels/h323/Makefile Tue Sep 12 15:06:15 2006
@@ -26,8 +26,18 @@
 
 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)
+PWLIB_MAJOR=$(shell cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
+PWLIB_MINOR=$(shell cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
+PWLIB_BUILD=$(shell cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER  | cut -f3 -d' ')
+STDCCFLAGS += -D_PWLIB_VERSION=${PWLIB_MAJOR}*10000+${PWLIB_MINOR}*100+${PWLIB_BUILD}
+
+OPENH323_MAJOR=$(shell cat ${OPENH323DIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
+OPENH323_MINOR=$(shell cat ${OPENH323DIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
+OPENH323_BUILD=$(shell cat ${OPENH323DIR}/version.h | grep BUILD_NUMBER  | cut -f3 -d' ')
+STDCCFLAGS += -D_OPENH323_VERSION=${OPENH323_MAJOR}*10000+${OPENH323_MINOR}*100+${OPENH323_BUILD}
+
+#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

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=42856&r1=42855&r2=42856&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/Makefile.in (original)
+++ team/pcadach/chan_h323-live/channels/h323/Makefile.in Tue Sep 12 15:06:15 2006
@@ -26,8 +26,18 @@
 
 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)
+PWLIB_MAJOR=$(shell cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
+PWLIB_MINOR=$(shell cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
+PWLIB_BUILD=$(shell cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER  | cut -f3 -d' ')
+STDCCFLAGS += -D_PWLIB_VERSION=${PWLIB_MAJOR}*10000+${PWLIB_MINOR}*100+${PWLIB_BUILD}
+
+OPENH323_MAJOR=$(shell cat ${OPENH323DIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
+OPENH323_MINOR=$(shell cat ${OPENH323DIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
+OPENH323_BUILD=$(shell cat ${OPENH323DIR}/version.h | grep BUILD_NUMBER  | cut -f3 -d' ')
+STDCCFLAGS += -D_OPENH323_VERSION=${OPENH323_MAJOR}*10000+${OPENH323_MINOR}*100+${OPENH323_BUILD}
+
+#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

Modified: team/pcadach/chan_h323-live/configure
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure?rev=42856&r1=42855&r2=42856&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Tue Sep 12 15:06:15 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 42084 .
+# From configure.ac Revision: 42637 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60.
 #