[SCM] Packaging for mathgl branch, experimental, updated. debian/2_rc2+svn376-10-g96a3be9

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the experimental branch:
commit 7b247ded6c624e91ee14a9b5436106fbbe9c81a3
Merge: 83f0ec35b1021c53aba5cbe8efe0b43339100057 0146b52e53cff3f046e1d8b012027a5cde726229
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sat Mar 24 18:07:51 2012 +0200

    Merge tag 'upstream/2_rc2+svn380' into experimental
    
    Upstream version 2~rc2+svn380

diff --combined CMakeLists.txt
index 03a1d41,2921bc7..ee577db
--- 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)
  
@@@ -121,7 -121,8 +121,8 @@@ else(enable-all OR enable-jpeg
  	set(MGL_HAVE_JPEG 0)
  endif(enable-all OR enable-jpeg)
  
- if((enable-all OR enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
+ #if((enable-all OR enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
+ if((enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
  	set(MGL_HAVE_U3D 1)
  	find_library(U3D_LIB IDTF)
  	if(NOT U3D_LIB)
@@@ -133,11 -134,14 +134,14 @@@
  	endif(NOT U3D_INCLUDE_DIR)
  	message(STATUS "Found U3D libraries at: ${U3D_LIB}")
  	message(STATUS "Found U3D headers: ${U3D_INCLUDE_DIR}")
+ #else((enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
  else((enable-all OR enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
  	set(MGL_HAVE_U3D 0)
- endif((enable-all OR enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
+ #endif((enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
+ endif((enable-u3d OR enable-pdf) AND (NOT enable-lgpl) )
  
- if((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
+ #if((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
+ if((enable-pdf) AND (NOT enable-lgpl) )
  	set(MGL_HAVE_PDF 1)
  	find_library(HPDF_LIB hpdf)
  	if(NOT HPDF_LIB)
@@@ -149,9 -153,11 +153,11 @@@
  	endif(NOT HPDF_INCLUDE_DIR)
  	message(STATUS "Found libHaru library at: ${HPDF_LIB}")
  	message(STATUS "Found libHaru headers: ${HPDF_INCLUDE_DIR}")
- else((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
+ #else((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
+ else((enable-pdf) AND (NOT enable-lgpl) )
  	set(MGL_HAVE_PDF 0)
- endif((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
+ #endif((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
+ endif((enable-pdf) AND (NOT enable-lgpl) )
  
  if(enable-all OR enable-gif)
  	set(MGL_HAVE_GIF 1)

-- 
Packaging for mathgl