From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 19 Jan 2000 02:59:03 +0000 (+0000)
Subject: Removed MBFLAGS from makefiles since it's now done in include/config.h.
X-Git-Tag: REL7_0~792
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=533d5166292b94fb5dce0892c572b149d7da18bd;p=postgresql

Removed MBFLAGS from makefiles since it's now done in include/config.h.
---

diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile
index 669dbffc9c..594ed50a59 100644
--- a/src/backend/access/common/Makefile
+++ b/src/backend/access/common/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/common
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.15 1999/12/13 22:32:20 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.16 2000/01/19 02:58:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,10 +13,6 @@ include ../../../Makefile.global
 
 CFLAGS+=-I../..
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o \
        scankey.o tupdesc.o  
 
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index 3e47413d79..b9f9270416 100644
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for the bootstrap module
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.20 2000/01/16 20:04:53 petere Exp $
+#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.21 2000/01/19 02:58:51 petere Exp $
 #
 #
 # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -22,9 +22,6 @@ SRCDIR= ../..
 include ../../Makefile.global
 
 CFLAGS += -I..
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
 
 ifeq ($(CC), gcc)
 CFLAGS+= -Wno-error
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index e3ebda6ba3..b0ee3f1e0d 100644
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for commands
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.22 1999/12/13 22:32:38 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.23 2000/01/19 02:58:51 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,10 +13,6 @@ include ../../Makefile.global
 
 CFLAGS += -I..
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 OBJS = async.o creatinh.o command.o comment.o copy.o indexcmds.o define.o \
        remove.o rename.o vacuum.o view.o cluster.o \
        explain.o sequence.o trigger.o user.o proclang.o \
diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile
index 58ecb4d82c..656fbdb480 100644
--- a/src/backend/libpq/Makefile
+++ b/src/backend/libpq/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.16 1999/12/13 22:32:43 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.17 2000/01/19 02:58:52 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,10 +19,6 @@ CFLAGS+= $(KRBFLAGS)
 LDFLAGS+= $(KRBLIBS)
 endif
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 OBJS = be-dumpdata.o be-fsstubs.o be-pqexec.o portal.o portalbuf.o \
 	auth.o hba.o crypt.o password.o \
 	pqcomm.o pqformat.o pqpacket.o pqsignal.o util.o
diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index dfdc1ccd74..6f3a9310ef 100644
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for parser
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.23 1999/12/13 22:33:03 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.24 2000/01/19 02:58:53 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,10 +17,6 @@ ifeq ($(CC), gcc)
 CFLAGS+= -Wno-error
 endif
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 OBJS= analyze.o gram.o keywords.o parser.o parse_agg.o parse_clause.o \
       parse_expr.o parse_func.o parse_node.o parse_oper.o parse_relation.o \
       parse_type.o parse_coerce.o parse_target.o scan.o scansup.o
diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile
index e9f569c4f5..9beda9746e 100644
--- a/src/backend/regex/Makefile
+++ b/src/backend/regex/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for regex
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.11 1999/12/13 22:33:23 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.12 2000/01/19 02:58:53 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,7 +19,6 @@ DEBUGOBJ =
 OBJS = regcomp.o regerror.o regexec.o regfree.o
 
 ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
 DEBUGOBJ += ../utils/mb/SUBSYS.o
 endif
 
