r15420 by craig - #9322: Add in freebsd build checks

[scribus-commit]

Author: craig
Date: Tue Aug 17 19:18:35 2010
New Revision: 15420

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15420
Log:
#9322: Add in freebsd build checks

Modified:
    branches/Version135/Scribus/scribus/CMakeLists.txt
    branches/Version135/Scribus/scribus/scclocale.cpp
    branches/Version135/Scribus/scribus/scclocale.h
    branches/Version135/Scribus/scribus/util.cpp

Modified: branches/Version135/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15420&path=/branches/Version135/Scribus/scribus/CMakeLists.txt
==============================================================================
--- branches/Version135/Scribus/scribus/CMakeLists.txt (original)
+++ branches/Version135/Scribus/scribus/CMakeLists.txt Tue Aug 17 19:18:35 2010
@@ -757,14 +757,14 @@
 
 # required to resolve symbols from libdl when ld is called with --no-add-needed
 # #9310 for the OpenBSD addition
-IF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+IF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
   TARGET_LINK_LIBRARIES(${EXE_NAME} dl)
-ENDIF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+ENDIF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 
 # #9311 for the OpenBSD addition
-IF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+IF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
   TARGET_LINK_LIBRARIES(${EXE_NAME} util)
-ENDIF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 
 IF(WIN32)
   TARGET_LINK_LIBRARIES(${EXE_NAME} ${QT_QTMAIN_LIBRARY})

Modified: branches/Version135/Scribus/scribus/scclocale.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15420&path=/branches/Version135/Scribus/scribus/scclocale.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scclocale.cpp (original)
+++ branches/Version135/Scribus/scribus/scclocale.cpp Tue Aug 17 19:18:35 2010
@@ -22,7 +22,7 @@
 #if defined(Q_WS_WIN)
 	cLocale = _create_locale(LC_ALL, "C");
 #else
-  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD)
+  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined (Q_OS_FREEBSD)
 	cLocale = newlocale(LC_ALL_MASK, "C", NULL);
   #endif
 #endif
@@ -33,7 +33,7 @@
 #if defined(Q_WS_WIN)
 	_free_locale(cLocale);
 #else
-  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD)
+  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined (Q_OS_FREEBSD)
 	freelocale(cLocale);
   #endif
 #endif
@@ -108,7 +108,7 @@
 #if defined(Q_WS_WIN)
 		return _strtod_l(str, endptr, that()->cLocale);
 #else
-  #if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD)
+  #if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD) or defined (Q_OS_FREEBSD)
 		char *oldlocale=setlocale(LC_NUMERIC, NULL);
 		double result(0.0);
 		setlocale(LC_NUMERIC, "C");

Modified: branches/Version135/Scribus/scribus/scclocale.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15420&path=/branches/Version135/Scribus/scribus/scclocale.h
==============================================================================
--- branches/Version135/Scribus/scribus/scclocale.h (original)
+++ branches/Version135/Scribus/scribus/scclocale.h Tue Aug 17 19:18:35 2010
@@ -21,14 +21,14 @@
 #include <xlocale.h>
 #endif
 
-#if defined(Q_OS_SOLARIS) || defined (Q_OS_OPENBSD)
+#if defined(Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined (Q_OS_FREEBSD)
 #include <locale.h>
 #endif
 
 #if defined(Q_WS_WIN)
 #define XLocaleType _locale_t
 #else
-  #if defined (Q_OS_SOLARIS) || defined (Q_OS_OPENBSD)
+  #if defined (Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined (Q_OS_FREEBSD)
   #define XLocaleType char*   //dummy?
   #else
   #define XLocaleType locale_t

Modified: branches/Version135/Scribus/scribus/util.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15420&path=/branches/Version135/Scribus/scribus/util.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/util.cpp (original)
+++ branches/Version135/Scribus/scribus/util.cpp Tue Aug 17 19:18:35 2010
@@ -934,7 +934,7 @@
  */
 void printBacktrace ( int nFrames )
 {
-#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD)
+#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD)  && !defined(Q_OS_FREEBSD)
 	void ** trace = new void*[nFrames + 1];
 	char **messages = ( char ** ) NULL;
 	int i, trace_size = 0;