14a538eac0
- the new code in check_user wants utmpx so those parts are reverted
to the old popen("/usr/bin/who",...) code for now.
45 lines
1.9 KiB
Plaintext
45 lines
1.9 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.1 2012/06/28 23:10:48 sthen Exp $
|
|
--- configure.in.orig Wed Jun 27 18:32:47 2012
|
|
+++ configure.in Thu Jun 28 23:04:19 2012
|
|
@@ -211,13 +211,13 @@ AC_ARG_WITH(pgsql,
|
|
ACX_HELP_STRING([--with-pgsql=DIR],
|
|
[sets path to pgsql installation]),
|
|
PGSQL=$withval,)
|
|
-AC_CHECK_LIB(crypt,main)
|
|
-if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then
|
|
+AC_CHECK_LIB(crypto,main)
|
|
+if test "$ac_cv_lib_crypto_main" = "yes" -a "x$PGSQL" != "xno"; then
|
|
if test -n "$PGSQL"; then
|
|
LDFLAGS="$LDFLAGS -L$PGSQL/lib"
|
|
CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
|
|
fi
|
|
- AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
|
|
+ AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypto)
|
|
if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
|
|
AC_CHECK_HEADERS(pgsql/libpq-fe.h)
|
|
AC_CHECK_HEADERS(postgresql/libpq-fe.h)
|
|
@@ -229,8 +229,8 @@ if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" !
|
|
PGLIBS="-lpq -lcrypt"
|
|
PGINCLUDE="-I/usr/include/pgsql"
|
|
elif test "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
|
|
- PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
|
|
- PGINCLUDE="-I/usr/include/postgresql"
|
|
+ PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
|
|
+ PGINCLUDE="-I$PGSQL/include/postgresql"
|
|
elif test "$ac_cv_header_libpq_fe_h" = "yes"; then
|
|
PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
|
|
PGINCLUDE="-I$PGSQL/include"
|
|
@@ -356,10 +356,10 @@ dnl Checks for Kerberos. Must come before openssl chec
|
|
AC_CHECK_HEADERS(krb5.h,FOUNDINCLUDE=yes,FOUNDINCLUDE=no)
|
|
if test "$FOUNDINCLUDE" = "no"; then
|
|
_SAVEDCPPFLAGS="$CPPFLAGS"
|
|
- CPPFLAGS="$_SAVEDCPPFLAGS -I/usr/kerberos/include"
|
|
+ CPPFLAGS="$_SAVEDCPPFLAGS -I/usr/include/kerberosV"
|
|
unset ac_cv_header_krb5_h
|
|
AC_CHECK_HEADERS(krb5.h,
|
|
- KRB5INCLUDE="-I/usr/kerberos/include"
|
|
+ KRB5INCLUDE="-I/usr/include/kerberosV"
|
|
FOUNDINCLUDE=yes,
|
|
FOUNDINCLUDE=no)
|
|
fi
|