Remove leftovers from subproject removals. Fixes for Python and Kerberos

configuration.
2025-09-02 04:21:28 +03:00 · 2002-09-04 22:54:18 +00:00
parent be475f92cd
commit e43ecb3d1a
21 changed files with 50 additions and 306 deletions
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.154 2002/09/03 21:45:41 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.155 2002/09/04 22:54:18 petere Exp $

 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -121,7 +121,6 @@ localedir := @localedir@
 #
 # Records the choice of the various --enable-xxx and --with-xxx options.

-with_CXX	= @with_CXX@
 with_java	= @with_java@
 with_perl	= @with_perl@
 with_python	= @with_python@
@@ -177,13 +176,6 @@ ifeq ($(GCC), yes)
  CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
 endif

-CXX = @CXX@
-GXX = @GXX@
-CXXFLAGS = @CXXFLAGS@
-ifeq ($(GXX), yes)
-  CXXFLAGS += -Wall
-endif
-
 # Kind-of compilers

 YACC = @YACC@
@@ -207,13 +199,10 @@ X = @EXEEXT@
 # Perl 

 PERL			= @PERL@
-perl_installsitearch	= @perl_installsitearch@
-perl_installman3dir	= @perl_installman3dir@
 perl_archlibexp		= @perl_archlibexp@
 perl_privlibexp		= @perl_privlibexp@
 perl_useshrplib		= @perl_useshrplib@
 perl_embed_ldflags	= @perl_embed_ldflags@
-perl_man3ext		= @perl_man3ext@

 # Miscellaneous

@@ -224,7 +213,6 @@ MSGFMT  = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 PYTHON	= @PYTHON@
 TAR	= @TAR@
-WISH	= @WISH@
 XGETTEXT = @XGETTEXT@

 GZIP	= gzip
@@ -436,10 +424,6 @@ ifndef COMPILE.c
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 endif

-ifndef COMPILE.cc
-COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
-endif
-
 DEPDIR = .deps
 df = $(DEPDIR)/$(*F)

@@ -462,14 +446,6 @@ ifeq ($(GCC), yes)

 endif # GCC

-ifeq ($(GXX), yes)
-
-%.o : %.cc
-	$(COMPILE.cc) -o $@ $< -MMD
-	$(postprocess-depend)
-
-endif # GXX
-
 # Include all the dependency files generated for the current
 # directory. List /dev/null as dummy because if the wildcard expands
 # to nothing then make would complain.
--- 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.62 2002/09/04 15:45:50 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.63 2002/09/04 22:54:18 petere Exp $
 #
 #-------------------------------------------------------------------------

@@ -58,33 +58,9 @@
 # bjm 2001-02-10


-ifndef cplusplus
 COMPILER = $(CC) $(CFLAGS)
-else
-COMPILER = $(CXX) $(CXXFLAGS)
-endif
-
-
-# First, a few hacks for building *static* libraries.
-
 LINK.static = $(AR) $(AROPT)

-ifdef cplusplus
-
-ifeq ($(PORTNAME), irix5)
-  ifneq ($(GXX), yes)
-    LINK.static = $(CXX) -ar -o
-  endif
-endif
-
-ifeq ($(PORTNAME), solaris)
-  ifneq ($(GXX), yes)
-    LINK.static = $(CXX) -xar -o
-  endif
-endif
-
-endif # cplusplus
-


 ifeq ($(enable_shared), yes)
@@ -95,14 +71,7 @@ ifeq ($(enable_shared), yes)

 # Try to keep the sections in some kind of order, folks...

-ifndef cplusplus
-  override CFLAGS	+= $(CFLAGS_SL)
-else
-  ifndef CXXFLAGS_SL
-    CXXFLAGS_SL = $(CFLAGS_SL)
-  endif
-  override CXXFLAGS	+= $(CXXFLAGS_SL)
-endif
+override CFLAGS += $(CFLAGS_SL)

 soname = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)

@@ -174,18 +143,10 @@ endif

 ifeq ($(PORTNAME), solaris)
  shlib			:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-  ifndef cplusplus
-    ifeq ($(GCC), yes)
-      LINK.shared	= $(CC) -shared
-    else
-      LINK.shared	= $(CC) -G
-    endif
+  ifeq ($(GCC), yes)
+    LINK.shared		= $(CC) -shared
  else
