aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Michael <fedora.dm0@gmail.com>2012-12-14 14:56:59 -0500
committerJunio C Hamano <gitster@pobox.com>2012-12-15 10:15:45 -0800
commit110d6985463886ecc53dbafe32e626704ec612cb (patch)
treeb52330e33bffc70786f8e40fc30a2de37b170fd2
parent6ede720529b00115abe46b8ab524bf06c58047e2 (diff)
downloadgit-110d6985463886ecc53dbafe32e626704ec612cb.tar.gz
git-110d6985463886ecc53dbafe32e626704ec612cb.tar.xz
Detect when the passwd struct is missing pw_gecos
NO_GECOS_IN_PWENT was documented with other Makefile variables but was only enforced by manually defining it to the C preprocessor. This adds support for detecting the condition with configure and defining the make variable. Signed-off-by: David Michael <fedora.dm0@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile3
-rw-r--r--configure.ac8
2 files changed, 11 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 81c12db27..e953951be 100644
--- a/Makefile
+++ b/Makefile
@@ -1648,6 +1648,9 @@ endif
ifdef NO_D_INO_IN_DIRENT
BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
endif
+ifdef NO_GECOS_IN_PWENT
+ BASIC_CFLAGS += -DNO_GECOS_IN_PWENT
+endif
ifdef NO_ST_BLOCKS_IN_STRUCT_STAT
BASIC_CFLAGS += -DNO_ST_BLOCKS_IN_STRUCT_STAT
endif
diff --git a/configure.ac b/configure.ac
index 1393aa336..66d0c91ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -759,6 +759,14 @@ AC_CHECK_MEMBER(struct dirent.d_type,
[#include <dirent.h>])
GIT_CONF_SUBST([NO_D_TYPE_IN_DIRENT])
#
+# Define NO_GECOS_IN_PWENT if you don't have pw_gecos in struct passwd
+# in the C library.
+AC_CHECK_MEMBER(struct passwd.pw_gecos,
+[NO_GECOS_IN_PWENT=],
+[NO_GECOS_IN_PWENT=YesPlease],
+[#include <pwd.h>])
+GIT_CONF_SUBST([NO_GECOS_IN_PWENT])
+#
# Define NO_SOCKADDR_STORAGE if your platform does not have struct
# sockaddr_storage.
AC_CHECK_TYPE(struct sockaddr_storage,