r16359 by craig - #8232: Use system hyphenation when available (fedora, rhel, debian/ubuntu , plus a carbon cmakelists change

[scribus-commit]

Author: craig
Date: Mon Feb 14 19:28:33 2011
New Revision: 16359

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16359
Log:
#8232: Use system hyphenation when available (fedora, rhel, debian/ubuntu , plus a carbon cmakelists change

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/hyphenator.h

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16359&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Mon Feb 14 19:28:33 2011
@@ -468,8 +468,6 @@
   guidesdelegate.cpp
   guidesmodel.cpp
   guidesview.cpp
-  hnjalloc.c
-  hyphen.c
   hyphenator.cpp
   ioapi.c
   KarbonCurveFit.cpp
@@ -794,6 +792,16 @@
   ${SCRIBUS_GMAGICK_SRC}
 )
 
+IF(NOT HAVE_HYPHEN)
+  SET(SCRIBUS_SOURCES
+    ${SCRIBUS_SOURCES}
+    hnjalloc.c
+    hyphen.c
+  )
+ENDIF(NOT HAVE_HYPHEN)
+
+
+
 IF(WIN32)
   SET(SCRIBUS_MOC_WIN32_ONLY_CLASSES scprintengine_gdi.h)
   SET(SCRIBUS_WIN32_ONLY_SOURCES
@@ -868,6 +876,13 @@
     ${LIBPODOFO_INCLUDE_DIR}
     )
 ENDIF(HAVE_PODOFO)
+
+IF(HAVE_HYPHEN)
+  TARGET_LINK_LIBRARIES(${EXE_NAME}
+    ${HYPHEN_LIBRARY}
+  )
+ENDIF(HAVE_HYPHEN)
+
 
 IF(GESTURE_FRAME_PREVIEW)
    MESSAGE(STATUS "Enable gesture frame preview [experimental]")

Modified: trunk/Scribus/scribus/hyphenator.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16359&path=/trunk/Scribus/scribus/hyphenator.h
==============================================================================
--- trunk/Scribus/scribus/hyphenator.h (original)
+++ trunk/Scribus/scribus/hyphenator.h Mon Feb 14 19:28:33 2011
@@ -13,7 +13,7 @@
 #include <QSet>
 
 #include "scribusapi.h"
-#include "hyphen.h"
+#include <hyphen.h>
 class ScribusDoc;
 class ScribusMainWindow;
 class PageItem;