diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-02-10 16:25:10 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-02-10 16:25:10 +0000 |
| commit | fd866b458021605d8466ac29db22482ee33065bf (patch) | |
| tree | ec2e84e340759223db06d8c2a48bc178e576ce24 /src | |
| parent | a4b348f48fb917d7d45aaaa3d137f5706cff30f0 (diff) | |
| download | postgresql-fd866b458021605d8466ac29db22482ee33065bf.tar.gz postgresql-fd866b458021605d8466ac29db22482ee33065bf.zip | |
Remove protcol option buttons.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.shlib | 15 | ||||
| -rw-r--r-- | src/interfaces/odbc/psqlodbc.rc | 7 |
2 files changed, 7 insertions, 15 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 6506d6d5b92..e8aee43b19f 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.38 2001/02/04 14:09:33 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.39 2001/02/10 16:25:10 momjian Exp $ # #------------------------------------------------------------------------- @@ -112,7 +112,7 @@ endif ifeq ($(PORTNAME), openbsd) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) ifdef ELF_SYSTEM - LINK.shared = $(LD) -x -Bshareable -soname $(soname) + LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) else LINK.shared = $(LD) -x -Bshareable -Bforcearchive endif @@ -121,7 +121,7 @@ endif ifeq ($(PORTNAME), bsdi) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) ifeq ($(DLSUFFIX), .so) - LINK.shared = $(LD) -shared -soname $(soname) + LINK.shared = $(COMPILER) -shared -Wl,-soname,$(soname) endif ifeq ($(DLSUFFIX), .o) LINK.shared = shlicc -O $(LDREL) @@ -131,7 +131,7 @@ endif ifeq ($(PORTNAME), freebsd) ifdef ELF_SYSTEM shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) - LINK.shared = $(LD) -x -shared -soname $(soname) + LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) else shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LINK.shared = $(LD) -x -Bshareable -Bforcearchive @@ -165,13 +165,12 @@ endif ifeq ($(PORTNAME), solaris) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LINK.shared = $(COMPILER) -G ifeq ($(with_gnu_ld), yes) - LINK.shared += -Wl,-soname,$(soname) + LINK.shared = $(COMPILER) -G -Wl,-soname,$(soname) else - LINK.shared += -Wl,-h,$(soname) + LINK.shared = $(COMPILER) -G -Wl,-h,$(soname) endif - SHLIB_LINK += -lm -lc + SHLIB_LINK = $(COMPILER) -G -lm -lc endif ifeq ($(PORTNAME), osf) diff --git a/src/interfaces/odbc/psqlodbc.rc b/src/interfaces/odbc/psqlodbc.rc index 503b478372a..b59847c6e6d 100644 --- a/src/interfaces/odbc/psqlodbc.rc +++ b/src/interfaces/odbc/psqlodbc.rc @@ -144,13 +144,6 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,130,10,85,10 CONTROL "Show System &Tables",DS_SHOWSYSTEMTABLES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,25,25,85,10 - GROUPBOX "Protocol",IDC_STATIC,15,40,180,25 - CONTROL "6.4+",DS_PG64,"Button",BS_AUTORADIOBUTTON | WS_GROUP,25, - 50,35,10 - CONTROL "6.3",DS_PG63,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 75,50,26,10 - CONTROL "6.2",DS_PG62,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 130,50,26,10 GROUPBOX "OID Options",IDC_STATIC,15,70,180,25 CONTROL "Show &Column",DS_SHOWOIDCOLUMN,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,25,81,59,10 |