80 lines
2.5 KiB
Plaintext
80 lines
2.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.12 2010/08/28 09:19:48 sthen Exp $
|
|
--- configure.orig Tue Jul 27 21:48:13 2010
|
|
+++ configure Thu Aug 26 15:17:44 2010
|
|
@@ -14015,13 +14015,13 @@ if test "${with_pgsql+set}" = set; then
|
|
fi
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
|
|
-echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6; }
|
|
+{ echo "$as_me:$LINENO: checking for main in -lcrypto" >&5
|
|
+echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6; }
|
|
if test "${ac_cv_lib_crypt_main+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lcrypt $LIBS"
|
|
+LIBS="-lcrypto $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -14075,7 +14075,7 @@ if test $ac_cv_lib_crypt_main = yes; then
|
|
#define HAVE_LIBCRYPT 1
|
|
_ACEOF
|
|
|
|
- LIBS="-lcrypt $LIBS"
|
|
+ LIBS="-lcrypto $LIBS"
|
|
|
|
fi
|
|
|
|
@@ -14091,7 +14091,7 @@ if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpq -lcrypt $LIBS"
|
|
+LIBS="-lpq -lcrypto $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -14577,16 +14577,16 @@ fi
|
|
done
|
|
|
|
if [ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]; then
|
|
- PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
|
|
+ PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
|
|
PGINCLUDE="-I$PGSQL/include"
|
|
elif test "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
|
|
- PGLIBS="-lpq -lcrypt"
|
|
- PGINCLUDE="-I/usr/include/pgsql"
|
|
+ PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
|
|
+ PGINCLUDE="-I$PGSQL/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"
|
|
+ PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
|
|
PGINCLUDE="-I$PGSQL/include"
|
|
fi
|
|
if test -z "$PGINCLUDE"; then
|
|
@@ -15721,7 +15721,7 @@ done
|
|
|
|
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
|
|
|
|
for ac_header in krb5.h
|
|
@@ -15858,7 +15858,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
- KRB5INCLUDE="-I/usr/kerberos/include"
|
|
+ KRBINCLUDE="-I/usr/include/kerberosV"
|
|
FOUNDINCLUDE=yes
|
|
else
|
|
FOUNDINCLUDE=no
|