-    ifeq ($(GXX), yes)
-      LINK.shared	= $(CXX) -shared
-    else
-      LINK.shared	= $(CXX) -G
-    endif
+    LINK.shared		= $(CC) -G
  endif
  ifeq ($(with_gnu_ld), yes)
    LINK.shared		+= -Wl,-soname,$(soname)
@@ -206,19 +167,11 @@ endif

 ifeq ($(PORTNAME), sco)
  shlib			:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-  ifndef cplusplus
-    ifeq ($(GCC), yes)
-      LINK.shared	= $(CC) -shared
-    else
-      LINK.shared	= $(CC) -G
-    endif
+  ifeq ($(GCC), yes)
+    LINK.shared		= $(CC) -shared
  else
-    ifeq ($(GXX), yes)
-      LINK.shared	= $(CXX) -shared
-    else
-      LINK.shared	= $(CXX) -G
+    LINK.shared		= $(CC) -G
    endif
-  endif
  LINK.shared		+= -Wl,-z,text -Wl,-h,$(soname)
 endif

@@ -234,27 +187,16 @@ endif

 ifeq ($(PORTNAME), unixware)
  shlib			:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-  ifndef cplusplus
-    ifeq ($(GCC), yes)
-      LINK.shared	= $(CC) -shared
-    else
-      LINK.shared	= $(CC) -G
-    endif
+  ifeq ($(GCC), yes)
+    LINK.shared		= $(CC) -shared
  else
-    ifeq ($(GXX), yes)
-      LINK.shared	= $(CXX) -shared
-    else
-      LINK.shared	= $(CXX) -G
-    endif
+    LINK.shared		= $(CC) -G
  endif
  LINK.shared		+= -Wl,-z,text -Wl,-h,$(soname)
 endif

 ifeq ($(PORTNAME), win)
  shlib			:= $(NAME)$(DLSUFFIX)
-  ifdef cplusplus
-    SHLIB_LINK		+= --driver-name g++
-  endif
 endif

 ifeq ($(PORTNAME), beos)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -12,7 +12,7 @@
 * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: c.h,v 1.125 2002/09/04 20:31:36 momjian Exp $
+ * $Id: c.h,v 1.126 2002/09/04 22:54:18 petere Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -149,7 +149,6 @@
 /* BeOS defines bool already, but the compiler chokes on the
 * #ifndef unless we wrap it in this check.
 */
-/* Also defined in interfaces/odbc/md5.h */
 #ifndef __BEOS__

 #ifndef __cplusplus
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -8,7 +8,7 @@
 * or in pg_config.h afterwards.  Of course, if you edit pg_config.h, then your
 * changes will be overwritten the next time you run configure.
 *
- * $Id: pg_config.h.in,v 1.30 2002/09/02 01:05:06 tgl Exp $
+ * $Id: pg_config.h.in,v 1.31 2002/09/04 22:54:18 petere Exp $
 */

 #ifndef PG_CONFIG_H
@@ -36,7 +36,7 @@
 /* Set to 1 if you want 64-bit integer timestamp and interval support (--enable-integer-datetimes) */
 #undef USE_INTEGER_DATETIMES

-/* Set to 1 if you want cyrillic recode (--enable-recode) */
+/* Set to 1 if you want single-byte recode (--enable-recode) */
 #undef CYR_RECODE

 /* Set to 1 if you want ASSERT checking (--enable-cassert) */
@@ -81,12 +81,6 @@
 /* location of locale files */
 #undef LOCALEDIR

-/* Define to build the ODBC driver for unixODBC */
-#undef WITH_UNIXODBC
-
-/* Define to build the ODBC driver for iODBC */
-#undef WITH_IODBC
-

 /*
 *------------------------------------------------------------------------
@@ -649,12 +643,6 @@ extern int fdatasync(int fildes);
 /* Define if POSIX signal interface is available */
 #undef HAVE_POSIX_SIGNALS

-/* Define if C++ compiler accepts "using namespace std" */
-#undef HAVE_NAMESPACE_STD
-
-/* Define if C++ compiler accepts "#include <string>" */
-#undef HAVE_CXX_STRING_HEADER
-
 /* Define if you have the optreset variable */
 #undef HAVE_INT_OPTRESET

--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -16,17 +16,9 @@

 #define MAXPGPATH 1024

