diff --git a/aclocal.m4 b/aclocal.m4
index 1edb7f9800..511838f152 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.14 2002/03/29 17:32:48 petere Exp $
+dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.15 2002/09/04 22:54:17 petere Exp $
 m4_include([config/ac_func_accept_argtypes.m4])
 m4_include([config/c-compiler.m4])
 m4_include([config/c-library.m4])
-m4_include([config/cxx.m4])
 m4_include([config/docbook.m4])
 m4_include([config/general.m4])
 m4_include([config/java.m4])
diff --git a/config/cxx.m4 b/config/cxx.m4
deleted file mode 100644
index 5498db091a..0000000000
--- a/config/cxx.m4
+++ /dev/null
@@ -1,64 +0,0 @@
-# Macros to detect certain C++ features
-# $Header: /cvsroot/pgsql/config/Attic/cxx.m4,v 1.3 2002/03/29 20:54:33 petere Exp $
-
-
-# PGAC_CLASS_STRING
-# -----------------
-# Look for class `string'. First look for the <string> header. If this
-# is found a <string> header then it's probably safe to assume that
-# class string exists.  If not, check to make sure that <string.h>
-# defines class `string'.
-AC_DEFUN([PGAC_CLASS_STRING],
-[AC_LANG_PUSH(C++)
-AC_CHECK_HEADER(string,
-                [AC_DEFINE(HAVE_CXX_STRING_HEADER, 1,
-                           [Define to 1 if you have the C++ <string> header])],
-                [AC_CACHE_CHECK([for class string in <string.h>],
-                                [pgac_cv_class_string_in_string_h],
-[AC_TRY_COMPILE([#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-],
-                [string foo = "test"],
-                [pgac_cv_class_string_in_string_h=yes],
-                [pgac_cv_class_string_in_string_h=no])])
-
-  if test x"$pgac_cv_class_string_in_string_h" != xyes ; then
-    AC_MSG_ERROR([neither <string> nor <string.h> seem to define the C++ class 'string'])
-  fi
-])
-AC_LANG_POP(C++)])# PGAC_CLASS_STRING
-
-
-# PGAC_CXX_NAMESPACE_STD
-# ----------------------
-# Check whether the C++ compiler understands `using namespace std'.
-#
-# Note 1: On at least some compilers, it will not work until you've
-# included a header that mentions namespace std. Thus, include the
-# usual suspects before trying it.
-#
-# Note 2: This test does not actually reveal whether the C++ compiler
-# properly understands namespaces in all generality. (GNU C++ 2.8.1
-# is one that doesn't.) However, we don't care.
-AC_DEFUN([PGAC_CXX_NAMESPACE_STD],
-[AC_REQUIRE([PGAC_CLASS_STRING])
-AC_CACHE_CHECK([for namespace std in C++],
-pgac_cv_cxx_namespace_std,
-[
-AC_LANG_PUSH(C++)
-AC_TRY_COMPILE(
-[#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_CXX_STRING_HEADER
-#include <string>
-#endif
-using namespace std;
-], [],
-[pgac_cv_cxx_namespace_std=yes],
-[pgac_cv_cxx_namespace_std=no])
-AC_LANG_POP(C++)])
-
-if test $pgac_cv_cxx_namespace_std = yes ; then
-    AC_DEFINE(HAVE_NAMESPACE_STD, 1, [Define to 1 if the C++ compiler understands 'using namespace std'])
-fi])# PGAC_CXX_NAMESPACE_STD
diff --git a/config/python.m4 b/config/python.m4
index 6058ef3d2a..ce126419b7 100644
--- a/config/python.m4
+++ b/config/python.m4
@@ -1,7 +1,7 @@
 #
 # Autoconf macros for configuring the build of Python extension modules
 #
-# $Header: /cvsroot/pgsql/config/python.m4,v 1.4 2002/03/29 17:32:54 petere Exp $
+# $Header: /cvsroot/pgsql/config/python.m4,v 1.5 2002/09/04 22:54:18 petere Exp $
 #
 
 # PGAC_PATH_PYTHON
@@ -69,6 +69,11 @@ AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP],
 [AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
 AC_MSG_CHECKING([how to link an embedded Python application])
 
+if test ! -f "$python_configdir/Makefile"; then
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([Python Makefile not found])
+fi
+
 _python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
 _python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'`
 _python_libm=`grep '^LIBM=' $python_configdir/Makefile | sed 's/^.*=//'`
diff --git a/configure b/configure
index d540b1d9e2..4712096f7e 100755
--- a/configure
+++ b/configure
@@ -838,7 +838,7 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-integer-datetimes  enable 64-bit integer date/time support
-  --enable-recode         enable character set recode support
+  --enable-recode         enable single-byte recode support
   --enable-nls[=LANGUAGES]  enable Native Language Support
   --disable-shared        do not build shared libraries
   --disable-rpath         do not embed shared library search path in executables
@@ -860,7 +860,7 @@ Optional Packages:
   --without-tk            do not build Tk interfaces if Tcl is enabled
   --with-tclconfig=DIR    tclConfig.sh and tkConfig.sh are in DIR
   --with-tkconfig=DIR     tkConfig.sh is in DIR
-  --with-perl             build PL/Perl
+  --with-perl             build Perl modules (PL/Perl)
   --with-python           build Python interface module
   --with-java             build JDBC interface and Java tools
   --with-krb4[=DIR]       build with Kerberos 4 support [/usr/athena]
@@ -2935,7 +2935,7 @@ fi;
 
 
 #
-# Optionally build Perl modules (Pg.pm and PL/Perl)
+# Optionally build Perl modules (PL/Perl)
 #
 echo "$as_me:$LINENO: checking whether to build Perl modules" >&5
 echo $ECHO_N "checking whether to build Perl modules... $ECHO_C" >&6
@@ -4105,51 +4105,6 @@ echo "$as_me: WARNING:
 fi
 
 
-if test "$with_tk" = yes; then
-    # Extract the first word of "wish", so it can be a program name with args.
-set dummy wish; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_WISH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $WISH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_WISH="$WISH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-WISH=$ac_cv_path_WISH
-
-if test -n "$WISH"; then
-  echo "$as_me:$LINENO: result: $WISH" >&5
-echo "${ECHO_T}$WISH" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -z "$WISH" && { { echo "$as_me:$LINENO: error: 'wish' is required for Tk support" >&5
-echo "$as_me: error: 'wish' is required for Tk support" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -4191,16 +4146,6 @@ fi
 
 if test "$with_perl" = yes; then
 
-echo "$as_me:$LINENO: checking for Perl installsitearch" >&5
-echo $ECHO_N "checking for Perl installsitearch... $ECHO_C" >&6
-perl_installsitearch=`$PERL -MConfig -e 'print $Config{installsitearch}'`
-echo "$as_me:$LINENO: result: $perl_installsitearch" >&5
-echo "${ECHO_T}$perl_installsitearch" >&6
-echo "$as_me:$LINENO: checking for Perl installman3dir" >&5
-echo $ECHO_N "checking for Perl installman3dir... $ECHO_C" >&6
-perl_installman3dir=`$PERL -MConfig -e 'print $Config{installman3dir}'`
-echo "$as_me:$LINENO: result: $perl_installman3dir" >&5
-echo "${ECHO_T}$perl_installman3dir" >&6
 echo "$as_me:$LINENO: checking for Perl archlibexp" >&5
 echo $ECHO_N "checking for Perl archlibexp... $ECHO_C" >&6
 perl_archlibexp=`$PERL -MConfig -e 'print $Config{archlibexp}'`
@@ -4216,11 +4161,6 @@ echo $ECHO_N "checking for Perl useshrplib... $ECHO_C" >&6
 perl_useshrplib=`$PERL -MConfig -e 'print $Config{useshrplib}'`
 echo "$as_me:$LINENO: result: $perl_useshrplib" >&5
 echo "${ECHO_T}$perl_useshrplib" >&6
-echo "$as_me:$LINENO: checking for Perl man3ext" >&5
-echo $ECHO_N "checking for Perl man3ext... $ECHO_C" >&6
-perl_man3ext=`$PERL -MConfig -e 'print $Config{man3ext}'`
-echo "$as_me:$LINENO: result: $perl_man3ext" >&5
-echo "${ECHO_T}$perl_man3ext" >&6
 
 echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5
 echo $ECHO_N "checking for flags to link embedded Perl... $ECHO_C" >&6
@@ -4307,6 +4247,14 @@ fi
 echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5
 echo $ECHO_N "checking how to link an embedded Python application... $ECHO_C" >&6
 
+if test ! -f "$python_configdir/Makefile"; then
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  { { echo "$as_me:$LINENO: error: Python Makefile not found" >&5
+echo "$as_me: error: Python Makefile not found" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 _python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
 _python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'`
 _python_libm=`grep '^LIBM=' $python_configdir/Makefile | sed 's/^.*=//'`
@@ -9425,7 +9373,12 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_e_data" >&5
 echo "${ECHO_T}$ac_cv_member_krb5_error_e_data" >&6
 if test $ac_cv_member_krb5_error_e_data = yes; then
-  :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KRB5_ERROR_E_DATA 1
+_ACEOF
+
+
 else
   { { echo "$as_me:$LINENO: error: could not determine how to extract Kerberos 5 error messages" >&5
 echo "$as_me: error: could not determine how to extract Kerberos 5 error messages" >&2;}
@@ -16310,14 +16263,10 @@ s,@STRIP_STATIC_LIB@,$STRIP_STATIC_LIB,;t t
 s,@STRIP_SHARED_LIB@,$STRIP_SHARED_LIB,;t t
 s,@YACC@,$YACC,;t t
 s,@YFLAGS@,$YFLAGS,;t t
-s,@WISH@,$WISH,;t t
 s,@PERL@,$PERL,;t t
-s,@perl_installsitearch@,$perl_installsitearch,;t t
-s,@perl_installman3dir@,$perl_installman3dir,;t t
 s,@perl_archlibexp@,$perl_archlibexp,;t t
 s,@perl_privlibexp@,$perl_privlibexp,;t t
 s,@perl_useshrplib@,$perl_useshrplib,;t t
-s,@perl_man3ext@,$perl_man3ext,;t t
 s,@perl_embed_ldflags@,$perl_embed_ldflags,;t t
 s,@PYTHON@,$PYTHON,;t t
 s,@python_version@,$python_version,;t t
diff --git a/configure.in b/configure.in
index 152a8d6e23..3729459d54 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.204 2002/09/04 08:08:29 momjian Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.205 2002/09/04 22:54:18 petere Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -155,9 +155,9 @@ AC_MSG_RESULT([$enable_integer_datetimes])
 # Character set recode (--enable-recode)
 #
 AC_MSG_CHECKING([whether to build with recode support])
-PGAC_ARG_BOOL(enable, recode, no, [  --enable-recode         enable character set recode support],
+PGAC_ARG_BOOL(enable, recode, no, [  --enable-recode         enable single-byte recode support],
               [AC_DEFINE([CYR_RECODE], 1,
-                         [Set to 1 if you want cyrillic recode support (--enable-recode)])])
+                         [Set to 1 if you want single-byte recode support (--enable-recode)])])
 AC_MSG_RESULT([$enable_recode])
 
 
@@ -350,10 +350,10 @@ PGAC_ARG_REQ(with, tclconfig, [  --with-tclconfig=DIR    tclConfig.sh and tkConf
 PGAC_ARG_REQ(with, tkconfig,  [  --with-tkconfig=DIR     tkConfig.sh is in DIR])
 
 #
-# Optionally build Perl modules (Pg.pm and PL/Perl)
+# Optionally build Perl modules (PL/Perl)
 #
 AC_MSG_CHECKING([whether to build Perl modules])
-PGAC_ARG_BOOL(with, perl, no, [  --with-perl             build PL/Perl])
+PGAC_ARG_BOOL(with, perl, no, [  --with-perl             build Perl modules (PL/Perl)])
 AC_MSG_RESULT([$with_perl])
 AC_SUBST(with_perl)
 
@@ -570,15 +570,9 @@ if test -z "$YACC"; then
 fi
 AC_SUBST(YFLAGS)
 
-if test "$with_tk" = yes; then
-    AC_PATH_PROG(WISH, wish)
-    test -z "$WISH" && AC_MSG_ERROR(['wish' is required for Tk support])
-fi
-
 PGAC_PATH_PERL
 if test "$with_perl" = yes; then
-  PGAC_CHECK_PERL_CONFIGS([installsitearch,installman3dir,
-                           archlibexp,privlibexp,useshrplib,man3ext])
+  PGAC_CHECK_PERL_CONFIGS([archlibexp,privlibexp,useshrplib])
   PGAC_CHECK_PERL_EMBED_LDFLAGS
 fi
 
@@ -748,9 +742,9 @@ if test "$with_krb5" = yes; then
                                      [#include <krb5.h>])],
                    [#include <krb5.h>])
   AC_CHECK_MEMBERS([krb5_error.text.data], [],
-                   [AC_CHECK_MEMBER([krb5_error.e_data], [],
-                                    [AC_MSG_ERROR([could not determine how to extract Kerberos 5 error messages])],
-                                    [#include <krb5.h>])],
+                   [AC_CHECK_MEMBERS([krb5_error.e_data], [],
+                                     [AC_MSG_ERROR([could not determine how to extract Kerberos 5 error messages])],
+                                     [#include <krb5.h>])],
                    [#include <krb5.h>])
 fi
 
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 5f73c93f3b..e0fd91dc92 100644
--- 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.
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index d44920520a..7140b451d2 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.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)
diff --git a/src/include/c.h b/src/include/c.h
index 39dbc5d1d8..4e1680a94e 100644
--- 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
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 670c80a403..2d03838ed2 100644
--- 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
 
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 594c5a8356..9f8fe46522 100644
--- 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
diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux
index cfdbee114b..d1d18fb878 100644
--- 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)
diff --git a/src/makefiles/Makefile.qnx4 b/src/makefiles/Makefile.qnx4
index 23364955ed..de82e7f1ea 100644
--- 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
diff --git a/src/makefiles/Makefile.sco b/src/makefiles/Makefile.sco
index 4cd2bcfe2f..0d8a7c8b23 100644
--- 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 $@ $<
diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
index 3bc4f5a914..eb7dbd79a3 100644
--- 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 $@ $<
diff --git a/src/makefiles/Makefile.sunos4 b/src/makefiles/Makefile.sunos4
index f9e9fc63d9..d408dd3c46 100644
--- 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 $@ $<
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index 5722c46a17..9e4d715932 100644
--- 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
diff --git a/src/template/aix b/src/template/aix
index 4a987da899..768d38d88d 100644
--- 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
diff --git a/src/template/freebsd b/src/template/freebsd
index a917d3f203..89958c28b7 100644
--- 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
diff --git a/src/template/hpux b/src/template/hpux
index db43432a5e..4db8f44eba 100644
--- 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
diff --git a/src/template/osf b/src/template/osf
index c38cbec8b5..2d782ea1c3 100644
--- 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'
diff --git a/src/template/unixware b/src/template/unixware
index df54dc5f35..3dc45073c6 100644
--- 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"