r24479 by jghali - Put some order in config.h and remove some useless stuf

scribus-commit scribus-commit at lists.scribus.net
Sun Feb 14 00:43:46 UTC 2021


Author: jghali
Date: Sun Feb 14 00:43:46 2021
New Revision: 24479

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24479
Log:
Put some order in config.h and remove some useless stuf

Modified:
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/config.h.cmake
    trunk/Scribus/win32/msvc2015/win-config.h
    trunk/Scribus/win32/msvc2017/win-config.h
    trunk/Scribus/win32/msvc2019/win-config.h

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24479&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Sun Feb 14 00:43:46 2021
@@ -198,8 +198,6 @@
 find_package(LCMS2 REQUIRED)
 if(LCMS2_FOUND)
 	set(HAVE_LCMS2 ON)
-	set(HAVE_CMS ON)
-	set(CMS_INC "\"lcms2.h\"")
 	message("LittleCMS-2 Library Found OK")
 else()
 	message(FATAL_ERROR "Could not find the LittleCMS 2 Library")

Modified: trunk/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24479&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake	(original)
+++ trunk/Scribus/config.h.cmake	Sun Feb 14 00:43:46 2021
@@ -11,29 +11,27 @@
 
 #cmakedefine VERSION "1.5.7.svn"
 
+#cmakedefine BUILD_MAC_BUNDLE
 #cmakedefine BUILD_WINDOWS_VERSION 1
 #cmakedefine DLL_USE_NATIVE_API 1
-#cmakedefine BUILD_MAC_BUNDLE
-#cmakedefine HAVE_CMS 1
-#cmakedefine HAVE_LCMS2 1
-#cmakedefine CMS_INC @CMS_INC@
-#cmakedefine HAVE_XML 1
+#cmakedefine GMAGICK_FOUND 1
+#cmakedefine HAVE_BOOST 1
 #cmakedefine HAVE_CAIRO 1
 #cmakedefine HAVE_CUPS 1
-#cmakedefine HAVE_TIFF 1
-#cmakedefine HAVE_LIBZ 1
 #cmakedefine HAVE_FONTCONFIG 1
 #cmakedefine HAVE_HARFBUZZ_SUBSET 1
+#cmakedefine HAVE_LCMS2 1
+#cmakedefine HAVE_LIBZ 1
+#cmakedefine HAVE_MEMRCHR 1
+#cmakedefine HAVE_OSG 1
 #cmakedefine HAVE_PODOFO 1
 #cmakedefine HAVE_POPPLER 1
 #cmakedefine HAVE_PYTHON 1
-#cmakedefine HAVE_OSG 1
-#cmakedefine HAVE_MEMRCHR 1
-#cmakedefine HAVE_BOOST 1
+#cmakedefine HAVE_REVENGE 1
+#cmakedefine HAVE_SYS_STAT_H 1
 #cmakedefine HAVE_SYS_TYPES_H 1
-#cmakedefine HAVE_SYS_STAT_H 1
+#cmakedefine HAVE_TIFF 1
+#cmakedefine HAVE_XML 1
+#cmakedefine HUNSPELL_NEWAPI "@HUNSPELL_NEWAPI@"
+#cmakedefine WITH_TESTS 1
 #cmakedefine WORDS_BIGENDIAN 1
-#cmakedefine GMAGICK_FOUND 1
-#cmakedefine WITH_TESTS 1
-#cmakedefine HAVE_REVENGE 1
-#cmakedefine HUNSPELL_NEWAPI "@HUNSPELL_NEWAPI@"

Modified: trunk/Scribus/win32/msvc2015/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24479&path=/trunk/Scribus/win32/msvc2015/win-config.h
==============================================================================
--- trunk/Scribus/win32/msvc2015/win-config.h	(original)
+++ trunk/Scribus/win32/msvc2015/win-config.h	Sun Feb 14 00:43:46 2021
@@ -3,6 +3,9 @@
 
 /* Version number of package */
 #define VERSION "1.5.7.svn"
+
+/* Are we building an executable to be included in MacOS/X .app bundle? */
+#undef BUILD_MAC_BUNDLE
 
 /* Are we building win32 native version. */
 #define BUILD_WINDOWS_VERSION 1
@@ -10,23 +13,11 @@
 /* Are we using native api for dll management */
 #define DLL_USE_NATIVE_API 1
 
-/* Are we building an executable to be included in MacOS/X .app bundle? */
-#undef BUILD_MAC_BUNDLE
+/* Defines if your system has the boost libraries */
+#define HAVE_BOOST 1
 
-/* ColorManagementInclude */
-#define CMS_INC "lcms2.h"
-
-/* ColorManagement (LittleCms) */
-#define HAVE_CMS 1
-
-/* ColorManagement (LittleCms2) */
-#define HAVE_LCMS2 1
-
-/* ColorManagement (Windows) */
-#define HAVE_ICM 1
-
-/* Can we use unicode functions (Windows) */
-#define HAVE_UNICODE 1
+/* Defines if your system has the cairo library */
+#define HAVE_CAIRO 1
 
 /* Cups */
 #undef HAVE_CUPS
@@ -34,17 +25,17 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Defines if your system has the cairo library */
-#define HAVE_CAIRO 1
-
-/* Defines if your system has the boost libraries */
-#define HAVE_BOOST 1
-
 /* Defines if your system has the libfontconfig library */
 #undef HAVE_FONTCONFIG
 
 /* Defines if your system has the harfbuzz-subset library */
 #define HAVE_HARFBUZZ_SUBSET 1
