added --enable-unicode
This commit is contained in:
parent
14dc22fd0e
commit
6e69dd97ce
130
mio/configure
vendored
130
mio/configure
vendored
@ -803,6 +803,7 @@ with_sysroot
|
||||
enable_libtool_lock
|
||||
enable_ssl
|
||||
enable_debug
|
||||
enable_unicode
|
||||
enable_cxx
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@ -1461,6 +1462,9 @@ Optional Features:
|
||||
--disable-libtool-lock avoid locking (might break parallel builds)
|
||||
--enable-ssl build the library in the ssl mode (default. yes)
|
||||
--enable-debug build the library in the debug mode (default. no)
|
||||
--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)
|
||||
--enable-cxx build the library for C++ if a C++ compiler is
|
||||
available (default. yes)
|
||||
|
||||
@ -17452,7 +17456,7 @@ __builtin_memset ((void*)1, ' ', 10);
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
@ -17463,7 +17467,8 @@ else
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __builtin_memcpy" >&5
|
||||
$as_echo_n "checking __builtin_memcpy... " >&6; }
|
||||
@ -17478,7 +17483,7 @@ __builtin_memcpy ((void*)1, (void*)2, 10);
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
@ -17489,7 +17494,8 @@ else
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __builtin_memmove" >&5
|
||||
$as_echo_n "checking __builtin_memmove... " >&6; }
|
||||
@ -17504,7 +17510,7 @@ __builtin_memmove ((void*)1, (void*)2, 10);
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
@ -17515,7 +17521,8 @@ else
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __builtin_memcmp" >&5
|
||||
$as_echo_n "checking __builtin_memcmp... " >&6; }
|
||||
@ -17530,7 +17537,7 @@ int a = __builtin_memcmp ((void*)1, (void*)2, 10);
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
@ -17541,7 +17548,8 @@ else
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
||||
$as_echo_n "checking for ANSI C header files... " >&6; }
|
||||
@ -19579,6 +19587,40 @@ cat >>confdefs.h <<_ACEOF
|
||||
_ACEOF
|
||||
|
||||
|
||||
# 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
|
||||
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
||||
# This bug is HP SR number 8606223364.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of __uint128_t" >&5
|
||||
$as_echo_n "checking size of __uint128_t... " >&6; }
|
||||
if ${ac_cv_sizeof___uint128_t+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (__uint128_t))" "ac_cv_sizeof___uint128_t" "
|
||||
"; then :
|
||||
|
||||
else
|
||||
if test "$ac_cv_type___uint128_t" = yes; then
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error 77 "cannot compute sizeof (__uint128_t)
|
||||
See \`config.log' for more details" "$LINENO" 5; }
|
||||
else
|
||||
ac_cv_sizeof___uint128_t=0
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof___uint128_t" >&5
|
||||
$as_echo "$ac_cv_sizeof___uint128_t" >&6; }
|
||||
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define SIZEOF___UINT128_T $ac_cv_sizeof___uint128_t
|
||||
_ACEOF
|
||||
|
||||
|
||||
# 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
|
||||
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
||||
@ -20438,16 +20480,18 @@ fi
|
||||
|
||||
if test ${ac_cv_sizeof___int128_t} -gt 0
|
||||
then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __int128_t with %" >&5
|
||||
$as_echo_n "checking __int128_t with %... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __int128_t with % and va_arg" >&5
|
||||
$as_echo_n "checking __int128_t with % and va_arg... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <stdarg.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
volatile __int128_t x, base;
|
||||
va_list ap;
|
||||
va_arg(ap, __int128_t);
|
||||
x = (__int128_t)&base;
|
||||
base = (__int128_t)&x;
|
||||
x = x % base;
|
||||
@ -20467,6 +20511,7 @@ else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
ac_cv_sizeof___int128_t=0
|
||||
ac_cv_sizeof___uint128_t=0
|
||||
|
||||
|
||||
fi
|
||||
@ -21066,6 +21111,69 @@ else
|
||||
|
||||
fi
|
||||
|
||||
# Check whether --enable-unicode was given.
|
||||
if test "${enable_unicode+set}" = set; then :
|
||||
enableval=$enable_unicode; enable_unicode=$enableval
|
||||
else
|
||||
enable_unicode=yes
|
||||
|
||||
fi
|
||||
|
||||
if test "${enable_unicode}" = "yes:4"
|
||||
then
|
||||
|
||||
$as_echo "#define MIO_UNICODE_SIZE 4" >>confdefs.h
|
||||
|
||||
|
||||
$as_echo "#define MIO_ENABLE_UNICODE 1" >>confdefs.h
|
||||
|
||||
if test "${platform_win32}" = "yes"
|
||||
then
|
||||
CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
|
||||
CXXFLAGS="$CXXFLAGS -DUNICODE -D_UNICODE"
|
||||
fi
|
||||
elif test "${enable_unicode}" = "yes:2"
|
||||
then
|
||||
|
||||
$as_echo "#define MIO_UNICODE_SIZE 2" >>confdefs.h
|
||||
|
||||
|
||||
$as_echo "#define MIO_ENABLE_UNICODE 1" >>confdefs.h
|
||||
|
||||
if test "${platform_win32}" = "yes"
|
||||
then
|
||||
CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
|
||||
CXXFLAGS="$CXXFLAGS -DUNICODE -D_UNICODE"
|
||||
fi
|
||||
elif test "${enable_unicode}" = "yes"
|
||||
then
|
||||
|
||||
$as_echo "#define MIO_UNICODE_SIZE 1" >>confdefs.h
|
||||
|
||||
|
||||
$as_echo "#define MIO_ENABLE_UNICODE 1" >>confdefs.h
|
||||
|
||||
if test "${platform_win32}" = "yes"
|
||||
then
|
||||
CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
|
||||
CXXFLAGS="$CXXFLAGS -DUNICODE -D_UNICODE"
|
||||
fi
|
||||
elif test "${enable_unicode}" = "no:4"
|
||||
then
|
||||
|
||||
$as_echo "#define MIO_UNICODE_SIZE 4" >>confdefs.h
|
||||
|
||||
elif test "${enable_unicode}" = "no:2"
|
||||
then
|
||||
|
||||
$as_echo "#define MIO_UNICODE_SIZE 2" >>confdefs.h
|
||||
|
||||
else
|
||||
|
||||
$as_echo "#define MIO_UNICODE_SIZE 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
# Check whether --enable-cxx was given.
|
||||
if test "${enable_cxx+set}" = set; then :
|
||||
enableval=$enable_cxx; enable_cxx_is=$enableval
|
||||
|
||||
@ -93,7 +93,7 @@ AC_SUBST(LIBM, $LIBM)
|
||||
|
||||
check some compiler builtins
|
||||
AC_MSG_CHECKING([__builtin_memset])
|
||||
AC_COMPILE_IFELSE(
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM([], [__builtin_memset ((void*)1, ' ', 10);])],
|
||||
[AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([HAVE___BUILTIN_MEMSET], [1], [__builtin_memset])],
|
||||
@ -101,7 +101,7 @@ AC_COMPILE_IFELSE(
|
||||
)
|
||||
|
||||
AC_MSG_CHECKING([__builtin_memcpy])
|
||||
AC_COMPILE_IFELSE(
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM([], [__builtin_memcpy ((void*)1, (void*)2, 10);])],
|
||||
[AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([HAVE___BUILTIN_MEMCPY], [1], [__builtin_memcpy])],
|
||||
@ -109,7 +109,7 @@ AC_COMPILE_IFELSE(
|
||||
)
|
||||
|
||||
AC_MSG_CHECKING([__builtin_memmove])
|
||||
AC_COMPILE_IFELSE(
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM([], [__builtin_memmove ((void*)1, (void*)2, 10);])],
|
||||
[AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([HAVE___BUILTIN_MEMMOVE], [1], [__builtin_memmove])],
|
||||
@ -117,7 +117,7 @@ AC_COMPILE_IFELSE(
|
||||
)
|
||||
|
||||
AC_MSG_CHECKING([__builtin_memcmp])
|
||||
AC_COMPILE_IFELSE(
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM([], [int a = __builtin_memcmp ((void*)1, (void*)2, 10);])],
|
||||
[AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([HAVE___BUILTIN_MEMCMP], [1], [__builtin_memcmp])],
|
||||
@ -383,6 +383,7 @@ AC_CHECK_SIZEOF(__int16_t,,[[]])
|
||||
AC_CHECK_SIZEOF(__int32_t,,[[]])
|
||||
AC_CHECK_SIZEOF(__int64_t,,[[]])
|
||||
AC_CHECK_SIZEOF(__int128_t,,[[]])
|
||||
AC_CHECK_SIZEOF(__uint128_t,,[[]])
|
||||
dnl AC_CHECK_SIZEOF doesn't work without white-space between void and *
|
||||
AC_CHECK_SIZEOF(void *,,[[]])
|
||||
AC_CHECK_SIZEOF(float,,[[]])
|
||||
@ -469,10 +470,12 @@ dnl Changing ac_cv_sizeof___int128_t here doesn't corret SIZEOF___INT128_T
|
||||
dnl since it's already generated. It only affects MIO_SIZEOF___INT128_T below.
|
||||
if test ${ac_cv_sizeof___int128_t} -gt 0
|
||||
then
|
||||
AC_MSG_CHECKING([__int128_t with %])
|
||||
AC_MSG_CHECKING([__int128_t with % and va_arg])
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM([], [
|
||||
[AC_LANG_PROGRAM([#include <stdarg.h>], [
|
||||
volatile __int128_t x, base;
|
||||
va_list ap;
|
||||
va_arg(ap, __int128_t);
|
||||
x = (__int128_t)&base;
|
||||
base = (__int128_t)&x;
|
||||
x = x % base;
|
||||
@ -485,6 +488,7 @@ then
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
ac_cv_sizeof___int128_t=0
|
||||
ac_cv_sizeof___uint128_t=0
|
||||
]
|
||||
)
|
||||
fi
|
||||
@ -627,6 +631,48 @@ else
|
||||
AC_SUBST(BUILD_MODE, "release")
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE([unicode],
|
||||
[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)])],
|
||||
enable_unicode=$enableval,
|
||||
enable_unicode=yes
|
||||
)
|
||||
if test "${enable_unicode}" = "yes:4"
|
||||
then
|
||||
AC_DEFINE([MIO_UNICODE_SIZE],[4],[Unicode character type size])
|
||||
AC_DEFINE([MIO_ENABLE_UNICODE],[1],[Use the unicode character type as the default character type])
|
||||
if test "${platform_win32}" = "yes"
|
||||
then
|
||||
[CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"]
|
||||
[CXXFLAGS="$CXXFLAGS -DUNICODE -D_UNICODE"]
|
||||
fi
|
||||
elif test "${enable_unicode}" = "yes:2"
|
||||
then
|
||||
AC_DEFINE([MIO_UNICODE_SIZE],[2],[Unicode character type size])
|
||||
AC_DEFINE([MIO_ENABLE_UNICODE],[1],[Use the unicode character type as the default character type])
|
||||
if test "${platform_win32}" = "yes"
|
||||
then
|
||||
[CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"]
|
||||
[CXXFLAGS="$CXXFLAGS -DUNICODE -D_UNICODE"]
|
||||
fi
|
||||
elif test "${enable_unicode}" = "yes"
|
||||
then
|
||||
AC_DEFINE([MIO_UNICODE_SIZE],[1],[Unicode character type size])
|
||||
AC_DEFINE([MIO_ENABLE_UNICODE],[1],[Use the unicode character type as the default character type])
|
||||
if test "${platform_win32}" = "yes"
|
||||
then
|
||||
[CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"]
|
||||
[CXXFLAGS="$CXXFLAGS -DUNICODE -D_UNICODE"]
|
||||
fi
|
||||
elif test "${enable_unicode}" = "no:4"
|
||||
then
|
||||
AC_DEFINE([MIO_UNICODE_SIZE],[4],[Unicode character type size])
|
||||
elif test "${enable_unicode}" = "no:2"
|
||||
then
|
||||
AC_DEFINE([MIO_UNICODE_SIZE],[2],[Unicode character type size])
|
||||
else
|
||||
AC_DEFINE([MIO_UNICODE_SIZE],[1],[Unicode character type size])
|
||||
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,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user