From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Jan 2009 07:08:53 +0000 (-0800)
Subject: Merge branch 'ds/uintmax-config'
X-Git-Tag: v1.6.2-rc0~132
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8b75d31c945c9361331db8cd554f25a8ea6abc4a?ds=inline;hp=-c

Merge branch 'ds/uintmax-config'

* ds/uintmax-config:
autoconf: Enable threaded delta search when pthreads are supported
---

8b75d31c945c9361331db8cd554f25a8ea6abc4a
diff --combined configure.ac
index 0a5fc8c6f6,cee06d7683..5198c83f65
--- a/configure.ac
+++ b/configure.ac
@@@ -127,7 -127,7 +127,7 @@@ els
        SAVE_LDFLAGS="${LDFLAGS}"
        LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/"
        AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_wl_rpath=yes], [ld_wl_rpath=no])
 -      LDFLAGS="${SAVE_LD_FLAGS}"
 +      LDFLAGS="${SAVE_LDFLAGS}"
     ])
     if test "$ld_wl_rpath" = "yes"; then
        AC_SUBST(CC_LD_DYNPATH, [-Wl,-rpath,])
@@@ -136,7 -136,7 +136,7 @@@
           SAVE_LDFLAGS="${LDFLAGS}"
           LDFLAGS="${SAVE_LDFLAGS} -rpath /"
           AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_rpath=yes], [ld_rpath=no])
 -         LDFLAGS="${SAVE_LD_FLAGS}"
 +         LDFLAGS="${SAVE_LDFLAGS}"
        ])
        if test "$ld_rpath" = "yes"; then
           AC_SUBST(CC_LD_DYNPATH, [-rpath])
@@@ -492,7 -492,8 +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 +501,19 @@@
  ${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