Remove --enable-unicode-conversion

unicode-conversion is always on if --enable-multibyte is specified

	   Tatsuo Ishii

configure.in

@@ -199,19 +199,6 @@ Or do not specify an argument to the option to use the default.]);;
 
 AC_SUBST(MULTIBYTE)
 
-#
-# Unicode conversion (--enable-unicode-conversion)
-#
-AC_MSG_CHECKING([whether to build with Unicode conversion support])
-PGAC_ARG_BOOL(enable, unicode-conversion, no,
-              [  --enable-unicode-conversion  enable unicode conversion support],
-[if test -z "$MULTIBYTE"; then
-  AC_MSG_ERROR([--enable-unicode-conversion only works with --enable-multibyte])
-fi
-AC_DEFINE([UNICODE_CONVERSION], 1,
-          [Set to 1 if you want Unicode conversion support (--enable-unicode-conversion)])])
-AC_MSG_RESULT([$enable_unicode_conversion])
-
 #
 # NLS
 #

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.5 2001/09/07 19:52:54 momjian Exp $
+ * $Id: pg_config.h.in,v 1.6 2001/09/14 10:36:52 ishii Exp $
  */
 
 #ifndef PG_CONFIG_H
@@ -42,8 +42,10 @@
 /* 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
+#ifdef MULTIBYTE
+/* --enable-multibyte implies UNICODE_CONVERSION */
+#define UNICODE_CONVERSION
+#endif
 
 /* Set to 1 if you want ASSERT checking (--enable-cassert) */
 #undef USE_ASSERT_CHECKING