- repair broken cmake support in 1.3.3.6

[packages/scribus.git] / scribus-cmake.patch

diff -Nur scribus-1.3.3.6/cmake/modules/CAIROConfig.cmake scribus-1.3.3.6-cmake/cmake/modules/CAIROConfig.cmake
--- scribus-1.3.3.6/cmake/modules/CAIROConfig.cmake	1970-01-01 01:00:00.000000000 +0100
+++ scribus-1.3.3.6-cmake/cmake/modules/CAIROConfig.cmake	2006-11-12 00:36:50.000000000 +0100
@@ -0,0 +1,69 @@
+#
+# Find the native cairo includes and library
+#
+
+# This module defines
+# CAIRO_INCLUDE_DIR, where to find art*.h etc
+# CAIRO_LIBRARY, the libraries to link against to use LIBART.
+# CAIRO_FOUND, If false, do not try to use LIBART.
+# CAIRO_LIBS, link information
+# CAIRO_CFLAGS, cflags for include information
+
+
+INCLUDE(UsePkgConfig)
+
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+PKGCONFIG(cairo _libCairoIncDir _libCairoLinkDir _libCairoLinkFlags _libCairoCflags)
+
+SET(CAIRO_LIBS ${_libCairoCflags})
+
+IF(PREFIX_CAIRO)
+	SET(PREFIX_CAIRO_INCLUDE "${PREFIX_CAIRO}/include")
+	SET(PREFIX_CAIRO_LIB "${PREFIX_CAIRO}/lib")
+	SET(PREFIX_CAIRO_BIN "${PREFIX_CAIRO}/bin")
+ENDIF(PREFIX_CAIRO)
+
+FIND_PATH(CAIRO_INCLUDE_DIR 
+NAMES cairo.h
+PATHS ${PREFIX_CAIRO_INCLUDE} ${_libCairoIncDir} /usr/local/include /usr/include
+PATH_SUFFIXES cairo
+NO_DEFAULT_PATH
+)
+
+FIND_LIBRARY(CAIRO_LIBRARY
+NAMES cairo
+PATHS ${PREFIX_CAIRO_LIB} ${_libCairoLinkDir} /usr/local/lib /usr/lib
+NO_DEFAULT_PATH
+)
+
+#If we had no cairo prefix specify it, set PREFIX_CAIRO_LIB most importantly, for the 
+# IF(NOT PREFIX_CAIRO)
+# 	GET_FILENAME_COMPONENT(CAIRO_DIR ${CAIRO_LIBRARY} PATH)
+# 	GET_FILENAME_COMPONENT(CAIRO_DIR ${CAIRO_DIR} PATH)
+# 	SET(PREFIX_CAIRO ${CAIRO_DIR})
+# 	IF(PREFIX_CAIRO)
+# 		SET(PREFIX_CAIRO_INCLUDE "${PREFIX_CAIRO}/include")
+# 		SET(PREFIX_CAIRO_LIB "${PREFIX_CAIRO}/lib")
+# 		SET(PREFIX_CAIRO_BIN "${PREFIX_CAIRO}/bin")
+# 	ENDIF(PREFIX_CAIRO)
+# ENDIF(NOT PREFIX_CAIRO)
+
+SET(CAIRO_FIND_QUIETLY 1)
+
+IF (CAIRO_LIBRARY)
+  IF (CAIRO_INCLUDE_DIR)
+    SET( CAIRO_FOUND "YES" )
+    IF(NOT CAIRO_FIND_QUIETLY)
+      MESSAGE(STATUS "Found cairo: ${CAIRO_LIBRARY}")
+    ENDIF(NOT CAIRO_FIND_QUIETLY)
+    SET( CAIRO_LIBRARIES ${CAIRO_LIBRARY} )
+#     CB: We dont use this yet anyway
+#     FIND_PROGRAM(CAIRO_CONFIG 
+#       NAMES pkg-config
+#       PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin
+#     )
+#     EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--libs cairo" OUTPUT_VARIABLE CAIRO_LIBS)
+#     EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--cflags cairo" OUTPUT_VARIABLE CAIRO_CFLAGS)
+  ENDIF (CAIRO_INCLUDE_DIR)
+ENDIF (CAIRO_LIBRARY)
diff -Nur scribus-1.3.3.6/cmake/modules/CUPSConfig.cmake scribus-1.3.3.6-cmake/cmake/modules/CUPSConfig.cmake
--- scribus-1.3.3.6/cmake/modules/CUPSConfig.cmake	1970-01-01 01:00:00.000000000 +0100
+++ scribus-1.3.3.6-cmake/cmake/modules/CUPSConfig.cmake	2006-11-12 00:36:50.000000000 +0100
@@ -0,0 +1,31 @@
+# - Try to find Cups
+# Once done this will define
+#
+#  CUPS_FOUND - system has Cups
+#  CUPS_INCLUDE_DIR - the Cups include directory
+#  CUPS_LIBRARY - Link these to use CUPS
+#
+
+FIND_PATH(CUPS_INCLUDE_DIR cups/cups.h
+  /usr/include
+  /usr/local/include
+)
+
+FIND_LIBRARY(CUPS_LIBRARY NAMES cups PATHS /usr/lib /usr/local/lib)
+
+IF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY)
+   SET(CUPS_FOUND TRUE)
+ENDIF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY)
+
+SET(Cups_FIND_QUIETLY 1)
+
+IF(CUPS_FOUND)
+  SET( CUPS_LIBRARIES ${CUPS_LIBRARY} )
+  IF(NOT Cups_FIND_QUIETLY)
+    MESSAGE(STATUS "Found Cups: ${CUPS_LIBRARY}")
+  ENDIF(NOT Cups_FIND_QUIETLY)
+ELSE(CUPS_FOUND)
+  IF(Cups_FIND_REQUIRED)
+    MESSAGE(SEND_ERROR "Could not find Cups")
+  ENDIF(Cups_FIND_REQUIRED)
+ENDIF(CUPS_FOUND)