summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-20 10:38:03 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-20 10:38:03 +0200
commit620a27bdf140e5e9091cc922f62b6fd12b12330e (patch)
tree5e0b4725caee8c9e8d4b18caa4210f201d7742e2
parente549759efe0b782106e6892685e0494376e592ff (diff)
downloadsamba-620a27bdf140e5e9091cc922f62b6fd12b12330e.tar.gz
samba-620a27bdf140e5e9091cc922f62b6fd12b12330e.tar.bz2
samba-620a27bdf140e5e9091cc922f62b6fd12b12330e.zip
Don't assume crypt.h is present even if crypt() is.
-rw-r--r--lib/replace/crypt.m41
-rw-r--r--lib/replace/replace.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/replace/crypt.m4 b/lib/replace/crypt.m4
index 0b31ae4964..047766d470 100644
--- a/lib/replace/crypt.m4
+++ b/lib/replace/crypt.m4
@@ -1,5 +1,6 @@
###############################################
# test for where we get crypt() from
+AC_CHECK_HEADERS(crypt.h)
AC_SEARCH_LIBS_EXT(crypt, [crypt],
[test "$ac_cv_search_crypt" = "none required" || CRYPT_LIBS="-lcrypt"
AC_DEFINE(HAVE_CRYPT,1,[Whether the system has the crypt() function])],
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 57ebeb5d2f..af1208a8fc 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -632,7 +632,9 @@ typedef int bool;
char *ufc_crypt(const char *key, const char *salt);
#define crypt ufc_crypt
#else
+#ifdef HAVE_CRYPT_H
#include <crypt.h>
#endif
+#endif
#endif /* _LIBREPLACE_REPLACE_H */