[SCM] Packaging for mathgl branch, experimental, updated. debian/2_rc2+svn368-1-4-g9646b18

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the experimental branch:
commit affb017a7a7c74d3b3bffb7e48300aa8694ab18a
Merge: c5195312e921bf68dc6263c40dd01e6a94f6ea30 f77239d8178c16a47170512a9db28c0499f9e349
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Thu Mar 22 21:44:53 2012 +0200

    Merge tag 'upstream/2_rc2+svn376' into experimental
    
    Upstream version 2~rc2+svn376
    
    Conflicts:
    	texinfo/CMakeLists.txt

diff --combined CMakeLists.txt
index f95adb4,423ccd8..03a1d41
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -2,28 -2,28 +2,28 @@@ cmake_minimum_required(VERSION 2.6
  
  project( MathGL )
  set(CMAKE_VERBOSE_MAKEFILE ON)
 -option(enable-double "Enable double precision in MathGL library")
 +option(enable-double "Enable double precision in MathGL library" ON)
  option(enable-all "Enable all features")
  option(enable-langall "Enable all language interfaces")
  option(enable-lgpl "Enable only LGPL part of MathGL" OFF)
 -option(enable-ltdl "Enable loading modules support")
 -option(enable-pthread "Enable POSIX threads support")
 -option(enable-gsl "Enable gsl support")
 -option(enable-jpeg "Enable jpeg support")
 +option(enable-ltdl "Enable loading modules support" ON)
 +option(enable-pthread "Enable POSIX threads support" ON)
 +option(enable-gsl "Enable gsl support" ON)
 +option(enable-jpeg "Enable jpeg support" ON)
  option(enable-u3d "Enable u3d support")
  option(enable-pdf "Enable pdf support")
 -option(enable-gif "Enable gif support")
 -option(enable-hdf4 "Enable hdf4 support")
 -option(enable-hdf5 "Enable hdf5 1.6 support")
 -option(enable-hdf5_18 "Enable hdf5 1.8 support")
 +option(enable-gif "Enable gif support" ON)
 +option(enable-hdf4 "Enable hdf4 support" ON)
 +option(enable-hdf5 "Enable hdf5 1.6 support" ON)
 +option(enable-hdf5_18 "Enable hdf5 1.8 support" ON)
  option(enable-opengl "Enable OpenGL support" ON)
 -option(enable-glut "Enable glut support")
 -option(enable-fltk "Enable fltk widget")
 -option(enable-wx "Enable wxWidget widget")
 -option(enable-qt "Enable Qt4 widget")
 -option(enable-python "Enable python interface")
 -option(enable-octave "Enable octave interface")
 -option(enable-doc "Enable documentation building")
 +option(enable-glut "Enable glut support" ON)
 +option(enable-fltk "Enable fltk widget" ON)
 +option(enable-wx "Enable wxWidget widget" ON)
 +option(enable-qt "Enable Qt4 widget" ON)
 +option(enable-python "Enable python interface" ON)
 +option(enable-octave "Enable octave interface" ON)
 +option(enable-doc "Enable documentation building" ON)
  
  include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
  
@@@ -218,12 -218,10 +218,10 @@@ endif((enable-all OR enable-qt) AND (NO
  
  if((enable-langall OR enable-python) AND (NOT enable-lgpl) )
  	set(MGL_HAVE_PYTHON 1)
- # include(FindPythonInterp)
- # if(NOT PYTHONLIBS_FOUND)
- # 	if(use_python)
- # 		message(SEND_ERROR "Couldn't find python interpreter.")
- # 	endif(use_python)
- # endif(NOT PYTHONINTERP_FOUND)
+ 	FIND_PACKAGE(PythonInterp)
+ 	if(NOT PYTHONINTERP_FOUND)
+ 		message(SEND_ERROR "Couldn't find python interpreter.")
+ 	endif(NOT PYTHONINTERP_FOUND)
  	FIND_PACKAGE(PythonLibs)
  	if(NOT PYTHONLIBS_FOUND)
  		message(SEND_ERROR "Couldn't find python development libraries.")

-- 
Packaging for mathgl