Another round of those unportable config/build changes :-/

* Add option to build with OpenSSL out of the box. Fix thusly exposed
  bit rot. Although it compiles now, getting this to do something
  useful is left as an exercise.

* Fix Kerberos options to defer checking for required libraries until
  all the other libraries are checked for.

* Change default odbcinst.ini and krb5.srvtab path to PREFIX/etc.

* Install work around for Autoconf's install-sh relative path anomaly.
  Get rid of old INSTL_*_OPTS variables, now that we don't need them
  anymore.

* Use `gunzip -c' instead of g?zcat. Reportedly broke on AIX.

* Look for only one of readline.h or readline/readline.h, not both.

* Make check for PS_STRINGS cacheable. Don't test for the header files
  separately.

* Disable fcntl(F_SETLK) test on Linux.

* Substitute the standard GCC warnings set into CFLAGS in configure,
  don't add it on in Makefile.global.

* Sweep through contrib tree to teach makefiles standard semantics.

... and in completely unrelated news:

* Make postmaster.opts arbitrary options-aware. I still think we need to
  save the environment as well.

1 files changed, 6 insertions, 19 deletions

diff --git a/contrib/Makefile b/contrib/Makefile
index 2a3b099afaf..bd7626ad88c 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,13 +1,12 @@
 #
 # The PostgreSQL contrib tree Makefile
 #
-#	Portions Copyright (c) 1999-2000, PostgreSQL, Inc
-#
-# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.5 2000/06/19 13:52:59 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.6 2000/07/09 13:12:57 petere Exp $
 #
 
-TOPDIR = ..
-include Makefile.global
+subdir = contrib
+top_builddir = ..
+include ../src/Makefile.global
 
 WANTED_DIRS =	array		\
 		earthdistance	\
@@ -25,34 +24,22 @@ WANTED_DIRS =	array		\
 		spi		\
 		string		\
 		tips		\
-		tools		\
 		unixdate	\
 		userlock	\
 		vacuumlo	
 	#	odbc
 
-
-all:
+all .DEFAULT:
 	for dir in $(WANTED_DIRS); do \
 	    if [ -e $$dir/Makefile ]; then \
 		$(MAKE) -C $$dir $@ ; \
 	    fi; \
 	done
 
-
 install:
-	../config/mkinstalldirs $(CONTRIB_BINDIR) $(CONTRIB_MODDIR) $(CONTRIB_DOCDIR) $(CONTRIB_SQLDIR) $(CONTRIB_EXAMPLESDIR)
-	for dir in $(WANTED_DIRS); do \
-	    if [ -e $$dir/Makefile ]; then \
-		$(MAKE) -C $$dir $@ ; \
-	    fi; \
-	done
-	$(INSTALL) $(INSTL_LIB_OPTS) Contrib.index $(CONTRIB_DOCDIR);
-
-
-.DEFAULT:
 	for dir in $(WANTED_DIRS); do \
 	    if [ -e $$dir/Makefile ]; then \
 		$(MAKE) -C $$dir $@ ; \
 	    fi; \
 	done
+	$(INSTALL_DATA) Contrib.index $(docdir)/contrib