-#define BLCKSZ	8192
-
-#define INDEX_MAX_KEYS		32
-#define FUNC_MAX_ARGS		INDEX_MAX_KEYS
-
 #define HAVE_ATEXIT
 #define HAVE_MEMMOVE

-#define HAVE_CXX_STRING_HEADER
-#define HAVE_NAMESPACE_STD
-
 /* use _snprintf instead of snprintf */
 #define	HAVE_DECL_SNPRINTF 1
 #define snprintf	_snprintf
--- a/src/makefiles/Makefile.hpux
+++ b/src/makefiles/Makefile.hpux
@@ -42,11 +42,6 @@ CFLAGS_SL = -fPIC
 else
 CFLAGS_SL = +z
 endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fPIC
-else
-CXXFLAGS_SL = +z
-endif

 # Rule for building shared libs (currently used only for regression test
 # shlib ... should go away, since this is not really enough knowledge)
--- a/src/makefiles/Makefile.qnx4
+++ b/src/makefiles/Makefile.qnx4
@@ -13,7 +13,4 @@ CFLAGS_SL =
 %$(DLSUFFIX): %.o
 	@echo 'cannot make shared object $@ from $<'

-override CXXFLAGS +=-I/usr/local/include/g++
-override CFLAGS +=-I/usr/local/include
-
 sqlmansect = 7
--- a/src/makefiles/Makefile.sco
+++ b/src/makefiles/Makefile.sco
@@ -8,11 +8,6 @@ CFLAGS_SL = -fpic
 else
 CFLAGS_SL = -K PIC
 endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fpic
-else
-CXXFLAGS_SL = -K PIC
-endif

 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
--- a/src/makefiles/Makefile.solaris
+++ b/src/makefiles/Makefile.solaris
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.8 2001/11/11 19:20:53 momjian Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.9 2002/09/04 22:54:18 petere Exp $

 AROPT = crs

@@ -16,11 +16,6 @@ CFLAGS_SL = -fPIC
 else
 CFLAGS_SL = -KPIC
 endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fPIC
-else
-CXXFLAGS_SL = -KPIC
-endif

 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
--- a/src/makefiles/Makefile.sunos4
+++ b/src/makefiles/Makefile.sunos4
@@ -6,11 +6,6 @@ CFLAGS_SL = -fpic
 else
 CFLAGS_SL = -PIC
 endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fPIC
-else
-CXXFLAGS_SL = -PIC
-endif

 %.so: %.o
 	$(LD) -assert pure-text -Bdynamic -o $@ $<
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -20,11 +20,6 @@ CFLAGS_SL = -fpic
 else
 CFLAGS_SL = -K PIC
 endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fpic
-else
-CXXFLAGS_SL = -K PIC
-endif
 ifeq ($(GCC), yes)
 SO_FLAGS = -shared
 else
--- a/src/template/aix
+++ b/src/template/aix
@@ -6,5 +6,4 @@ else # not GCC
    aix3.2.5 | aix4.1*)
      CFLAGS='-qmaxmem=16384 -qsrcmsg' ;;
  esac
-  CCC=xlC
 fi # not GCC
--- a/src/template/freebsd
+++ b/src/template/freebsd
@@ -1,6 +1,5 @@
 CFLAGS='-pipe'

 case $host_cpu in
-  alpha*)   CFLAGS="$CFLAGS -O"
-            GCC_CXXFLAGS="-O";;
+  alpha*)   CFLAGS="$CFLAGS -O" ;;
 esac
--- a/src/template/hpux
+++ b/src/template/hpux
@@ -1,8 +1,6 @@
 if test "$GCC" = yes ; then
  CFLAGS=-O2
-  CCC=g++
 else
  CC="$CC -Ae"
  CFLAGS=+O2
-  CCC=aCC
 fi
--- a/src/template/osf
+++ b/src/template/osf
@@ -1,9 +1,6 @@
 if test "$GCC" = yes ; then
  CFLAGS=
-  CCC=g++
 else
  CC="$CC -std"
  CFLAGS='-O4 -Olimit 2000'
-  CCC=cxx
 fi
-VENDOR_CXXFLAGS='-O4 -Olimit 2000'
--- a/src/template/unixware
+++ b/src/template/unixware
@@ -3,4 +3,3 @@ if test "$GCC" = yes; then
 else
  CFLAGS='-O -K inline'
 fi
-VENDOR_CXXFLAGS="-O"