diff --git a/configure.in b/configure.in
index a57dc77d5e6b719c7aa3fa1124bbd3088ddda07c..51d335bbead3be6981cdecba1f73ac13129a682a 100644
--- a/configure.in
+++ b/configure.in
@@ -201,6 +201,14 @@ Or do not specify an argument to the option to use the default.]);;
 
 AC_SUBST(MULTIBYTE)
 
+#
+# Unicode conversion (--enable-uniconv)
+#
+AC_MSG_CHECKING([whether to build with Unicode conversion support])
+PGAC_ARG_BOOL(enable, uniconv, no, [  --enable-uniconv         enable unicode conversion support],
+              [AC_DEFINE([UNICODE_CONVERSION], 1,
+                         [Set to 1 if you want Unicode conversion support (--enable-uniconv)])])
+AC_MSG_RESULT([$enable_uniconv])
 
 #
 # Default port number (--with-pgport), default 5432
diff --git a/src/include/config.h.in b/src/include/config.h.in
index fe6fb972c11615ff58585f9278d496c47063e0b6..66faa7503bba07394e813399748573aa643a70a0 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -8,7 +8,7 @@
  * or in config.h afterwards.  Of course, if you edit config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: config.h.in,v 1.144 2000/10/23 14:49:45 momjian Exp $
+ * $Id: config.h.in,v 1.145 2000/10/30 07:17:31 ishii Exp $
  */
 
 #ifndef CONFIG_H
@@ -42,6 +42,9 @@
 /* Set to 1 if you want to use multibyte characters (--enable-multibyte) */
 #undef MULTIBYTE
 
+/* Set to 1 if you want Unicode conversion support (--enable-uniconv) */
+#undef UNICODE_CONVERSION
+
 /* Set to 1 if you want ASSERT checking (--enable-cassert) */
 #undef USE_ASSERT_CHECKING