Commit 7d5770ea authored by Marc G. Fournier's avatar Marc G. Fournier

Check for and set HAVE_CRYPT_H if <crypt.h> exists

include crypt.h in password.c if crypt.h does exist
parent 419b4304
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
#include <libpq/libpq.h> #include <libpq/libpq.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_CRYPT
# include <crypt.h>
#endif
int int
verify_password(char *user, char *password, Port *port, verify_password(char *user, char *password, Port *port,
......
...@@ -2304,7 +2304,7 @@ else ...@@ -2304,7 +2304,7 @@ else
fi fi
done done
for ac_hdr in readline.h history.h dld.h for ac_hdr in readline.h history.h dld.h crypt.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
......
...@@ -127,7 +127,7 @@ dnl Checks for header files. ...@@ -127,7 +127,7 @@ dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
AC_HEADER_SYS_WAIT AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h) AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h)
AC_CHECK_HEADERS(readline.h history.h dld.h) AC_CHECK_HEADERS(readline.h history.h dld.h crypt.h)
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST
...@@ -160,7 +160,7 @@ AC_FUNC_MEMCMP ...@@ -160,7 +160,7 @@ AC_FUNC_MEMCMP
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_CHECK_FUNCS(isinf tzset getrusage vfork memmove sigsetjmp kill sysconf) AC_CHECK_FUNCS(isinf tzset getrusage vfork memmove sigsetjmp kill sysconf)
AC_CHECK_FUNCS(sigprocmask waitpid setsid) AC_CHECK_FUNCS(sigprocmask waitpid setsid )
AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), INET_ATON='inet_aton.o') AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), INET_ATON='inet_aton.o')
AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR), STRERROR='strerror.o') AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR), STRERROR='strerror.o')
AC_CHECK_FUNC(strdup, AC_DEFINE(HAVE_STRDUP), STRDUP='../../utils/strdup.o') AC_CHECK_FUNC(strdup, AC_DEFINE(HAVE_STRDUP), STRDUP='../../utils/strdup.o')
......
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
* The following is set using configure. * The following is set using configure.
*/ */
/* Set to 1 if you have <crypt.h> */
#undef HAVE_CRYPT_H
/* Set to 1 if you have <termios.h> */ /* Set to 1 if you have <termios.h> */
#undef HAVE_TERMIOS_H #undef HAVE_TERMIOS_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment