From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Nov 2008 06:27:33 +0000 (-0800)
Subject: Merge branch 'ds/uintmax-config' (early part)
X-Git-Tag: v1.6.1-rc1~53
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3e9f158c804776f6a7a42bef582a38909d3e920d;p=git.git

Merge branch 'ds/uintmax-config' (early part)

* 'ds/uintmax-config' (early part):
  Add autoconf tests for pthreads
  Make Pthread link flags configurable
  Add Makefile check for FreeBSD 4.9-SECURITY
  Build: add NO_UINTMAX_T to support ancient systems

Conflicts:
	Makefile
---

3e9f158c804776f6a7a42bef582a38909d3e920d
diff --cc Makefile
index 920cb4207,02f68e05f..35adafa01
--- a/Makefile
+++ b/Makefile
@@@ -690,6 -693,13 +691,11 @@@ ifeq ($(uname_S),FreeBSD
  	BASIC_LDFLAGS += -L/usr/local/lib
  	DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
  	THREADED_DELTA_SEARCH = YesPlease
 -	COMPAT_CFLAGS += -Icompat/regex
 -	COMPAT_OBJS += compat/regex/regex.o
+ 	ifeq ($(shell expr "$(uname_R)" : '4\.'),2)
+ 		PTHREAD_LIBS = -pthread
+ 		NO_UINTMAX_T = YesPlease
+ 		NO_STRTOUMAX = YesPlease
+ 	endif
  endif
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
diff --cc configure.ac
index ef544e877,3f058a087..42567420e
--- a/configure.ac
+++ b/configure.ac
@@@ -446,8 -436,16 +446,16 @@@ GIT_CHECK_FUNC(strlcpy
  [NO_STRLCPY=YesPlease])
  AC_SUBST(NO_STRLCPY)
  #
+ # Define NO_UINTMAX_T if your platform does not have uintmax_t
+ AC_CHECK_TYPE(uintmax_t,
+ [NO_UINTMAX_T=],
+ [NO_UINTMAX_T=YesPlease],[
+ #include <inttypes.h>
+ ])
+ AC_SUBST(NO_UINTMAX_T)
+ #
  # Define NO_STRTOUMAX if you don't have strtoumax in the C library.
 -AC_CHECK_FUNC(strtoumax,
 +GIT_CHECK_FUNC(strtoumax,
  [NO_STRTOUMAX=],
  [NO_STRTOUMAX=YesPlease])
  AC_SUBST(NO_STRTOUMAX)