From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2011 17:32:19 +0000 (-0700)
Subject: Merge branch 'rg/no-gecos-in-pwent'
X-Git-Tag: v1.7.6-rc0~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8784e4dddeb16a89dd19bfb879788b8df0aac1f5;p=git.git

Merge branch 'rg/no-gecos-in-pwent'

* rg/no-gecos-in-pwent:
  ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd

Conflicts:
	Makefile
---

8784e4dddeb16a89dd19bfb879788b8df0aac1f5
diff --cc Makefile
index db72c45f3,90283abb7..f52d84b89
--- a/Makefile
+++ b/Makefile
@@@ -63,13 -59,9 +63,16 @@@ all:
  #
  # Define NO_MKSTEMPS if you don't have mkstemps in the C library.
  #
 +# Define NO_STRTOK_R if you don't have strtok_r in the C library.
 +#
 +# Define NO_FNMATCH if you don't have fnmatch in the C library.
 +#
 +# Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
 +# FNM_CASEFOLD GNU extension.
 +#
+ # Define NO_GECOS_IN_PWENT if you don't have pw_gecos in struct passwd
+ # in the C library.
+ #
  # Define NO_LIBGEN_H if you don't have libgen.h.
  #
  # Define NEEDS_LIBGEN if your libgen needs -lgen when linking