Merge from PG master upto d5cb3bab564e0927ffac7c8729eacf181a12dd40

This is the result of the "git merge remotes/PGSQL/master" upto the said commit
point. We have done some basic analysis, fixed compilation problems etc, but
bulk of the logical problems in conflict resolution etc will be handled by
subsequent commits.

1 files changed, 0 insertions, 41 deletions

diff --git a/src/template/unixware b/src/template/unixware
deleted file mode 100644
index d08fca1e6b..0000000000
--- a/src/template/unixware
+++ /dev/null
@@ -1,41 +0,0 @@
-if test "$GCC" != yes; then
-  # The -Kno_host is for a bug in the compiler.  See -hackers
-  # discussion on 7-8/Aug/2003.
-  cat >conftest.c <<__EOF__
-extern char *strcpy(char *, const char *);
-
-static void f(char *p, int n){
-        strcpy(p+n,"");
-}
-void g(void){
-        f(0, 0);
-}
-__EOF__
-
-  # Debugging and optimization are mutually exclusive
-  if test "$enable_debug" != yes; then
-    CFLAGS="-O"
-  fi
-  if $CC -c -O -Kinline conftest.c >conftest.err 2>&1; then
-    CFLAGS="$CFLAGS -Kinline"
-  else
-    CFLAGS="$CFLAGS -Kinline,no_host"
-  fi
-  rm -f conftest.*
-
-  PTHREAD_CFLAGS="-Kpthread"
-
-# The effect of doing threading for the backend does not work
-# because of a threading bug that appears in the regression tests:
-#
-# in make check, the plpgsql test (plpgsql.sql)
-# set statement_timeout to 1000;
-# select blockme();
-# reset statement_timeout;
-#
-# per report from Olivier PRENANT <ohp@pyrenet.fr>
-
-fi
-
-# Unixware's ldap library reportedly needs these too
-EXTRA_LDAP_LIBS="-llber -lresolv"