Make configure more automated, from Brook Milligan.

src/GNUmakefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.17 1997/10/02 00:59:35 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.18 1997/10/30 04:46:37 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -65,7 +65,7 @@ install:
 ifneq ($(wildcard man), )
 	$(MAKE) -C man install
 endif
-	more -e ../register.txt
+	more ../register.txt
 
 clean:
 	@if test $(PORTNAME) = UNDEFINED; then \

src/Makefile.global.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.26 1997/08/17 00:39:02 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.27 1997/10/30 04:46:39 momjian Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -159,15 +159,17 @@ endif
 # location of Tcl/Tk headers and libraries
 #
 # Uncomment this to build the tcl utilities.
-# USE_TCL= true
+USE_TCL= @USE_TCL@
 # customize these to your site's needs
 #
-TCL_INCDIR= /home/tools/include
-TCL_LIBDIR= /home/tools/lib
-TCL_LIB= -ltcl7.5
-TK_INCDIR= /home/tools/include
-TK_LIBDIR= /home/tools/lib
-TK_LIB= -ltk4.1
+TCL_INCDIR= /usr/local/include
+TCL_LIBDIR= /usr/local/lib
+TCL_LIB= -ltcl80
+TK_INCDIR= /usr/local/include
+TK_LIBDIR= /usr/local/lib
+TK_LIB= -ltk80
+
+USE_PERL= @USE_PERL@
 
 X11_INCDIR= /usr/include
 X11_LIBDIR= /usr/lib

src/configure.in

@@ -131,7 +131,13 @@ echo "files, then you probably need to enter something here.
 echo "enter 'none' or new directories to override default"
 echo ""
 $ECHO_N "Additional directories to search for include files { $SRCH_INC }: $ECHO_C"
-read a
+if test "X$with_defaults" = "Xyes"
+then
+	a=$SRCH_INC
+	echo ""
+else
+	read a
+fi
 if test "$a." = "none." 
 then
 	SRCH_INC=
@@ -148,7 +154,13 @@ export CPPFLAGS
 echo "- setting CPPFLAGS=$CPPFLAGS"
 
 $ECHO_N "Additional directories to search for library files { $SRCH_LIB }: $ECHO_C"
-read a
+if test "X$with_defaults" = "Xyes"
+then
+	a=$SRCH_LIB
+	echo ""
+else
+	read a
+fi
 if test "$a." = "none."
 then
 	SRCH_LIB=
@@ -187,6 +199,24 @@ else
 fi
 export DEF_PGPORT
 
+dnl We exclude tcl support unless we override it with --with-tcl
+if test "X$with_tcl" = "Xyes"
+then
+	USE_TCL=true
+else
+	USE_TCL=
+fi
+export USE_TCL
+
+dnl We exclude perl support unless we override it with --with-perl
+if test "X$with_perl" = "Xyes"
+then
+	USE_PERL=true
+else
+	USE_PERL=
+fi
+export USE_PERL
+
 dnl Unless we specify the command line options
 dnl	--disable-hba		to explicitly disable it 
 dnl	--enable-hba		to explicitly enable it 
@@ -247,6 +277,8 @@ AC_SUBST(SHARED_LIB)
 AC_SUBST(CFLAGS)
 AC_SUBST(DLSUFFIX)
 AC_SUBST(DL_LIB)
+AC_SUBST(USE_TCL)
+AC_SUBST(USE_PERL)
 
 dnl ****************************************************************
 dnl Hold off on the C++ stuff until we can figure out why it doesn't