From 167e9eb1844c1d35b3cd2e6bd060bfcdf3890849 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Tue, 12 Apr 2005 17:25:42 +0000 Subject: [PATCH] FreeBSD 5.3 fix --- ChangeLog | 3 +++ config.h.in | 3 +++ configure | 3 ++- configure.in | 2 +- unix/encrypt.c | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d12c9e16..ad1f065c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,9 @@ v0.71.2 16-Jan-2005 symlinks in runlevel 4 if the directory /etc/rc.d/rc4.d didn't exist. + unix: + Fixed compiling under FreeBSD 5.3. + v0.71.1 28-Nov-2004 - 16-Jan-2005 diff --git a/config.h.in b/config.h.in index 2f49a230..950157ec 100644 --- a/config.h.in +++ b/config.h.in @@ -252,3 +252,6 @@ /* Define if Del != 207 */ #define GBK_DEL @GBK_DEL@ + +/* Define if you have the header file. */ +#undef HAVE_CRYPT_H diff --git a/configure b/configure index d9a260a5..4c303383 100755 --- a/configure +++ b/configure @@ -5898,7 +5898,8 @@ done -for ac_header in sys/resource.h usersec.h gshadow.h shadow.h + +for ac_header in sys/resource.h usersec.h gshadow.h shadow.h crypt.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/configure.in b/configure.in index 47bdfb21..93f51d79 100644 --- a/configure.in +++ b/configure.in @@ -223,7 +223,7 @@ AC_HEADER_TIME AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h) AC_CHECK_HEADERS(sys/time.h sys/vfs.h unistd.h netinet/in.h regex.h) -AC_CHECK_HEADERS(sys/resource.h usersec.h gshadow.h shadow.h) +AC_CHECK_HEADERS(sys/resource.h usersec.h gshadow.h shadow.h crypt.h) AC_CHECK_HEADERS(limits.h utmp.h utmpx.h lastlog.h rpc/key_prot.h) AC_STRUCT_TIMEZONE diff --git a/unix/encrypt.c b/unix/encrypt.c index 7c297468..4b07bbb1 100644 --- a/unix/encrypt.c +++ b/unix/encrypt.c @@ -64,7 +64,7 @@ #include #include #include -#ifdef _XOPEN_CRYPT +#ifdef HAVE_CRYPT_H #include #endif #include "encrypt.h"