diff options
author | Haibo Huang <hhb@google.com> | 2019-10-11 11:13:39 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2019-11-13 10:28:10 -0800 |
commit | 40a7191d8057597978b149621d2882ca507d8cb5 (patch) | |
tree | e8d918e4285a965f916def290385a0614313bde1 /configure | |
parent | 4c60b0d92a62545fa2ff75f7cac070df04a59bdf (diff) | |
download | expat-40a7191d8057597978b149621d2882ca507d8cb5.tar.gz |
Upgrade expat to R_2_2_9
Manual changes to Android.bp and expat_config.h.
Test: treehugger
Change-Id: Iba9d1ed11fadaf15b95a9e94cbc128e77f3aea6d
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 332 |
1 files changed, 202 insertions, 130 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for expat 2.2.7. +# Generated by GNU Autoconf 2.69 for expat 2.2.9. # # Report bugs to <expat-bugs@libexpat.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='expat' PACKAGE_TARNAME='expat' -PACKAGE_VERSION='2.2.7' -PACKAGE_STRING='expat 2.2.7' +PACKAGE_VERSION='2.2.9' +PACKAGE_STRING='expat 2.2.9' PACKAGE_BUGREPORT='expat-bugs@libexpat.org' PACKAGE_URL='' @@ -678,14 +678,6 @@ FGREP EGREP GREP SED -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build LIBTOOL OBJDUMP DLLTOOL @@ -736,6 +728,14 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build target_alias host_alias build_alias @@ -792,6 +792,9 @@ with_xmlwf with_examples with_tests with_libbsd +with_getrandom +with_sys_getrandom +enable_xml_attr_info enable_xml_context with_docbook ' @@ -1350,7 +1353,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures expat 2.2.7 to adapt to many kinds of systems. +\`configure' configures expat 2.2.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1420,7 +1423,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of expat 2.2.7:";; + short | recursive ) echo "Configuration of expat 2.2.9:";; esac cat <<\_ACEOF @@ -1439,6 +1442,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-xml-attr-info Enable retrieving the byte offsets for attribute + names and values [default=no] --enable-xml-context [COUNT] Retain context around the current parse point; default is enabled and a size of 1024 bytes @@ -1456,11 +1461,16 @@ Optional Packages: --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). --without-xmlwf do not build xmlwf - --without-examples do not build examples [default=included] - --without-tests do not build tests [default=included] --with-libbsd utilize libbsd (for arc4random_buf) + --with-getrandom enforce the use of getrandom function in the system + [default=check] + --without-getrandom skip auto detect of getrandom [default=check] + --with-sys-getrandom enforce the use of syscall SYS_getrandom function in + the system [default=check] + --without-sys-getrandom skip auto detect of syscall SYS_getrandom + [default=check] --with-docbook enforce XML to man page compilation [default=check] --without-docbook skip XML to man page compilation [default=check] @@ -1547,7 +1557,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -expat configure 2.2.7 +expat configure 2.2.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2091,7 +2101,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by expat $as_me 2.2.7, which was +It was created by expat $as_me 2.2.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2475,6 +2485,77 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + am__api_version='1.16' # Find a good install program. We prefer a C program (faster), @@ -2961,7 +3042,7 @@ fi # Define the identity of the package. PACKAGE='expat' - VERSION='2.2.7' + VERSION='2.2.9' cat >>confdefs.h <<_ACEOF @@ -3057,9 +3138,9 @@ fi -LIBCURRENT=7 # sync -LIBREVISION=9 # with -LIBAGE=6 # CMakeLists.txt! +LIBCURRENT=7 # sync +LIBREVISION=11 # with +LIBAGE=6 # CMakeLists.txt! if ${CPPFLAGS+:} false; then : @@ -4377,77 +4458,6 @@ macro_revision='2.4.6' ltmain=$ac_aux_dir/ltmain.sh -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - # Backslashify metacharacters that are still active within # double-quoted strings. sed_quote_subst='s/\(["`$\\]\)/\\\1/g' @@ -17392,6 +17402,18 @@ done fi +case "$LD" in #( + *clang*) : + case "${host_os}" in #( + *linux*) : + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ;; #( + *) : + ;; +esac ;; #( + *) : + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports visibility" >&5 $as_echo_n "checking whether compiler supports visibility... " >&6; } if ${expatcfg_cv_compiler_supports_visibility+:} false; then : @@ -17972,7 +17994,17 @@ else fi - if echo -- "${host}" | ${FGREP} mingw >/dev/null; then + +EXPATCFG_ON_MINGW=no +case "${host_os}" in #( + mingw*) : + EXPATCFG_ON_MINGW=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: detected OS: MinGW" >&5 +$as_echo "$as_me: detected OS: MinGW" >&6;} ;; #( + *) : + ;; +esac + if test x${EXPATCFG_ON_MINGW} = xyes; then MINGW_TRUE= MINGW_FALSE='#' else @@ -17980,6 +18012,7 @@ else MINGW_FALSE= fi + if echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP} XML_UNICODE >/dev/null; then UNICODE_TRUE= UNICODE_FALSE='#' @@ -18054,14 +18087,14 @@ $as_echo_n "checking for arc4random_buf (BSD or libbsd)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include <stdlib.h> /* for arc4random_buf on BSD, for NULL */ - #if defined(HAVE_LIBBSD) - # include <bsd/stdlib.h> - #endif - int main() { - arc4random_buf(NULL, 0U); - return 0; - } + #include <stdlib.h> /* for arc4random_buf on BSD, for NULL */ + #if defined(HAVE_LIBBSD) + # include <bsd/stdlib.h> + #endif + int main() { + arc4random_buf(NULL, 0U); + return 0; + } _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18079,15 +18112,15 @@ $as_echo_n "checking for arc4random (BSD, macOS or libbsd)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #if defined(HAVE_LIBBSD) - # include <bsd/stdlib.h> - #else - # include <stdlib.h> - #endif - int main() { + #if defined(HAVE_LIBBSD) + # include <bsd/stdlib.h> + #else + # include <stdlib.h> + #endif + int main() { arc4random(); return 0; - } + } _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18107,58 +18140,84 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getrandom (Linux 3.17+, glibc 2.25+)" >&5 +# Check whether --with-getrandom was given. +if test "${with_getrandom+set}" = set; then : + withval=$with_getrandom; +else + with_getrandom=check +fi + + +if test "x$with_getrandom" != xno; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getrandom (Linux 3.17+, glibc 2.25+)" >&5 $as_echo_n "checking for getrandom (Linux 3.17+, glibc 2.25+)... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include <stdlib.h> /* for NULL */ - #include <sys/random.h> - int main() { - return getrandom(NULL, 0U, 0U); - } + #include <stdlib.h> /* for NULL */ + #include <sys/random.h> + int main() { + return getrandom(NULL, 0U, 0U); + } _ACEOF if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + if test "x$with_getrandom" = xyes; then : + as_fn_error $? "enforced the use of getrandom --with-getrandom, but not detected" "$LINENO" 5 +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for syscall SYS_getrandom (Linux 3.17+)" >&5 + +# Check whether --with-sys_getrandom was given. +if test "${with_sys_getrandom+set}" = set; then : + withval=$with_sys_getrandom; +else + with_sys_getrandom=check +fi + + +if test "x$with_sys_getrandom" != xno; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for syscall SYS_getrandom (Linux 3.17+)" >&5 $as_echo_n "checking for syscall SYS_getrandom (Linux 3.17+)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include <stdlib.h> /* for NULL */ - #include <unistd.h> /* for syscall */ - #include <sys/syscall.h> /* for SYS_getrandom */ - int main() { - syscall(SYS_getrandom, NULL, 0, 0); - return 0; - } + #include <stdlib.h> /* for NULL */ + #include <unistd.h> /* for syscall */ + #include <sys/syscall.h> /* for SYS_getrandom */ + int main() { + syscall(SYS_getrandom, NULL, 0, 0); + return 0; + } _ACEOF if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_SYSCALL_GETRANDOM 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + if test "x$with_sys_getrandom" = xyes; then : + as_fn_error $? "enforced the use of syscall SYS_getrandom --with-sys-getrandom, but not detected" "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - +fi for ac_header in fcntl.h unistd.h do : @@ -18404,6 +18463,19 @@ $as_echo "#define XML_DTD 1" >>confdefs.h $as_echo "#define XML_DEV_URANDOM 1" >>confdefs.h +# Check whether --enable-xml-attr-info was given. +if test "${enable_xml_attr_info+set}" = set; then : + enableval=$enable_xml_attr_info; +else + enable_xml_attr_info=no +fi + +if test "x${enable_xml_attr_info}" = "xyes"; then : + +$as_echo "#define XML_ATTR_INFO 1" >>confdefs.h + +fi + # Check whether --enable-xml-context was given. if test "${enable_xml_context+set}" = set; then : enableval=$enable_xml_context; enable_xml_context=${enableval} @@ -19061,7 +19133,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by expat $as_me 2.2.7, which was +This file was extended by expat $as_me 2.2.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19127,7 +19199,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -expat config.status 2.2.7 +expat config.status 2.2.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |