Blob Blame History Raw
diff --git a/configure.ac b/configure.ac
index 876ebd0..ea5b2e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,11 +20,6 @@ AC_CHECK_LIB(pthread, pthread_create)
 AC_CHECK_LIB(tiff, TIFFOpen, TIFF_LIBS="-ltiff", , -lm)
 AC_SUBST([TIFF_LIBS])
 
-AC_CHECK_HEADER([yajl/yajl_common.h],
-                [YAJL_LIBS="-lyajl"],
-                [AC_MSG_ERROR([please install yajl])])
-AC_SUBST([YAJL_LIBS])
-
 AC_CHECK_LIB(X11, XOpenDisplay, X_LIBS="$X_LIBS -lX11")
 AC_CHECK_LIB(Xext, XextFindDisplay, X_LIBS="$X_LIBS -lXext",,-lX11)
 AC_CHECK_LIB(Xss, XScreenSaverSuspend, X_LIBS="$X_LIBS -lXss",,-lXext -lX11)
diff -up hargyllcms-1.3.5/h/aconfig.h.BAD hargyllcms-1.3.5/h/aconfig.h
--- hargyllcms-1.3.5/h/aconfig.h.BAD	2011-12-01 19:41:05.373294460 +0000
+++ hargyllcms-1.3.5/h/aconfig.h	2011-12-01 19:41:22.311293287 +0000
@@ -16,10 +16,6 @@
 /* Maximum file path length */
 #define MAXNAMEL 1024
 
-#if defined(UNIX) && !defined(__APPLE__)
-#define USE_UCMM		/* Enable the Unix micro CMM */
-#endif
-
 #ifndef SALONEINSTLIB
 #define ENABLE_SERIAL	/* Enable access to serial instruments */
 #define ENABLE_USB		/* Enable access to USB instruments using libusb */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 176fbea..ad5fcdc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,7 +6,6 @@ AM_CFLAGS = -DUNIX -I $(top_srcdir)/cgats -I$(top_srcdir)/gamut		\
     -I$(top_srcdir)/numlib -I$(top_srcdir)/plot -I$(top_srcdir)/profile	\
     -I$(top_srcdir)/render -I$(top_srcdir)/rspl -I$(top_srcdir)/spectro	\
     -I$(top_srcdir)/target -I$(top_srcdir)/xicc -I$(top_srcdir)/ucmm	\
-    -I$(top_srcdir)/jcnf						\
     -DUSE_LIBUSB1							\
     $(USB_CFLAGS) $(TIFF_CFLAGS)
 
@@ -25,10 +24,6 @@ libargyll_a_SOURCES += ../plot/plot.h ../plot/plot.c
 
 libargyll_a_SOURCES += ../plot/vrml.h ../plot/vrml.c
 
-libargyll_a_SOURCES += ../ucmm/ucmm.h ../ucmm/ucmm.c
-
-libargyll_a_SOURCES += ../jcnf/jcnf.h ../jcnf/jcnf.c
-
 libargyll_a_SOURCES += ../profile/prof.h ../profile/profin.c ../profile/profout.c
 
 libargyll_a_SOURCES += ../render/render.h ../render/render.c
-- 
1.7.7.3