d8b5d22387
Also align our configure.in to the changes Change source file (configure.in), not only generated file (configure)
39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
diff --recursive -u misc/build/postgresql-9.1.1/configure.in misc/build/postgresql-9.1.1.patched/configure.in
|
|
--- misc/build/postgresql-9.1.1/configure.in 2011-09-22 23:57:57.000000000 +0200
|
|
+++ misc/build/postgresql-9.1.1.patched/configure.in 2012-02-03 11:42:45.000000000 +0100
|
|
@@ -918,18 +918,9 @@
|
|
*** Not using spinlocks will cause poor performance.])
|
|
fi
|
|
|
|
-if test "$with_gssapi" = yes ; then
|
|
- if test "$PORTNAME" != "win32"; then
|
|
- AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
|
|
- [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
|
|
- else
|
|
- LIBS="$LIBS -lgssapi32"
|
|
- fi
|
|
-fi
|
|
-
|
|
if test "$with_krb5" = yes ; then
|
|
if test "$PORTNAME" != "win32"; then
|
|
- AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err 'com_err -lssl -lcrypto'], [],
|
|
+ AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
|
|
[AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
|
|
AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
|
|
[AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
|
|
@@ -939,6 +930,15 @@
|
|
fi
|
|
fi
|
|
|
|
+if test "$with_gssapi" = yes ; then
|
|
+ if test "$PORTNAME" != "win32"; then
|
|
+ AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
|
|
+ [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
|
|
+ else
|
|
+ LIBS="$LIBS -lgssapi32"
|
|
+ fi
|
|
+fi
|
|
+
|
|
if test "$with_openssl" = yes ; then
|
|
dnl Order matters!
|
|
if test "$PORTNAME" != "win32"; then
|