diff --git a/src/backend/regex/engine.c b/src/backend/regex/engine.c
index 698d5da729..b4f6844549 100644
--- a/src/backend/regex/engine.c
+++ b/src/backend/regex/engine.c
@@ -37,6 +37,8 @@
  *		@(#)engine.c	8.5 (Berkeley) 3/20/94
  */
 
+#include "postgres.h"
+
 /*
  * The matching engine and friends.  This file is #included by regexec.c
  * after suitable #defines of a variety of macros used herein, so that
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index b6c01ef004..65cf92fc56 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 
 #endif	 /* LIBC_SCCS and not lint */
 
+#include "postgres.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c
index 93b4733061..d44b6db57c 100644
--- a/src/backend/regex/regerror.c
+++ b/src/backend/regex/regerror.c
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 
 #endif	 /* LIBC_SCCS and not lint */
 
+#include "postgres.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index ec71296cc4..c5a45b3889 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
 
 #endif	 /* LIBC_SCCS and not lint */
 
+#include "postgres.h"
+
 /*
  * the outer shell of regexec()
  *
diff --git a/src/backend/regex/regfree.c b/src/backend/regex/regfree.c
index f0a019b0f6..55d5c62810 100644
--- a/src/backend/regex/regfree.c
+++ b/src/backend/regex/regfree.c
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
 
 #endif	 /* LIBC_SCCS and not lint */
 
+#include "postgres.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile
index 3e0c7765de..a38cbb268e 100644
--- a/src/backend/rewrite/Makefile
+++ b/src/backend/rewrite/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for rewrite
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.10 1999/12/13 22:33:28 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.11 2000/01/19 02:58:54 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,9 +12,6 @@ SRCDIR = ../..
 include ../../Makefile.global
 
 CFLAGS += -I..
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
 
 OBJS = rewriteRemove.o rewriteDefine.o \
        rewriteHandler.o rewriteManip.o rewriteSupport.o locks.o
diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile
index 906f1256c8..7d374e523f 100644
--- a/src/backend/storage/lmgr/Makefile
+++ b/src/backend/storage/lmgr/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for storage/lmgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.11 1999/12/13 22:33:54 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.12 2000/01/19 02:58:54 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,9 +12,6 @@ SRCDIR = ../../..
 include ../../../Makefile.global
 
 CFLAGS += -I../..
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
 
 OBJS = lmgr.o lock.o proc.o
 
diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile
index 40687b9edb..3a3617698d 100644
--- a/src/backend/storage/smgr/Makefile
+++ b/src/backend/storage/smgr/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for storage/smgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.10 1999/12/13 22:34:09 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.11 2000/01/19 02:58:55 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,10 +13,6 @@ include ../../../Makefile.global
 
 CFLAGS += -I../..
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 OBJS = md.o mm.o smgr.o smgrtype.o
 
 all: SUBSYS.o
diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index 85a83c488f..2ee1faefcd 100644
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.20 1999/12/13 22:34:16 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.21 2000/01/19 02:58:56 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,10 +13,6 @@ include ../../Makefile.global
 
 CFLAGS+= -I..
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 ifeq ($(CC), gcc)
 CFLAGS+= -Wno-error
 endif
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index dbf5d40ce9..ce132c719b 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/adt
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.31 2000/01/07 17:22:47 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.32 2000/01/19 02:58:56 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,10 +23,6 @@ CFLAGS+= -mieee
 endif
 endif
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 OBJS = acl.o arrayfuncs.o arrayutils.o bool.o cash.o char.o chunk.o \
 	date.o datetime.o datum.o dt.o filename.o float.o \
 	geo_ops.o geo_selfuncs.o int.o int8.o like.o \
diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile
index ef2cff43a0..656eadaf9f 100644
--- a/src/backend/utils/init/Makefile
+++ b/src/backend/utils/init/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/init
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.11 1999/12/13 22:34:53 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.12 2000/01/19 02:58:57 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,9 +12,6 @@ SRCDIR = ../../..
 include ../../../Makefile.global
 
 CFLAGS += -I../..
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
 
 OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o
 
diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile
index 3b25a1821a..325e8835c0 100644
--- a/src/backend/utils/mb/Makefile
+++ b/src/backend/utils/mb/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/mb
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.6 2000/01/13 01:08:14 ishii Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.7 2000/01/19 02:58:57 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,9 +12,6 @@ SRCDIR = ../../..
 include ../../../Makefile.global
 
 CFLAGS += -I../..
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
 
 OBJS = common.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \
        big5.o
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 4af55f5a9e..626142d67c 100644
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/misc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.11 1999/12/13 22:35:01 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.12 2000/01/19 02:58:58 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,10 +13,6 @@ include ../../../Makefile.global
 
 CFLAGS += -I../..
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 OBJS = database.o superuser.o trace.o 
 
 all: SUBSYS.o
diff --git a/src/bin/Makefile b/src/bin/Makefile
index d9a5b38e19..a845b6148c 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -7,14 +7,14 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.22 1999/12/22 04:12:54 ishii Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.23 2000/01/19 02:58:59 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ..
 include ../Makefile.global
 
-DIRS = pg_id pg_version psql pg_dump pg_passwd \
+DIRS = pg_version psql pg_dump pg_passwd \
  	scripts initdb initlocation ipcclean \
 	pg_ctl
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index a4f2676edd..157aba864d 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.135 2000/01/18 18:09:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.136 2000/01/19 02:58:59 petere Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -608,9 +608,9 @@ main(int argc, char **argv)
      */
 
 #ifdef HAVE_GETOPT_LONG
-	while ((c = getopt_long(argc, argv, "acdDh:nNoOp:st:uvxzV?\037", long_options, &optindex)) != -1)
+	while ((c = getopt_long(argc, argv, "acdDf:h:nNoOp:st:uvxzV?\037", long_options, &optindex)) != -1)
 #else
-    while ((c = getopt(argc, argv, "acdDh:nNoOp:st:uvxzV?")) != -1)
+    while ((c = getopt(argc, argv, "acdDf:h:nNoOp:st:uvxzV?-")) != -1)
 #endif
 	{
 		switch (c)
@@ -630,6 +630,10 @@ main(int argc, char **argv)
 				dumpData = true;
 				attrNames = true;
 				break;
+            case 'f':
+                fprintf(stderr, "%s: The -f option is obsolete. You can achieve the same by writing %s > %s.\n",
+                        progname, progname, optarg);
+                exit(1);
 			case '\037':		/* output file name, see note above */
 				filename = optarg;
 				break;
@@ -695,9 +699,26 @@ main(int argc, char **argv)
                 exit(0);
                 break;
 			case '?':
-				help(progname);
-                exit(0);
+                /* getopt returns '?' on unknown argument. That's not
+                   quite what we want */
+                if (strcmp(argv[optind-1], "-?")==0)
+                {
+                    help(progname);
+                    exit(1);
+                }
+                else
+                {
+                    fputs("Try -? for help.\n", stderr);
+                    exit(1);
+                }
 				break;
+#ifndef HAVE_GETOPT_LONG
+			case '-':
+				fprintf(stderr, "%s was compiled without support for long options.\n"
+						"Use -? for help on invocation options.\n", progname);
+				exit(1);
+				break;
+#endif
 			default:
                 fprintf(stderr, "%s: unknown option -%c\nTry -? for help.\n", progname, c);
                 exit(1);
diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index 2768b4ee27..976f07c8f3 100644
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.19 1999/11/27 19:43:20 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.20 2000/01/19 02:59:00 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,10 +24,6 @@ LDFLAGS+= $(KRBLIBS)
 CFLAGS+= $(KRBFLAGS)
 endif
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 OBJS=command.o common.o help.o input.o stringutils.o mainloop.o \
 	copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o \
 	tab-complete.o
diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser
index 8849994b6e..bb1aabba3e 100644
--- a/src/bin/scripts/createuser
+++ b/src/bin/scripts/createuser
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.6 2000/01/14 22:11:36 petere Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.7 2000/01/19 02:59:01 petere Exp $
 #
 # Note - this should NOT be setuid.
 #
@@ -147,6 +147,11 @@ if [ "$SysID" ]; then
         fi
 fi
 
+# Don't want to leave the user blind if he breaks
+# during password entry.
+
+trap 'stty echo >& /dev/null' 1 2 3 15
+
 # Get missing user attributes
 
 if [ -z "$NewUser" ]; then
@@ -157,7 +162,20 @@ fi
 
 if [ "$PwPrompt" ]; then
 	$ECHO_N "Enter password for user \"$NewUser\": "$ECHO_C
-	read Password
+        stty -echo >& /dev/null
+        read FirstPw
+        stty echo >& /dev/null
+        echo
+        $ECHO_N "Enter it again: "$ECHO_C
+        stty -echo >& /dev/null
+        read SecondPw
+        stty echo >& /dev/null
+        echo
+        if [ "$FirstPw" != "$SecondPw" ]; then
+            echo "Passwords didn't match."
+            exit 1
+        fi
+	Password=$FirstPw
 fi
 
 if [ -z "$CanCreateDb" ]; then
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 324b4437d1..af363b7ef9 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -11,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.48 2000/01/18 05:08:29 ishii Exp $
+ * $Id: miscadmin.h,v 1.49 2000/01/19 02:59:02 petere Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -22,6 +22,8 @@
 #ifndef MISCADMIN_H
 #define MISCADMIN_H
 
+#include "postgres.h"
+
 #include "utils/trace.h"
 
 /*****************************************************************************
diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index b0b86f3cb6..677f5ca9a2 100644
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -40,6 +40,7 @@
 #ifndef _REGEX_H_
 #define _REGEX_H_
 
+#include "postgres.h"
 #include <sys/types.h>
 #include "mb/pg_wchar.h"
 
diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h
index aab9195dc5..25d7853c42 100644
--- a/src/include/regex/regex2.h
+++ b/src/include/regex/regex2.h
@@ -37,6 +37,8 @@
  *		@(#)regex2.h	8.4 (Berkeley) 3/20/94
  */
 
+#include "postgres.h"
+
 /*
  * First, the stuff that ends up in the outside-world include file
 */
diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h
index bf51a8b8e7..b2e2307e1d 100644
--- a/src/include/regex/utils.h
+++ b/src/include/regex/utils.h
@@ -37,7 +37,7 @@
  *		@(#)utils.h		8.3 (Berkeley) 3/20/94
  */
 
-#include "config.h"
+#include "postgres.h"
 
 /* utility definitions */
 #define DUPMAX			100000000		/* xxx is this right? */
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 99da195830..5801ffc641 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.52 2000/01/17 02:59:46 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.53 2000/01/19 02:59:03 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,10 +23,6 @@ ifdef KRBVERS
 CFLAGS+= $(KRBFLAGS)
 endif
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
 OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
       pqexpbuffer.o dllist.o pqsignal.o @SNPRINTF@