r15351 by fschmid - Reverted the lib2geom update, 2nd stage reverting cmake related changes.

[scribus-commit]

Revision: 15351
Author: fschmid
Date: 2010-07-17T21:08:42.629052Z
Commit message: Reverted the lib2geom update, 2nd stage reverting cmake related changes.

Changeset: 
M  /trunk/Scribus/config.h.cmake
M  /trunk/Scribus/CMakeLists.txt

Diffs:
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 15350)
+++ CMakeLists.txt	(revision 15351)
@@ -716,21 +716,6 @@
   ELSE(Boost_FOUND)
 	MESSAGE("Boost: NOT FOUND, not building 2geomtools")
   ENDIF (Boost_FOUND)
-  FIND_PACKAGE(GSL)
-  IF(GSL_FOUND)
-    SET(LINK_GSL ${GSL_LINK_FLAGS})
-    SET(GSL_CFLAGS "${GSL_CFLAGS} -DHAVE_GSL")
-    SET(HAVE_GSL 1)
-    INCLUDE (CheckCXXSourceCompiles)
-    MACRO(CHECK_MATH_FUNCTION FUNCTION VAR)
-     CHECK_CXX_SOURCE_COMPILES("#include <math.h>\nint main() { double a=0.5,b=0.5,c=0.5; int i=1,j=2,k=3; ${FUNCTION}; return 0; }" ${VAR})
-    ENDMACRO(CHECK_MATH_FUNCTION)
-    CHECK_MATH_FUNCTION("sincos(a,&b,&c)" HAVE_SINCOS)
-    CHECK_MATH_FUNCTION("round(a)" HAVE_ROUND)
-    CHECK_MATH_FUNCTION("trunc(a)" HAVE_TRUNC)
-  ELSE(GSL_FOUND)
-    SET(HAVE_BOOST 0)
-  ENDIF(GSL_FOUND)
 ENDIF (WITH_BOOST)
 #>>Boost for 2Geom Tools
 
Index: config.h.cmake
===================================================================
--- config.h.cmake	(revision 15350)
+++ config.h.cmake	(revision 15351)
@@ -29,7 +29,6 @@
 #cmakedefine HAVE_PODOFO 1
 #cmakedefine HAVE_OSG 1
 #cmakedefine HAVE_BOOST 1
-#cmakedefine HAVE_GSL 1
 #cmakedefine HAVE_SINCOS
 #cmakedefine HAVE_ROUND
 #cmakedefine HAVE_TRUNC