changed --enable-unicode to --enable-wide-char in configure.ac and removed c++ stuffs

hcl/Makefile.in

@@ -92,7 +92,6 @@ host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
-	$(top_srcdir)/m4/ax_cxx_namespace.m4 \
 	$(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@@ -224,10 +223,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -242,7 +237,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_CXX = @HAVE_CXX@
 HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
 HCL_PROJECT_URL = @HCL_PROJECT_URL@
 HCL_SIZEOF_CHAR = @HCL_SIZEOF_CHAR@
@@ -314,7 +308,6 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@

hcl/aclocal.m4

@@ -1194,7 +1194,6 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([m4/ax_check_sign.m4])
-m4_include([m4/ax_cxx_namespace.m4])
 m4_include([m4/ax_numval.m4])
 m4_include([m4/ax_pthread.m4])
 m4_include([m4/libtool.m4])

hcl/bin/Makefile.in

@@ -95,7 +95,6 @@ bin_PROGRAMS = hcl$(EXEEXT) $(am__EXEEXT_1)
 subdir = bin
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
-	$(top_srcdir)/m4/ax_cxx_namespace.m4 \
 	$(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@@ -225,10 +224,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -243,7 +238,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_CXX = @HAVE_CXX@
 HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
 HCL_PROJECT_URL = @HCL_PROJECT_URL@
 HCL_SIZEOF_CHAR = @HCL_SIZEOF_CHAR@
@@ -315,7 +309,6 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@

hcl/configure.ac

@@ -20,15 +20,6 @@ dnl m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 dnl determine a C compiler to use
 AC_PROG_CC
 
-dnl determine a C++ compiler to use
-AC_PROG_CXX
-
-dnl check if the C++ compiler exists in PATH
-AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
-
-dnl check if the C++ compiler supports namespace
-AX_CXX_NAMESPACE_STD
-
 dnl determine some key programs
 AC_PROG_INSTALL
 AC_PROG_EGREP
@@ -48,21 +39,11 @@ then
 	fi
 fi
 
-if test "$ac_test_CXXFLAGS" != "set"
-then
-	if test "$GCC" = "yes"
-	then
-		CXXFLAGS="$CXXFLAGS -Wall"
-	fi
-fi
-
 dnl indicate the existence of config.h
 CFLAGS="$CFLAGS -DHCL_HAVE_CFG_H"
-CXXFLAGS="$CXXFLAGS -DHCL_HAVE_CFG_H"
 
 dnl make visible the 64-bit interface to the file system
 CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
-CXXFLAGS="$CXXFLAGS -D_LARGEFILE64_SOURCE"
 
 dnl define the WIN32 conditional if necessary
 case "$host" in
@@ -562,41 +543,39 @@ AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],[build the library in th
 if test "$enable_debug_is" = "yes"
 then
 	[CFLAGS="$CFLAGS -g -D_DEBUG -UNDEBUG -U_FORTIFY_SOURCE"]
-	[CXXFLAGS="$CXXFLAGS -g -D_DEBUG -UNDEBUG -U_FORTIFY_SOURCE"]
 	AC_DEFINE([HCL_BUILD_DEBUG],[1],[build release/debug])
 	AC_SUBST(BUILD_MODE, "debug")
 else
 	[CFLAGS="$CFLAGS -DNDEBUG -U_DEBUG -U_FORTIFY_SOURCE"]
-	[CXXFLAGS="$CXXFLAGS -DNDEBUG -U_DEBUG -U_FORTIFY_SOURCE"]
 	AC_DEFINE([HCL_BUILD_RELEASE],[1],[build release/debug])
 	AC_SUBST(BUILD_MODE, "release")
 fi
 
-AC_ARG_ENABLE([unicode], 
+AC_ARG_ENABLE([wide-char], 
-	[AS_HELP_STRING([--enable-unicode],[Use the unicode character type as the default character type. one of yes, no, yes:2, yes:4, no:2, no:4 (default. yes)])],
+	[AS_HELP_STRING([--enable-wide-char],[Use the wide-character type as the default character type. one of yes, no, yes:2, yes:4, no:2, no:4 (default. yes)])],
-	enable_unicode=$enableval,
+	enable_wide_char=$enableval,
-	enable_unicode=yes
+	enable_wide_char=yes
 )
-if test "${enable_unicode}" = "yes:4"
+if test "${enable_wide_char}" = "yes:4"
 then
-	AC_DEFINE([HCL_UNICODE_SIZE],[4],[Unicode character type size])
+	AC_DEFINE([HCL_WIDE_CHAR_SIZE],[4],[Wide-character type size])
-	AC_DEFINE([HCL_ENABLE_UNICODE],[1],[Use the unicode character type as the default character type])
+	AC_DEFINE([HCL_ENABLE_WIDE_CHAR],[1],[Use the wide-character type as the default character type])
-elif test "${enable_unicode}" = "yes:2"
+elif test "${enable_wide_char}" = "yes:2"
 then
-	AC_DEFINE([HCL_UNICODE_SIZE],[2],[Unicode character type size])
+	AC_DEFINE([HCL_WIDE_CHAR_SIZE],[2],[Wide-character type size])
-	AC_DEFINE([HCL_ENABLE_UNICODE],[1],[Use the unicode character type as the default character type])
+	AC_DEFINE([HCL_ENABLE_WIDE_CHAR],[1],[Use the wide-character type as the default character type])
-elif test "${enable_unicode}" = "yes"
+elif test "${enable_wide_char}" = "yes"
 then
-	AC_DEFINE([HCL_UNICODE_SIZE],[1],[Unicode character type size])
+	AC_DEFINE([HCL_WIDE_CHAR_SIZE],[1],[Wide-character type size])
-	AC_DEFINE([HCL_ENABLE_UNICODE],[1],[Use the unicode character type as the default character type])
+	AC_DEFINE([HCL_ENABLE_WIDE_CHAR],[1],[Use the wide-character type as the default character type])
-elif test "${enable_unicode}" = "no:4"
+elif test "${enable_wide_char}" = "no:4"
 then
-	AC_DEFINE([HCL_UNICODE_SIZE],[4],[Unicode character type size])
+	AC_DEFINE([HCL_WIDE_CHAR_SIZE],[4],[Wide-character type size])
-elif test "${enable_unicode}" = "no:2"
+elif test "${enable_wide_char}" = "no:2"
 then
-	AC_DEFINE([HCL_UNICODE_SIZE],[2],[Unicode character type size])
+	AC_DEFINE([HCL_WIDE_CHAR_SIZE],[2],[Wide-character type size])
 else
-	AC_DEFINE([HCL_UNICODE_SIZE],[1],[Unicode character type size])
+	AC_DEFINE([HCL_WIDE_CHAR_SIZE],[1],[Wide-character type size])
 fi
 
 AC_ARG_ENABLE([full-liw],
@@ -609,21 +588,6 @@ then
 	AC_DEFINE([HCL_ENABLE_FULL_LIW],[1],[Use a full word as a large integer word])
 fi
 
-
-AC_ARG_ENABLE([cxx], 
-	[AS_HELP_STRING([--enable-cxx],[build the library for C++ if a C++ compiler is available (default. yes)])],
-	enable_cxx_is=$enableval,
-	enable_cxx_is=yes
-)
-
-dnl disable c++ if no c++ compiler was found
-test "${HAVE_CXX}" = "yes" || enable_cxx_is="no"
-dnl disable c++ if the compiler is too old.
-test "${ax_cv_cxx_have_std_namespace}" = "yes" || enable_cxx_is="no"
-
-AM_CONDITIONAL(ENABLE_CXX, test "${enable_cxx_is}" = "yes" )
-
-
 dnl ===== enable-dynamic-module =====
 AC_ARG_ENABLE([dynamic-module],
 	[AS_HELP_STRING([--enable-dynamic-module],[enable dynamic module capability(default. yes)])],
@@ -735,8 +699,6 @@ echo "  Build mode : ${BUILD_MODE}"
 echo "  Source directory: ${srcdir}"
 echo "  Installation directory: ${prefix}"
 echo "  C compiler: ${CC} ${CFLAGS}"
-echo "  C++ compiler: ${CXX} ${CXXFLAGS}"
-echo "  C++ support: ${enable_cxx_is}"
 echo "  Math library: ${LIBM}"
 echo "-------------------------------------------------------------------------"
 ]

hcl/lib/Makefile.in

@@ -103,7 +103,6 @@ host_triplet = @host@
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
-	$(top_srcdir)/m4/ax_cxx_namespace.m4 \
 	$(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@@ -279,10 +278,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -297,7 +292,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_CXX = @HAVE_CXX@
 HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
 HCL_PROJECT_URL = @HCL_PROJECT_URL@
 HCL_SIZEOF_CHAR = @HCL_SIZEOF_CHAR@
@@ -369,7 +363,6 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@

hcl/lib/hcl-cfg.h.in

@@ -39,9 +39,6 @@
 /* Define to 1 if you have the `cosq' function. */
 #undef HAVE_COSQ
 
-/* Define if c++ supports namespace std. */
-#undef HAVE_CXX_NAMESPACE_STD
-
 /* Define to 1 if you have the <dirent.h> header file. */
 #undef HAVE_DIRENT_H
 
@@ -285,8 +282,8 @@
 /* link modules statically into the main library */
 #undef HCL_ENABLE_STATIC_MODULE
 
-/* Use the unicode character type as the default character type */
+/* Use the wide-character type as the default character type */
-#undef HCL_ENABLE_UNICODE
+#undef HCL_ENABLE_WIDE_CHAR
 
 /* Big Endian */
 #undef HCL_ENDIAN_BIG
@@ -417,8 +414,8 @@
 /* Define if socklen_t is signed */
 #undef HCL_SOCKLEN_T_IS_SIGNED
 
-/* Unicode character type size */
+/* Wide-character type size */
-#undef HCL_UNICODE_SIZE
+#undef HCL_WIDE_CHAR_SIZE
 
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR

hcl/lib/hcl-cmn.h

@@ -353,7 +353,7 @@ typedef unsigned char           hcl_bchu_t; /* unsigned version of hcl_bch_t for
 #define HCL_SIZEOF_BCH_T HCL_SIZEOF_CHAR
 #define HCL_SIZEOF_BCI_T HCL_SIZEOF_INT
 
-#if defined(HCL_UNICODE_SIZE) && (HCL_UNICODE_SIZE >= 4)
+#if defined(HCL_WIDE_CHAR_SIZE) && (HCL_WIDE_CHAR_SIZE >= 4)
 #	if defined(__GNUC__) && defined(__CHAR32_TYPE__)
 	typedef __CHAR32_TYPE__    hcl_uch_t;
 #	else
@@ -407,7 +407,7 @@ struct hcl_bcs_t
 };
 typedef struct hcl_bcs_t hcl_bcs_t;
 
-#if defined(HCL_ENABLE_UNICODE)
+#if defined(HCL_ENABLE_WIDE_CHAR)
 	typedef hcl_uch_t               hcl_ooch_t;
 	typedef hcl_uchu_t              hcl_oochu_t;
 	typedef hcl_uci_t               hcl_ooci_t;

hcl/mod/Makefile.in

@@ -91,7 +91,6 @@ host_triplet = @host@
 subdir = mod
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
-	$(top_srcdir)/m4/ax_cxx_namespace.m4 \
 	$(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@@ -255,10 +254,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -273,7 +268,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_CXX = @HAVE_CXX@
 HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
 HCL_PROJECT_URL = @HCL_PROJECT_URL@
 HCL_SIZEOF_CHAR = @HCL_SIZEOF_CHAR@
@@ -345,7 +339,6 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@