diff options
| author | Marti Maria <info@littlecms.com> | 2014-02-16 19:41:56 +0100 |
|---|---|---|
| committer | Marti Maria <info@littlecms.com> | 2014-02-16 19:41:56 +0100 |
| commit | b1ef66aafe407c8165b174aa95a55a68903fd50c (patch) | |
| tree | a6ed5e3937c76d5e3efebe6637ada2619e8536df /include | |
| parent | a6fd3eb3560a064b5dc901fa7babecd01fc6085f (diff) | |
| download | lcms2-b1ef66aafe407c8165b174aa95a55a68903fd50c.tar.gz | |
Added pthread dependency, and multithreading support
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.in | 10 | ||||
| -rw-r--r-- | include/lcms2.h | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/include/Makefile.in b/include/Makefile.in index 7874c99..aef488b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -59,7 +59,8 @@ subdir = include DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -152,7 +153,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_JPEG = @LIB_JPEG@ LIB_MATH = @LIB_MATH@ -LIB_PTHREAD = @LIB_PTHREAD@ +LIB_THREAD = @LIB_THREAD@ LIB_TIFF = @LIB_TIFF@ LIB_ZLIB = @LIB_ZLIB@ LIPO = @LIPO@ @@ -176,6 +177,10 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_CXX = @PTHREAD_CXX@ +PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -191,6 +196,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/include/lcms2.h b/include/lcms2.h index c595506..1fe0492 100644 --- a/include/lcms2.h +++ b/include/lcms2.h @@ -237,6 +237,14 @@ typedef int cmsBool; # define CMSAPI #endif +#ifdef HasTHREADS +# if HasTHREADS == 1 +# undef CMS_NO_PTHREADS +# else +# define CMS_NO_PTHREADS 1 +# endif +#endif + // Some common definitions #define cmsMAX_PATH 256 |