diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:08:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:08:53 -0800 |
| commit | 8b75d31c945c9361331db8cd554f25a8ea6abc4a (patch) | |
| tree | 8e9653fc89962d66652c5b8d57afe62b81366a6d | |
| parent | 094f75b4330a68aba7e92b74ddb9282b9f083c6f (diff) | |
| parent | d937c374ccb987356c1412986c8fb106b8aaef75 (diff) | |
| download | git-8b75d31c945c9361331db8cd554f25a8ea6abc4a.tar.gz git-8b75d31c945c9361331db8cd554f25a8ea6abc4a.tar.xz | |
Merge branch 'ds/uintmax-config'
* ds/uintmax-config:
autoconf: Enable threaded delta search when pthreads are supported
| -rw-r--r-- | config.mak.in | 1 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config.mak.in b/config.mak.in index 14dfb21fa..55b25c3d2 100644 --- a/config.mak.in +++ b/config.mak.in @@ -52,4 +52,5 @@ NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@ FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@ SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@ NO_PTHREADS=@NO_PTHREADS@ +THREADED_DELTA_SEARCH=@THREADED_DELTA_SEARCH@ PTHREAD_LIBS=@PTHREAD_LIBS@ diff --git a/configure.ac b/configure.ac index 0a5fc8c6f..5198c83f6 100644 --- a/configure.ac +++ b/configure.ac @@ -492,7 +492,8 @@ AC_SUBST(NO_MKDTEMP) # # Define NO_PTHREADS if we do not have pthreads # -# Define PTHREAD_LIBS to the linker flag used for Pthread support. +# Define PTHREAD_LIBS to the linker flag used for Pthread support and define +# THREADED_DELTA_SEARCH if Pthreads are available. AC_LANG_CONFTEST([AC_LANG_PROGRAM( [[#include <pthread.h>]], [[pthread_mutex_t test_mutex;]] @@ -500,16 +501,19 @@ AC_LANG_CONFTEST([AC_LANG_PROGRAM( ${CC} -pthread conftest.c -o conftest.o > /dev/null 2>&1 if test $? -eq 0;then PTHREAD_LIBS="-pthread" + THREADED_DELTA_SEARCH=YesPlease else ${CC} -lpthread conftest.c -o conftest.o > /dev/null 2>&1 if test $? -eq 0;then PTHREAD_LIBS="-lpthread" + THREADED_DELTA_SEARCH=YesPlease else NO_PTHREADS=UnfortunatelyYes fi fi AC_SUBST(PTHREAD_LIBS) AC_SUBST(NO_PTHREADS) +AC_SUBST(THREADED_DELTA_SEARCH) ## Site configuration (override autodetection) ## --with-PACKAGE[=ARG] and --without-PACKAGE |