[paragui-cvs] CVS: paragui configure.in,1.3.6.20,1.3.6.21

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui
In directory subversions:/tmp/cvs-serv2475

Modified Files:
      Tag: devel-1-0
        configure.in 
Log Message:
added Ruby bindings. Thanks Leon <address@hidden>



Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.3.6.20
retrieving revision 1.3.6.21
diff -C2 -r1.3.6.20 -r1.3.6.21
*** configure.in        1 Nov 2002 10:43:34 -0000       1.3.6.20
--- configure.in        1 Nov 2002 15:00:58 -0000       1.3.6.21
***************
*** 471,528 ****
  fi
  
! dnl Check for --enable-python flag
  
  BINDINGS=""
! SWIG=""
  
  AC_ARG_ENABLE(python,
!       [  --enable-python         compile with python support],
!       python=$enable_python
  )
- if test "x$python" = xyes; then
-     AC_PATH_PROG(SWIG, swig, no)
-     if test "x$SWIG" = xno; then
-       AC_MSG_ERROR([*** Unable to find swig! (www.swig.org) ***])
-     fi
  
      AC_PATH_PROG(PYTHON, python, no)
      if test "x$PYTHON" = xno; then
        AC_MSG_ERROR([*** Unable to find python interpreter! ***])
      fi
  
!     dnl Check for Python.h                                                    
                               
!                                                                               
                           
!     PYTHON_INCLUDE_DIR=""                                                     
                               
!     PYTHON_LIB_DIR=""                                                         
                               
!     have_python_include=no                                                    
                               
!                                                                               
                           
!     AC_CHECK_HEADER(python2.2/Python.h, [have_python_include=yes])            
                               
!     PYTHON_INCLUDE_DIR=$prefix/include/python2.2                              
                               
!     PYTHON_LIB_DIR=$libdir/python2.2                                          
                               
!                                                                               
                           
!     if test x$have_python_include = xno; then                                 
                               
!         AC_CHECK_HEADER(python2.1/Python.h, [have_python_include=yes])        
                               
!       PYTHON_INCLUDE_DIR=$prefix/include/python2.1                            
                             
!       PYTHON_LIB_DIR=$libdir/python2.1                                        
                             
!     fi                                                                        
                               
!                                                                               
                                     
!     if test x$have_python_include = xno; then                                 
                               
!         AC_CHECK_HEADER(python2.0/Python.h, [have_python_include=yes])        
                              
!         PYTHON_INCLUDE_DIR=$prefix/include/python2.0                          
                               
!         PYTHON_LIB_DIR=$libdir/python2.0                                      
                               
!     fi                                                                        
                               
!                                                                               
                                                 
!     if test x$have_python_include = xno; then                                 
                               
!         AC_MSG_ERROR([*** Python.h not found!])                               
                                 
!     fi                                                                        
                               
!                                                                               
                                                     
!     AC_SUBST(PYTHON_INCLUDE_DIR)                                              
                               
!     AC_SUBST(PYTHON_LIB_DIR) 
  
!     BINDINGS="python"
  fi
  
  AC_SUBST(BINDINGS)
- AC_SUBST(SWIG)
  
  AC_SUBST(IMAGE_LIBS)
--- 471,556 ----
  fi
  
! dnl Check for swig bindings
  
  BINDINGS=""
! 
! swig_p=no
! python_p=no
! ruby_p=no
  
  AC_ARG_ENABLE(python,
!       [  --enable-python         create Python bindings],
!       [python_p=$enable_python
!      swig_p=$enable_python]
! )
! 
! AC_ARG_ENABLE(ruby,
!     [  --enable-ruby           create Ruby bindings],
!       [ruby_p=$enable_ruby
!      swig_p=$enable_ruby]
  )
  
+ if test "x$swig_p" = xyes; then
+   SWIG=""
+   AC_PATH_PROG(SWIG, swig, no)
+   if test "x$SWIG" = xno; then
+     AC_MSG_ERROR([*** Unable to find swig! (www.swig.org) ***])
+   fi
+   AC_SUBST(SWIG)
+ fi
+ 
+ if test "x$python_p" = xyes; then
      AC_PATH_PROG(PYTHON, python, no)
      if test "x$PYTHON" = xno; then
        AC_MSG_ERROR([*** Unable to find python interpreter! ***])
      fi
+     dnl Check for Python.h
+     PYTHON_INCLUDE_DIR=""
+     PYTHON_LIB_DIR=""
+     have_python_include=no
+     AC_CHECK_HEADER(python2.2/Python.h, [have_python_include=yes])
+     PYTHON_INCLUDE_DIR=$prefix/include/python2.2
+     PYTHON_LIB_DIR=$libdir/python2.2
+     if test x$have_python_include = xno; then
+         AC_CHECK_HEADER(python2.1/Python.h, [have_python_include=yes])
+       PYTHON_INCLUDE_DIR=$prefix/include/python2.1
+       PYTHON_LIB_DIR=$libdir/python2.1
+     fi
+     if test x$have_python_include = xno; then
+         AC_CHECK_HEADER(python2.0/Python.h, [have_python_include=yes])
+         PYTHON_INCLUDE_DIR=$prefix/include/python2.0
+         PYTHON_LIB_DIR=$libdir/python2.0
+     fi
+     if test x$have_python_include = xno; then
+         AC_MSG_ERROR([*** Python.h not found! ***])
+     fi
+     AC_SUBST(PYTHON_INCLUDE_DIR)
+     AC_SUBST(PYTHON_LIB_DIR)
+ 
+     BINDINGS="$BINDINGS python"
+ fi
+ 
+ if test "x$ruby_p" = xyes; then
+     AC_PATH_PROG(RUBY, ruby, no)
+     if test "x$RUBY" = xno; then
+       AC_MSG_ERROR([*** Unable to find Ruby interpreter! ***])
+     fi
+ 
+     RUBY_INCLUDE_DIR=[`ruby -e "require 'rbconfig'; puts 
Config::CONFIG['archdir']"`]
+     RUBY_INSTALL_DIR=[`ruby -e "require 'rbconfig'; puts 
Config::CONFIG['sitearchdir']"`]
+ 
+     have_ruby_include=no
+     AC_CHECK_HEADER($RUBY_INCLUDE_DIR/ruby.h, [have_ruby_include=yes])
+     if test "x$have_ruby_include" = xno; then
+       AC_MSG_ERROR([*** ruby.h not found! ***])
+     fi
  
!     AC_SUBST(RUBY_INCLUDE_DIR)
!     AC_SUBST(RUBY_INSTALL_DIR)
  
!     BINDINGS="$BINDINGS ruby"
  fi
  
  AC_SUBST(BINDINGS)
  
  AC_SUBST(IMAGE_LIBS)
***************
*** 589,592 ****
--- 617,622 ----
  bindings/Makefile
  bindings/python/Makefile
+ bindings/ruby/Makefile
+ bindings/ruby/test/Makefile
  test/Makefile
  test/fireworks/Makefile