redo c16027de cleaner

Also align our configure.in to the changes
Change source file (configure.in), not only generated file (configure)

configure.in

@@ -6143,7 +6143,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
         # MacOS X has system MIT Kerberos 5 since 10.4
         if test "$with_krb5" != "no"; then
             WITH_KRB5=YES
-            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])])
@@ -6162,7 +6162,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
     Linux|GNU|*BSD)
         if test "$with_krb5" != "no"; then
             WITH_KRB5=YES
-            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])])
@@ -6176,7 +6176,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
     *)
         if test "$with_krb5" = "yes"; then
             WITH_KRB5=YES
-            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])])

postgresql/makefile.mk

@@ -40,14 +40,9 @@ TARFILE_NAME=postgresql-9.1.1
 TARFILE_MD5=061a9f17323117c9358ed60f33ecff78
 PATCH_FILES=\
 	postgresql-moz-ldap.patch \
+	postgresql-libs-leak.patch \
 	$(TARFILE_NAME)-libreoffice.patch \
-	$(TARFILE_NAME)-autoreconf.patch \
-    postgresql-9.1.1-configure.patch
-# postgresql-9.1.1-configure.patch: move check for with_krb5 before with_gssapi,
-#  so that LIBS does not already contain -lgssapi_krb5 (which links against
-#  -lkrb5) when looking for symbols from -lkrb5, and within with_krb5, move
-#  com_err before krb5, so that looking with symbol com_err does not erroneously
-#  pick -lkrb5 (which links against -lcom_err) instead of -lcom_err
+	$(TARFILE_NAME)-autoreconf.patch
 
 .IF "$(SYSTEM_POSTGRESQL)" == "YES"
 @all:

postgresql/postgresql-libs-leak.patch

+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