Remove TCL_LIB,TCL_INCDIR,TK_LIB,TK_INCDIR.
This commit is contained in:
Bruce Momjian
parent
97f5547297
commit
ecf145f492
|
|
@ -7,7 +7,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.48 1998/10/12 15:01:40 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.49 1998/10/13 16:30:45 momjian Exp $
|
||||
#
|
||||
# NOTES
|
||||
# Essentially all Postgres make files include this file and use the
|
||||
|
|
@ -136,15 +136,7 @@ KRBLIBS+= -lkrb5 -lcrypto -lcom_err -lisode
|
|||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# location of Tcl/Tk headers and libraries
|
||||
#
|
||||
# Uncomment this to build the tcl utilities.
|
||||
USE_TCL= @USE_TCL@
|
||||
# customize these to your site's needs
|
||||
#
|
||||
#TCL_LIB= @TCL_LIB@
|
||||
#TK_LIB= @TK_LIB@
|
||||
|
||||
USE_PERL= @USE_PERL@
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.20 1998/10/12 04:32:22 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.21 1998/10/13 16:30:48 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ pgtclsh: pgtclAppInit.o
|
|||
pgtksh: pgtkAppInit.o
|
||||
$(CC) $(CFLAGS) $(TK_DEFS) -o $@ pgtkAppInit.o \
|
||||
$(LIBPGTCL) $(LIBPQ) $(X_LIBS) $(TK_LIB_SPEC) $(TK_LIBS) \
|
||||
$(TCL_LIB_SPEC) $(TCL_LIB) $(X11_LIBS) $(LDFLAGS)
|
||||
$(TCL_LIB_SPEC) $(X11_LIBS) $(LDFLAGS)
|
||||
|
||||
install: pgtclsh pgtksh
|
||||
$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
|
||||
|
|
|
|||
|
|
@ -772,39 +772,6 @@ if test "$USE_X" = true; then
|
|||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
fi
|
||||
|
||||
dnl Check for location of Tcl support
|
||||
dnl Disable Tcl support if not found
|
||||
|
||||
dnl Check for tcl.h
|
||||
if test "$USE_TCL" = "true"
|
||||
then
|
||||
TCL_INCDIR=no
|
||||
AC_CHECK_HEADER(tcl.h, TCL_INCDIR=yes)
|
||||
if test "$TCL_INCDIR" = "no"; then
|
||||
AC_MSG_WARN(tcl support disabled; tcl.h missing)
|
||||
USE_TCL=
|
||||
fi
|
||||
AC_SUBST(TCL_INCDIR)
|
||||
fi
|
||||
|
||||
dnl Check for Tcl archive
|
||||
if test "$USE_TCL" = "true"; then
|
||||
TCL_LIB=
|
||||
tcl_libs="tcl8.0 tcl80 tcl7.6 tcl76 tcl"
|
||||
for tcl_lib in $tcl_libs; do
|
||||
if test -z "$TCL_LIB"; then
|
||||
AC_CHECK_LIB($tcl_lib, main, TCL_LIB=$tcl_lib)
|
||||
fi
|
||||
done
|
||||
if test -z "$TCL_LIB"; then
|
||||
AC_MSG_WARN(tcl support disabled; Tcl library missing)
|
||||
USE_TCL=
|
||||
else
|
||||
TCL_LIB=-l$TCL_LIB
|
||||
AC_SUBST(TCL_LIB)
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Check for Tcl configuration script tclConfig.sh
|
||||
if test "$USE_TCL"; then
|
||||
AC_MSG_CHECKING(for tclConfig.sh)
|
||||
|
|
@ -834,66 +801,6 @@ if test "$USE_TCL"; then
|
|||
fi
|
||||
fi
|
||||
|
||||
dnl Check for location of Tk support (only if Tcl used)
|
||||
dnl Disable Tcl support if Tk not found
|
||||
|
||||
dnl Check for tk.h
|
||||
if test "$USE_TCL" = "true"
|
||||
then
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
|
||||
TK_INCDIR=no
|
||||
AC_CHECK_HEADER(tk.h, TK_INCDIR=yes)
|
||||
if test "$TK_INCDIR" = "no"; then
|
||||
AC_MSG_WARN(tcl support disabled; tk.h missing)
|
||||
USE_TCL=
|
||||
fi
|
||||
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
fi
|
||||
|
||||
dnl Check for Tk archive
|
||||
if test "$USE_TCL" = "true"
|
||||
then
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
|
||||
LIBS="$TCL_LIB $X_PRE_LIBS $X11_LIBS $X_EXTRA_LIBS $LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
|
||||
TK_LIB=
|
||||
tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
|
||||
for tk_lib in $tk_libs; do
|
||||
if test -z "$TK_LIB"; then
|
||||
AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib)
|
||||
fi
|
||||
done
|
||||
if test -z "$TK_LIB"; then
|
||||
AC_MSG_WARN(tk support disabled; Tk library missing)
|
||||
USE_TCL=
|
||||
else
|
||||
TK_LIB=-l$TK_LIB
|
||||
AC_SUBST(TK_LIB)
|
||||
fi
|
||||
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
fi
|
||||
|
||||
dnl Check for Tk configuration script tkConfig.sh
|
||||
if test "$USE_TCL"; then
|
||||
AC_MSG_CHECKING(for tkConfig.sh)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# Makefile for the pltcl shared object
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.6 1998/10/08 23:45:18 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.7 1998/10/13 16:30:49 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -20,15 +20,6 @@ include $(SRCDIR)/Makefile.global
|
|||
#
|
||||
include Makefile.tcldefs
|
||||
|
||||
|
||||
#
|
||||
# Uncomment the following to force a specific version of the
|
||||
# Tcl shared library to be used.
|
||||
#
|
||||
#TCL_LIB_SPEC=-L/usr/lib -ltcl8.0
|
||||
|
||||
|
||||
#
|
||||
# Change following to how shared library that contain
|
||||
# correct references to libtcl must get built on your system.
|
||||
# Since these definitions come from the tclConfig.sh script,
|
||||
|
|
|
|||
Loading…
Reference in New Issue