Merge tag 'upstream/2_rc2+svn367' into experimental

Upstream version 2~rc2+svn367

diff --cc CMakeLists.txt
index 38acc65bc6033104842da6c86238aead74a91daa,b83f692114b5d3db08482be0cc2c5a91ba338bec..c9f8cf048e67f31bd54b600dfa2c82ae75b40e8a
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -2,98 -2,41 +2,41 @@@ 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-langall "Enable all language interfaces" ON)
  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-gif "Enable gif support" ON)
 +option(enable-hdf4 "Enable hdf4 support" ON)
  option(enable-hdf5 "Enable hdf5 1.6 support")
 -option(enable-hdf5_18 "Enable hdf5 1.8 support")
 +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-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")
- if(enable-double)
-       set(use_double 1)
- endif(enable-double)
- if((enable-all OR enable-gsl) AND (NOT enable-lgpl) )
-       set(use_gsl 1)
- endif((enable-all OR enable-gsl) AND (NOT enable-lgpl) )
- if(enable-all OR enable-ltdl)
-       set(use_ltdl 1)
- endif(enable-all OR enable-ltdl)
- if(enable-all OR enable-pthread)
-       set(use_pthread 1)
- endif(enable-all OR enable-pthread)
- if(enable-all OR enable-jpeg)
-       set(use_jpeg 1)
- endif(enable-all OR enable-jpeg)
- if((enable-all OR enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
-       set(use_u3d 1)
- endif((enable-all OR enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
- if((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
-       set(use_pdf 1)
- endif((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
- if(enable-all OR enable-gif)
-       set(use_gif 1)
- endif(enable-all OR enable-gif)
- if(enable-all OR enable-opengl)
-       set(use_opengl 1)
- endif(enable-all OR enable-opengl)
- if((enable-all OR enable-hdf4) AND (NOT enable-lgpl) )
-       set(use_hdf4 1)
- endif((enable-all OR enable-hdf4) AND (NOT enable-lgpl) )
- if((enable-all OR enable-hdf5) AND (NOT enable-lgpl) )
-       set(use_hdf5 1)
- endif((enable-all OR enable-hdf5) AND (NOT enable-lgpl) )
- if(enable-hdf5_18)
-       set(use_hdf5_18 1)
- endif(enable-hdf5_18)
- if((enable-all OR enable-glut) AND (NOT enable-lgpl) )
-       set(use_glut 1)
- endif((enable-all OR enable-glut) AND (NOT enable-lgpl) )
- if((enable-all OR enable-fltk) AND (NOT enable-lgpl) )
-       set(use_fltk 1)
- endif((enable-all OR enable-fltk) AND (NOT enable-lgpl) )
- if((enable-all OR enable-wx) AND (NOT enable-lgpl) )
-       set(use_wx 0)
- endif((enable-all OR enable-wx) AND (NOT enable-lgpl) )
- if((enable-all OR enable-qt) AND (NOT enable-lgpl) )
-       set(use_qt 1)
- endif((enable-all OR enable-qt) AND (NOT enable-lgpl) )
- if(enable-all OR enable-doc)
-       set(use_doc 1)
- endif(enable-all OR enable-doc)
- if((enable-langall OR enable-python) AND (NOT enable-lgpl) )
-       set(use_python 1)
- endif((enable-langall OR enable-python) AND (NOT enable-lgpl) )
- if((enable-langall OR enable-octave) AND (NOT enable-lgpl) )
-       set(use_octave 1)
- endif((enable-langall OR enable-octave) AND (NOT enable-lgpl) )
- if(use_glut AND NOT use_opengl)
-       message(SEND_ERROR "You have to enable OpenGL if you plan to use GLUT.")
- endif(use_glut AND NOT use_opengl)
  
+ include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
  
- include_directories( ${MathGL_SOURCE_DIR}/include )
+ if(enable-double)
+       set(MGL_USE_DOUBLE 1)
+ else(enable-double)
+       set(MGL_USE_DOUBLE 0)
+ endif(enable-double)
  
- include(FindOpenGL)
- if(NOT OPENGL_FOUND)
-       if(use_opengl)
-               message(SEND_ERROR "Couldn't find OpenGL libraries.")
-       endif(use_opengl)
- endif(NOT OPENGL_FOUND)
+ include(FindZLIB)
+ if(NOT ZLIB_FOUND)
+       message(SEND_ERROR "Couldn't find ZLIB library.")
+ endif(NOT ZLIB_FOUND)
  
  include(FindPNG)
  if(NOT PNG_FOUND)