From: t-ishii@sra.co.jp

[postgresql] / src / Makefile.global.in

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 39640b9193b90dc1dc54f49a58171da10cf32a8e..555066e2811e7b4ad3ba7219e304fbed6db8f390 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.34 1998/02/13 05:09:12 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.45 1998/07/26 04:30:15 scrappy Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -44,11 +44,6 @@
 # installation.  
 # of the port.
 #
-# Ignore LINUX_ELF if you're not using Linux.  But if you are, and you're
-# compiling to a.out (which means you're using the dld dynamic loading 
-# library), set LINUX_ELF to null in Makefile.custom.
-LINUX_ELF= true
-#
 # Ignore BSD_SHLIB if you're not using one of the BSD ports.  But if you
 # are, and it's one that doesn't have shared libraries (NetBSD/vax is an
 # example of this), set BSD_SHLIB to null in Makefile.custom.
@@ -85,23 +80,6 @@ POSTDOCDIR= $(POSTGRESDIR)/doc
 # Where the header files necessary to build frontend programs get installed.
 HEADERDIR= $(POSTGRESDIR)/include
 
-# NAMEDATALEN is the max length for system identifiers (e.g. table names,
-# attribute names, function names, etc.)
-#
-# These MUST be set here.  DO NOT COMMENT THESE OUT
-# Setting these too high will result in excess space usage for system catalogs
-# Setting them too low will make the system unusable.
-# values between 16 and 64 that are multiples of four are recommended.
-# 
-# NOTE also that databases with different NAMEDATALEN's cannot interoperate!
-#
-# THERE ARE REDUNDANT DEFINITIONS OF THESE VALUES IN config.h.
-# Don't change anything here without changing it there too.
-
-NAMEDATALEN= 32
-# OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid)
-OIDNAMELEN= 36
- 
 ##############################################################################
 #
 # FEATURES 
@@ -160,19 +138,23 @@ endif
 USE_TCL= @USE_TCL@
 # customize these to your site's needs
 #
-TCL_INCDIR= /usr/local/include
-TCL_LIBDIR= /usr/local/lib
-TCL_LIB= -ltcl8.0
-TK_INCDIR= /usr/local/include
-TK_LIBDIR= /usr/local/lib
-TK_LIB= -ltk8.0
+TCL_LIB= @TCL_LIB@
+TK_LIB= @TK_LIB@
 
 USE_PERL= @USE_PERL@
 
-X11_INCDIR= /usr/include
-X11_LIBDIR= /usr/lib
-X11_LIB= -lX11 @SOCKET_LIB@ @NSL_LIB@
+X_CFLAGS= @X_CFLAGS@
+X_LIBS= @X_LIBS@
+X11_LIBS= -lX11 @X_EXTRA_LIBS@
 
+#
+# enable multi-byte support
+# choose one of:
+# EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5
+MULTIBYTE=@MULTIBYTE@
+ifdef MULTIBYTE
+MBFLAGS = -DMULTIBYTE=$(MULTIBYTE)
+endif
 
 ##############################################################################
 #
@@ -185,6 +167,7 @@ RANLIB= @RANLIB@
 INSTLOPTS= @INSTLOPTS@
 INSTL_EXE_OPTS= @INSTL_EXE_OPTS@
 INSTL_LIB_OPTS= @INSTL_LIB_OPTS@
+INSTL_SHLIB_OPTS= @INSTL_SHLIB_OPTS@
 
 ##############################################################################
 #
@@ -277,8 +260,10 @@ endif
 
 ifdef COPT
    CFLAGS+= $(COPT)
+   LDFLAGS+= $(COPT)
 endif
 
 ifdef PROFILE
    CFLAGS+= $(PROFILE)
+   LDFLAGS+= $(PROFILE)
 endif