From: Eric Biggers Date: Sun, 18 Nov 2012 20:53:53 +0000 (-0600) Subject: PTHREAD_LDADD X-Git-Tag: v1.1.0~7 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=9f6a1409c765f07fc4c030d1428461b38898b2bd PTHREAD_LDADD --- diff --git a/Makefile.am b/Makefile.am index 3f04be86..035eda4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,8 @@ libwim_la_LIBADD = \ $(LIBNTFS_3G_LDADD) \ $(LTLIBICONV) \ $(LIBCRYPTO_LDADD) \ - $(SSSE3_SHA1_OBJ) + $(SSSE3_SHA1_OBJ) \ + $(PTHREAD_LDADD) libwim_la_CFLAGS = \ $(AM_CFLAGS) \ diff --git a/configure.ac b/configure.ac index 63f00975..5c4ad6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -147,7 +147,11 @@ if test "x$ENABLE_MULTITHREADED_COMPRESSION" = "xyes"; then AC_DEFINE([ENABLE_MULTITHREADED_COMPRESSION], [1], [Define to 1 if including support for multithreaded compression]) + PTHREAD_LDADD="-lpthread" +else + PTHREAD_LDADD="" fi +AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD]) AC_MSG_CHECKING([whether to include support for ntfs-3g]) AC_ARG_WITH([ntfs-3g], diff --git a/rpm/wimlib-minimal.spec b/rpm/wimlib-minimal.spec index cbd32727..a22ff67e 100644 --- a/rpm/wimlib-minimal.spec +++ b/rpm/wimlib-minimal.spec @@ -36,6 +36,7 @@ Development files for wimlib --without-fuse \ --disable-xattr \ --disable-verify-compression \ + --disable-multithreaded-compression \ --disable-custom-memory-allocator \ --disable-assertions %__make %{?_smp_mflags}