[argyllcms] Centralize the definition to use UCMM
- From: Richard Hughes <hughsient@xxxxxxxxx>
- To: argyllcms@xxxxxxxxxxxxx
- Date: Wed, 19 May 2010 10:37:09 +0100
Fedora doesn't ship the ucmm support in the argyll package. The
attached patch reduces the distro patch to a single line, and would
make my life a bit easier if it was merged upstream. Please consider.
Thanks.
Richard.
diff --git a/h/aconfig.h b/h/aconfig.h
index 32ccaca..2b9b65d 100644
--- a/h/aconfig.h
+++ b/h/aconfig.h
@@ -19,4 +19,8 @@
#define ENABLE_SERIAL /* Enable access to serial instruments */
#define ENABLE_USB /* Enable access to USB instruments using
libusb */
+#if defined(UNIX) && !defined(__APPLE__)
+#define USE_UCMM
+#endif
+
#endif /* __CONFIG_H__ */
diff --git a/spectro/dispwin.c b/spectro/dispwin.c
index 82b0df3..1dbe146 100644
--- a/spectro/dispwin.c
+++ b/spectro/dispwin.c
@@ -54,7 +54,8 @@
#include "cgats.h"
#include "conv.h"
#include "dispwin.h"
-#if defined(UNIX) && !defined(__APPLE__)
+
+#if defined(USE_UCMM)
#include "ucmm.h"
#endif
@@ -1956,7 +1957,7 @@ int dispwin_install_profile(dispwin *p, char *fname,
ramdac *r, p_scope scope) {
}
#endif /* __APPLE__ */
-#if defined(UNIX) && !defined(__APPLE__)
+#if defined(USE_UCMM)
{
ucmm_error ev;
ucmm_scope sc;
@@ -2157,7 +2158,7 @@ int dispwin_uninstall_profile(dispwin *p, char *fname,
p_scope scope) {
}
#endif /* __APPLE__ */
-#if defined(UNIX) && !defined(__APPLE__)
+#if defined(USE_UCMM)
{
ucmm_error ev;
ucmm_scope sc;
@@ -2294,7 +2295,7 @@ icmFile *dispwin_get_profile(dispwin *p, char *name, int
mxlen) {
}
#endif /* __APPLE__ */
-#if defined(UNIX) && !defined(__APPLE__)
+#if defined(USE_UCMM)
/* Try and get the currently installed profile from ucmm */
{
ucmm_error ev;
Other related posts:
