diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GNUmakefile.in | 4 | ||||
| -rw-r--r-- | src/bin/pgtclsh/Makefile | 4 | ||||
| -rw-r--r-- | src/configure.in | 48 |
3 files changed, 40 insertions, 16 deletions
diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in index 60a5a06d89a..21b436b643d 100644 --- a/src/GNUmakefile.in +++ b/src/GNUmakefile.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.40 1998/10/18 02:33:54 tgl Exp $ +# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.41 1998/10/18 04:16:07 momjian Exp $ # #------------------------------------------------------------------------- @@ -80,8 +80,6 @@ distclean: clean backend/port/tas.s \ backend/port/dynloader.c \ backend/utils/Gen_fmgrtab.sh \ - bin/pgtclsh/Makefile.tcldefs \ - bin/pgtclsh/Makefile.tkdefs \ \ \ \ diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile index c9731376481..325c70e3350 100644 --- a/src/bin/pgtclsh/Makefile +++ b/src/bin/pgtclsh/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.22 1998/10/15 15:58:15 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.23 1998/10/18 04:16:08 momjian Exp $ # #------------------------------------------------------------------------- @@ -69,7 +69,7 @@ install_tk: pgtksh $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh clean: - rm -f pgtclAppInit.o pgtkAppInit.o pgtclsh pgtksh + rm -f *.o Makefile.t*defs pgtclsh pgtksh dep depend: $(CC) -MM $(CFLAGS) *.c > depend diff --git a/src/configure.in b/src/configure.in index 5a679789e92..ebb140e3f8d 100644 --- a/src/configure.in +++ b/src/configure.in @@ -134,7 +134,7 @@ if test "$INCLUDE_DIRS"; then fi AC_ARG_WITH(libs, - [ --with-libs=DIR site library directories for tk/tcl, etc in DIR], + [ --with-libs=DIR also search for libraries in DIR], [ case "$withval" in "" | y | ye | yes | n | no) @@ -145,7 +145,7 @@ AC_ARG_WITH(libs, ]) AC_ARG_WITH(libraries, - [ --with-libraries=DIR site library directories for tk/tcl, etc in DIR], + [ --with-libraries=DIR also search for libraries in DIR], [ case "$withval" in "" | y | ye | yes | n | no) @@ -232,6 +232,21 @@ AC_ARG_WITH( export USE_TCL export USE_TK +dnl We see if the path to the TCL/TK configuration scripts is specified. +dnl This will overide the use of tclsh to find the paths to search. + +AC_ARG_WITH(tclconfig, + [ --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR], + [ + case "$withval" in + "" | y | ye | yes | n | no) + AC_MSG_ERROR([*** You must supply an argument to the --with-tclconfig option.]) + ;; + esac + TCL_DIRS="$withval" + ] +) + dnl We exclude perl support unless we override it with --with-perl AC_MSG_CHECKING(setting USE_PERL) AC_ARG_WITH( @@ -250,7 +265,7 @@ dnl We include odbc support unless we disable it with --with-odbc=false AC_MSG_CHECKING(setting USE_ODBC) AC_ARG_WITH( odbc, - [ --with-odbc build ODBC driver package ], + [ --with-odbc build ODBC driver package ], [ case "$withval" in y | ye | yes) USE_ODBC=true; AC_MSG_RESULT(enabled) ;; @@ -276,7 +291,7 @@ then AC_MSG_CHECKING(setting ODBCINST) AC_ARG_WITH( odbcinst, - [ --with-odbcinst=dir change default directory for odbcinst.ini], + [ --with-odbcinst=dir change default directory for odbcinst.ini], AC_DEFINE_UNQUOTED(ODBCINST, ${with_odbcinst}) AC_MSG_RESULT($with_odbcinst), AC_DEFINE_UNQUOTED(ODBCINST, ${ODBCINSTDIR}) AC_MSG_RESULT(${ODBCINSTDIR}) ) @@ -754,20 +769,31 @@ fi dnl Check for Tcl configuration script tclConfig.sh -AC_PATH_PROG(TCLSH, tclsh) - -if test -z "$TCLSH" +dnl If --with-tclconfig was given, don't check for tclsh, tcl +if test -z "$TCL_DIRS" then - AC_MSG_WARN(TCL/TK support disabled; tclsh is not in your path) - USE_TCL= + AC_PATH_PROG(TCLSH, tclsh) + if test -z "$TCLSH" + then + AC_PATH_PROG(TCLSH, tcl) + if test -z "$TCLSH" + then + AC_MSG_WARN(TCL/TK support disabled; tcl shell is not in your path) + USE_TCL= + fi + fi fi if test "$USE_TCL" = true then AC_MSG_CHECKING(for tclConfig.sh) TCL_CONFIG_SH= - library_dirs=`echo 'puts $auto_path' | $TCLSH` - library_dirs="$LIBRARY_DIRS $library_dirs" + library_dirs= + if test -z "$TCL_DIRS" + then + library_dirs=`echo 'puts $auto_path' | $TCLSH` + fi + library_dirs="$TCL_DIRS $library_dirs" for dir in $library_dirs; do if test -d "$dir" -a -r "$dir/tclConfig.sh"; then TCL_CONFIG_SH=$dir/tclConfig.sh |