+
+/* ColorManagement (Windows) */
+#define HAVE_ICM 1
+
+/* ColorManagement (LittleCms2) */
+#define HAVE_LCMS2 1
 
 /* Define if you have libz */
 #define HAVE_LIBZ 1
@@ -70,9 +61,6 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-// #define HAVE_STDLIB_H 1
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -81,6 +69,9 @@
 
 /* Tifflib */
 #define HAVE_TIFF 1
+
+/* Can we use unicode functions (Windows) */
+#define HAVE_UNICODE 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H

Modified: trunk/Scribus/win32/msvc2017/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24479&path=/trunk/Scribus/win32/msvc2017/win-config.h
==============================================================================
--- trunk/Scribus/win32/msvc2017/win-config.h	(original)
+++ trunk/Scribus/win32/msvc2017/win-config.h	Sun Feb 14 00:43:46 2021
@@ -3,6 +3,9 @@
 
 /* Version number of package */
 #define VERSION "1.5.7.svn"
+
+/* Are we building an executable to be included in MacOS/X .app bundle? */
+#undef BUILD_MAC_BUNDLE
 
 /* Are we building win32 native version. */
 #define BUILD_WINDOWS_VERSION 1
@@ -10,23 +13,11 @@
 /* Are we using native api for dll management */
 #define DLL_USE_NATIVE_API 1
 
-/* Are we building an executable to be included in MacOS/X .app bundle? */
-#undef BUILD_MAC_BUNDLE
+/* Defines if your system has the boost libraries */
+#define HAVE_BOOST 1
 
-/* ColorManagementInclude */
-#define CMS_INC "lcms2.h"
-
-/* ColorManagement (LittleCms) */
-#define HAVE_CMS 1
-
-/* ColorManagement (LittleCms2) */
-#define HAVE_LCMS2 1
-
-/* ColorManagement (Windows) */
-#define HAVE_ICM 1
-
-/* Can we use unicode functions (Windows) */
-#define HAVE_UNICODE 1
+/* Defines if your system has the cairo library */
+#define HAVE_CAIRO 1
 
 /* Cups */
 #undef HAVE_CUPS
@@ -34,17 +25,17 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Defines if your system has the cairo library */
-#define HAVE_CAIRO 1
-
-/* Defines if your system has the boost libraries */
-#define HAVE_BOOST 1
-
 /* Defines if your system has the libfontconfig library */
 #undef HAVE_FONTCONFIG
 
 /* Defines if your system has the harfbuzz-subset library */
 #define HAVE_HARFBUZZ_SUBSET 1
+
+/* ColorManagement (Windows) */
+#define HAVE_ICM 1
+
+/* ColorManagement (LittleCms2) */
+#define HAVE_LCMS2 1
 
 /* Define if you have libz */
 #define HAVE_LIBZ 1
@@ -70,9 +61,6 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-// #define HAVE_STDLIB_H 1
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -81,6 +69,9 @@
 
 /* Tifflib */
 #define HAVE_TIFF 1
+
+/* Can we use unicode functions (Windows) */
+#define HAVE_UNICODE 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H

Modified: trunk/Scribus/win32/msvc2019/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24479&path=/trunk/Scribus/win32/msvc2019/win-config.h
==============================================================================
--- trunk/Scribus/win32/msvc2019/win-config.h	(original)
+++ trunk/Scribus/win32/msvc2019/win-config.h	Sun Feb 14 00:43:46 2021
@@ -3,6 +3,9 @@
 
 /* Version number of package */
 #define VERSION "1.5.7.svn"
+
+/* Are we building an executable to be included in MacOS/X .app bundle? */
+#undef BUILD_MAC_BUNDLE
 
 /* Are we building win32 native version. */
 #define BUILD_WINDOWS_VERSION 1
@@ -10,23 +13,11 @@
 /* Are we using native api for dll management */
 #define DLL_USE_NATIVE_API 1
 
-/* Are we building an executable to be included in MacOS/X .app bundle? */
-#undef BUILD_MAC_BUNDLE
+/* Defines if your system has the boost libraries */
+#define HAVE_BOOST 1
 
-/* ColorManagementInclude */
-#define CMS_INC "lcms2.h"
-
-/* ColorManagement (LittleCms) */
-#define HAVE_CMS 1
-
-/* ColorManagement (LittleCms2) */
-#define HAVE_LCMS2 1
-
-/* ColorManagement (Windows) */
-#define HAVE_ICM 1
-
-/* Can we use unicode functions (Windows) */
-#define HAVE_UNICODE 1
+/* Defines if your system has the cairo library */
+#define HAVE_CAIRO 1
 
 /* Cups */
 #undef HAVE_CUPS
@@ -34,17 +25,17 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Defines if your system has the cairo library */
-#define HAVE_CAIRO 1
-
-/* Defines if your system has the boost libraries */
-#define HAVE_BOOST 1
-
 /* Defines if your system has the libfontconfig library */
 #undef HAVE_FONTCONFIG
 
 /* Defines if your system has the harfbuzz-subset library */
 #define HAVE_HARFBUZZ_SUBSET 1
+
+/* ColorManagement (Windows) */
+#define HAVE_ICM 1
+
+/* ColorManagement (LittleCms2) */
+#define HAVE_LCMS2 1
 
 /* Define if you have libz */
 #define HAVE_LIBZ 1
@@ -70,9 +61,6 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-// #define HAVE_STDLIB_H 1
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -81,6 +69,9 @@
 
 /* Tifflib */
 #define HAVE_TIFF 1
+
+/* Can we use unicode functions (Windows) */
+#define HAVE_UNICODE 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H




More information about the scribus-commit mailing list