[Csp-commits] APPLICATIONS/CSPSim acinclude.m4,1.2,1.3 configure.in,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv19397

Modified Files:
	acinclude.m4 configure.in 
Log Message:
new sky code, hid enhancement, smoke fixes, other misc

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/acinclude.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** acinclude.m4	26 Jan 2003 23:30:59 -0000	1.2
--- acinclude.m4	19 Feb 2003 11:41:55 -0000	1.3
***************
*** 117,118 ****
--- 117,150 ----
  ])
  
+ dnl check for python
+ AC_DEFUN(CSP_PYTHON, [
+   min_version=$1
+   python=no
+   AC_MSG_CHECKING(for python >= $min_version)
+   version=`python -V 2>&1`
+   major=`echo $version | sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 
+   minor=`echo $version | sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` 
+   micro=`echo $version | sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` 
+   major_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 
+   minor_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+   micro_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+   version_proper=`expr \
+     $major \> $major_min \| \
+     $major \= $major_min \& \
+     $minor \> $minor_min \| \
+     $major \= $major_min \& \
+     $minor \= $minor_min \& \
+     $micro \>= $micro_min `
+   if test "$version_proper" = "1" ; then
+     AC_MSG_RESULT(yes)
+     python=yes
+   else
+     AC_MSG_RESULT(no)
+     AC_MSG_ERROR([
+       Python version >= $min_version must be installed.  Python is
+       avalable in prepackaged binary and source distributions from
+       http://www.python.org.
+     ])
+   fi
+ ])
+ 

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.in	2 Feb 2003 21:06:42 -0000	1.3
--- configure.in	19 Feb 2003 11:41:55 -0000	1.4
***************
*** 57,60 ****
--- 57,62 ----
  CSP_OSG_CONFIG(osgParticle, 0.9.2, [OpenSceneGraph Particle library])
  
+ CSP_PYTHON(2.2.0)
+ 
  #AC_CHECK_LIB(osgGLUT, osgGLUTGetVersion, ,
  #     [AC_MSG_ERROR(OpenSceneGraph GLUT library not found. See http://www.openscenegraph.org)],)
***************
*** 67,70 ****
  
  
! AC_OUTPUT([Makefile Source/Makefile], [])
  	      
--- 69,72 ----
  
  
! AC_OUTPUT([Makefile Source/Makefile Source/FX/Makefile], [])