[Openh323-cvs] openh323 configure.ac,1.15,1.16 configure,1.34,1.35

[Craig S. <cso...@us...>]

Update of /cvsroot/openh323/openh323
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12035

Modified Files:
	configure.ac configure 
Log Message:
Add check for required PWLib version


Index: configure.ac
===================================================================
RCS file: /cvsroot/openh323/openh323/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** configure.ac	27 Mar 2006 00:05:34 -0000	1.15
--- configure.ac	29 Apr 2006 21:45:39 -0000	1.16
***************
*** 4,7 ****
--- 4,12 ----
  AC_HEADER_STDC
  
+ dnl this must be updated for every minor revision, and for
+ dnl builds when and as necessary
+ REQUIRED_PWLIB_MAJOR=1
+ REQUIRED_PWLIB_MINOR=10
+ REQUIRED_PWLIB_BUILD=0
  
  dnl ########################################################################
***************
*** 101,104 ****
--- 106,145 ----
  echo "PWLib prefix set to.... $PWLIBDIR"
  
+ if test "${PWLIBDIR:-unset}" = "unset" ; then
+   PWVERSION=`$PTLIB_CONFIG --version`
+   PW_MAJOR_VERSION=`echo $PW_VERSION | cut -d'.' -f1`
+   PW_MINOR_VERSION=`echo $PW_VERSION | cut -d'.' -f2`
+   PW_BUILD_NUMBER=`echo $PW_VERSION | cut -d'.' -f3`
+   
+ else
+   PW_MAJOR_VERSION=`cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`
+   PW_MINOR_VERSION=`cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
+   PW_BUILD_NUMBER=`cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
+   PWVERSION="${PW_MAJOR_VERSION}.${PW_MINOR_VERSION}.${PW_BUILD_NUMBER}"
+ fi
+ 
+ AC_ARG_ENABLE(versioncheck,
+ 		[  --disable-versioncheck    disable PWLib version check],
+ 		PWLIB_VERSION_CHECK=$enableval)
+ 
+ AC_MSG_CHECKING(Checking PWLib version ${PWVERSION})
+ if test "${PWLIB_VERSION_CHECK}x" = "nox" ; then
+   AC_MSG_RESULT(check disabled)
+ else
+   if test $PW_MAJOR_VERSION -lt $REQUIRED_PWLIB_MAJOR ; then
+     AC_MSG_RESULT(Major version less than required $REQUIRED_PWLIB_MAJOR)
+     exit 1
+   fi
+   if test $PW_MINOR_VERSION -lt $REQUIRED_PWLIB_MINOR ; then
+     AC_MSG_RESULT(Minor version less than required $REQUIRED_PWLIB_MINOR)
+     exit 1
+   fi
+   if test $PW_BUILD_NUMBER -lt $REQUIRED_PWLIB_BUILD ; then
+     AC_MSG_RESULT(Build version less than required $REQUIRED_PWLIB_BUILD)
+     exit 1
+   fi
+   AC_MSG_RESULT(ok)
+ fi
+ 
  AC_SUBST(PWLIBDIR)
  

Index: configure
===================================================================
RCS file: /cvsroot/openh323/openh323/configure,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** configure	27 Mar 2006 00:05:34 -0000	1.34
--- configure	29 Apr 2006 21:45:40 -0000	1.35
***************
*** 1,7 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59.
  #
! # Copyright (C) 2003 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
--- 1,8 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
[...3252 lines suppressed...]
!   (eval $ac_compile) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
!          { ac_try='test -s conftest.$ac_objext'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
***************
*** 6697,6701 ****
  
  fi
! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    if test ${has_upad128_t} == "y"; then
      echo "$as_me:$LINENO: result: yes" >&5
--- 6403,6407 ----
  
  fi
! rm -f conftest.$ac_objext conftest.$ac_ext
    if test ${has_upad128_t} == "y"; then
      echo "$as_me:$LINENO: result: yes" >&5