mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-04 00:02:52 -05:00 
			
		
		
		
	Bring in changes to READLINE/HISTORY defines
This commit is contained in:
		
							parent
							
								
									c801ca0982
								
							
						
					
					
						commit
						1bdbf4092a
					
				@ -7,7 +7,7 @@
 | 
				
			|||||||
#
 | 
					#
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# IDENTIFICATION
 | 
					# IDENTIFICATION
 | 
				
			||||||
#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.21 1996/08/19 13:50:41 scrappy Exp $
 | 
					#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.22 1996/08/20 05:04:06 scrappy Exp $
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# NOTES
 | 
					# NOTES
 | 
				
			||||||
#    This is seen by any Makefiles that include mk/postgres.mk. To
 | 
					#    This is seen by any Makefiles that include mk/postgres.mk. To
 | 
				
			||||||
@ -59,7 +59,7 @@
 | 
				
			|||||||
#	until after this file is processed!
 | 
					#	until after this file is processed!
 | 
				
			||||||
#  make sure that you have no whitespaces after the PORTNAME setting
 | 
					#  make sure that you have no whitespaces after the PORTNAME setting
 | 
				
			||||||
#  or the makefiles can get confused
 | 
					#  or the makefiles can get confused
 | 
				
			||||||
PORTNAME=	svr4
 | 
					PORTNAME=	BSD44_derived
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# SRCDIR specifies where the source files are.
 | 
					# SRCDIR specifies where the source files are.
 | 
				
			||||||
SRCDIR=		/home/tools/postgres95-1.02/src
 | 
					SRCDIR=		/home/tools/postgres95-1.02/src
 | 
				
			||||||
@ -157,10 +157,12 @@ EUROPEAN_DATES = 1
 | 
				
			|||||||
USE_READLINE= true
 | 
					USE_READLINE= true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# directories for the readline and history libraries.
 | 
					# directories for the readline and history libraries.
 | 
				
			||||||
READLINE_INCDIR=  /home/tools/include
 | 
					READLINE_INCDIR=  -I/home/tools/include
 | 
				
			||||||
HISTORY_INCDIR=   /home/tools/include -I/home/tools/include/readline
 | 
					READLINE_LIBDIR=  -L/home/tools/lib
 | 
				
			||||||
READLINE_LIBDIR=  /home/tools/lib
 | 
					
 | 
				
			||||||
HISTORY_LIBDIR=   /home/tools/lib
 | 
					# use the following if your readline has a separate history lib
 | 
				
			||||||
 | 
					#HISTORY_INCDIR=   -I/home/tools/include -I/home/tools/include/readline
 | 
				
			||||||
 | 
					#HISTORY_LIBDIR=   -L/home/tools/lib
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# If you do not plan to use Host based authentication,
 | 
					# If you do not plan to use Host based authentication,
 | 
				
			||||||
# comment out the following line
 | 
					# comment out the following line
 | 
				
			||||||
 | 
				
			|||||||
@ -7,7 +7,7 @@
 | 
				
			|||||||
#
 | 
					#
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# IDENTIFICATION
 | 
					# IDENTIFICATION
 | 
				
			||||||
#    $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.4 1996/07/25 20:01:51 scrappy Exp $
 | 
					#    $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.5 1996/08/20 05:04:13 scrappy Exp $
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
#-------------------------------------------------------------------------
 | 
					#-------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -22,7 +22,7 @@ include ../Makefile.global
 | 
				
			|||||||
# 
 | 
					# 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifeq ($(USE_READLINE), true)
 | 
					ifeq ($(USE_READLINE), true)
 | 
				
			||||||
   CFLAGS += -I$(READLINE_INCDIR) -I$(HISTORY_INCDIR)
 | 
					   CFLAGS += $(READLINE_INC) $(HISTORY_INC)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# if you are using an older readline that uses #include "readline.h" instead
 | 
					# if you are using an older readline that uses #include "readline.h" instead
 | 
				
			||||||
# of #include <readline/readline.h>,
 | 
					# of #include <readline/readline.h>,
 | 
				
			||||||
@ -30,9 +30,7 @@ ifeq ($(USE_READLINE), true)
 | 
				
			|||||||
# CFLAGS += -DOLD_READLINE
 | 
					# CFLAGS += -DOLD_READLINE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   LIBCURSES=	-lcurses 
 | 
					   LIBCURSES=	-lcurses 
 | 
				
			||||||
   LD_ADD += -L$(READLINE_LIBDIR) -L$(HISTORY_LIBDIR) -lreadline -lhistory $(LIBCURSES)
 | 
					   LD_ADD += $(READLINE_LIB) $(HISTORY_LIB) $(LIBCURSES)
 | 
				
			||||||
# use the following if your readline has no separate history lib
 | 
					 | 
				
			||||||
#   LD_ADD += -L$(READLINE_LIBDIR) -lreadline $(LIBCURSES)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
   ifeq ($(PORTNAME), ultrix4)
 | 
					   ifeq ($(PORTNAME), ultrix4)
 | 
				
			||||||
   LD_ADD += -ltermcap
 | 
					   LD_ADD += -ltermcap
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user