diff --git a/qse/configure b/qse/configure index fffa38c7..8461e849 100755 --- a/qse/configure +++ b/qse/configure @@ -17507,14 +17507,6 @@ fi done -ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "#include -" -if test "x$ac_cv_type_wchar_t" = xyes; then : - -$as_echo "#define HAVE_WCHAR_T_IN_STDDEF_H /**/" >>confdefs.h - -fi - for ac_func in uselocale do : @@ -19879,7 +19871,7 @@ _ACEOF -if test "${platform_win32}" == "yes" +if test "${platform_win32}" = "yes" then # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects @@ -20866,6 +20858,7 @@ else fi test "${ac_cv_sizeof_wchar_t}" = "0" && enable_wchar_is=no +test "${ac_cv_sizeof_wchar_t}" = "1" && enable_wchar_is=no if test "${enable_wchar_is}" = "yes" then diff --git a/qse/configure.ac b/qse/configure.ac index a2058a60..fe293622 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -131,11 +131,11 @@ AC_CHECK_HEADERS([sys/stropts.h sys/macstat.h linux/ethtool.h linux/sockios.h]) AC_CHECK_HEADERS([quadmath.h crt_externs.h sys/prctl.h uci.h]) dnl check data types -AC_CHECK_TYPE([wchar_t], - [ AC_DEFINE([HAVE_WCHAR_T_IN_STDDEF_H], - [],[wchar_t is available in stddef.h]) ], - [], - [#include ]) +dnl AC_CHECK_TYPE([wchar_t], +dnl [ AC_DEFINE([HAVE_WCHAR_T_IN_STDDEF_H], +dnl [],[wchar_t is available in stddef.h]) ], +dnl [], +dnl [#include ]) dnl check functions AC_CHECK_FUNCS([uselocale]) @@ -375,7 +375,7 @@ AC_CHECK_SIZEOF(off64_t) AC_CHECK_SIZEOF(mbstate_t,,[#include ]) AX_CHECK_NUMVALOF(MB_LEN_MAX,[32],[#include ]) -if test "${platform_win32}" == "yes" +if test "${platform_win32}" = "yes" then AC_CHECK_SIZEOF(struct sockaddr_in,,[ #include @@ -581,6 +581,7 @@ dnl define extra options AC_ARG_ENABLE([wchar], [AS_HELP_STRING([--enable-wchar],[Use the wide character type as the default charater type when enabled (default. yes)])], enable_wchar_is=$enableval,enable_wchar_is=yes) test "${ac_cv_sizeof_wchar_t}" = "0" && enable_wchar_is=no +test "${ac_cv_sizeof_wchar_t}" = "1" && enable_wchar_is=no if test "${enable_wchar_is}" = "yes" then AC_DEFINE([QSE_CHAR_IS_WCHAR],[],[The default character type is the wide character type]) diff --git a/qse/doc/page/installation.md b/qse/doc/page/installation.md index ffabb3a5..63a3ef32 100644 --- a/qse/doc/page/installation.md +++ b/qse/doc/page/installation.md @@ -156,6 +156,16 @@ available for the native makefile for Watcom C/C++ for OS/2 only. wmake TCPV40HDRS=on +### SCO UNIX System V/386 Release 3.2 ### + +- Specify GREP if configure fails to find an acceptable grep. +- Build in the source tree. Building outside the source tree is likely to fail + for dificiency of the bundled make utility. +- Do not include -g in CFLAGS. + + ./configure GREP=/bin/grep CFLAGS="" + + ### More options ### More options are available for the configure script. Execute this for more diff --git a/qse/include/qse/config.h.in b/qse/include/qse/config.h.in index 25da7e56..ffbd06a1 100644 --- a/qse/include/qse/config.h.in +++ b/qse/include/qse/config.h.in @@ -700,9 +700,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WCHAR_H -/* wchar_t is available in stddef.h */ -#undef HAVE_WCHAR_T_IN_STDDEF_H - /* Define to 1 if you have the `wcrtomb' function. */ #undef HAVE_WCRTOMB