diff options
Diffstat (limited to 'lib/libXt/configure')
| -rw-r--r-- | lib/libXt/configure | 217 |
1 files changed, 156 insertions, 61 deletions
diff --git a/lib/libXt/configure b/lib/libXt/configure index 21a5efdd9..d71323fbb 100644 --- a/lib/libXt/configure +++ b/lib/libXt/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libXt 1.1.5. +# Generated by GNU Autoconf 2.69 for libXt 1.2.0. # -# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXt/issues>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +$0: https://gitlab.freedesktop.org/xorg/lib/libXt/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -651,9 +651,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libXt' PACKAGE_TARNAME='libXt' -PACKAGE_VERSION='1.1.5' -PACKAGE_STRING='libXt 1.1.5' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='libXt 1.2.0' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libXt/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -901,6 +901,8 @@ with_fop with_xsltproc with_perl enable_xkb +enable_const +enable_geo_tattler enable_unit_tests with_glib with_xfile_search_path @@ -1467,7 +1469,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 libXt 1.1.5 to adapt to many kinds of systems. +\`configure' configures libXt 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1537,7 +1539,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXt 1.1.5:";; + short | recursive ) echo "Configuration of libXt 1.2.0:";; esac cat <<\_ACEOF @@ -1569,6 +1571,8 @@ Optional Features: malloc(0) returns NULL (default: auto) --enable-specs Enable building the specs (default: yes) --disable-xkb Disable XKB support + --disable-const Disable const-support + --enable-geo-tattler Enable geo-tattler traces --enable-unit-tests Enable building unit test cases (default: auto) Optional Packages: @@ -1621,7 +1625,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXt/issues>. _ACEOF ac_status=$? fi @@ -1684,7 +1688,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXt configure 1.1.5 +libXt configure 1.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2075,9 +2079,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ##" +( $as_echo "## ------------------------------------------------------------------- ## +## Report this to https://gitlab.freedesktop.org/xorg/lib/libXt/issues ## +## ------------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2099,7 +2103,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 libXt $as_me 1.1.5, which was +It was created by libXt $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2929,7 +2933,7 @@ fi # Define the identity of the package. PACKAGE='libXt' - VERSION='1.1.5' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -17619,10 +17623,11 @@ _ACEOF -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ -echo 'git directory not found: installing possibly empty changelog.' >&2)" +|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ +touch \$(top_srcdir)/ChangeLog; \ +echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" @@ -17630,14 +17635,45 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)" macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ -echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ +touch \$(top_srcdir)/INSTALL; \ +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" +case $host_os in + solaris*) + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we + # check for a man page file found in later versions that use + # traditional section numbers instead + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 +$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } +if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : + $as_echo_n "(cached) " >&6 +else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "/usr/share/man/man7/attributes.7"; then + ac_cv_file__usr_share_man_man7_attributes_7=yes +else + ac_cv_file__usr_share_man_man7_attributes_7=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 +$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } +if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : + SYSV_MAN_SECTIONS=false +else + SYSV_MAN_SECTIONS=true +fi + + ;; + *) SYSV_MAN_SECTIONS=false ;; +esac + if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 fi @@ -17653,9 +17689,9 @@ if test x$LIB_MAN_DIR = x ; then fi if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; + case $SYSV_MAN_SECTIONS in + true) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then @@ -17663,9 +17699,9 @@ if test x$FILE_MAN_DIR = x ; then fi if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; + case $SYSV_MAN_SECTIONS in + true) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then @@ -17673,9 +17709,9 @@ if test x$MISC_MAN_DIR = x ; then fi if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; + case $SYSV_MAN_SECTIONS in + true) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then @@ -17683,9 +17719,9 @@ if test x$DRIVER_MAN_DIR = x ; then fi if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; + case $SYSV_MAN_SECTIONS in + true) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; esac fi if test x$ADMIN_MAN_DIR = x ; then @@ -18004,6 +18040,11 @@ esac fi # Test for the ability of xmlto to generate a text target +# +# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the +# following test for empty XML docbook files. +# For compatibility reasons use the following empty XML docbook file and if +# it fails try it again with a non-empty XML file. have_xmlto_text=no cat > conftest.xml << "EOF" EOF @@ -18011,10 +18052,18 @@ if test "$have_xmlto" = yes; then : if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then : have_xmlto_text=yes else + # Try it again with a non-empty XML file. + cat > conftest.xml << "EOF" +<x></x> +EOF + if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then : + have_xmlto_text=yes +else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate text format, this format skipped" >&5 $as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;} fi fi +fi rm -f conftest.xml if test $have_xmlto_text = yes; then HAVE_XMLTO_TEXT_TRUE= @@ -18706,9 +18755,13 @@ fi done else - CC_FOR_BUILD="$CC" + CC_FOR_BUILD="$CC" fi fi +if test x"$cross_compiling" != xyes; then + : ${CFLAGS_FOR_BUILD=${CFLAGS}} + : ${LDFLAGS_FOR_BUILD=${LDFLAGS}} +fi DEFAULT_CPPFLAGS_FOR_BUILD="${CPPFLAGS}" ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf" @@ -18719,9 +18772,7 @@ fi CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${DEFAULT_CPPFLAGS_FOR_BUILD}} DEFAULT_CFLAGS_FOR_BUILD="${CFLAGS} ${CWARNFLAGS}" -CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${DEFAULT_CFLAGS_FOR_BUILD}} -LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} # Map function checks to old Imake #defines @@ -18809,6 +18860,8 @@ ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main esac # Options +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if XKB support is wanted" >&5 +$as_echo_n "checking if XKB support is wanted... " >&6; } # Check whether --enable-xkb was given. if test "${enable_xkb+set}" = set; then : enableval=$enable_xkb; XKB="$enableval" @@ -18816,12 +18869,48 @@ else XKB="yes" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XKB" >&5 +$as_echo "$XKB" >&6; } if test "x$XKB" = "xyes" ; then $as_echo "#define XKB 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if C const-support is wanted" >&5 +$as_echo_n "checking if C const-support is wanted... " >&6; } +# Check whether --enable-const was given. +if test "${enable_const+set}" = set; then : + enableval=$enable_const; USE_CONST="$enableval" +else + USE_CONST="yes" +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_CONST" >&5 +$as_echo "$USE_CONST" >&6; } +if test "x$USE_CONST" = "xyes" ; then + +$as_echo "#define _CONST_X_STRING 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if geo-tattler traces are wanted" >&5 +$as_echo_n "checking if geo-tattler traces are wanted... " >&6; } +# Check whether --enable-geo-tattler was given. +if test "${enable_geo_tattler+set}" = set; then : + enableval=$enable_geo_tattler; GEO_TATTLER="$enableval" +else + GEO_TATTLER="no" +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GEO_TATTLER" >&5 +$as_echo "$GEO_TATTLER" >&6; } +if test "x$GEO_TATTLER" = "xyes" ; then + +$as_echo "#define XT_GEO_TATTLER 1" >>confdefs.h + +fi + # --enable-unit-tests @@ -19043,8 +19132,8 @@ fi # Memory checking support case $host_os in - solaris*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for umem_alloc in -lumem" >&5 + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for umem_alloc in -lumem" >&5 $as_echo_n "checking for umem_alloc in -lumem... " >&6; } if ${ac_cv_lib_umem_umem_alloc+:} false; then : $as_echo_n "(cached) " >&6 @@ -19084,28 +19173,38 @@ if test "x$ac_cv_lib_umem_umem_alloc" = xyes; then : MALLOC_DEBUG_ENV='LD_PRELOAD=libumem.so UMEM_DEBUG=default' fi - ;; - *-gnu*) # GNU libc - Value is used as a single byte bit pattern, - # both directly and inverted, so should not be 0 or 255. - MALLOC_DEBUG_ENV='MALLOC_PERTURB_=15' - ;; - *bsd*|darwin*) - MALLOC_DEBUG_ENV='MallocPreScribble=1 MallocScribble=1' - ;; + ;; + *-gnu*) # GNU libc - Value is used as a single byte bit pattern, + # both directly and inverted, so should not be 0 or 255. + MALLOC_DEBUG_ENV='MALLOC_PERTURB_=15' + ;; + *bsd*|darwin*) + MALLOC_DEBUG_ENV='MallocPreScribble=1 MallocScribble=1' + ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for definitions to enable memory-checking support" >&5 +$as_echo_n "checking for definitions to enable memory-checking support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${MALLOC_DEBUG_ENV:-none}" >&5 +$as_echo "${MALLOC_DEBUG_ENV:-none}" >&6; } # Replaces XFileSearchPathDefault from Imake configs XFILESEARCHPATHDEFAULT='$(sysconfdir)/X11/%L/%T/%N%C%S:$(sysconfdir)/X11/%l/%T/%N%C%S:$(sysconfdir)/X11/%T/%N%C%S:$(sysconfdir)/X11/%L/%T/%N%S:$(sysconfdir)/X11/%l/%T/%N%S:$(sysconfdir)/X11/%T/%N%S:$(datadir)/X11/%L/%T/%N%C%S:$(datadir)/X11/%l/%T/%N%C%S:$(datadir)/X11/%T/%N%C%S:$(datadir)/X11/%L/%T/%N%S:$(datadir)/X11/%l/%T/%N%S:$(datadir)/X11/%T/%N%S:$(libdir)/X11/%L/%T/%N%C%S:$(libdir)/X11/%l/%T/%N%C%S:$(libdir)/X11/%T/%N%C%S:$(libdir)/X11/%L/%T/%N%S:$(libdir)/X11/%l/%T/%N%S:$(libdir)/X11/%T/%N%S' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X files search path" >&5 +$as_echo_n "checking for X files search path... " >&6; } # Check whether --with-xfile-search-path was given. if test "${with_xfile_search_path+set}" = set; then : withval=$with_xfile_search_path; XFILESEARCHPATHDEFAULT="$withval" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${XFILESEARCHPATHDEFAULT:-none}" >&5 +$as_echo "${XFILESEARCHPATHDEFAULT:-none}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X app-defaults directory" >&5 +$as_echo_n "checking for X app-defaults directory... " >&6; } # Check whether --with-appdefaultdir was given. if test "${with_appdefaultdir+set}" = set; then : @@ -19114,6 +19213,8 @@ else appdefaultdir=${datadir}/X11/app-defaults fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $appdefaultdir" >&5 +$as_echo "$appdefaultdir" >&6; } prefix_NONE= exec_prefix_NONE= @@ -19134,10 +19235,12 @@ _ACEOF # Replacement for Imake ToolkitStringsABIOptions, controls string tables # generated by util/string.list in StringDefs.h & Shell.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ABI options" >&5 +$as_echo_n "checking for ABI options... " >&6; } case $host_os in solaris*) # Solaris uses -intelabi even on SPARC - STRINGSABIOPTIONS="-intelabi -solarisabinames" + STRINGSABIOPTIONS="-intelabi -solarisabinames" ;; sco* | svr4*) case $host_cpu in @@ -19146,23 +19249,14 @@ case $host_os in esac ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${STRINGSABIOPTIONS:-none}" >&5 +$as_echo "${STRINGSABIOPTIONS:-none}" >&6; } ERRORDBDIR=${datadir}/X11 -case $host_os in - darwin*) - OS_CFLAGS="-Wl,-flat_namespace" - ;; - *) - OS_CFLAGS= - ;; -esac - -XT_CFLAGS="$XT_CFLAGS $OS_CFLAGS" - -ac_config_files="$ac_config_files Makefile src/Makefile util/Makefile include/Makefile man/Makefile specs/Makefile test/Makefile xt.pc" +ac_config_files="$ac_config_files Makefile src/Makefile util/Makefile include/Makefile man/Makefile specs/Makefile specs/libXt.ent test/Makefile xt.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19734,7 +19828,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 libXt $as_me 1.1.5, which was +This file was extended by libXt $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19794,13 +19888,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." +Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXt/issues>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libXt config.status 1.1.5 +libXt config.status 1.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20215,6 +20309,7 @@ do "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "specs/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Makefile" ;; + "specs/libXt.ent") CONFIG_FILES="$CONFIG_FILES specs/libXt.ent" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "xt.pc") CONFIG_FILES="$CONFIG_FILES xt.pc" ;; |