From 7ed9d943b31d3ee9c5fb2387e84a241ba33afe90 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Wed, 31 Dec 2008 00:30:49 +0200 Subject: Remove lzma_init() and other init functions from liblzma API. Half of developers were already forgetting to use these functions, which could have caused total breakage in some future liblzma version or even now if --enable-small was used. Now liblzma uses pthread_once() to do the initializations unless it has been built with --disable-threads which make these initializations thread-unsafe. When --enable-small isn't used, liblzma currently gets needlessly linked against libpthread (on systems that have it). While it is stupid for now, liblzma will need threads in future anyway, so this stupidity will be temporary only. When --enable-small is used, different code CRC32 and CRC64 is now used than without --enable-small. This made the resulting binary slightly smaller, but the main reason was to clean it up and to handle the lack of lzma_init_check(). The pkg-config file lzma.pc was renamed to liblzma.pc. I'm not sure if it works correctly and portably for static linking (Libs.private includes -pthread or other operating system specific flags). Hopefully someone complains if it is bad. lzma_rc_prices[] is now included as a precomputed array even with --enable-small. It's just 128 bytes now that it uses uint8_t instead of uint32_t. Smaller array seemed to be at least as fast as the more bloated uint32_t array on x86; hopefully it's not bad on other architectures. --- configure.ac | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6ebe54b5..257cb037 100644 --- a/configure.ac +++ b/configure.ac @@ -383,6 +383,21 @@ AC_MSG_RESULT([$enable_small]) AM_CONDITIONAL(COND_SMALL, test "x$enable_small" = xyes) +############# +# Threading # +############# + +AC_MSG_CHECKING([if threading support is wanted]) +AC_ARG_ENABLE([threads], AC_HELP_STRING([--disable-threads], + [Disable threading support. + This makes some things thread-unsafe.]), + [], [enable_threads=yes]) +if test "x$enable_threads" != xyes && test "x$enable_threads" != xno; then + AC_MSG_ERROR([--enable-threads accepts only \`yes' or \`no']) +fi +# We use the actual result a little later. + + ############################################################################### # Checks for programs. ############################################################################### @@ -402,10 +417,14 @@ AM_PROG_CC_C_O AM_PROG_AS AC_USE_SYSTEM_EXTENSIONS -echo -echo "Threading support:" -ACX_PTHREAD -CC="$PTHREAD_CC" +if test "x$enable_threads" = xyes; then + echo + echo "Threading support:" + ACX_PTHREAD + LIBS="$LIBS $PTHREAD_LIBS" + CFLAGS="$PTHREAD_CFLAGS $CFLAGS" + CC="$PTHREAD_CC" +fi echo echo "Initializing Libtool:" @@ -698,7 +717,7 @@ AC_CONFIG_FILES([ po/Makefile.in lib/Makefile src/Makefile - src/liblzma/lzma.pc + src/liblzma/liblzma.pc src/liblzma/Makefile src/liblzma/api/Makefile src/liblzma/common/Makefile -- cgit v1.2.3