diff -Nru libinput-1.2.2/config.h.in libinput-0.21.0/config.h.in --- libinput-1.2.2/config.h.in 2016-03-15 00:23:59.000000000 +0000 +++ libinput-0.21.0/config.h.in 2015-08-04 00:58:33.000000000 +0000 @@ -21,9 +21,6 @@ /* Have libunwind support */ #undef HAVE_LIBUNWIND -/* Build with libwacom */ -#undef HAVE_LIBWACOM - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -48,7 +45,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory where libtool stores uninstalled libraries. */ +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ #undef LT_OBJDIR /* Name of package */ diff -Nru libinput-1.2.2/configure libinput-0.21.0/configure --- libinput-1.2.2/configure 2016-03-15 00:23:56.000000000 +0000 +++ libinput-0.21.0/configure 2015-08-04 00:58:30.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libinput 1.2.2. +# Generated by GNU Autoconf 2.69 for libinput 0.21.0. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ $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=Wayland&component=libinput&version=1.2.2 +$0: https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=libinput&version=0.21.0 $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 @@ # Identity of this package. PACKAGE_NAME='libinput' PACKAGE_TARNAME='libinput' -PACKAGE_VERSION='1.2.2' -PACKAGE_STRING='libinput 1.2.2' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=libinput&version=1.2.2' +PACKAGE_VERSION='0.21.0' +PACKAGE_STRING='libinput 0.21.0' +PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=libinput&version=0.21.0' PACKAGE_URL='http://www.freedesktop.org/wiki/Software/libinput/' # Factoring default headers for most tests. @@ -703,8 +703,6 @@ BUILD_TESTS_TRUE HAVE_VALGRIND_FALSE HAVE_VALGRIND_TRUE -LIBWACOM_LIBS -LIBWACOM_CFLAGS VALGRIND CHECK_LIBS CHECK_CFLAGS @@ -734,7 +732,6 @@ PKG_CONFIG_PATH PKG_CONFIG CXXCPP -LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -867,16 +864,13 @@ enable_static with_pic enable_fast_install -with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock -with_libunwind with_udev_dir enable_documentation enable_event_gui enable_tests -enable_libwacom ' ac_precious_vars='build_alias host_alias @@ -890,7 +884,6 @@ CXX CXXFLAGS CCC -LT_SYS_LIBRARY_PATH CXXCPP PKG_CONFIG PKG_CONFIG_PATH @@ -908,9 +901,7 @@ GTK_CFLAGS GTK_LIBS CHECK_CFLAGS -CHECK_LIBS -LIBWACOM_CFLAGS -LIBWACOM_LIBS' +CHECK_LIBS' # Initialize some variables set by options. @@ -1451,7 +1442,7 @@ # 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 libinput 1.2.2 to adapt to many kinds of systems. +\`configure' configures libinput 0.21.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1521,7 +1512,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libinput 1.2.2:";; + short | recursive ) echo "Configuration of libinput 0.21.0:";; esac cat <<\_ACEOF @@ -1543,21 +1534,15 @@ --enable-documentation Enable building the documentation (default=auto) --enable-event-gui Build the GUI event viewer (default=auto) --enable-tests Build the tests (default=auto) - --enable-libwacom Use libwacom for tablet identification - (default=enabled) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] - --with-aix-soname=aix|svr4|both - shared library versioning (aka "SONAME") variant to - provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot[=DIR] Search for dependent libraries within DIR (or the - compiler's sysroot if not specified). - --without-libunwind Do not use libunwind + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-udev-dir=DIR udev base directory [[default=$udev_dir_default]] Some influential environment variables: @@ -1571,8 +1556,6 @@ CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags - LT_SYS_LIBRARY_PATH - User-defined run-time library search path. CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH @@ -1602,15 +1585,11 @@ CHECK_CFLAGS C compiler flags for CHECK, overriding pkg-config CHECK_LIBS linker flags for CHECK, overriding pkg-config - LIBWACOM_CFLAGS - C compiler flags for LIBWACOM, overriding pkg-config - LIBWACOM_LIBS - linker flags for LIBWACOM, overriding pkg-config 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 . +Report bugs to . libinput home page: . _ACEOF ac_status=$? @@ -1674,7 +1653,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libinput configure 1.2.2 +libinput configure 0.21.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1833,9 +1812,9 @@ $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=Wayland&component=libinput&version=1.2.2 ## -## ---------------------------------------------------------------------------------------------------------- ##" +( $as_echo "## ----------------------------------------------------------------------------------------------------------- ## +## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=libinput&version=0.21.0 ## +## ----------------------------------------------------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2210,7 +2189,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libinput $as_me 1.2.2, which was +It was created by libinput $as_me 0.21.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2559,13 +2538,13 @@ -LIBINPUT_VERSION_MAJOR=1 +LIBINPUT_VERSION_MAJOR=0 -LIBINPUT_VERSION_MINOR=2 +LIBINPUT_VERSION_MINOR=21 -LIBINPUT_VERSION_MICRO=2 +LIBINPUT_VERSION_MICRO=0 -LIBINPUT_VERSION=1.2.2 +LIBINPUT_VERSION=0.21.0 ac_config_headers="$ac_config_headers config.h" @@ -3087,7 +3066,7 @@ # Define the identity of the package. PACKAGE='libinput' - VERSION='1.2.2' + VERSION='0.21.0' cat >>confdefs.h <<_ACEOF @@ -3190,7 +3169,7 @@ # b) If interfaces have been changed or added, but binary compatibility has # been preserved, change to C+1:0:A+1 # c) If the interface is the same as the previous version, change to C:R+1:A -LIBINPUT_LT_VERSION=17:4:7 +LIBINPUT_LT_VERSION=15:0:5 # Check whether --enable-silent-rules was given. @@ -5368,8 +5347,8 @@ -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5383,7 +5362,7 @@ -ltmain=$ac_aux_dir/ltmain.sh +ltmain="$ac_aux_dir/ltmain.sh" # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -5503,7 +5482,7 @@ $ECHO "" } -case $ECHO in +case "$ECHO" in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -5696,19 +5675,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test yes = "$GCC"; then +if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return, which upsets mingw + # gcc leaves a trailing carriage return which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -5722,7 +5701,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD=$ac_prog + test -z "$LD" && LD="$ac_prog" ;; "") # If it fails, then pretend we aren't using GCC. @@ -5733,7 +5712,7 @@ with_gnu_ld=unknown ;; esac -elif test yes = "$with_gnu_ld"; then +elif test "$with_gnu_ld" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -5744,32 +5723,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD=$ac_dir/$ac_prog + lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -5812,38 +5791,33 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM=$NM + lt_cv_path_NM="$NM" else - lt_nm_to_check=${ac_tool_prefix}nm + lt_nm_to_check="${ac_tool_prefix}nm" if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. - tmp_nm=$ac_dir/$lt_tmp_nm - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # Adding the `sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty - case $build_os in - mingw*) lt_bad_file=conftest.nm/nofile ;; - *) lt_bad_file=/dev/null ;; - esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in - *$lt_bad_file* | *'Invalid file or object type'*) + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break 2 + break ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break 2 + break ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -5854,15 +5828,15 @@ esac fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test no != "$lt_cv_path_NM"; then - NM=$lt_cv_path_NM +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -5968,9 +5942,9 @@ fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols -headers" + DUMPBIN="$DUMPBIN -symbols" ;; *) DUMPBIN=: @@ -5978,8 +5952,8 @@ esac fi - if test : != "$DUMPBIN"; then - NM=$DUMPBIN + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" fi fi test -z "$NM" && NM=nm @@ -6030,7 +6004,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring=ABCD + teststring="ABCD" case $build_os in msdosdjgpp*) @@ -6070,7 +6044,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -6120,23 +6094,22 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8; do + for i in 1 2 3 4 5 6 7 8 ; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test 17 != "$i" # 1/2 MB should be enough + test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -6154,7 +6127,7 @@ fi -if test -n "$lt_cv_sys_max_cmd_len"; then +if test -n $lt_cv_sys_max_cmd_len ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -6172,6 +6145,30 @@ : ${MV="mv -f"} : ${RM="rm -f"} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } + + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -6294,13 +6291,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test yes != "$GCC"; then + if test "$GCC" != yes; then reload_cmds=false fi ;; darwin*) - if test yes = "$GCC"; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -6428,13 +6425,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# 'unknown' -- same as none, but documents that we really don't know. +# `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# that responds to the $file_magic_cmd with a given extended regex. -# If you have 'file' or equivalent on your system and you're not sure -# whether 'pass_all' will *always* work, you probably want this one. +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -6461,7 +6458,8 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -6497,6 +6495,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -6535,7 +6537,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6557,8 +6559,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd* | bitrig*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -6611,9 +6613,6 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; -os2*) - lt_cv_deplibs_check_method=pass_all - ;; esac fi @@ -6771,8 +6770,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh; - # decide which one to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -6784,7 +6783,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd=$ECHO + lt_cv_sharedlib_from_linklib_cmd="$ECHO" ;; esac @@ -6938,7 +6937,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test 0 -eq "$ac_status"; then + if test "$ac_status" -eq 0; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -6946,7 +6945,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test 0 -ne "$ac_status"; then + if test "$ac_status" -ne 0; then lt_cv_ar_at_file=@ fi fi @@ -6959,7 +6958,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test no = "$lt_cv_ar_at_file"; then +if test "x$lt_cv_ar_at_file" = xno; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -7176,7 +7175,7 @@ if test -n "$RANLIB"; then case $host_os in - bitrig* | openbsd*) + openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -7266,7 +7265,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then symcode='[ABCDEGRST]' fi ;; @@ -7299,44 +7298,14 @@ symcode='[ABCDGIRSTW]' ;; esac -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" - # Adjust the below global symbol transforms to fixup imported variables. - lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" - lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" - lt_c_name_lib_hook="\ - -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ - -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" -else - # Disable hooks by default. - lt_cv_sys_global_symbol_to_import= - lt_cdecl_hook= - lt_c_name_hook= - lt_c_name_lib_hook= -fi - # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ -$lt_cdecl_hook\ -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ -$lt_c_name_hook\ -" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" - -# Transform an extracted symbol line into symbol name with lib prefix and -# symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ -$lt_c_name_lib_hook\ -" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -7354,24 +7323,21 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function, - # D for any global variable and I for any imported variable. + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ -" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ -" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ -" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ -" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -7419,11 +7385,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE -/* DATA imports from DLLs on WIN32 can't be const, because runtime +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined __osf__ +#elif defined(__osf__) /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -7449,7 +7415,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -7469,13 +7435,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS=conftstm.$ac_objext + LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest$ac_exeext; then + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -7496,7 +7462,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test yes = "$pipe_works"; then + if test "$pipe_works" = yes; then break else lt_cv_sys_global_symbol_pipe= @@ -7549,16 +7515,6 @@ - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -7571,9 +7527,9 @@ lt_sysroot= -case $with_sysroot in #( +case ${with_sysroot} in #( yes) - if test yes = "$GCC"; then + if test "$GCC" = yes; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -7583,8 +7539,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 -$as_echo "$with_sysroot" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -7596,99 +7552,18 @@ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 -$as_echo_n "checking for a working dd... " >&6; } -if ${ac_cv_path_lt_DD+:} false; then : - $as_echo_n "(cached) " >&6 -else - printf 0123456789abcdef0123456789abcdef >conftest.i -cat conftest.i conftest.i >conftest2.i -: ${lt_DD:=$DD} -if test -z "$lt_DD"; then - ac_path_lt_DD_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in dd; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_lt_DD" || continue -if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then - cmp -s conftest.i conftest.out \ - && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: -fi - $ac_path_lt_DD_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_lt_DD"; then - : - fi -else - ac_cv_path_lt_DD=$lt_DD -fi - -rm -f conftest.i conftest2.i conftest.out -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 -$as_echo "$ac_cv_path_lt_DD" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 -$as_echo_n "checking how to truncate binary pipes... " >&6; } -if ${lt_cv_truncate_bin+:} false; then : - $as_echo_n "(cached) " >&6 -else - printf 0123456789abcdef0123456789abcdef >conftest.i -cat conftest.i conftest.i >conftest2.i -lt_cv_truncate_bin= -if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then - cmp -s conftest.i conftest.out \ - && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" -fi -rm -f conftest.i conftest2.i conftest.out -test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 -$as_echo "$lt_cv_truncate_bin" >&6; } - - - - - - - -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -func_cc_basename () -{ - for cc_temp in $*""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac - done - func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -} - # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test no = "$enable_libtool_lock" || enable_libtool_lock=yes +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out what ABI is being produced by ac_compile, and set mode - # options accordingly. + # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7697,25 +7572,24 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE=32 + HPUX_IA64_MODE="32" ;; *ELF-64*) - HPUX_IA64_MODE=64 + HPUX_IA64_MODE="64" ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. + # Find out which ABI we are using. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test yes = "$lt_cv_prog_gnu_ld"; then + if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -7744,50 +7618,9 @@ rm -rf conftest* ;; -mips64*-*linux*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - emul=elf - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - emul="${emul}32" - ;; - *64-bit*) - emul="${emul}64" - ;; - esac - case `/usr/bin/file conftest.$ac_objext` in - *MSB*) - emul="${emul}btsmip" - ;; - *LSB*) - emul="${emul}ltsmip" - ;; - esac - case `/usr/bin/file conftest.$ac_objext` in - *N32*) - emul="${emul}n32" - ;; - esac - LD="${LD-ld} -m $emul" - fi - rm -rf conftest* - ;; - x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. Note that the listed cases only cover the - # situations where additional linker options are needed (such as when - # doing 32-bit compilation for a host where ld defaults to 64-bit, or - # vice versa); the common cases where no linker options are needed do - # not appear in the list. + # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7801,14 +7634,7 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -7853,7 +7679,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS=$CFLAGS + SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -7893,14 +7719,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test yes != "$lt_cv_cc_needs_belf"; then + if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS=$SAVE_CFLAGS + CFLAGS="$SAVE_CFLAGS" fi ;; *-*solaris*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. + # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7912,7 +7737,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*|x86_64-*-solaris*) + i?86-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -7921,7 +7746,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD=${LD-ld}_sol2 + LD="${LD-ld}_sol2" fi ;; *) @@ -7937,7 +7762,7 @@ ;; esac -need_locks=$enable_libtool_lock +need_locks="$enable_libtool_lock" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -8048,7 +7873,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test yes != "$lt_cv_path_mainfest_tool"; then +if test "x$lt_cv_path_mainfest_tool" != xyes; then MANIFEST_TOOL=: fi @@ -8551,7 +8376,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "$LT_MULTI_MODULE"; then + if test -z "${LT_MULTI_MODULE}"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -8569,7 +8394,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -8608,7 +8433,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS + LDFLAGS="$save_LDFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -8637,7 +8462,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8650,32 +8475,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test yes = "$lt_cv_apple_cc_single_mod"; then + if test "$lt_cv_apple_cc_single_mod" = "yes"; then _lt_dar_single_mod='$single_module' fi - if test yes = "$lt_cv_ld_exported_symbols_list"; then - _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -8683,41 +8508,6 @@ ;; esac -# func_munge_path_list VARIABLE PATH -# ----------------------------------- -# VARIABLE is name of variable containing _space_ separated list of -# directories to be munged by the contents of PATH, which is string -# having a format: -# "DIR[:DIR]:" -# string "DIR[ DIR]" will be prepended to VARIABLE -# ":DIR[:DIR]" -# string "DIR[ DIR]" will be appended to VARIABLE -# "DIRP[:DIRP]::[DIRA:]DIRA" -# string "DIRP[ DIRP]" will be prepended to VARIABLE and string -# "DIRA[ DIRA]" will be appended to VARIABLE -# "DIR[:DIR]" -# VARIABLE will be replaced by "DIR[ DIR]" -func_munge_path_list () -{ - case x$2 in - x) - ;; - *:) - eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" - ;; - x:*) - eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" - ;; - *::*) - eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" - eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" - ;; - *) - eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" - ;; - esac -} - for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default @@ -8736,9 +8526,9 @@ func_stripname_cnf () { - case $2 in - .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;; - *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;; + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; esac } # func_stripname_cnf @@ -8765,14 +8555,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" ;; esac else @@ -8796,14 +8586,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" ;; esac else @@ -8827,14 +8617,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for lt_pkg in $withval; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" ;; esac else @@ -8842,6 +8632,8 @@ fi +test -z "$pic_mode" && pic_mode=default + @@ -8857,14 +8649,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" ;; esac else @@ -8878,63 +8670,11 @@ - shared_archive_member_spec= -case $host,$enable_shared in -power*-*-aix[5-9]*,yes) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 -$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } - -# Check whether --with-aix-soname was given. -if test "${with_aix_soname+set}" = set; then : - withval=$with_aix_soname; case $withval in - aix|svr4|both) - ;; - *) - as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 - ;; - esac - lt_cv_with_aix_soname=$with_aix_soname -else - if ${lt_cv_with_aix_soname+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_with_aix_soname=aix -fi - - with_aix_soname=$lt_cv_with_aix_soname -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 -$as_echo "$with_aix_soname" >&6; } - if test aix != "$with_aix_soname"; then - # For the AIX way of multilib, we name the shared archive member - # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', - # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. - # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, - # the AIX toolchain works better with OBJECT_MODE set (default 32). - if test 64 = "${OBJECT_MODE-32}"; then - shared_archive_member_spec=shr_64 - else - shared_archive_member_spec=shr - fi - fi - ;; -*) - with_aix_soname=aix - ;; -esac - - - - - - - # This can be used to rebuild libtool when needed -LIBTOOL_DEPS=$ltmain +LIBTOOL_DEPS="$ltmain" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -8983,7 +8723,7 @@ -if test -n "${ZSH_VERSION+set}"; then +if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi @@ -9022,7 +8762,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test set != "${COLLECT_NAMES+set}"; then + if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -9033,14 +8773,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld=$lt_cv_prog_gnu_ld +with_gnu_ld="$lt_cv_prog_gnu_ld" -old_CC=$CC -old_CFLAGS=$CFLAGS +old_CC="$CC" +old_CFLAGS="$CFLAGS" # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -9049,8 +8789,15 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -func_cc_basename $compiler -cc_basename=$func_cc_basename_result +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -9065,22 +8812,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD=$MAGIC_CMD - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/${ac_tool_prefix}file"; then - lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD=$lt_cv_path_MAGIC_CMD + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -9103,13 +8850,13 @@ break fi done - IFS=$lt_save_ifs - MAGIC_CMD=$lt_save_MAGIC_CMD + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" ;; esac fi -MAGIC_CMD=$lt_cv_path_MAGIC_CMD +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -9131,22 +8878,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD=$MAGIC_CMD - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/file"; then - lt_cv_path_MAGIC_CMD=$ac_dir/"file" + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD=$lt_cv_path_MAGIC_CMD + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -9169,13 +8916,13 @@ break fi done - IFS=$lt_save_ifs - MAGIC_CMD=$lt_save_MAGIC_CMD + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" ;; esac fi -MAGIC_CMD=$lt_cv_path_MAGIC_CMD +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -9196,7 +8943,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC=$CC +lt_save_CC="$CC" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9258,7 +9005,7 @@ lt_prog_compiler_no_builtin_flag= -if test yes = "$GCC"; then +if test "$GCC" = yes; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -9274,7 +9021,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment + lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9304,7 +9051,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -9322,18 +9069,17 @@ lt_prog_compiler_static= - if test yes = "$GCC"; then + if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi - lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -9344,8 +9090,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the '-m68020' flag to GCC prevents building anything better, - # like '-m68040'. + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -9361,11 +9107,6 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' - case $host_os in - os2*) - lt_prog_compiler_static='$wl-static' - ;; - esac ;; darwin* | rhapsody*) @@ -9436,7 +9177,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -9444,29 +9185,10 @@ fi ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - case $cc_basename in - nagfor*) - # NAG Fortran compiler - lt_prog_compiler_wl='-Wl,-Wl,,' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - esac - ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' - case $host_os in - os2*) - lt_prog_compiler_static='$wl-static' - ;; - esac ;; hpux9* | hpux10* | hpux11*) @@ -9482,7 +9204,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='$wl-a ${wl}archive' + lt_prog_compiler_static='${wl}-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -9491,9 +9213,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in - # old Intel for x86_64, which still supported -KPIC. + # old Intel for x86_64 which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -9518,12 +9240,6 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; - tcc*) - # Fabrice Bellard et al's Tiny C Compiler - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -9621,7 +9337,7 @@ ;; sysv4*MP*) - if test -d /usr/nec; then + if test -d /usr/nec ;then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -9650,7 +9366,7 @@ fi case $host_os in - # For platforms that do not support PIC, -DPIC is meaningless: + # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -9682,7 +9398,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9712,7 +9428,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test yes = "$lt_cv_prog_compiler_pic_works"; then +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -9744,7 +9460,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS=$LDFLAGS + save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9763,13 +9479,13 @@ fi fi $RM -r conftest* - LDFLAGS=$save_LDFLAGS + LDFLAGS="$save_LDFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test yes = "$lt_cv_prog_compiler_static_works"; then +if test x"$lt_cv_prog_compiler_static_works" = xyes; then : else lt_prog_compiler_static= @@ -9889,8 +9605,8 @@ -hard_links=nottested -if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -9902,9 +9618,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test no = "$hard_links"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -9947,9 +9663,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ' (' and ')$', so one must not match beginning or - # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', - # as well as any symbol that contains 'd'. + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -9964,7 +9680,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test yes != "$GCC"; then + if test "$GCC" != yes; then with_gnu_ld=no fi ;; @@ -9972,7 +9688,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd* | bitrig*) + openbsd*) with_gnu_ld=no ;; esac @@ -9982,7 +9698,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test yes = "$with_gnu_ld"; then + if test "$with_gnu_ld" = yes; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -10004,24 +9720,24 @@ esac fi - if test yes = "$lt_use_gnu_ld_interface"; then + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='$wl' + wlarc='${wl}' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - export_dynamic_flag_spec='$wl--export-dynamic' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + case `$LD -v 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -10034,7 +9750,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test ia64 != "$host_cpu"; then + if test "$host_cpu" != ia64; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -10053,7 +9769,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10069,7 +9785,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -10079,7 +9795,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='$wl--export-all-symbols' + export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -10087,89 +9803,61 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file, use it as - # is; otherwise, prepend EXPORTS... - archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' link_all_deplibs=yes ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - shrext_cmds=.dll - archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - enable_shared_with_static_runtimes=yes - ;; - interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='$wl-rpath,$libdir' - export_dynamic_flag_spec='$wl-E' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test linux-dietlibc = "$host_os"; then + if test "$host_os" = linux-dietlibc; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test no = "$tmp_diet" + && test "$tmp_diet" = no then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -10180,47 +9868,42 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - nagfor*) # NAGFOR 5.3 - tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test yes = "$supports_anon_versioning"; then + if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi case $cc_basename in - tcc*) - export_dynamic_flag_spec='-rdynamic' - ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test yes = "$supports_anon_versioning"; then + if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -10234,8 +9917,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -10253,8 +9936,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10266,7 +9949,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -10281,9 +9964,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10300,15 +9983,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test no = "$ld_shlibs"; then + if test "$ld_shlibs" = no; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -10324,7 +10007,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -10332,57 +10015,34 @@ ;; aix[4-9]*) - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag= + no_entry_flag="" else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to GNU nm, but means don't demangle to AIX nm. - # Without the "-l" option, or with the "-B" option, AIX nm treats - # weak defined symbols like other global defined symbols, whereas - # GNU nm marks them as "W". - # While the 'weak' keyword is ignored in the Export File, we need - # it in the Import File for the 'aix-soname' feature, so we have - # to replace the "-B" option with "-P" for AIX nm. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # have runtime linking enabled, and use it for executables. - # For shared libraries, we enable/disable runtime linking - # depending on the kind of the shared library created - - # when "with_aix_soname,aix_use_runtimelinking" is: - # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables - # "aix,yes" lib.so shared, rtl:yes, for executables - # lib.a static archive - # "both,no" lib.so.V(shr.o) shared, rtl:yes - # lib.a(lib.so.V) shared, rtl:no, for executables - # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a(lib.so.V) shared, rtl:no - # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a static archive + # need to do runtime linking. case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes break fi done - if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then - # With aix-soname=svr4, we create the lib.so.V shared archives only, - # so we don't have lib.a shared libs to link our executables. - # We have to force runtime linking in this case. - aix_use_runtimelinking=yes - LDFLAGS="$LDFLAGS -Wl,-brtl" - fi ;; esac @@ -10401,21 +10061,13 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='$wl-f,' - case $with_aix_soname,$aix_use_runtimelinking in - aix,*) ;; # traditional, no import file - svr4,* | *,yes) # use import file - # The Import File defines what to hardcode. - hardcode_direct=no - hardcode_direct_absolute=no - ;; - esac + file_list_spec='${wl}-f,' - if test yes = "$GCC"; then + if test "$GCC" = yes; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`$CC -print-prog-name=collect2` + collect2name=`${CC} -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -10434,42 +10086,35 @@ ;; esac shared_flag='-shared' - if test yes = "$aix_use_runtimelinking"; then - shared_flag="$shared_flag "'$wl-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' fi - # Need to ensure runtime linking is disabled for the traditional - # shared library, or the linker may eventually find shared libraries - # /with/ Import File - we do not want to mix them. - shared_flag_aix='-shared' - shared_flag_svr4='-shared $wl-G' else # not using gcc - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test yes = "$aix_use_runtimelinking"; then - shared_flag='$wl-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='$wl-bM:SRE' + shared_flag='${wl}-bM:SRE' fi - shared_flag_aix='$wl-bM:SRE' - shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='$wl-bexpall' + export_dynamic_flag_spec='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test set = "${lt_cv_aix_libpath+set}"; then + if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10504,7 +10149,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=/usr/lib:/lib + lt_cv_aix_libpath_="/usr/lib:/lib" fi fi @@ -10512,17 +10157,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else - if test ia64 = "$host_cpu"; then - hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test set = "${lt_cv_aix_libpath+set}"; then + if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10557,7 +10202,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=/usr/lib:/lib + lt_cv_aix_libpath_="/usr/lib:/lib" fi fi @@ -10565,33 +10210,21 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' $wl-bernotok' - allow_undefined_flag=' $wl-berok' - if test yes = "$with_gnu_ld"; then + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' - # -brtl affects multiple linker settings, -berok does not and is overridden later - compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' - if test svr4 != "$with_aix_soname"; then - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' - fi - if test aix != "$with_aix_soname"; then - archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' - else - # used by -dlpreopen to get the symbols - archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' - fi - archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -10600,7 +10233,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10630,17 +10263,16 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=.dll + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' - archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then - cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; - else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -10649,18 +10281,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile=$lt_outputfile.exe - lt_tool_outputfile=$lt_tool_outputfile.exe - ;; - esac~ - if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -10669,7 +10301,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=.dll + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -10688,24 +10320,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test yes = "$lt_cv_ld_force_load"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag=$_lt_dar_allow_undefined + allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in - ifort*|nagfor*) _lt_dar_can_shared=yes ;; + ifort*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test yes = "$_lt_dar_can_shared"; then + if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else ld_shlibs=no @@ -10747,33 +10379,33 @@ ;; hpux9*) - if test yes = "$GCC"; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='$wl-E' + export_dynamic_flag_spec='${wl}-E' ;; hpux10*) - if test yes,no = "$GCC,$with_gnu_ld"; then - archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test no = "$with_gnu_ld"; then - hardcode_libdir_flag_spec='$wl+b $wl$libdir' + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='$wl-E' + export_dynamic_flag_spec='${wl}-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -10781,25 +10413,25 @@ ;; hpux11*) - if test yes,no = "$GCC,$with_gnu_ld"; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -10811,7 +10443,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS=$LDFLAGS + save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -10830,14 +10462,14 @@ fi fi $RM -r conftest* - LDFLAGS=$save_LDFLAGS + LDFLAGS="$save_LDFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test yes = "$lt_cv_prog_compiler__b"; then - archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -10845,8 +10477,8 @@ ;; esac fi - if test no = "$with_gnu_ld"; then - hardcode_libdir_flag_spec='$wl+b $wl$libdir' + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -10857,7 +10489,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='$wl-E' + export_dynamic_flag_spec='${wl}-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -10868,8 +10500,8 @@ ;; irix5* | irix6* | nonstopux*) - if test yes = "$GCC"; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + if test "$GCC" = yes; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -10879,8 +10511,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -10892,34 +10524,24 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS + LDFLAGS="$save_LDFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test yes = "$lt_cv_irix_exported_symbol"; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; - linux*) - case $cc_basename in - tcc*) - # Fabrice Bellard et al's Tiny C Compiler - ld_shlibs=yes - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -10934,7 +10556,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -10942,19 +10564,27 @@ *nto* | *qnx*) ;; - openbsd* | bitrig*) + openbsd*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='$wl-rpath,$libdir' - export_dynamic_flag_spec='$wl-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' else - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='$wl-rpath,$libdir' + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac fi else ld_shlibs=no @@ -10965,53 +10595,33 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - shrext_cmds=.dll - archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - enable_shared_with_static_runtimes=yes + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) - if test yes = "$GCC"; then - allow_undefined_flag=' $wl-expect_unresolved $wl\*' - archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test yes = "$GCC"; then - allow_undefined_flag=' $wl-expect_unresolved $wl\*' - archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -11022,24 +10632,24 @@ solaris*) no_undefined_flag=' -z defs' - if test yes = "$GCC"; then - wlarc='$wl' - archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='$wl' - archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -11049,11 +10659,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands '-z linker_flag'. GCC discards it without '$wl', + # but understands `-z linker_flag'. GCC discards it without `$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test yes = "$GCC"; then - whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -11063,10 +10673,10 @@ ;; sunos4*) - if test sequent = "$host_vendor"; then + if test "x$host_vendor" = xsequent; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -11115,43 +10725,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='$wl-z,text' + no_undefined_flag='${wl}-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test yes = "$GCC"; then - archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We CANNOT use -z defs as we might desire, because we do not + # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='$wl-z,text' - allow_undefined_flag='$wl-z,nodefs' + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='$wl-R,$libdir' + hardcode_libdir_flag_spec='${wl}-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='$wl-Bexport' + export_dynamic_flag_spec='${wl}-Bexport' runpath_var='LD_RUN_PATH' - if test yes = "$GCC"; then - archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -11166,10 +10776,10 @@ ;; esac - if test sni = "$host_vendor"; then + if test x$host_vendor = xsni; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='$wl-Blargedynsym' + export_dynamic_flag_spec='${wl}-Blargedynsym' ;; esac fi @@ -11177,7 +10787,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test no = "$ld_shlibs" && can_build_shared=no +test "$ld_shlibs" = no && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -11203,7 +10813,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test yes,yes = "$GCC,$enable_shared"; then + if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -11418,14 +11028,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test yes = "$GCC"; then +if test "$GCC" = yes; then case $host_os in - darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; - *) lt_awk_arg='/^libraries:/' ;; + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; - *) lt_sed_strip_eq='s|=/|/|g' ;; + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -11441,35 +11051,28 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary... + # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= - lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - # ...but if some path component already ends with the multilib dir we assume - # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). - case "$lt_multi_os_dir; $lt_search_path_spec " in - "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) - lt_multi_os_dir= - ;; - esac + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" - elif test -n "$lt_multi_os_dir"; then + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS = " "; FS = "/|\n";} { - lt_foo = ""; - lt_count = 0; +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo = "/" $lt_i lt_foo; + lt_foo="/" $lt_i lt_foo; } else { lt_count--; } @@ -11483,7 +11086,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's|/\([A-Za-z]:\)|\1|g'` ;; + $SED 's,/\([A-Za-z]:\),\1,g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -11492,7 +11095,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=.so +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11509,16 +11112,14 @@ # flags to be left without arguments need_version=unknown - - case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='$libname$release$shared_ext$major' + soname_spec='${libname}${release}${shared_ext}$major' ;; aix[4-9]*) @@ -11526,91 +11127,41 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 supports IA64 - library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line '#! .'. This would cause the generated library to - # depend on '.', always an invalid library. This was fixed in + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # Using Import Files as archive members, it is possible to support - # filename-based versioning of shared library archives on AIX. While - # this would work for both with and without runtime linking, it will - # prevent static linking of such archives. So we do filename-based - # shared library versioning with .so extension only, which is used - # when both runtime linking and shared linking is enabled. - # Unfortunately, runtime linking may impact performance, so we do - # not want this to be the default eventually. Also, we use the - # versioned .so libs for executables only if there is the -brtl - # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. - # To allow for filename-based versioning support, we need to create - # libNAME.so.V as an archive file, containing: - # *) an Import File, referring to the versioned filename of the - # archive as well as the shared archive member, telling the - # bitwidth (32 or 64) of that shared object, and providing the - # list of exported symbols of that shared object, eventually - # decorated with the 'weak' keyword - # *) the shared object with the F_LOADONLY flag set, to really avoid - # it being seen by the linker. - # At run time we better use the real file rather than another symlink, - # but for link time we create the symlink libNAME.so -> libNAME.so.V - - case $with_aix_soname,$aix_use_runtimelinking in - # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - aix,yes) # traditional libtool - dynamic_linker='AIX unversionable lib.so' + if test "$aix_use_runtimelinking" = yes; then # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - ;; - aix,no) # traditional AIX only - dynamic_linker='AIX lib.a(lib.so.V)' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='$libname$release.a $libname.a' - soname_spec='$libname$release$shared_ext$major' - ;; - svr4,*) # full svr4 only - dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,yes) # both, prefer svr4 - dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # unpreferred sharedlib libNAME.a needs extra handling - postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' - postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,no) # both, prefer aix - dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" - library_names_spec='$libname$release.a $libname.a' - soname_spec='$libname$release$shared_ext$major' - # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling - postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' - postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' - ;; - esac + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi shlibpath_var=LIBPATH fi ;; @@ -11620,18 +11171,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='$libname$shared_ext' + library_names_spec='${libname}${shared_ext}' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -11639,8 +11190,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -11652,7 +11203,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=.dll + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -11661,8 +11212,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -11678,17 +11229,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac dynamic_linker='Win32 ld.exe' @@ -11697,8 +11248,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' - library_names_spec='$libname.dll.lib' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' case $build_os in mingw*) @@ -11725,7 +11276,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec=$LIB + sys_lib_search_path_spec="$LIB" if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -11738,8 +11289,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -11752,7 +11303,7 @@ *) # Assume MSVC wrapper - library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -11765,8 +11316,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' - soname_spec='$libname$release$major$shared_ext' + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -11779,8 +11330,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -11798,13 +11349,12 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; esac @@ -11829,15 +11379,26 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=no + shlibpath_overrides_runpath=yes sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -11855,15 +11416,14 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - if test 32 = "$HPUX_IA64_MODE"; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -11871,8 +11431,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -11881,8 +11441,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -11895,8 +11455,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -11907,7 +11467,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test yes = "$lt_cv_prog_gnu_ld"; then + if test "$lt_cv_prog_gnu_ld" = yes; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -11915,8 +11475,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='$libname$release$shared_ext$major' - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -11935,8 +11495,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" - sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" hardcode_into_libs=yes ;; @@ -11945,33 +11505,13 @@ dynamic_linker=no ;; -linux*android*) - version_type=none # Android doesn't support versioned libraries. - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext' - soname_spec='$libname$release$shared_ext' - finish_cmds= - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - dynamic_linker='Android linker' - # Don't embed -rpath directories since the linker doesn't support them. - hardcode_libdir_flag_spec='-L$libdir' - ;; - # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -12018,15 +11558,11 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are - # searched for libraries, however this is still not possible. Aside from not - # being certain /sbin/ldconfig is available, command - # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, - # even though it is searched at run-time. Try to do the best guess by - # appending ld.so.conf contents (and includes) to the search path. + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12043,12 +11579,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -12058,7 +11594,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -12067,68 +11603,58 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd* | bitrig*) +openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec=/usr/lib + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - need_version=no - else - need_version=yes - fi - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi ;; os2*) libname_spec='$name' - version_type=windows - shrext_cmds=.dll - need_version=no + shrext_cmds=".dll" need_lib_prefix=no - # OS/2 can only load a DLL with a base name of 8 characters or less. - soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; - v=$($ECHO $release$versuffix | tr -d .-); - n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); - $ECHO $n$v`$shared_ext' - library_names_spec='${libname}_dll.$libext' + library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' - shlibpath_var=BEGINLIBPATH - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' + shlibpath_var=LIBPATH ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='$libname$release$shared_ext$major' - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; rdos*) @@ -12139,8 +11665,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -12150,11 +11676,11 @@ sunos4*) version_type=sunos - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test yes = "$with_gnu_ld"; then + if test "$with_gnu_ld" = yes; then need_lib_prefix=no fi need_version=yes @@ -12162,8 +11688,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -12184,24 +11710,24 @@ ;; sysv4*MP*) - if test -d /usr/nec; then + if test -d /usr/nec ;then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' - soname_spec='$libname$shared_ext.$major' + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=sco + version_type=freebsd-elf need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test yes = "$with_gnu_ld"; then + if test "$with_gnu_ld" = yes; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -12219,7 +11745,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -12227,8 +11753,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -12238,35 +11764,20 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test no = "$dynamic_linker" && can_build_shared=no +test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test yes = "$GCC"; then +if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then - sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" fi - -if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then - sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" fi -# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... -configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec - -# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code -func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" - -# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool -configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - - - - - - @@ -12363,15 +11874,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test yes = "$hardcode_automatic"; then + test "X$hardcode_automatic" = "Xyes" ; then # We can hardcode non-existent directories. - if test no != "$hardcode_direct" && + if test "$hardcode_direct" != no && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && - test no != "$hardcode_minus_L"; then + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -12386,12 +11897,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test relink = "$hardcode_action" || - test yes = "$inherit_rpath"; then +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then # Fast installation is not supported enable_fast_install=no -elif test yes = "$shlibpath_overrides_runpath" || - test no = "$enable_shared"; then +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then # Fast installation is not necessary enable_fast_install=needless fi @@ -12401,7 +11912,7 @@ - if test yes != "$enable_dlopen"; then + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -12411,23 +11922,23 @@ case $host_os in beos*) - lt_cv_dlopen=load_add_on + lt_cv_dlopen="load_add_on" lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen=LoadLibrary + lt_cv_dlopen="LoadLibrary" lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen=dlopen + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -12465,10 +11976,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - lt_cv_dlopen=dyld + lt_cv_dlopen="dyld" lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -12476,18 +11987,10 @@ ;; - tpf*) - # Don't try to run any link tests for TPF. We know it's impossible - # because TPF is a cross-compiler, and we know how we open DSOs. - lt_cv_dlopen=dlopen - lt_cv_dlopen_libs= - lt_cv_dlopen_self=no - ;; - *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen=shl_load + lt_cv_dlopen="shl_load" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -12526,11 +12029,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen=dlopen + lt_cv_dlopen="dlopen" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -12569,7 +12072,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -12608,7 +12111,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -12647,7 +12150,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -12668,21 +12171,21 @@ ;; esac - if test no = "$lt_cv_dlopen"; then - enable_dlopen=no - else + if test "x$lt_cv_dlopen" != xno; then enable_dlopen=yes + else + enable_dlopen=no fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS=$CPPFLAGS - test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS=$LDFLAGS + save_LDFLAGS="$LDFLAGS" wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS=$LIBS + save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -12690,7 +12193,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test yes = "$cross_compiling"; then : + if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12737,9 +12240,9 @@ # endif #endif -/* When -fvisibility=hidden is used, assume the code has been annotated +/* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -12769,7 +12272,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12789,14 +12292,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test yes = "$lt_cv_dlopen_self"; then + if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test yes = "$cross_compiling"; then : + if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12843,9 +12346,9 @@ # endif #endif -/* When -fvisibility=hidden is used, assume the code has been annotated +/* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -12875,7 +12378,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12896,9 +12399,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS=$save_CPPFLAGS - LDFLAGS=$save_LDFLAGS - LIBS=$save_LIBS + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" ;; esac @@ -12942,7 +12445,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP"; then + if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -12970,7 +12473,7 @@ - # Report what library types will actually be built + # Report which library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -12978,13 +12481,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test no = "$can_build_shared" && enable_shared=no + test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test yes = "$enable_shared" && enable_static=no + test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -12992,12 +12495,8 @@ ;; aix[4-9]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no fi ;; esac @@ -13007,7 +12506,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test yes = "$enable_shared" || enable_static=yes + test "$enable_shared" = yes || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -13021,11 +12520,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC=$lt_save_CC +CC="$lt_save_CC" - if test -n "$CXX" && ( test no != "$CXX" && - ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || - (test g++ != "$CXX"))); then + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -13204,7 +12703,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test yes != "$_lt_caught_CXX_error"; then +if test "$_lt_caught_CXX_error" != yes; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -13265,39 +12764,46 @@ CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC - func_cc_basename $compiler -cc_basename=$func_cc_basename_result + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test yes = "$GXX"; then + if test "$GXX" = yes; then lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' else lt_prog_compiler_no_builtin_flag_CXX= fi - if test yes = "$GXX"; then + if test "$GXX" = yes; then # Set up default GNU C++ configuration # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test yes = "$GCC"; then +if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return, which upsets mingw + # gcc leaves a trailing carriage return which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -13311,7 +12817,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD=$ac_prog + test -z "$LD" && LD="$ac_prog" ;; "") # If it fails, then pretend we aren't using GCC. @@ -13322,7 +12828,7 @@ with_gnu_ld=unknown ;; esac -elif test yes = "$with_gnu_ld"; then +elif test "$with_gnu_ld" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -13333,32 +12839,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD=$ac_dir/$ac_prog + lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -13394,22 +12900,22 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test yes = "$with_gnu_ld"; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' - export_dynamic_flag_spec_CXX='$wl--export-dynamic' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='$wl' + wlarc='${wl}' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' else whole_archive_flag_spec_CXX= fi @@ -13446,30 +12952,18 @@ ld_shlibs_CXX=no ;; aix[4-9]*) - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag= + no_entry_flag="" else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # have runtime linking enabled, and use it for executables. - # For shared libraries, we enable/disable runtime linking - # depending on the kind of the shared library created - - # when "with_aix_soname,aix_use_runtimelinking" is: - # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables - # "aix,yes" lib.so shared, rtl:yes, for executables - # lib.a static archive - # "both,no" lib.so.V(shr.o) shared, rtl:yes - # lib.a(lib.so.V) shared, rtl:no, for executables - # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a(lib.so.V) shared, rtl:no - # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a static archive + # need to do runtime linking. case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -13479,13 +12973,6 @@ ;; esac done - if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then - # With aix-soname=svr4, we create the lib.so.V shared archives only, - # so we don't have lib.a shared libs to link our executables. - # We have to force runtime linking in this case. - aix_use_runtimelinking=yes - LDFLAGS="$LDFLAGS -Wl,-brtl" - fi ;; esac @@ -13504,21 +12991,13 @@ hardcode_direct_absolute_CXX=yes hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - file_list_spec_CXX='$wl-f,' - case $with_aix_soname,$aix_use_runtimelinking in - aix,*) ;; # no import file - svr4,* | *,yes) # use import file - # The Import File defines what to hardcode. - hardcode_direct_CXX=no - hardcode_direct_absolute_CXX=no - ;; - esac + file_list_spec_CXX='${wl}-f,' - if test yes = "$GXX"; then + if test "$GXX" = yes; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`$CC -print-prog-name=collect2` + collect2name=`${CC} -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -13536,44 +13015,36 @@ fi esac shared_flag='-shared' - if test yes = "$aix_use_runtimelinking"; then - shared_flag=$shared_flag' $wl-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' fi - # Need to ensure runtime linking is disabled for the traditional - # shared library, or the linker may eventually find shared libraries - # /with/ Import File - we do not want to mix them. - shared_flag_aix='-shared' - shared_flag_svr4='-shared $wl-G' else # not using gcc - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test yes = "$aix_use_runtimelinking"; then - shared_flag='$wl-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='$wl-bM:SRE' + shared_flag='${wl}-bM:SRE' fi - shared_flag_aix='$wl-bM:SRE' - shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec_CXX='$wl-bexpall' + export_dynamic_flag_spec_CXX='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. always_export_symbols_CXX=yes - if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - # The "-G" linker flag allows undefined symbols. - no_undefined_flag_CXX='-bernotok' + allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. - if test set = "${lt_cv_aix_libpath+set}"; then + if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -13608,7 +13079,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=/usr/lib:/lib + lt_cv_aix_libpath__CXX="/usr/lib:/lib" fi fi @@ -13616,18 +13087,18 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else - if test ia64 = "$host_cpu"; then - hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test set = "${lt_cv_aix_libpath+set}"; then + if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -13662,7 +13133,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=/usr/lib:/lib + lt_cv_aix_libpath__CXX="/usr/lib:/lib" fi fi @@ -13670,34 +13141,22 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' $wl-bernotok' - allow_undefined_flag_CXX=' $wl-berok' - if test yes = "$with_gnu_ld"; then + no_undefined_flag_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec_CXX='$convenience' fi archive_cmds_need_lc_CXX=yes - archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' - # -brtl affects multiple linker settings, -berok does not and is overridden later - compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' - if test svr4 != "$with_aix_soname"; then - # This is similar to how AIX traditionally builds its shared - # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. - archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' - fi - if test aix != "$with_aix_soname"; then - archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' - else - # used by -dlpreopen to get the symbols - archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir' - fi - archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d' + # This is similar to how AIX traditionally builds its shared + # libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -13707,7 +13166,7 @@ allow_undefined_flag_CXX=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs_CXX=no fi @@ -13735,58 +13194,57 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=.dll + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' - archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then - cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; - else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' enable_shared_with_static_runtimes_CXX=yes # Don't use ranlib old_postinstall_cmds_CXX='chmod 644 $oldlib' postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile=$lt_outputfile.exe - lt_tool_outputfile=$lt_tool_outputfile.exe - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='$wl--export-all-symbols' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file, use it as - # is; otherwise, prepend EXPORTS... - archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi @@ -13800,27 +13258,27 @@ hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - if test yes = "$lt_cv_ld_force_load"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec_CXX='' fi link_all_deplibs_CXX=yes - allow_undefined_flag_CXX=$_lt_dar_allow_undefined + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" case $cc_basename in - ifort*|nagfor*) _lt_dar_can_shared=yes ;; + ifort*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test yes = "$_lt_dar_can_shared"; then + if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" - if test yes != "$lt_cv_apple_cc_single_mod"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi else @@ -13829,34 +13287,6 @@ ;; - os2*) - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_minus_L_CXX=yes - allow_undefined_flag_CXX=unsupported - shrext_cmds=.dll - archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - enable_shared_with_static_runtimes_CXX=yes - ;; - dgux*) case $cc_basename in ec++*) @@ -13891,15 +13321,18 @@ ld_shlibs_CXX=yes ;; + gnu*) + ;; + haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes ;; hpux9*) - hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='$wl-E' + export_dynamic_flag_spec_CXX='${wl}-E' hardcode_direct_CXX=yes hardcode_minus_L_CXX=yes # Not in the search PATH, # but as the default @@ -13911,7 +13344,7 @@ ld_shlibs_CXX=no ;; aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -13920,11 +13353,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test yes = "$GXX"; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + if test "$GXX" = yes; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13934,15 +13367,15 @@ ;; hpux10*|hpux11*) - if test no = "$with_gnu_ld"; then - hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' + if test $with_gnu_ld = no; then + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_separator_CXX=: case $host_cpu in hppa*64*|ia64*) ;; *) - export_dynamic_flag_spec_CXX='$wl-E' + export_dynamic_flag_spec_CXX='${wl}-E' ;; esac fi @@ -13968,13 +13401,13 @@ aCC*) case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -13985,20 +13418,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test yes = "$GXX"; then - if test no = "$with_gnu_ld"; then + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -14013,22 +13446,22 @@ interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' - export_dynamic_flag_spec_CXX='$wl-E' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -14037,22 +13470,22 @@ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test yes = "$GXX"; then - if test no = "$with_gnu_ld"; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes ;; esac - hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -14060,8 +13493,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -14070,10 +13503,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' - export_dynamic_flag_spec_CXX='$wl--export-dynamic' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -14087,59 +13520,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; esac archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' - export_dynamic_flag_spec_CXX='$wl--export-dynamic' - whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir' - export_dynamic_flag_spec_CXX='$wl--export-dynamic' - whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -14153,18 +13586,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' - export_dynamic_flag_spec_CXX='$wl--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test yes = "$supports_anon_versioning"; then + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -14172,10 +13605,10 @@ *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on @@ -14233,17 +13666,22 @@ ld_shlibs_CXX=yes ;; - openbsd* | bitrig*) + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; + + openbsd*) if test -f /usr/libexec/ld.so; then hardcode_direct_CXX=yes hardcode_shlibpath_var_CXX=no hardcode_direct_absolute_CXX=yes archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='$wl-E' - whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -14259,9 +13697,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' hardcode_libdir_separator_CXX=: # Archives containing C++ object files must be created using @@ -14279,17 +13717,17 @@ cxx*) case $host in osf3*) - allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' - archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; esac @@ -14304,21 +13742,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test yes,no = "$GXX,$with_gnu_ld"; then - allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: # Commands to make compiler produce verbose output that lists @@ -14364,9 +13802,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no @@ -14374,7 +13812,7 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands '-z linker_flag'. + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; @@ -14391,30 +13829,30 @@ ;; gcx*) # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test yes,no = "$GXX,$with_gnu_ld"; then - no_undefined_flag_CXX=' $wl-z ${wl}defs' + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require '-G' NOT '-shared' on this + # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. - archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -14422,11 +13860,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac fi @@ -14435,52 +13873,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='$wl-z,text' + no_undefined_flag_CXX='${wl}-z,text' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We CANNOT use -z defs as we might desire, because we do not + # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag_CXX='$wl-z,text' - allow_undefined_flag_CXX='$wl-z,nodefs' + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='$wl-R,$libdir' + hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='$wl-Bexport' + export_dynamic_flag_spec_CXX='${wl}-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" + '"$old_archive_cmds_CXX" reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" + '"$reload_cmds_CXX" ;; *) - archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -14512,10 +13950,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } - test no = "$ld_shlibs_CXX" && can_build_shared=no + test "$ld_shlibs_CXX" = no && can_build_shared=no - GCC_CXX=$GXX - LD_CXX=$LD + GCC_CXX="$GXX" + LD_CXX="$LD" ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -14559,13 +13997,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $prev$p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test x-L = "$p" || - test x-R = "$p"; then + if test $p = "-L" || + test $p = "-R"; then prev=$p continue fi @@ -14581,16 +14019,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test no = "$pre_test_object_deps_done"; then - case $prev in + if test "$pre_test_object_deps_done" = no; then + case ${prev} in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX=$prev$p + compiler_lib_search_path_CXX="${prev}${p}" else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p" + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" fi ;; # The "-l" case would never come before the object being @@ -14598,9 +14036,9 @@ esac else if test -z "$postdeps_CXX"; then - postdeps_CXX=$prev$p + postdeps_CXX="${prev}${p}" else - postdeps_CXX="${postdeps_CXX} $prev$p" + postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi prev= @@ -14615,15 +14053,15 @@ continue fi - if test no = "$pre_test_object_deps_done"; then + if test "$pre_test_object_deps_done" = no; then if test -z "$predep_objects_CXX"; then - predep_objects_CXX=$p + predep_objects_CXX="$p" else predep_objects_CXX="$predep_objects_CXX $p" fi else if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX=$p + postdep_objects_CXX="$p" else postdep_objects_CXX="$postdep_objects_CXX $p" fi @@ -14653,6 +14091,51 @@ postdep_objects_CXX= postdeps_CXX= ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; esac @@ -14661,7 +14144,7 @@ esac compiler_lib_search_dirs_CXX= if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'` + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` fi @@ -14700,18 +14183,17 @@ # C++ specific cases for pic, static, wl, etc. - if test yes = "$GXX"; then + if test "$GXX" = yes; then lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-static' case $host_os in aix*) # All AIX code is PIC. - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' fi - lt_prog_compiler_pic_CXX='-fPIC' ;; amigaos*) @@ -14722,8 +14204,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the '-m68020' flag to GCC prevents building anything better, - # like '-m68040'. + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -14738,11 +14220,6 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - case $host_os in - os2*) - lt_prog_compiler_static_CXX='$wl-static' - ;; - esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -14792,7 +14269,7 @@ case $host_os in aix[4-9]*) # All AIX code is PIC. - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' else @@ -14832,14 +14309,14 @@ case $cc_basename in CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='$wl-a ${wl}archive' - if test ia64 != "$host_cpu"; then + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then lt_prog_compiler_pic_CXX='+Z' fi ;; aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='$wl-a ${wl}archive' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -14868,7 +14345,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -14876,7 +14353,7 @@ lt_prog_compiler_pic_CXX='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64, which still supported -KPIC. + # old Intel C++ for x86_64 which still supported -KPIC. lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' @@ -15021,7 +14498,7 @@ fi case $host_os in - # For platforms that do not support PIC, -DPIC is meaningless: + # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= ;; @@ -15053,7 +14530,7 @@ lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -15083,7 +14560,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -15109,7 +14586,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS=$LDFLAGS + save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -15128,13 +14605,13 @@ fi fi $RM -r conftest* - LDFLAGS=$save_LDFLAGS + LDFLAGS="$save_LDFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : else lt_prog_compiler_static_CXX= @@ -15248,8 +14725,8 @@ -hard_links=nottested -if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -15261,9 +14738,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test no = "$hard_links"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -15280,21 +14757,17 @@ case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to GNU nm, but means don't demangle to AIX nm. - # Without the "-l" option, or with the "-B" option, AIX nm treats - # weak defined symbols like other global defined symbols, whereas - # GNU nm marks them as "W". - # While the 'weak' keyword is ignored in the Export File, we need - # it in the Import File for the 'aix-soname' feature, so we have - # to replace the "-B" option with "-P" for AIX nm. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - export_symbols_cmds_CXX=$ltdll_cmds + export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -15314,7 +14787,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -test no = "$ld_shlibs_CXX" && can_build_shared=no +test "$ld_shlibs_CXX" = no && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -15331,7 +14804,7 @@ # Assume -lc should be added archive_cmds_need_lc_CXX=yes - if test yes,yes = "$GCC,$enable_shared"; then + if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds_CXX in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -15459,7 +14932,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=.so +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -15476,16 +14949,14 @@ # flags to be left without arguments need_version=unknown - - case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='$libname$release$shared_ext$major' + soname_spec='${libname}${release}${shared_ext}$major' ;; aix[4-9]*) @@ -15493,91 +14964,41 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 supports IA64 - library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line '#! .'. This would cause the generated library to - # depend on '.', always an invalid library. This was fixed in + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # Using Import Files as archive members, it is possible to support - # filename-based versioning of shared library archives on AIX. While - # this would work for both with and without runtime linking, it will - # prevent static linking of such archives. So we do filename-based - # shared library versioning with .so extension only, which is used - # when both runtime linking and shared linking is enabled. - # Unfortunately, runtime linking may impact performance, so we do - # not want this to be the default eventually. Also, we use the - # versioned .so libs for executables only if there is the -brtl - # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. - # To allow for filename-based versioning support, we need to create - # libNAME.so.V as an archive file, containing: - # *) an Import File, referring to the versioned filename of the - # archive as well as the shared archive member, telling the - # bitwidth (32 or 64) of that shared object, and providing the - # list of exported symbols of that shared object, eventually - # decorated with the 'weak' keyword - # *) the shared object with the F_LOADONLY flag set, to really avoid - # it being seen by the linker. - # At run time we better use the real file rather than another symlink, - # but for link time we create the symlink libNAME.so -> libNAME.so.V - - case $with_aix_soname,$aix_use_runtimelinking in - # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - aix,yes) # traditional libtool - dynamic_linker='AIX unversionable lib.so' + if test "$aix_use_runtimelinking" = yes; then # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - ;; - aix,no) # traditional AIX only - dynamic_linker='AIX lib.a(lib.so.V)' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='$libname$release.a $libname.a' - soname_spec='$libname$release$shared_ext$major' - ;; - svr4,*) # full svr4 only - dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,yes) # both, prefer svr4 - dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # unpreferred sharedlib libNAME.a needs extra handling - postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' - postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,no) # both, prefer aix - dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" - library_names_spec='$libname$release.a $libname.a' - soname_spec='$libname$release$shared_ext$major' - # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling - postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' - postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' - ;; - esac + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi shlibpath_var=LIBPATH fi ;; @@ -15587,18 +15008,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='$libname$shared_ext' + library_names_spec='${libname}${shared_ext}' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -15606,8 +15027,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -15619,7 +15040,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=.dll + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -15628,8 +15049,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -15645,16 +15066,16 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac dynamic_linker='Win32 ld.exe' @@ -15663,8 +15084,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' - library_names_spec='$libname.dll.lib' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' case $build_os in mingw*) @@ -15691,7 +15112,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec=$LIB + sys_lib_search_path_spec="$LIB" if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -15704,8 +15125,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -15718,7 +15139,7 @@ *) # Assume MSVC wrapper - library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -15731,8 +15152,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' - soname_spec='$libname$release$major$shared_ext' + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -15744,8 +15165,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -15763,13 +15184,12 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; esac @@ -15794,15 +15214,26 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=no + shlibpath_overrides_runpath=yes sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -15820,15 +15251,14 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - if test 32 = "$HPUX_IA64_MODE"; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -15836,8 +15266,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -15846,8 +15276,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -15860,8 +15290,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -15872,7 +15302,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test yes = "$lt_cv_prog_gnu_ld"; then + if test "$lt_cv_prog_gnu_ld" = yes; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -15880,8 +15310,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='$libname$release$shared_ext$major' - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -15900,8 +15330,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" - sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" hardcode_into_libs=yes ;; @@ -15910,33 +15340,13 @@ dynamic_linker=no ;; -linux*android*) - version_type=none # Android doesn't support versioned libraries. - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext' - soname_spec='$libname$release$shared_ext' - finish_cmds= - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - dynamic_linker='Android linker' - # Don't embed -rpath directories since the linker doesn't support them. - hardcode_libdir_flag_spec_CXX='-L$libdir' - ;; - # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -15983,15 +15393,11 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are - # searched for libraries, however this is still not possible. Aside from not - # being certain /sbin/ldconfig is available, command - # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, - # even though it is searched at run-time. Try to do the best guess by - # appending ld.so.conf contents (and includes) to the search path. + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -16008,12 +15414,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -16023,7 +15429,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -16032,68 +15438,58 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd* | bitrig*) +openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec=/usr/lib + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - need_version=no - else - need_version=yes - fi - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi ;; os2*) libname_spec='$name' - version_type=windows - shrext_cmds=.dll - need_version=no + shrext_cmds=".dll" need_lib_prefix=no - # OS/2 can only load a DLL with a base name of 8 characters or less. - soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; - v=$($ECHO $release$versuffix | tr -d .-); - n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); - $ECHO $n$v`$shared_ext' - library_names_spec='${libname}_dll.$libext' + library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' - shlibpath_var=BEGINLIBPATH - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' + shlibpath_var=LIBPATH ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='$libname$release$shared_ext$major' - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; rdos*) @@ -16104,8 +15500,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -16115,11 +15511,11 @@ sunos4*) version_type=sunos - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test yes = "$with_gnu_ld"; then + if test "$with_gnu_ld" = yes; then need_lib_prefix=no fi need_version=yes @@ -16127,8 +15523,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -16149,24 +15545,24 @@ ;; sysv4*MP*) - if test -d /usr/nec; then + if test -d /usr/nec ;then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' - soname_spec='$libname$shared_ext.$major' + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=sco + version_type=freebsd-elf need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test yes = "$with_gnu_ld"; then + if test "$with_gnu_ld" = yes; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -16184,7 +15580,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -16192,8 +15588,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -16203,32 +15599,20 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test no = "$dynamic_linker" && can_build_shared=no +test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test yes = "$GCC"; then +if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then - sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" fi - -if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then - sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" fi -# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... -configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec - -# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code -func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" - -# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool -configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - - - @@ -16271,15 +15655,15 @@ hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || test -n "$runpath_var_CXX" || - test yes = "$hardcode_automatic_CXX"; then + test "X$hardcode_automatic_CXX" = "Xyes" ; then # We can hardcode non-existent directories. - if test no != "$hardcode_direct_CXX" && + if test "$hardcode_direct_CXX" != no && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" && - test no != "$hardcode_minus_L_CXX"; then + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then # Linking always hardcodes the temporary library directory. hardcode_action_CXX=relink else @@ -16294,12 +15678,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } -if test relink = "$hardcode_action_CXX" || - test yes = "$inherit_rpath_CXX"; then +if test "$hardcode_action_CXX" = relink || + test "$inherit_rpath_CXX" = yes; then # Fast installation is not supported enable_fast_install=no -elif test yes = "$shlibpath_overrides_runpath" || - test no = "$enable_shared"; then +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then # Fast installation is not necessary enable_fast_install=needless fi @@ -16322,7 +15706,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test yes != "$_lt_caught_CXX_error" +fi # test "$_lt_caught_CXX_error" != yes ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -16772,15 +16156,6 @@ fi - -# Check whether --with-libunwind was given. -if test "${with_libunwind+set}" = set; then : - withval=$with_libunwind; -fi - - -if test "x$with_libunwind" != "xno"; then : - pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUNWIND" >&5 $as_echo_n "checking for LIBUNWIND... " >&6; } @@ -16851,20 +16226,11 @@ $as_echo "yes" >&6; } HAVE_LIBUNWIND=yes fi -else - HAVE_LIBUNWIND=no -fi - -if test "x$HAVE_LIBUNWIND" = "xyes"; then : +if test "x$HAVE_LIBUNWIND" = "xyes"; then $as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h -else - if test "x$with_libunwind" = "xyes"; then : - as_fn_error $? "libunwind requested but not found" "$LINENO" 5 -fi fi - if test "x$HAVE_LIBUNWIND" = xyes; then HAVE_LIBUNWIND_TRUE= HAVE_LIBUNWIND_FALSE='#' @@ -17544,110 +16910,6 @@ fi -# Check whether --enable-libwacom was given. -if test "${enable_libwacom+set}" = set; then : - enableval=$enable_libwacom; use_libwacom="$enableval" -else - use_libwacom="yes" -fi - -if test "x$use_libwacom" = "xyes"; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWACOM" >&5 -$as_echo_n "checking for LIBWACOM... " >&6; } - -if test -n "$LIBWACOM_CFLAGS"; then - pkg_cv_LIBWACOM_CFLAGS="$LIBWACOM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwacom >= 0.12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libwacom >= 0.12") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBWACOM_CFLAGS=`$PKG_CONFIG --cflags "libwacom >= 0.12" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LIBWACOM_LIBS"; then - pkg_cv_LIBWACOM_LIBS="$LIBWACOM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwacom >= 0.12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libwacom >= 0.12") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBWACOM_LIBS=`$PKG_CONFIG --libs "libwacom >= 0.12" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBWACOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwacom >= 0.12" 2>&1` - else - LIBWACOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwacom >= 0.12" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBWACOM_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libwacom >= 0.12) were not met: - -$LIBWACOM_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables LIBWACOM_CFLAGS -and LIBWACOM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables LIBWACOM_CFLAGS -and LIBWACOM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - LIBWACOM_CFLAGS=$pkg_cv_LIBWACOM_CFLAGS - LIBWACOM_LIBS=$pkg_cv_LIBWACOM_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_LIBWACOM="yes" -fi - -$as_echo "#define HAVE_LIBWACOM 1" >>confdefs.h - -fi - if test "x$VALGRIND" != "x"; then HAVE_VALGRIND_TRUE= HAVE_VALGRIND_FALSE='#' @@ -18277,7 +17539,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libinput $as_me 1.2.2, which was +This file was extended by libinput $as_me 0.21.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18337,14 +17599,14 @@ Configuration commands: $config_commands -Report bugs to . +Report bugs to . libinput home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libinput config.status 1.2.2 +libinput config.status 0.21.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18479,7 +17741,6 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -18529,13 +17790,10 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -18600,8 +17858,7 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' -configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -18706,12 +17963,9 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ -lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -lt_cv_nm_interface \ nm_file_list_spec \ -lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -18777,7 +18031,7 @@ compiler_lib_search_path_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -18804,8 +18058,7 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -configure_time_dlsearch_path \ -configure_time_lt_sys_library_path \ +sys_lib_dlsearch_path_spec \ reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ @@ -18819,7 +18072,7 @@ postlink_cmds_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -18828,16 +18081,19 @@ done ac_aux_dir='$ac_aux_dir' +xsi_shell='$xsi_shell' +lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options that allow our +# See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}"; then +if test -n "\${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -19559,53 +18815,55 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options that allow our + # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}"; then + if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi - cfgfile=${ofile}T + cfgfile="${ofile}T" trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL -# Generated automatically by $as_me ($PACKAGE) $VERSION + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. - -# Provide generalized library-building support services. -# Written by Gordon Matzigkeit, 1996 - -# Copyright (C) 2014 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of of the License, or -# (at your option) any later version. # -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program or library that is built -# using GNU Libtool, you may include this file under the same -# distribution terms that you use for the rest of that program. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. # -# GNU Libtool is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # The names of the tagged configurations supported by this script. -available_tags='CXX ' - -# Configured defaults for sys_lib_dlsearch_path munging. -: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} +available_tags="CXX " # ### BEGIN LIBTOOL CONFIG @@ -19625,9 +18883,6 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install -# Shared archive member basename,for filename based shared library versioning on AIX. -shared_archive_member_spec=$shared_archive_member_spec - # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -19745,27 +19000,18 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -# Transform the output of nm into a list of symbols to manually relocate. -global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import - # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -# The name lister interface. -nm_interface=$lt_lt_cv_nm_interface - # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and where our libraries should be installed. +# The root where to search for dependent libraries,and in which our libraries should be installed. lt_sysroot=$lt_sysroot -# Command to truncate a binary pipe. -lt_truncate_bin=$lt_lt_cv_truncate_bin - # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -19856,11 +19102,8 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Detected run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path - -# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. -configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path +# Run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -19953,13 +19196,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \$shlibpath_var if the +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -20025,72 +19268,13 @@ _LT_EOF - cat <<'_LT_EOF' >> "$cfgfile" - -# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE - -# func_munge_path_list VARIABLE PATH -# ----------------------------------- -# VARIABLE is name of variable containing _space_ separated list of -# directories to be munged by the contents of PATH, which is string -# having a format: -# "DIR[:DIR]:" -# string "DIR[ DIR]" will be prepended to VARIABLE -# ":DIR[:DIR]" -# string "DIR[ DIR]" will be appended to VARIABLE -# "DIRP[:DIRP]::[DIRA:]DIRA" -# string "DIRP[ DIRP]" will be prepended to VARIABLE and string -# "DIRA[ DIRA]" will be appended to VARIABLE -# "DIR[:DIR]" -# VARIABLE will be replaced by "DIR[ DIR]" -func_munge_path_list () -{ - case x$2 in - x) - ;; - *:) - eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" - ;; - x:*) - eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" - ;; - *::*) - eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" - eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" - ;; - *) - eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" - ;; - esac -} - - -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -func_cc_basename () -{ - for cc_temp in $*""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac - done - func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -} - - -# ### END FUNCTIONS SHARED WITH CONFIGURE - -_LT_EOF - case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test set != "${COLLECT_NAMES+set}"; then +if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -20099,7 +19283,7 @@ esac -ltmain=$ac_aux_dir/ltmain.sh +ltmain="$ac_aux_dir/ltmain.sh" # We use sed instead of cat because bash on DJGPP gets confused if @@ -20109,6 +19293,165 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi + + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -20195,13 +19538,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct_CXX -# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \$shlibpath_var if the +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute_CXX @@ -20311,7 +19654,6 @@ Prefix ${prefix} udev base dir ${UDEV_DIR} - libwacom enabled ${use_libwacom} Build documentation ${build_documentation} Build tests ${build_tests} Tests use valgrind ${VALGRIND} @@ -20322,7 +19664,6 @@ Prefix ${prefix} udev base dir ${UDEV_DIR} - libwacom enabled ${use_libwacom} Build documentation ${build_documentation} Build tests ${build_tests} Tests use valgrind ${VALGRIND} diff -Nru libinput-1.2.2/configure.ac libinput-0.21.0/configure.ac --- libinput-1.2.2/configure.ac 2016-03-15 00:23:38.000000000 +0000 +++ libinput-0.21.0/configure.ac 2015-08-04 00:33:56.000000000 +0000 @@ -1,8 +1,8 @@ AC_PREREQ([2.64]) -m4_define([libinput_major_version], [1]) -m4_define([libinput_minor_version], [2]) -m4_define([libinput_micro_version], [2]) +m4_define([libinput_major_version], [0]) +m4_define([libinput_minor_version], [21]) +m4_define([libinput_micro_version], [0]) m4_define([libinput_version], [libinput_major_version.libinput_minor_version.libinput_micro_version]) @@ -31,7 +31,7 @@ # b) If interfaces have been changed or added, but binary compatibility has # been preserved, change to C+1:0:A+1 # c) If the interface is the same as the previous version, change to C:R+1:A -LIBINPUT_LT_VERSION=17:4:7 +LIBINPUT_LT_VERSION=15:0:5 AC_SUBST(LIBINPUT_LT_VERSION) AM_SILENT_RULES([yes]) @@ -60,22 +60,13 @@ PKG_CHECK_MODULES(MTDEV, [mtdev >= 1.1.0]) PKG_CHECK_MODULES(LIBUDEV, [libudev]) PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4]) - -AC_ARG_WITH(libunwind, - AS_HELP_STRING([--without-libunwind],[Do not use libunwind])) - -AS_IF([test "x$with_libunwind" != "xno"], - [PKG_CHECK_MODULES(LIBUNWIND, +PKG_CHECK_MODULES(LIBUNWIND, [libunwind], [HAVE_LIBUNWIND=yes], - [HAVE_LIBUNWIND=no])], - [HAVE_LIBUNWIND=no]) - -AS_IF([test "x$HAVE_LIBUNWIND" = "xyes"], - [AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support])], - [AS_IF([test "x$with_libunwind" = "xyes"], - [AC_MSG_ERROR([libunwind requested but not found])])]) - + [HAVE_LIBUNWIND=no]) +if test "x$HAVE_LIBUNWIND" = "xyes"; then + AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) +fi AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes]) AC_PATH_PROG(ADDR2LINE, [addr2line]) if test "x$ADDR2LINE" != "x"; then @@ -189,16 +180,6 @@ AC_PATH_PROG(VALGRIND, [valgrind]) fi -AC_ARG_ENABLE(libwacom, - AS_HELP_STRING([--enable-libwacom], - [Use libwacom for tablet identification (default=enabled)]), - [use_libwacom="$enableval"], - [use_libwacom="yes"]) -if test "x$use_libwacom" = "xyes"; then - PKG_CHECK_MODULES(LIBWACOM, [libwacom >= 0.12], [HAVE_LIBWACOM="yes"]) - AC_DEFINE(HAVE_LIBWACOM, 1, [Build with libwacom]) -fi - AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"]) AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"]) AM_CONDITIONAL(BUILD_DOCS, [test "x$build_documentation" = "xyes"]) @@ -228,7 +209,6 @@ Prefix ${prefix} udev base dir ${UDEV_DIR} - libwacom enabled ${use_libwacom} Build documentation ${build_documentation} Build tests ${build_tests} Tests use valgrind ${VALGRIND} diff -Nru libinput-1.2.2/debian/changelog libinput-0.21.0/debian/changelog --- libinput-1.2.2/debian/changelog 2016-04-15 20:44:35.000000000 +0000 +++ libinput-0.21.0/debian/changelog 2018-04-02 22:49:02.000000000 +0000 @@ -1,72 +1,18 @@ -libinput (1.2.2-1ppa1~trusty1) trusty; urgency=medium +libinput (0.21.0-1ubuntu1~ppa1404+1) trusty; urgency=medium - * Automated backport upload; no source changes. + * Upload to trusty PPA - -- Alexander Pozdnyakov Fri, 15 Apr 2016 23:44:35 +0300 + -- Thorsten Glaser Tue, 03 Apr 2018 00:49:02 +0200 -libinput (1.2.2-1) unstable; urgency=medium +libinput (0.21.0-1ubuntu1) wily; urgency=medium - * New upstream release. + * debian/patches/touch-point-orientation-size.patch: + * debian/patches/fix-litest.patch: + - Add support for touchscreen contact properties (LP: #1488064) + * debian/libinput10.symbols: + - Updated - -- Timo Aaltonen Thu, 17 Mar 2016 10:49:19 +0200 - -libinput (1.2.0-1) unstable; urgency=medium - - * New upstream release. - * control: Add libwacom-dev to build-depends. - * symbols: Updated. - - -- Timo Aaltonen Tue, 23 Feb 2016 16:23:11 +0200 - -libinput (1.1.7-1) unstable; urgency=medium - - * New upstream release - - -- Héctor Orón Martínez Wed, 10 Feb 2016 17:19:28 +0100 - -libinput (1.1.6-1) unstable; urgency=medium - - * New upstream release. - - -- Héctor Orón Martínez Fri, 05 Feb 2016 10:37:55 +0100 - -libinput (1.1.4-1) unstable; urgency=medium - - * New upstream release. - - -- Timo Aaltonen Thu, 14 Jan 2016 14:13:45 +0200 - -libinput (1.1.3-1) unstable; urgency=medium - - [ Andreas Boll ] - * Change maintainer to Debian X Strike Force. - - [ Timo Aaltonen ] - * New upstream release. - - -- Timo Aaltonen Thu, 17 Dec 2015 14:54:35 +0200 - -libinput (1.1.2-1) unstable; urgency=medium - - * New upstream release. - * control: Add a package for libinput-tools, thanks Alessio Treglia! - (Closes: #806985) - * control: Update long descriptions. - - -- Timo Aaltonen Thu, 10 Dec 2015 08:34:16 +0200 - -libinput (1.1.0-1) unstable; urgency=medium - - * New upstream release. - * symbols: Updated. - - -- Timo Aaltonen Tue, 27 Oct 2015 14:54:45 +0200 - -libinput (1.0.1-1) unstable; urgency=medium - - * New upstream release. - - -- Timo Aaltonen Thu, 03 Sep 2015 11:52:08 +0300 + -- Robert Ancell Mon, 24 Aug 2015 13:13:32 +0100 libinput (0.21.0-1) unstable; urgency=medium diff -Nru libinput-1.2.2/debian/control libinput-0.21.0/debian/control --- libinput-1.2.2/debian/control 2016-03-17 08:48:58.000000000 +0000 +++ libinput-0.21.0/debian/control 2015-08-07 05:47:51.000000000 +0000 @@ -1,8 +1,8 @@ Source: libinput Section: libs Priority: optional -Maintainer: Debian X Strike Force -Uploaders: Emilio Pozuelo Monfort , Hector Oron +Maintainer: Emilio Pozuelo Monfort +Uploaders: Hector Oron Build-Depends: debhelper (>= 9), dh-autoreconf, @@ -10,7 +10,6 @@ libmtdev-dev (>= 1.1.0), libudev-dev, libevdev-dev (>= 0.4), - libwacom-dev (>= 0.12), Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-xorg/lib/libinput.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/lib/libinput.git @@ -31,8 +30,6 @@ processing and abstraction so minimize the amount of custom input code the user of libinput need to provide the common set of functionality that users expect. - . - This package includes the shared library. Package: libinput10-udeb XC-Package-Type: udeb @@ -61,8 +58,6 @@ processing and abstraction so minimize the amount of custom input code the user of libinput need to provide the common set of functionality that users expect. - . - This package includes the debugging symbols. Package: libinput-dev Section: libdevel @@ -81,25 +76,3 @@ processing and abstraction so minimize the amount of custom input code the user of libinput need to provide the common set of functionality that users expect. - . - This package includes the development headers. - -Package: libinput-tools -Section: libdevel -Priority: extra -Architecture: any -Multi-Arch: allowed -Depends: - libinput10 (= ${binary:Version}), - ${shlibs:Depends}, - ${misc:Depends}, -Description: input device management and event handling library - command line tools - libinput is a library that handles input devices for display servers and - other applications that need to directly deal with input devices. - . - It provides device detection, device handling, input device event - processing and abstraction so minimize the amount of custom input - code the user of libinput need to provide the common set of - functionality that users expect. - . - This package includes the command line tools. diff -Nru libinput-1.2.2/debian/libinput10.symbols libinput-0.21.0/debian/libinput10.symbols --- libinput-1.2.2/debian/libinput10.symbols 2016-03-17 08:48:58.000000000 +0000 +++ libinput-0.21.0/debian/libinput10.symbols 2015-08-24 14:46:53.000000000 +0000 @@ -6,16 +6,11 @@ LIBINPUT_0.19.0@LIBINPUT_0.19.0 0.21.0 LIBINPUT_0.20.0@LIBINPUT_0.20.0 0.21.0 LIBINPUT_0.21.0@LIBINPUT_0.21.0 0.21.0 - LIBINPUT_1.1@LIBINPUT_1.1 1.1.0 - LIBINPUT_1.2@LIBINPUT_1.2 1.2.0-1 + LIBINPUT_0.22.0@LIBINPUT_0.22.0 0.21.0-1ubuntu1 libinput_config_status_to_str@LIBINPUT_0.12.0 0.15.0 - libinput_device_config_accel_get_default_profile@LIBINPUT_1.1 1.1.0 libinput_device_config_accel_get_default_speed@LIBINPUT_0.12.0 0.15.0 - libinput_device_config_accel_get_profile@LIBINPUT_1.1 1.1.0 - libinput_device_config_accel_get_profiles@LIBINPUT_1.1 1.1.0 libinput_device_config_accel_get_speed@LIBINPUT_0.12.0 0.15.0 libinput_device_config_accel_is_available@LIBINPUT_0.12.0 0.15.0 - libinput_device_config_accel_set_profile@LIBINPUT_1.1 1.1.0 libinput_device_config_accel_set_speed@LIBINPUT_0.12.0 0.15.0 libinput_device_config_calibration_get_default_matrix@LIBINPUT_0.12.0 0.15.0 libinput_device_config_calibration_get_matrix@LIBINPUT_0.12.0 0.15.0 @@ -52,14 +47,11 @@ libinput_device_config_send_events_get_mode@LIBINPUT_0.12.0 0.15.0 libinput_device_config_send_events_get_modes@LIBINPUT_0.12.0 0.15.0 libinput_device_config_send_events_set_mode@LIBINPUT_0.12.0 0.15.0 - libinput_device_config_tap_get_default_drag_enabled@LIBINPUT_1.2 1.2.0 libinput_device_config_tap_get_default_drag_lock_enabled@LIBINPUT_0.19.0 0.21.0 libinput_device_config_tap_get_default_enabled@LIBINPUT_0.12.0 0.15.0 libinput_device_config_tap_get_enabled@LIBINPUT_0.12.0 0.15.0 - libinput_device_config_tap_get_drag_enabled@LIBINPUT_1.2 1.2.0 libinput_device_config_tap_get_drag_lock_enabled@LIBINPUT_0.19.0 0.21.0 libinput_device_config_tap_get_finger_count@LIBINPUT_0.12.0 0.15.0 - libinput_device_config_tap_set_drag_enabled@LIBINPUT_1.2 1.2.0 libinput_device_config_tap_set_drag_lock_enabled@LIBINPUT_0.19.0 0.21.0 libinput_device_config_tap_set_enabled@LIBINPUT_0.12.0 0.15.0 libinput_device_get_context@LIBINPUT_0.12.0 0.15.0 @@ -105,7 +97,6 @@ libinput_event_get_gesture_event@LIBINPUT_0.20.0 0.21.0 libinput_event_get_keyboard_event@LIBINPUT_0.12.0 0.15.0 libinput_event_get_pointer_event@LIBINPUT_0.12.0 0.15.0 - libinput_event_get_tablet_tool_event@LIBINPUT_1.2 1.2.0 libinput_event_get_touch_event@LIBINPUT_0.12.0 0.15.0 libinput_event_get_type@LIBINPUT_0.12.0 0.15.0 libinput_event_keyboard_get_base_event@LIBINPUT_0.12.0 0.15.0 @@ -132,39 +123,13 @@ libinput_event_pointer_get_time@LIBINPUT_0.12.0 0.15.0 libinput_event_pointer_get_time_usec@LIBINPUT_0.21.0 0.21.0 libinput_event_pointer_has_axis@LIBINPUT_0.12.0 0.15.0 - libinput_event_tablet_tool_distance_has_changed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_base_event@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_button@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_button_state@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_distance@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_dx@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_dy@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_pressure@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_proximity_state@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_rotation@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_seat_button_count@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_slider_position@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_tilt_x@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_tilt_y@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_time@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_time_usec@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_tip_state@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_tool@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_wheel_delta@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_wheel_delta_discrete@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_x@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_x_transformed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_y@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_get_y_transformed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_pressure_has_changed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_rotation_has_changed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_slider_has_changed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_tilt_x_has_changed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_tilt_y_has_changed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_wheel_has_changed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_x_has_changed@LIBINPUT_1.2 1.2.0 - libinput_event_tablet_tool_y_has_changed@LIBINPUT_1.2 1.2.0 libinput_event_touch_get_base_event@LIBINPUT_0.12.0 0.15.0 + libinput_event_touch_get_major@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_major_transformed@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_minor@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_minor_transformed@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_orientation@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_pressure@LIBINPUT_0.22.0 0.21.0-1ubuntu1 libinput_event_touch_get_seat_slot@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_slot@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_time@LIBINPUT_0.12.0 0.15.0 @@ -173,6 +138,10 @@ libinput_event_touch_get_x_transformed@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_y@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_y_transformed@LIBINPUT_0.12.0 0.15.0 + libinput_event_touch_has_major@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_has_minor@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_has_orientation@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_has_pressure@LIBINPUT_0.22.0 0.21.0-1ubuntu1 libinput_get_event@LIBINPUT_0.12.0 0.15.0 libinput_get_fd@LIBINPUT_0.12.0 0.15.0 libinput_get_user_data@LIBINPUT_0.12.0 0.15.0 @@ -194,21 +163,6 @@ libinput_seat_unref@LIBINPUT_0.12.0 0.15.0 libinput_set_user_data@LIBINPUT_0.12.0 0.15.0 libinput_suspend@LIBINPUT_0.12.0 0.15.0 - libinput_tablet_tool_get_serial@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_get_tool_id@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_get_type@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_get_user_data@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_has_button@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_has_distance@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_has_pressure@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_has_rotation@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_has_slider@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_has_tilt@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_has_wheel@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_is_unique@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_ref@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_set_user_data@LIBINPUT_1.2 1.2.0 - libinput_tablet_tool_unref@LIBINPUT_1.2 1.2.0 libinput_udev_assign_seat@LIBINPUT_0.12.0 0.15.0 libinput_udev_create_context@LIBINPUT_0.12.0 0.15.0 libinput_unref@LIBINPUT_0.12.0 0.15.0 diff -Nru libinput-1.2.2/debian/libinput-tools.install libinput-0.21.0/debian/libinput-tools.install --- libinput-1.2.2/debian/libinput-tools.install 2016-03-17 08:48:58.000000000 +0000 +++ libinput-0.21.0/debian/libinput-tools.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin/* -usr/share/man/man1/* diff -Nru libinput-1.2.2/debian/patches/fix-litest.patch libinput-0.21.0/debian/patches/fix-litest.patch --- libinput-1.2.2/debian/patches/fix-litest.patch 1970-01-01 00:00:00.000000000 +0000 +++ libinput-0.21.0/debian/patches/fix-litest.patch 2015-08-24 12:13:16.000000000 +0000 @@ -0,0 +1,44 @@ +With this change auto assign events will be skipped if no replacement value +is provided. This behavior is practical when emitting mt events, as those +only contain the axis values that changed. + +Signed-off-by: Andreas Pokorny +--- + test/litest.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/litest.c b/test/litest.c +index 26c5e43..8fc7bca 100644 +--- a/test/litest.c ++++ b/test/litest.c +@@ -1292,7 +1292,6 @@ litest_auto_assign_value(struct litest_device *d, + value = touching ? 0 : 1; + break; + default: +- value = -1; + if (!axis_replacement_value(axes, ev->code, &value) && + d->interface->get_axis_default) + d->interface->get_axis_default(d, ev->code, &value); +@@ -1342,8 +1341,8 @@ litest_slot_start(struct litest_device *d, + y, + axes, + touching); +- +- litest_event(d, ev->type, ev->code, value); ++ if (value != LITEST_AUTO_ASSIGN) ++ litest_event(d, ev->type, ev->code, value); + ev++; + } + } +@@ -1428,7 +1427,8 @@ litest_slot_move(struct litest_device *d, + y, + axes, + touching); +- litest_event(d, ev->type, ev->code, value); ++ if (value != LITEST_AUTO_ASSIGN) ++ litest_event(d, ev->type, ev->code, value); + ev++; + } + } +-- +2.1.4 diff -Nru libinput-1.2.2/debian/patches/series libinput-0.21.0/debian/patches/series --- libinput-1.2.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libinput-0.21.0/debian/patches/series 2015-08-24 12:17:29.000000000 +0000 @@ -0,0 +1,2 @@ +fix-litest.patch +touch-point-orientation-size.patch diff -Nru libinput-1.2.2/debian/patches/touch-point-orientation-size.patch libinput-0.21.0/debian/patches/touch-point-orientation-size.patch --- libinput-1.2.2/debian/patches/touch-point-orientation-size.patch 1970-01-01 00:00:00.000000000 +0000 +++ libinput-0.21.0/debian/patches/touch-point-orientation-size.patch 2015-08-24 12:11:53.000000000 +0000 @@ -0,0 +1,1675 @@ +This change adds four new properties to touch events: +* major: diameter of the touch ellipse along the major axis +* minor: diameter perpendicular to major axis +* pressure: a pressure value mapped into the range [0, 1] +* orientation: the angle between major and the x axis [0, 360] + +Those values are optionally supported by multi-touch drivers, so default values +are used if the information is missing. The existance of each of the properties +can be querried at the event using another set of libinput_event_touch_has_* +functions. + +Explanation of those values was added to the touch screen page. + +Signed-off-by: Andreas Pokorny +--- + doc/Makefile.am | 2 + + doc/page-hierarchy.dox | 1 + + doc/svg/touchscreen-touch-event-properties.svg | 347 +++++++++++++++++++++++++ + doc/touch-event-properties.dox | 42 +++ + src/evdev.c | 218 ++++++++++++++-- + src/evdev.h | 25 ++ + src/libinput-private.h | 25 +- + src/libinput-util.h | 6 + + src/libinput.c | 205 ++++++++++++++- + src/libinput.h | 222 ++++++++++++++++ + src/libinput.sym | 13 + + test/touch.c | 239 +++++++++++++++++ + 12 files changed, 1313 insertions(+), 32 deletions(-) + create mode 100644 doc/svg/touchscreen-touch-event-properties.svg + create mode 100644 doc/touch-event-properties.dox + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index a8d4182..da21283 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -26,6 +26,7 @@ header_files = \ + $(srcdir)/tapping.dox \ + $(srcdir)/test-suite.dox \ + $(srcdir)/tools.dox \ ++ $(srcdir)/touch-event-properties.dox \ + $(srcdir)/touchpads.dox + + diagram_files = \ +@@ -49,6 +50,7 @@ diagram_files = \ + $(srcdir)/svg/thumb-detection.svg \ + $(srcdir)/svg/top-software-buttons.svg \ + $(srcdir)/svg/touchscreen-gestures.svg \ ++ $(srcdir)/svg/touchscreen-touch-event-properties.svg \ + $(srcdir)/svg/twofinger-scrolling.svg + + style_files = \ +diff --git a/doc/page-hierarchy.dox b/doc/page-hierarchy.dox +index 3fdb1f7..72765e2 100644 +--- a/doc/page-hierarchy.dox ++++ b/doc/page-hierarchy.dox +@@ -11,6 +11,7 @@ + @page touchscreens Touchscreens + + - @subpage absolute_axes ++- @subpage touch_event_properties + + @page pointers Mice, Trackballs, etc. + +diff --git a/doc/svg/touchscreen-touch-event-properties.svg b/doc/svg/touchscreen-touch-event-properties.svg +new file mode 100644 +index 0000000..b728f40 +--- /dev/null ++++ b/doc/svg/touchscreen-touch-event-properties.svg +@@ -0,0 +1,347 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ image/svg+xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ minor axis ++ major axis ++ ++ pointing direction ++ y axis ++ ++ orientation ++ ++ +diff --git a/doc/touch-event-properties.dox b/doc/touch-event-properties.dox +new file mode 100644 +index 0000000..75fc072 +--- /dev/null ++++ b/doc/touch-event-properties.dox +@@ -0,0 +1,42 @@ ++/** ++ at page touch_event_properties Properties of a touch event ++ ++This page gives some overview on touchscreen events. With libinput touchscreens ++provide the event types @ref LIBINPUT_EVENT_TOUCH_DOWN, @ref LIBINPUT_EVENT_TOUCH_UP, ++ at ref LIBINPUT_EVENT_TOUCH_MOTION and @ref LIBINPUT_EVENT_TOUCH_CANCEL. The ++touchscreen events @ref LIBINPUT_EVENT_TOUCH_DOWN and ++ at ref LIBINPUT_EVENT_TOUCH_MOTION provide alongside the actual state change and ++the absolute coordinates (@ref absolute_axes_handling) additional information ++about the touch contact. ++ ++ at image html touchscreen-touch-event-properties.svg "Properties of a touch screen contact" ++ ++Assuming the interaction of fingers with a touch screen, touch contacts are ++approximated with an ellipse. The major axis of the ellipse describes the ++pointing direction of the finger. The minor axis is the perpendicular ++extent of the touching shape. The orientation angle is the clockwise rotation of ++the pointing direction against the y-axis of the touchscreen. ++ ++Additionally to the values shown in the drawing above, most touchscreens also ++provide a pressure value to indicate the force applied with the contact point. ++ ++The support for those contact properties varies between the different ++available touchscreens. In the case of pressure libinput will return the ++maximum pressure value, which is 1.0. If only the major axis but no minor axis ++is present, libinput will assume a circular shape and return the major axis ++value for convenience. If also no major axis value is known 0.0 is returned. ++If the orientation is not available libinput will return 0.0 degrees. ++ ++For querying the touch properties see: ++- @ref libinput_event_touch_get_major_transformed ++- @ref libinput_event_touch_get_minor_transformed ++- @ref libinput_event_touch_get_orientation ++- @ref libinput_event_touch_get_pressure ++ ++For testing which of the touch properties are available see: ++- @ref libinput_event_touch_has_major ++- @ref libinput_event_touch_has_minor ++- @ref libinput_event_touch_has_orientation ++- @ref libinput_event_touch_has_pressure ++ ++*/ +diff --git a/src/evdev.c b/src/evdev.c +index 303e447..29303f8 100644 +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -45,6 +45,10 @@ + + #define DEFAULT_WHEEL_CLICK_ANGLE 15 + #define DEFAULT_MIDDLE_BUTTON_SCROLL_TIMEOUT ms2us(200) ++#define DEFAULT_TOUCH_PRESSURE 1 ++#define DEFAULT_TOUCH_ORIENTATION 0 ++#define DEFAULT_TOUCH_MAJOR 0 ++#define DEFAULT_TOUCH_MINOR 0 + + enum evdev_key_type { + EVDEV_KEY_TYPE_NONE, +@@ -245,6 +249,100 @@ evdev_device_transform_y(struct evdev_device *device, + return scale_axis(device->abs.absinfo_y, y, height); + } + ++double ++evdev_device_transform_ellipse_diameter_to_mm(struct evdev_device *device, ++ int diameter, ++ double axis_angle) ++{ ++ double x_res = device->abs.absinfo_x->resolution; ++ double y_res = device->abs.absinfo_y->resolution; ++ ++ if (x_res == y_res) ++ return diameter / x_res; ++ ++ /* resolution differs but no orientation available ++ * -> estimate resolution using the average */ ++ if (device->abs.absinfo_orientation == NULL) { ++ return diameter * 2.0 / (x_res + y_res); ++ } else { ++ /* Why scale x using sine of angle? ++ * axis_angle = 0 indicates that the given diameter ++ * is aligned with the y-axis. */ ++ double x_scaling_ratio = fabs(sin(deg2rad(axis_angle))); ++ double y_scaling_ratio = fabs(cos(deg2rad(axis_angle))); ++ ++ return diameter / (y_res * y_scaling_ratio + ++ x_res * x_scaling_ratio); ++ } ++} ++ ++double ++evdev_device_transform_ellipse_diameter(struct evdev_device *device, ++ int diameter, ++ double axis_angle, ++ uint32_t width, ++ uint32_t height) ++{ ++ double x_res = device->abs.absinfo_x->resolution; ++ double y_res = device->abs.absinfo_y->resolution; ++ double x_scale = width / (device->abs.dimensions.x + 1.0); ++ double y_scale = height / (device->abs.dimensions.y + 1.0); ++ ++ if (x_res == y_res) ++ return diameter * x_scale; ++ ++ /* no orientation available -> estimate resolution using the ++ * average */ ++ if (device->abs.absinfo_orientation == NULL) { ++ return diameter * (x_scale + y_scale) / 2.0; ++ } else { ++ /* Why scale x using sine of angle? ++ * axis_angle = 0 indicates that the given diameter ++ * is aligned with the y-axis. */ ++ double x_scaling_ratio = fabs(sin(deg2rad(axis_angle))); ++ double y_scaling_ratio = fabs(cos(deg2rad(axis_angle))); ++ ++ return diameter * (y_scale * y_scaling_ratio + ++ x_scale * x_scaling_ratio); ++ } ++} ++ ++double ++evdev_device_transform_orientation(struct evdev_device *device, ++ int32_t orientation) ++{ ++ const struct input_absinfo *orientation_info = ++ device->abs.absinfo_orientation; ++ ++ double angle = DEFAULT_TOUCH_ORIENTATION; ++ ++ /* ABS_MT_ORIENTATION is defined as a clockwise rotation - zero ++ * (instead of minimum) is mapped to the y-axis, and maximum is ++ * mapped to the x-axis. So minimum is likely to be negative but ++ * plays no role in scaling the value to degrees.*/ ++ if (orientation_info) ++ angle = (90.0 * orientation) / orientation_info->maximum; ++ ++ return fmod(360.0 + angle, 360.0); ++} ++ ++double ++evdev_device_transform_pressure(struct evdev_device *device, ++ int32_t pressure) ++{ ++ const struct input_absinfo *pressure_info = ++ device->abs.absinfo_pressure; ++ ++ if (pressure_info) { ++ double max_pressure = pressure_info->maximum; ++ double min_pressure = pressure_info->minimum; ++ return (pressure - min_pressure) / ++ (max_pressure - min_pressure); ++ } else { ++ return DEFAULT_TOUCH_PRESSURE; ++ } ++} ++ + static inline void + normalize_delta(struct evdev_device *device, + const struct device_coords *delta, +@@ -282,8 +380,15 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) + struct normalized_coords accel, unaccel; + struct device_coords point; + struct device_float_coords raw; ++ struct mt_slot *slot_data; ++ struct ellipse default_touch = { ++ .major = DEFAULT_TOUCH_MAJOR, ++ .minor = DEFAULT_TOUCH_MINOR, ++ .orientation = DEFAULT_TOUCH_ORIENTATION ++ }; + + slot = device->mt.slot; ++ slot_data = &device->mt.slots[slot]; + + switch (device->pending_event) { + case EVDEV_NONE: +@@ -314,7 +419,7 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) + if (!(device->seat_caps & EVDEV_DEVICE_TOUCH)) + break; + +- if (device->mt.slots[slot].seat_slot != -1) { ++ if (slot_data->seat_slot != -1) { + log_bug_kernel(libinput, + "%s: Driver sent multiple touch down for the " + "same slot", +@@ -323,38 +428,52 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) + } + + seat_slot = ffs(~seat->slot_map) - 1; +- device->mt.slots[slot].seat_slot = seat_slot; ++ slot_data->seat_slot = seat_slot; + + if (seat_slot == -1) + break; + + seat->slot_map |= 1 << seat_slot; +- point = device->mt.slots[slot].point; ++ point = slot_data->point; + transform_absolute(device, &point); + +- touch_notify_touch_down(base, time, slot, seat_slot, +- &point); ++ touch_notify_touch_down(base, ++ time, ++ slot, ++ seat_slot, ++ &point, ++ slot_data->available_data, ++ &slot_data->area, ++ slot_data->pressure); + break; + case EVDEV_ABSOLUTE_MT_MOTION: + if (!(device->seat_caps & EVDEV_DEVICE_TOUCH)) + break; + +- seat_slot = device->mt.slots[slot].seat_slot; +- point = device->mt.slots[slot].point; ++ seat_slot = slot_data->seat_slot; ++ ++ point = slot_data->point; + + if (seat_slot == -1) + break; + + transform_absolute(device, &point); +- touch_notify_touch_motion(base, time, slot, seat_slot, +- &point); ++ ++ touch_notify_touch_motion(base, ++ time, ++ slot, ++ seat_slot, ++ &point, ++ slot_data->available_data, ++ &slot_data->area, ++ slot_data->pressure); + break; + case EVDEV_ABSOLUTE_MT_UP: + if (!(device->seat_caps & EVDEV_DEVICE_TOUCH)) + break; + +- seat_slot = device->mt.slots[slot].seat_slot; +- device->mt.slots[slot].seat_slot = -1; ++ seat_slot = slot_data->seat_slot; ++ slot_data->seat_slot = -1; + + if (seat_slot == -1) + break; +@@ -386,7 +505,14 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) + point = device->abs.point; + transform_absolute(device, &point); + +- touch_notify_touch_down(base, time, -1, seat_slot, &point); ++ touch_notify_touch_down(base, ++ time, ++ -1, ++ seat_slot, ++ &point, ++ TOUCH_SLOT_DATA_NONE, ++ &default_touch, ++ DEFAULT_TOUCH_PRESSURE); + break; + case EVDEV_ABSOLUTE_MOTION: + point = device->abs.point; +@@ -398,8 +524,14 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) + if (seat_slot == -1) + break; + +- touch_notify_touch_motion(base, time, -1, seat_slot, +- &point); ++ touch_notify_touch_motion(base, ++ time, ++ -1, ++ seat_slot, ++ &point, ++ TOUCH_SLOT_DATA_NONE, ++ &default_touch, ++ DEFAULT_TOUCH_PRESSURE); + } else if (device->seat_caps & EVDEV_DEVICE_POINTER) { + pointer_notify_motion_absolute(base, time, &point); + } +@@ -559,8 +691,9 @@ evdev_process_touch(struct evdev_device *device, + struct input_event *e, + uint64_t time) + { +- switch (e->code) { +- case ABS_MT_SLOT: ++ struct mt_slot *current_slot = &device->mt.slots[device->mt.slot]; ++ ++ if (e->code == ABS_MT_SLOT) { + if ((size_t)e->value >= device->mt.slots_len) { + log_bug_libinput(device->base.seat->libinput, + "%s exceeds slots (%d of %zd)\n", +@@ -571,8 +704,7 @@ evdev_process_touch(struct evdev_device *device, + } + evdev_flush_pending_event(device, time); + device->mt.slot = e->value; +- break; +- case ABS_MT_TRACKING_ID: ++ } else if(e->code == ABS_MT_TRACKING_ID) { + if (device->pending_event != EVDEV_NONE && + device->pending_event != EVDEV_ABSOLUTE_MT_MOTION) + evdev_flush_pending_event(device, time); +@@ -580,17 +712,40 @@ evdev_process_touch(struct evdev_device *device, + device->pending_event = EVDEV_ABSOLUTE_MT_DOWN; + else + device->pending_event = EVDEV_ABSOLUTE_MT_UP; +- break; +- case ABS_MT_POSITION_X: +- device->mt.slots[device->mt.slot].point.x = e->value; +- if (device->pending_event == EVDEV_NONE) +- device->pending_event = EVDEV_ABSOLUTE_MT_MOTION; +- break; +- case ABS_MT_POSITION_Y: +- device->mt.slots[device->mt.slot].point.y = e->value; +- if (device->pending_event == EVDEV_NONE) ++ } else { ++ bool needs_wake = true; ++ ++ switch(e->code) { ++ case ABS_MT_POSITION_X: ++ current_slot->point.x = e->value; ++ break; ++ case ABS_MT_POSITION_Y: ++ current_slot->point.y = e->value; ++ break; ++ case ABS_MT_TOUCH_MAJOR: ++ current_slot->available_data |= TOUCH_SLOT_DATA_MAJOR; ++ current_slot->area.major = e->value; ++ break; ++ case ABS_MT_TOUCH_MINOR: ++ current_slot->available_data |= TOUCH_SLOT_DATA_MINOR; ++ current_slot->area.minor = e->value; ++ break; ++ case ABS_MT_ORIENTATION: ++ current_slot->available_data |= ++ TOUCH_SLOT_DATA_ORIENTATION; ++ current_slot->area.orientation = e->value; ++ break; ++ case ABS_MT_PRESSURE: ++ current_slot->available_data |= ++ TOUCH_SLOT_DATA_PRESSURE; ++ current_slot->pressure = e->value; ++ break; ++ default: ++ needs_wake = false; ++ break; ++ } ++ if (needs_wake && device->pending_event == EVDEV_NONE) + device->pending_event = EVDEV_ABSOLUTE_MT_MOTION; +- break; + } + } + +@@ -1941,6 +2096,13 @@ evdev_configure_device(struct evdev_device *device) + return -1; + } + ++ device->abs.absinfo_orientation = ++ libevdev_get_abs_info(evdev, ++ ABS_MT_ORIENTATION); ++ device->abs.absinfo_pressure = ++ libevdev_get_abs_info(evdev, ++ ABS_MT_PRESSURE); ++ + if (!evdev_is_fake_mt_device(device)) + evdev_fix_android_mt(device); + +diff --git a/src/evdev.h b/src/evdev.h +index e44a65d..383e682 100644 +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -112,6 +112,9 @@ enum evdev_device_model { + struct mt_slot { + int32_t seat_slot; + struct device_coords point; ++ enum touch_slot_data available_data; ++ struct ellipse area; ++ int32_t pressure; + }; + + struct evdev_device { +@@ -128,6 +131,8 @@ struct evdev_device { + int fd; + struct { + const struct input_absinfo *absinfo_x, *absinfo_y; ++ const struct input_absinfo *absinfo_pressure, ++ *absinfo_orientation; + int fake_resolution; + + struct device_coords point; +@@ -349,6 +354,26 @@ double + evdev_device_transform_y(struct evdev_device *device, + double y, + uint32_t height); ++double ++evdev_device_transform_ellipse_diameter_to_mm(struct evdev_device *device, ++ int32_t diameter, ++ double axis_angle); ++ ++double ++evdev_device_transform_ellipse_diameter(struct evdev_device *device, ++ int32_t diameter, ++ double axis_angle, ++ uint32_t width, ++ uint32_t height); ++ ++double ++evdev_device_transform_orientation(struct evdev_device *device, ++ int32_t orientation); ++ ++double ++evdev_device_transform_pressure(struct evdev_device *device, ++ int32_t pressure); ++ + int + evdev_device_suspend(struct evdev_device *device); + +diff --git a/src/libinput-private.h b/src/libinput-private.h +index 8b161cc..0060030 100644 +--- a/src/libinput-private.h ++++ b/src/libinput-private.h +@@ -40,6 +40,11 @@ struct device_coords { + int x, y; + }; + ++/* Ellipse parameters in device coordinates */ ++struct ellipse { ++ int major, minor, orientation; ++}; ++ + /* + * A coordinate pair in device coordinates, capable of holding non discrete + * values, this is necessary e.g. when device coordinates get averaged. +@@ -58,6 +63,16 @@ struct discrete_coords { + int x, y; + }; + ++enum touch_slot_data { ++ TOUCH_SLOT_DATA_NONE = 0, ++ TOUCH_SLOT_DATA_MAJOR = (1 << 1), ++ TOUCH_SLOT_DATA_MINOR = (1 << 2), ++ TOUCH_SLOT_DATA_ORIENTATION = (1 << 3), ++ TOUCH_SLOT_DATA_PRESSURE = (1 << 4), ++}; ++ ++ ++ + struct libinput_interface_backend { + int (*resume)(struct libinput *libinput); + void (*suspend)(struct libinput *libinput); +@@ -381,14 +396,20 @@ touch_notify_touch_down(struct libinput_device *device, + uint64_t time, + int32_t slot, + int32_t seat_slot, +- const struct device_coords *point); ++ const struct device_coords *point, ++ enum touch_slot_data available_data, ++ const struct ellipse *area, ++ int32_t pressure); + + void + touch_notify_touch_motion(struct libinput_device *device, + uint64_t time, + int32_t slot, + int32_t seat_slot, +- const struct device_coords *point); ++ const struct device_coords *point, ++ enum touch_slot_data available_data, ++ const struct ellipse *area, ++ int32_t pressure); + + void + touch_notify_touch_up(struct libinput_device *device, +diff --git a/src/libinput-util.h b/src/libinput-util.h +index ba253b5..9495fa6 100644 +--- a/src/libinput-util.h ++++ b/src/libinput-util.h +@@ -118,6 +118,12 @@ msleep(unsigned int ms) + usleep(ms * 1000); + } + ++static inline double ++deg2rad(double angle) ++{ ++ return angle * M_PI/180.0; ++} ++ + static inline int + long_bit_is_set(const unsigned long *array, int bit) + { +diff --git a/src/libinput.c b/src/libinput.c +index e564571..237a35f 100644 +--- a/src/libinput.c ++++ b/src/libinput.c +@@ -112,6 +112,9 @@ struct libinput_event_touch { + int32_t slot; + int32_t seat_slot; + struct device_coords point; ++ enum touch_slot_data available_data; ++ struct ellipse area; ++ int32_t pressure; + }; + + struct libinput_event_gesture { +@@ -729,6 +732,192 @@ libinput_event_touch_get_y(struct libinput_event_touch *event) + return evdev_convert_to_mm(device->abs.absinfo_y, event->point.y); + } + ++LIBINPUT_EXPORT double ++libinput_event_touch_get_major(struct libinput_event_touch *event) ++{ ++ struct evdev_device *device = ++ (struct evdev_device *) event->base.device; ++ double angle; ++ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ angle = evdev_device_transform_orientation(device, ++ event->area.orientation); ++ ++ return evdev_device_transform_ellipse_diameter_to_mm(device, ++ event->area.major, ++ angle); ++} ++ ++LIBINPUT_EXPORT double ++libinput_event_touch_get_major_transformed(struct libinput_event_touch *event, ++ uint32_t width, ++ uint32_t height) ++{ ++ struct evdev_device *device = ++ (struct evdev_device *) event->base.device; ++ double angle; ++ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ angle = evdev_device_transform_orientation(device, ++ event->area.orientation); ++ ++ return evdev_device_transform_ellipse_diameter(device, ++ event->area.major, ++ angle, ++ width, ++ height); ++} ++ ++LIBINPUT_EXPORT int ++libinput_event_touch_has_major(struct libinput_event_touch *event) ++{ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ return event->available_data & TOUCH_SLOT_DATA_MAJOR; ++} ++ ++LIBINPUT_EXPORT double ++libinput_event_touch_get_minor(struct libinput_event_touch *event) ++{ ++ struct evdev_device *device = ++ (struct evdev_device *) event->base.device; ++ double angle; ++ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ angle = evdev_device_transform_orientation(device, ++ event->area.orientation); ++ ++ /* angle + 90 since the minor diameter is perpendicular to the ++ * major axis */ ++ return evdev_device_transform_ellipse_diameter_to_mm(device, ++ event->area.minor, ++ angle + 90.0); ++ ++} ++ ++LIBINPUT_EXPORT double ++libinput_event_touch_get_minor_transformed(struct libinput_event_touch *event, ++ uint32_t width, ++ uint32_t height) ++{ ++ struct evdev_device *device = ++ (struct evdev_device *) event->base.device; ++ double angle; ++ int diameter; ++ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ angle = evdev_device_transform_orientation(device, ++ event->area.orientation); ++ ++ /* use major diameter if minor is not available, but if it is ++ * add 90 since the minor diameter is perpendicular to the ++ * major axis */ ++ if( event->available_data & TOUCH_SLOT_DATA_MINOR) { ++ diameter = event->area.minor, ++ angle += 90.0; ++ } else { ++ diameter = event->area.major; ++ } ++ ++ return evdev_device_transform_ellipse_diameter(device, ++ diameter, ++ angle, ++ width, ++ height); ++} ++ ++LIBINPUT_EXPORT int ++libinput_event_touch_has_minor(struct libinput_event_touch *event) ++{ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ return event->available_data & TOUCH_SLOT_DATA_MINOR; ++} ++ ++LIBINPUT_EXPORT double ++libinput_event_touch_get_orientation(struct libinput_event_touch *event) ++{ ++ struct evdev_device *device = ++ (struct evdev_device *) event->base.device; ++ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ return evdev_device_transform_orientation(device, ++ event->area.orientation); ++} ++ ++LIBINPUT_EXPORT int ++libinput_event_touch_has_orientation(struct libinput_event_touch *event) ++{ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ return event->available_data & TOUCH_SLOT_DATA_ORIENTATION; ++} ++ ++LIBINPUT_EXPORT double ++libinput_event_touch_get_pressure(struct libinput_event_touch *event) ++{ ++ struct evdev_device *device = ++ (struct evdev_device *) event->base.device; ++ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ return evdev_device_transform_pressure(device, ++ event->pressure); ++} ++ ++LIBINPUT_EXPORT int ++libinput_event_touch_has_pressure(struct libinput_event_touch *event) ++{ ++ require_event_type(libinput_event_get_context(&event->base), ++ event->base.type, ++ 0, ++ LIBINPUT_EVENT_TOUCH_DOWN, ++ LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ return event->available_data & TOUCH_SLOT_DATA_PRESSURE; ++} ++ + LIBINPUT_EXPORT uint32_t + libinput_event_gesture_get_time(struct libinput_event_gesture *event) + { +@@ -1500,7 +1689,10 @@ touch_notify_touch_down(struct libinput_device *device, + uint64_t time, + int32_t slot, + int32_t seat_slot, +- const struct device_coords *point) ++ const struct device_coords *point, ++ enum touch_slot_data available_data, ++ const struct ellipse *area, ++ int32_t pressure) + { + struct libinput_event_touch *touch_event; + +@@ -1516,6 +1708,9 @@ touch_notify_touch_down(struct libinput_device *device, + .slot = slot, + .seat_slot = seat_slot, + .point = *point, ++ .available_data = available_data, ++ .area = *area, ++ .pressure = pressure, + }; + + post_device_event(device, time, +@@ -1528,7 +1723,10 @@ touch_notify_touch_motion(struct libinput_device *device, + uint64_t time, + int32_t slot, + int32_t seat_slot, +- const struct device_coords *point) ++ const struct device_coords *point, ++ enum touch_slot_data available_data, ++ const struct ellipse *area, ++ int32_t pressure) + { + struct libinput_event_touch *touch_event; + +@@ -1544,6 +1742,9 @@ touch_notify_touch_motion(struct libinput_device *device, + .slot = slot, + .seat_slot = seat_slot, + .point = *point, ++ .available_data = available_data, ++ .area = *area, ++ .pressure = pressure, + }; + + post_device_event(device, time, +diff --git a/src/libinput.h b/src/libinput.h +index 88b3c05..34ef518 100644 +--- a/src/libinput.h ++++ b/src/libinput.h +@@ -968,6 +968,228 @@ libinput_event_touch_get_y_transformed(struct libinput_event_touch *event, + /** + * @ingroup event_touch + * ++ * Return the diameter of the major axis of the touch ellipse in mm. ++ * This value might not be provided by the device, in that case the value ++ * 0.0 is returned. ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN, @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @return The current major axis diameter ++ */ ++double ++libinput_event_touch_get_major(struct libinput_event_touch *event); ++ ++/** ++ * @ingroup event_touch ++ * ++ * Return the diameter of the major axis of the touch ellipse in screen ++ * space. This value might not be provided by the device, in that case the ++ * value 0.0 is returned. ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @param width The current output screen width ++ * @param height The current output screen height ++ * @return The current major axis diameter ++ */ ++double ++libinput_event_touch_get_major_transformed(struct libinput_event_touch *event, ++ uint32_t width, ++ uint32_t height); ++ ++/** ++ * @ingroup event_touch ++ * ++ * Return if the event contains a major axis value of the touch ellipse. ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN, @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @return Whether a major diameter is available ++ */ ++int ++libinput_event_touch_has_major(struct libinput_event_touch *event); ++ ++/** ++ * @ingroup event_touch ++ * ++ * Return the diameter of the minor axis of the touch ellipse in mm. ++ * This value might not be provided by the device, in this case the value ++ * 0.0 is returned. ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @return The current minor diameter ++ */ ++double ++libinput_event_touch_get_minor(struct libinput_event_touch *event); ++ ++/** ++ * @ingroup event_touch ++ * ++ * Return the diameter of the minor axis of the touch ellipse in screen ++ * space. This value might not be provided by the device, in this case ++ * the value 0.0 is returned. ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @param width The current output screen width ++ * @param height The current output screen height ++ * @return The current minor diameter ++ */ ++double ++libinput_event_touch_get_minor_transformed(struct libinput_event_touch *event, ++ uint32_t width, ++ uint32_t height); ++/** ++ * @ingroup event_touch ++ * ++ * Return if the event contains a minor axis value of the touch ellipse. ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN, @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @return Whether a minor diameter is available ++ */ ++int ++libinput_event_touch_has_minor(struct libinput_event_touch *event); ++ ++/** ++ * @ingroup event_touch ++ * ++ * Return the pressure value applied to the touch contact normalized to the ++ * range [0, 1]. If this value is not available the function returns the maximum ++ * value 1.0. ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @return The current pressure value ++ */ ++double ++libinput_event_touch_get_pressure(struct libinput_event_touch *event); ++ ++/** ++ * @ingroup event_touch ++ * ++ * Return if the event contains a pressure value for the touch contact. ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN, @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @return Whether a pressure value is available ++ */ ++int ++libinput_event_touch_has_pressure(struct libinput_event_touch *event); ++ ++/** ++ * @ingroup event_touch ++ * ++ * Return the major axis rotation in degrees, clockwise from the logical north ++ * of the touch screen. ++ * ++ * @note Even when the orientation is measured by the device, it might be only ++ * available in coarse steps (e.g only indicating alignment with either of the ++ * axes). ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN, @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @return The current orientation value ++ */ ++double ++libinput_event_touch_get_orientation(struct libinput_event_touch *event); ++ ++/** ++ * @ingroup event_touch ++ * ++ * Return if the event contains a orientation value for the touch contact. ++ * ++ * A more detailed explanation can be found in @ref touch_event_properties. ++ * ++ * For events not of type @ref LIBINPUT_EVENT_TOUCH_DOWN, @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. ++ * ++ * @note It is an application bug to call this function for events of type ++ * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref ++ * LIBINPUT_EVENT_TOUCH_MOTION. ++ * ++ * @param event The libinput touch event ++ * @return Whether a orientation value is available ++ */ ++int ++libinput_event_touch_has_orientation(struct libinput_event_touch *event); ++ ++/** ++ * @ingroup event_touch ++ * + * @return The generic libinput_event of this event + */ + struct libinput_event * +diff --git a/src/libinput.sym b/src/libinput.sym +index 7e0ef1c..12edd15 100644 +--- a/src/libinput.sym ++++ b/src/libinput.sym +@@ -172,3 +172,16 @@ LIBINPUT_0.21.0 { + libinput_event_pointer_get_time_usec; + libinput_event_touch_get_time_usec; + } LIBINPUT_0.20.0; ++ ++LIBINPUT_0.22.0 { ++ libinput_event_touch_get_major; ++ libinput_event_touch_get_major_transformed; ++ libinput_event_touch_get_minor; ++ libinput_event_touch_get_minor_transformed; ++ libinput_event_touch_get_orientation; ++ libinput_event_touch_get_pressure; ++ libinput_event_touch_has_major; ++ libinput_event_touch_has_minor; ++ libinput_event_touch_has_orientation; ++ libinput_event_touch_has_pressure; ++} LIBINPUT_0.21.0; +diff --git a/test/touch.c b/test/touch.c +index eae8007..066eee4 100644 +--- a/test/touch.c ++++ b/test/touch.c +@@ -673,6 +673,243 @@ START_TEST(touch_time_usec) + } + END_TEST + ++static inline double calc_diameter_scale(double x_res, ++ double y_res, ++ double orientation) ++{ ++ double orientation_rad = deg2rad(orientation); ++ if (x_res == y_res) ++ return x_res; ++ ++ return y_res * fabs(cos(orientation_rad)) + ++ x_res * fabs(sin(orientation_rad)); ++} ++ ++static inline bool exceeds_range(const struct input_absinfo *info, ++ int value) ++{ ++ return !info || (info->minimum > value) || (info->maximum < value); ++} ++ ++START_TEST(touch_point_properties) ++{ ++ struct litest_device *dev = litest_current_device(); ++ struct libinput *li = dev->libinput; ++ struct libinput_event *ev; ++ struct libinput_event_touch *tev; ++ ++ const int touch_x = 50; ++ const int touch_y = 90; ++ const int input_orientation = 64; ++ const int input_pressure = 128; ++ const int input_major = 14; ++ const int input_minor= 8; ++ ++ const int input_orientation_2 = 128; ++ const int input_major_2 = 30; ++ ++ struct axis_replacement down_values[] = { ++ {ABS_MT_PRESSURE, input_pressure}, ++ {ABS_MT_ORIENTATION, input_orientation}, ++ {ABS_MT_TOUCH_MAJOR, input_major}, ++ {ABS_MT_TOUCH_MINOR, input_minor}, ++ {-1, -1}}; ++ struct axis_replacement move_values[] = { ++ {ABS_MT_ORIENTATION, input_orientation_2}, ++ {ABS_MT_TOUCH_MAJOR, input_major_2}, ++ {-1, -1}}; ++ const struct input_absinfo *orientation_info; ++ const struct input_absinfo *pressure_info; ++ const struct input_absinfo *major_info; ++ const struct input_absinfo *minor_info; ++ const struct input_absinfo *x_info, *y_info; ++ ++ double x_res, y_res, touch_minor_scale, touch_major_scale; ++ ++ double expected_major; ++ double expected_minor; ++ double expected_orientation; ++ double expected_pressure; ++ ++ pressure_info = libevdev_get_abs_info(dev->evdev, ABS_MT_PRESSURE); ++ orientation_info = libevdev_get_abs_info(dev->evdev, ABS_MT_ORIENTATION); ++ major_info = libevdev_get_abs_info(dev->evdev, ABS_MT_TOUCH_MAJOR); ++ minor_info = libevdev_get_abs_info(dev->evdev, ABS_MT_TOUCH_MINOR); ++ x_info = libevdev_get_abs_info(dev->evdev, ABS_MT_POSITION_X); ++ y_info = libevdev_get_abs_info(dev->evdev, ABS_MT_POSITION_Y); ++ ++ if (!orientation_info || !pressure_info || !major_info || !minor_info) ++ return; ++ ++ if (exceeds_range(pressure_info, input_pressure) || ++ exceeds_range(major_info, input_major) || ++ exceeds_range(major_info, input_major_2) || ++ exceeds_range(minor_info, input_minor) || ++ exceeds_range(orientation_info, input_orientation) || ++ exceeds_range(orientation_info, input_orientation_2)) { ++ fprintf(stderr, "%s does not support the required value ranges", ++ libinput_device_get_name(dev->libinput_device)); ++ return; ++ } ++ ++ x_res = x_info->resolution ? x_info->resolution : 1; ++ y_res = y_info->resolution ? y_info->resolution : 1; ++ ++ expected_orientation = 90.0 * input_orientation / ++ orientation_info->maximum; ++ touch_major_scale = calc_diameter_scale(x_res, ++ y_res, ++ expected_orientation); ++ touch_minor_scale = calc_diameter_scale(x_res, ++ y_res, ++ expected_orientation + 90.0); ++ expected_major = input_major / touch_major_scale; ++ expected_minor = input_minor / touch_minor_scale; ++ expected_pressure = (double)input_pressure / (pressure_info->maximum - ++ pressure_info->minimum); ++ ++ litest_drain_events(li); ++ ++ litest_touch_down_extended(dev, 0, touch_x, touch_y, down_values); ++ ++ litest_wait_for_event(li); ++ ev = libinput_get_event(li); ++ tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN); ++ ++ ck_assert_double_eq(libinput_event_touch_get_pressure(tev), ++ expected_pressure); ++ ck_assert_double_eq(libinput_event_touch_get_orientation(tev), ++ expected_orientation); ++ ck_assert_double_eq(libinput_event_touch_get_major(tev), ++ expected_major); ++ ck_assert_double_eq(libinput_event_touch_get_minor(tev), ++ expected_minor); ++ ++ libinput_event_destroy(ev); ++ ++ litest_touch_move_extended(dev, 0, touch_x, touch_y, move_values); ++ ++ do { ++ litest_wait_for_event(li); ++ ev = libinput_get_event(li); ++ } while (libinput_event_get_type(ev) == LIBINPUT_EVENT_TOUCH_FRAME); ++ tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ expected_orientation = 90.0 * input_orientation_2 / ++ orientation_info->maximum; ++ touch_major_scale = calc_diameter_scale(x_res, ++ y_res, ++ expected_orientation); ++ expected_major = input_major_2 / touch_major_scale; ++ ++ ck_assert_double_eq(libinput_event_touch_get_pressure(tev), ++ expected_pressure); ++ ck_assert_double_eq(libinput_event_touch_get_orientation(tev), ++ expected_orientation); ++ ck_assert_double_eq(libinput_event_touch_get_major(tev), ++ expected_major); ++ ck_assert_double_eq(libinput_event_touch_get_minor(tev), ++ expected_minor); ++ ++ libinput_event_destroy(ev); ++} ++END_TEST ++ ++START_TEST(touch_point_no_minor_or_orienation) ++{ ++ struct litest_device *dev = litest_current_device(); ++ struct libinput *li = dev->libinput; ++ struct libinput_event *ev; ++ struct libinput_event_touch *tev; ++ const int touch_x = 50; ++ const int touch_y = 90; ++ const int input_pressure = 43; ++ const int input_major = 23; ++ const int input_major_2 = 30; ++ ++ struct axis_replacement down_values[] = { ++ {ABS_MT_PRESSURE, input_pressure}, ++ {ABS_MT_TOUCH_MAJOR, input_major}, ++ {-1, -1}}; ++ struct axis_replacement move_values[] = { ++ {ABS_MT_TOUCH_MAJOR, input_major_2}, ++ {-1, -1}}; ++ ++ const struct input_absinfo *orientation_info; ++ const struct input_absinfo *pressure_info; ++ const struct input_absinfo *x_info; ++ const struct input_absinfo *major_info; ++ double touch_major_scale; ++ ++ double expected_major; ++ double expected_minor; ++ double expected_orientation = 0.0; ++ double expected_pressure; ++ ++ x_info = libevdev_get_abs_info(dev->evdev, ABS_MT_POSITION_X); ++ pressure_info = libevdev_get_abs_info(dev->evdev, ABS_MT_PRESSURE); ++ major_info = libevdev_get_abs_info(dev->evdev, ABS_MT_TOUCH_MAJOR); ++ orientation_info = libevdev_get_abs_info(dev->evdev, ++ ABS_MT_ORIENTATION); ++ ++ if (orientation_info || !pressure_info || !x_info || !major_info || ++ !libevdev_has_event_code(dev->evdev, EV_ABS, ABS_MT_TOUCH_MAJOR) || ++ libevdev_has_event_code(dev->evdev, EV_ABS, ABS_MT_TOUCH_MINOR)) ++ return; ++ ++ if (exceeds_range(pressure_info, input_pressure) || ++ exceeds_range(major_info, input_major) || ++ exceeds_range(major_info, input_major_2)) { ++ fprintf(stderr, "%s does not support the required value ranges", ++ libinput_device_get_name(dev->libinput_device)); ++ return; ++ } ++ ++ expected_pressure = (double) input_pressure / ++ (pressure_info->maximum - pressure_info->minimum); ++ touch_major_scale = x_info->resolution ? x_info->resolution : 1; ++ expected_major = input_major / touch_major_scale; ++ expected_minor = expected_major; ++ ++ litest_drain_events(li); ++ ++ litest_touch_down_extended(dev, 0, touch_x, touch_y, down_values); ++ ++ litest_wait_for_event(li); ++ ev = libinput_get_event(li); ++ tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN); ++ ++ ck_assert_double_eq(libinput_event_touch_get_orientation(tev), ++ expected_orientation); ++ ck_assert_double_eq(libinput_event_touch_get_pressure(tev), ++ expected_pressure); ++ ck_assert_double_eq(libinput_event_touch_get_major(tev), ++ expected_major); ++ ck_assert_double_eq(libinput_event_touch_get_minor(tev), ++ expected_minor); ++ ++ libinput_event_destroy(ev); ++ ++ expected_major = input_major_2 / touch_major_scale; ++ expected_minor = expected_major; ++ ++ litest_touch_move_extended(dev, 0, touch_x, touch_y, move_values); ++ ++ do { ++ litest_wait_for_event(li); ++ ev = libinput_get_event(li); ++ } while (libinput_event_get_type(ev) == LIBINPUT_EVENT_TOUCH_FRAME); ++ tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_MOTION); ++ ++ ck_assert_double_eq(libinput_event_touch_get_major(tev), ++ expected_major); ++ ck_assert_double_eq(libinput_event_touch_get_minor(tev), ++ expected_minor); ++ ++ libinput_event_destroy(ev); ++} ++END_TEST ++ + void + litest_setup_tests(void) + { +@@ -697,6 +934,8 @@ litest_setup_tests(void) + litest_add("touch:protocol a", touch_protocol_a_init, LITEST_PROTOCOL_A, LITEST_ANY); + litest_add("touch:protocol a", touch_protocol_a_touch, LITEST_PROTOCOL_A, LITEST_ANY); + litest_add("touch:protocol a", touch_protocol_a_2fg_touch, LITEST_PROTOCOL_A, LITEST_ANY); ++ litest_add("touch:properties", touch_point_properties, LITEST_TOUCH|LITEST_ELLIPSE, LITEST_ANY); ++ litest_add("touch:properties", touch_point_no_minor_or_orienation, LITEST_TOUCH|LITEST_ELLIPSE, LITEST_ANY); + + litest_add_ranged("touch:state", touch_initial_state, LITEST_TOUCH, LITEST_PROTOCOL_A, &axes); + +-- +2.1.4 diff -Nru libinput-1.2.2/doc/absolute-axes.dox libinput-0.21.0/doc/absolute-axes.dox --- libinput-1.2.2/doc/absolute-axes.dox 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/doc/absolute-axes.dox 2015-07-09 02:52:56.000000000 +0000 @@ -10,7 +10,7 @@ - multi-touch screens - single-touch screens - - @ref tablet-support "graphics tablets" + - graphics tablets (currently WIP) Touchpads are technically absolute devices but libinput converts the axis values to directional motion and posts events as relative events. Touchpads do not count @@ -18,10 +18,7 @@ For all absolute devices in libinput, the default unit for x/y coordinates is in mm off the top left corner on the device, or more specifically off the -device's sensor. If the device is physically rotated from its natural -position and this rotation was communicated to libinput (e.g. -@ref libinput_device_config_left_handed_set "by setting the device left-handed"), -the coordinate origin is the top left corner of in the current rotation. +device's sensor. @section absolute_axes_handling Handling of absolute coordinates @@ -43,7 +40,7 @@ @section absolute_axes_nores Devices without x/y resolution An absolute device that does not provide a valid resolution is considered -buggy and must be fixed in the kernel. Some touchpad devices do not +buggy and must be fixed in the kernel. Some touchpad devices that do not provide resolution, those devices are correctly handled within libinput (touchpads are not absolute devices, as mentioned above). @@ -70,7 +67,7 @@ usually requires an offset to move the coordinates back into the original range. -The most common matrices are: +The most comon matrices are: - 90 degree clockwise: @f$ @@ -110,13 +107,10 @@ See Wikipedia's Transformation -Matrix article for more information on the matrix maths. See -libinput_device_config_calibration_get_default_matrix() for how these -matrices must be supplied to libinput. +Matrix article for more information on the matrix maths. -Once applied, any x and y axis value has the calibration applied before it -is made available to the caller. libinput does not provide access to the -raw coordinates before the calibration is applied. +See libinput_device_config_calibration_get_default_matrix() for how these +matrices must be supplied to libinput. @section absolute_axes_nonorm Why x/y coordinates are not normalized diff -Nru libinput-1.2.2/doc/device-configuration-via-udev.dox libinput-0.21.0/doc/device-configuration-via-udev.dox --- libinput-1.2.2/doc/device-configuration-via-udev.dox 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/doc/device-configuration-via-udev.dox 2015-07-28 22:12:38.000000000 +0000 @@ -64,11 +64,11 @@
A constant (linear) acceleration factor to apply to pointingstick deltas to normalize them.
LIBINPUT_MODEL_*
-
This prefix is reserved as private API, do not use. See @ref +
This prefix is reserved as private API, do not use.. See @ref model_specific_configuration for details.
LIBINPUT_ATTR_*
-
This prefix is reserved as private API, do not use. See @ref +
This prefix is reserved as private API, do not use.. See @ref model_specific_configuration for details.
@@ -117,22 +117,4 @@ format of the property and the value of the property are subject to change at any time. -@subsection model_specific_configuration_x220fw81 Lenovo x220 with touchpad firmware v8.1 - -The property LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81 may be set by a -user in a local hwdb file. This property designates the touchpad on a Lenovo -x220 with a touchpad firmware version 8.1. When this firmware version is -installed, the touchpad is imprecise. The touchpad device does not send -continuos x/y axis position updates, a behavior also observed on its -successor model, the Lenovo x230 which has the same firmware version. If the -above property is set, libinput adjusts its behavior to better suit this -particular model. - -The touchpad firmware version cannot be detected automatically by libinput, -local configuration is required to set this property. Refer to the libinput -model quirks hwdb for instructions. - -This property must not be used for any other purpose, no specific behavior -is guaranteed. - */ diff -Nru libinput-1.2.2/doc/dot/evemu.gv libinput-0.21.0/doc/dot/evemu.gv --- libinput-1.2.2/doc/dot/evemu.gv 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/dot/evemu.gv 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -digraph stack -{ - compound=true; - rankdir="LR"; - node [ - shape="box"; - ] - - kernel [label="Kernel"]; - - libinput; - xserver [label="X Server"]; - - kernel -> libinput - libinput -> xserver - - kernel -> evemu - evemu -> stdout -} diff -Nru libinput-1.2.2/doc/faqs.dox libinput-0.21.0/doc/faqs.dox --- libinput-1.2.2/doc/faqs.dox 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/faqs.dox 2015-07-28 22:12:38.000000000 +0000 @@ -30,7 +30,7 @@ @section faq_gpl Is libinput GPL-licensed? No, libinput is MIT licensed. The Linux kernel header file linux/input.h in -libinput's tree is provided to ensure the same behavior regardless of which +libinput's tree is provded to ensure the same behavior regardless of which kernel version libinput is built on. It does not make libinput GPL-licensed. @section faq_config_options Where is the configuration stored? diff -Nru libinput-1.2.2/doc/gestures.dox libinput-0.21.0/doc/gestures.dox --- libinput-1.2.2/doc/gestures.dox 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/doc/gestures.dox 2015-07-28 22:12:38.000000000 +0000 @@ -82,48 +82,10 @@ @image html touchscreen-gestures.svg "Context-sensitivity of touchscreen gestures" In this example, the finger movements are identical but in the left case -both fingers are located within the same window, thus suggesting an attempt +both fingers are located within the same window, thus suggesting an attemp to zoom. In the right case both fingers are located on a window border, thus suggesting a window movement. libinput only has knowledge of the finger coordinates (and even then only in device coordinates, not in screen coordinates) and thus cannot differentiate the two. -@section gestures_softbuttons Gestures with enabled software buttons - -If the touchpad device is a @ref touchpads_buttons_clickpads "Clickpad", it -is recommended that a caller switches to @ref clickfinger. -Usually fingers placed in a @ref software_buttons "software button area" is not -considered for gestures, resulting in some gestures to be interpreted as -pointer motion or two-finger scroll events. - -@image html pinch-gestures-softbuttons.svg "Interference of software buttons and pinch gestures" - -In the example above, the software button area is highlighted in red. The -user executes a three-finger pinch gesture, with the thumb remaining in the -software button area. libinput ignores fingers within the software button -areas, the movement of the remaining fingers is thus interpreted as a -two-finger scroll motion. - -@section gestures_twofinger_touchpads Gestures on two-finger touchpads - -As of kernel 4.2, many @ref touchpads_touch_partial_mt provide only two -slots. This affects how gestures can be interpreted. Touchpads with only two -slots can identify two touches by position but can usually tell that there -is a third (or fourth) finger down on the touchpad - without providing -positional information for that finger. - -Touchpoints are assigned in sequential order and only the first two touch -points are trackable. For libinput this produces an ambiguity where it is -impossible to detect whether a gesture is a pinch gesture or a swipe gesture -whenever a user puts the index and middle finger down first. Since the third -finger does not have positional information, it's location cannot be -determined. - -@image html gesture-2fg-ambiguity.svg "Ambiguity of three-finger gestures on two-finger touchpads" - -The image above illustrates this ambiguity. The index and middle finger are -set down first, the data stream from both finger positions looks identical. -In this case, libinput assumes the fingers are in a horizontal arrangement -(the right image above) and use a swipe gesture. - */ diff -Nru libinput-1.2.2/doc/Makefile.am libinput-0.21.0/doc/Makefile.am --- libinput-1.2.2/doc/Makefile.am 2016-02-21 21:52:18.000000000 +0000 +++ libinput-0.21.0/doc/Makefile.am 2015-08-03 21:42:14.000000000 +0000 @@ -18,12 +18,10 @@ $(srcdir)/normalization-of-relative-motion.dox \ $(srcdir)/palm-detection.dox \ $(srcdir)/page-hierarchy.dox \ - $(srcdir)/pointer-acceleration.dox \ $(srcdir)/reporting-bugs.dox \ $(srcdir)/scrolling.dox \ $(srcdir)/seats.dox \ $(srcdir)/t440-support.dox \ - $(srcdir)/tablet-support.dox \ $(srcdir)/tapping.dox \ $(srcdir)/test-suite.dox \ $(srcdir)/tools.dox \ @@ -35,17 +33,12 @@ $(srcdir)/dot/libinput-stack-wayland.gv \ $(srcdir)/dot/libinput-stack-xorg.gv \ $(srcdir)/dot/libinput-stack-gnome.gv \ - $(srcdir)/dot/evemu.gv \ $(srcdir)/svg/software-buttons.svg \ $(srcdir)/svg/clickfinger.svg \ $(srcdir)/svg/button-scrolling.svg \ $(srcdir)/svg/edge-scrolling.svg \ $(srcdir)/svg/palm-detection.svg \ $(srcdir)/svg/pinch-gestures.svg \ - $(srcdir)/svg/ptraccel-linear.svg \ - $(srcdir)/svg/ptraccel-low-dpi.svg \ - $(srcdir)/svg/ptraccel-touchpad.svg \ - $(srcdir)/svg/ptraccel-trackpoint.svg \ $(srcdir)/svg/swipe-gestures.svg \ $(srcdir)/svg/tap-n-drag.svg \ $(srcdir)/svg/thumb-detection.svg \ diff -Nru libinput-1.2.2/doc/Makefile.in libinput-0.21.0/doc/Makefile.in --- libinput-1.2.2/doc/Makefile.in 2016-03-15 00:23:56.000000000 +0000 +++ libinput-0.21.0/doc/Makefile.in 2015-08-04 00:58:30.000000000 +0000 @@ -192,12 +192,9 @@ LIBUDEV_LIBS = @LIBUDEV_LIBS@ LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@ LIBUNWIND_LIBS = @LIBUNWIND_LIBS@ -LIBWACOM_CFLAGS = @LIBWACOM_CFLAGS@ -LIBWACOM_LIBS = @LIBWACOM_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -297,12 +294,10 @@ @BUILD_DOCS_TRUE@ $(srcdir)/normalization-of-relative-motion.dox \ @BUILD_DOCS_TRUE@ $(srcdir)/palm-detection.dox \ @BUILD_DOCS_TRUE@ $(srcdir)/page-hierarchy.dox \ -@BUILD_DOCS_TRUE@ $(srcdir)/pointer-acceleration.dox \ @BUILD_DOCS_TRUE@ $(srcdir)/reporting-bugs.dox \ @BUILD_DOCS_TRUE@ $(srcdir)/scrolling.dox \ @BUILD_DOCS_TRUE@ $(srcdir)/seats.dox \ @BUILD_DOCS_TRUE@ $(srcdir)/t440-support.dox \ -@BUILD_DOCS_TRUE@ $(srcdir)/tablet-support.dox \ @BUILD_DOCS_TRUE@ $(srcdir)/tapping.dox \ @BUILD_DOCS_TRUE@ $(srcdir)/test-suite.dox \ @BUILD_DOCS_TRUE@ $(srcdir)/tools.dox \ @@ -314,17 +309,12 @@ @BUILD_DOCS_TRUE@ $(srcdir)/dot/libinput-stack-wayland.gv \ @BUILD_DOCS_TRUE@ $(srcdir)/dot/libinput-stack-xorg.gv \ @BUILD_DOCS_TRUE@ $(srcdir)/dot/libinput-stack-gnome.gv \ -@BUILD_DOCS_TRUE@ $(srcdir)/dot/evemu.gv \ @BUILD_DOCS_TRUE@ $(srcdir)/svg/software-buttons.svg \ @BUILD_DOCS_TRUE@ $(srcdir)/svg/clickfinger.svg \ @BUILD_DOCS_TRUE@ $(srcdir)/svg/button-scrolling.svg \ @BUILD_DOCS_TRUE@ $(srcdir)/svg/edge-scrolling.svg \ @BUILD_DOCS_TRUE@ $(srcdir)/svg/palm-detection.svg \ @BUILD_DOCS_TRUE@ $(srcdir)/svg/pinch-gestures.svg \ -@BUILD_DOCS_TRUE@ $(srcdir)/svg/ptraccel-linear.svg \ -@BUILD_DOCS_TRUE@ $(srcdir)/svg/ptraccel-low-dpi.svg \ -@BUILD_DOCS_TRUE@ $(srcdir)/svg/ptraccel-touchpad.svg \ -@BUILD_DOCS_TRUE@ $(srcdir)/svg/ptraccel-trackpoint.svg \ @BUILD_DOCS_TRUE@ $(srcdir)/svg/swipe-gestures.svg \ @BUILD_DOCS_TRUE@ $(srcdir)/svg/tap-n-drag.svg \ @BUILD_DOCS_TRUE@ $(srcdir)/svg/thumb-detection.svg \ diff -Nru libinput-1.2.2/doc/normalization-of-relative-motion.dox libinput-0.21.0/doc/normalization-of-relative-motion.dox --- libinput-1.2.2/doc/normalization-of-relative-motion.dox 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/doc/normalization-of-relative-motion.dox 2015-07-28 22:12:38.000000000 +0000 @@ -25,24 +25,20 @@ device will roughly feel the same as a higher-dpi mouse. This normalization only applies to accelerated coordinates, unaccelerated -coordinates are left in device-units. It is up to the caller to interpret +coordiantes are left in device-units. It is up to the caller to interpret those coordinates correctly. -@section motion_normalization_touchpad Normalization of touchpad coordinates +@section Normalization of touchpad coordinates Touchpads may have a different resolution for the horizontal and vertical -axis. Interpreting coordinates from the touchpad without taking resolution +axis. Interpreting coordinates from the touchpad without taking resolutino into account results in uneven motion. -libinput scales unaccelerated touchpad motion to the resolution of the +libinput scales unaccelerated touchpad motion do the resolution of the touchpad's x axis, i.e. the unaccelerated value for the y axis is: y = (x / resolution_x) * resolution_y -@section motion_normalization_tablet Normalization of tablet coordinates - -See @ref tablet-relative-motion - -@section motion_normalization_customization Setting custom DPI settings +@section Setting custom DPI settings Devices usually do not advertise their resolution and libinput relies on the udev property MOUSE_DPI for this information. This property is usually diff -Nru libinput-1.2.2/doc/page-hierarchy.dox libinput-0.21.0/doc/page-hierarchy.dox --- libinput-1.2.2/doc/page-hierarchy.dox 2016-02-24 06:33:17.000000000 +0000 +++ libinput-0.21.0/doc/page-hierarchy.dox 2015-08-03 03:44:47.000000000 +0000 @@ -16,10 +16,6 @@ - @subpage motion_normalization -@page tablets Graphics Tablets - -- @subpage tablet-support - @page general General setup - @subpage udev_config @@ -35,6 +31,5 @@ - @subpage test-suite - @subpage tools -- @subpage pointer-acceleration */ diff -Nru libinput-1.2.2/doc/palm-detection.dox libinput-0.21.0/doc/palm-detection.dox --- libinput-1.2.2/doc/palm-detection.dox 2016-02-15 07:06:05.000000000 +0000 +++ libinput-0.21.0/doc/palm-detection.dox 2015-07-31 01:50:42.000000000 +0000 @@ -46,10 +46,10 @@ If a device provides a trackpoint, it is -usually located above the touchpad. This increases the likelihood of +usually located above the touchpad. This increases the likelyhood of accidental touches whenever the trackpoint is used. -libinput disables the touchpad whenever it detects trackpoint activity for a +libinput disables the touchpad whenver it detects trackpoint activity for a certain timeout until after trackpoint activity stops. Touches generated during this timeout will not move the pointer, and touches started during this timeout will likewise not move the pointer (allowing for a user to rest @@ -78,10 +78,7 @@ has stopped, it is thus possible to rest the palm on the touchpad while typing. - Physical buttons work even while the touchpad is disabled. This includes - @ref t440_support "software-emulated buttons". - -Disable-while-typing can be enabled and disabled by calling -libinput_device_config_dwt_set_enabled(). + software-emulated buttons. @section thumb-detection Thumb detection diff -Nru libinput-1.2.2/doc/pointer-acceleration.dox libinput-0.21.0/doc/pointer-acceleration.dox --- libinput-1.2.2/doc/pointer-acceleration.dox 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/doc/pointer-acceleration.dox 1970-01-01 00:00:00.000000000 +0000 @@ -1,133 +0,0 @@ -/** -@page pointer-acceleration Pointer acceleration - -libinput uses device-specific pointer acceleration methods, with the default -being the @ref ptraccel-linear. The methods share common properties, such as -@ref ptraccel-velocity. - -This page explains the high-level concepts used in the code. It aims to -provide an overview for developers and is not necessarily useful for -users. - -@section ptraccel-profiles Pointer acceleration profiles - -The profile decides the general method of pointer acceleration. -libinput currently supports two profiles: "adaptive" and "flat". The aptive -profile is the default profile for all devices and takes the current speed -of the device into account when deciding on acceleration. The flat profile -is simply a constant factor applied to all device deltas, regardless of the -speed of motion (see @ref ptraccel-profile-flat). Most of this document -describes the adaptive pointer acceleration. - -@section ptraccel-velocity Velocity calculation - -The device's speed of movement is measured across multiple input events -through so-called "trackers". Each event prepends a the tracker item, each -subsequent tracker contains the delta of that item to the current position, -the timestamp of the event that created it and the cardinal direction of the -movement at the time. If a device moves into the same direction, the -velocity is calculated across multiple trackers. For example, if a device -moves steadily for 10 events to the left, the velocity is calculated across -all 10 events. - -Whenever the movement changes direction or significantly changes speed, the -velocity is calculated from the direction/speed change only. For example, if -a device moves steadily for 8 events to the left and then 2 events to the -right, the velocity is only that of the last 2 events. - -An extra time limit prevents events that are too old to factor into the -velocity calculation. For example, if a device moves steadily for 5 events -to the left, then pauses, then moves again for 5 events to the left, only -the last 5 events are used for velocity calculation. - -The velocity is then used to calculate the acceleration factor - -@section ptraccel-factor Acceleration factor - -The acceleration factor is the final outcome of the pointer acceleration -calculations. It is a unitless factor that is applied to the current delta, -a factor of 2 doubles the delta (i.e. speeds up the movement), a factor of -less than 1 reduces the delta (i.e. slows the movement). - -Any factor less than 1 requires the user to move the device further to move -the visible pointer. This is called deceleration and enables high precision -target selection through subpixel movements. libinput's current maximum -deceleration factor is 0.3 (i.e. slow down to 30% of the pointer speed). - -A factor higher than 1 moves the pointer further than the physical device -moves. This is acceleration and allows a user to cross the screen quickly -but effectively skips pixels. libinput's current maximum acceleration factor -is 3.5. - -@section ptraccel-linear Linear pointer acceleration - -The linear pointer acceleration method is the default for most pointer -devices. It provides deceleration at very slow movements, a 1:1 mapping for -regular movements and a linear increase to the maximum acceleration factor -for fast movements. - -Linear pointer acceleration applies to devices with above 1000dpi resolution -and after @ref motion_normalization is applied. - -@image html ptraccel-linear.svg "Linear pointer acceleration" - -The image above shows the linear pointer acceleration settings at various -speeds. The line for 0.0 is the default acceleration curve, speed settings -above 0.0 accelerate sooner, faster and to a higher maximum acceleration. -Speed settings below 0 delay when acceleration kicks in, how soon the -maximum acceleration is reached and the maximum acceleration factor. - -Extremely low speed settings provide no acceleration and additionally -decelerate all movement by a constant factor. - -@section ptraccel-low-dpi Pointer acceleration for low-dpi devices - -Low-dpi devices are those with a physical resolution of less than 1000 dots -per inch (dpi). The pointer acceleration is adjusted to provide roughly the -same feel for all devices at normal to high speeds. At slow speeds, the -pointer acceleration works on device-units rather than normalized -coordinates (see @ref motion_normalization). - -@image html ptraccel-low-dpi.svg "Pointer acceleration for low-dpi devices" - -The image above shows the default pointer acceleration curve for a speed of -0.0 at different DPI settings. A device with low DPI has the acceleration -applied sooner and with a stronger acceleration factor. - -@section ptraccel-touchpad Pointer acceleration on touchpads - -Touchpad pointer acceleration uses the @ref ptraccel-linear profile, with a -constant deceleration factor applied. The user expectation of how much a -pointer should move in response to finger movement is different to that of a -mouse device, hence the constant deceleration factor. - -@image html ptraccel-touchpad.svg "Pointer acceleration curve for touchpads" - -The image above shows the touchpad acceleration profile in comparison to the -@ref ptraccel-linear. The shape of the curve is identical but vertically squashed. - -@section ptraccel-trackpoint Pointer acceleration on trackpoints - -Trackpoint pointer acceleration uses the @ref ptraccel-low-dpi profile, with a -constant deceleration factor taking the place of the DPI settings. - -@image html ptraccel-trackpoint.svg "Pointer acceleration curves for trackpoints" - -The image above shows the trackpoint acceleration profile in comparison to the -@ref ptraccel-linear. The constant acceleration factor, usually applied by -udev, shapes the acceleration profile. - -@section ptraccel-profile-flat The flat pointer acceleration profile - -In a flat profile, the acceleration factor is constant regardless of the -velocity of the pointer and each delta (dx, dy) results in an accelerated delta -(dx * factor, dy * factor). This provides 1:1 movement between the device -and the pointer on-screen. - -@section ptraccel-tablet Pointer acceleration on tablets - -Pointer acceleration for relative motion on tablet devices is a flat -acceleration, with the speed seeting slowing down or speeding up the pointer -motion by a constant factor. Tablets do not allow for switchable profiles. - -*/ diff -Nru libinput-1.2.2/doc/reporting-bugs.dox libinput-0.21.0/doc/reporting-bugs.dox --- libinput-1.2.2/doc/reporting-bugs.dox 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/reporting-bugs.dox 2015-08-03 03:44:47.000000000 +0000 @@ -8,7 +8,7 @@ and provide the required data. This will speed up triage, resulting in a quicker bugfix. -First, try to identify the bug by reproducing it reliably. The more +First, try to identify the bugi by reproducing it reliably. The more specific a bug description is, the easier it is to fix. The @ref libinput-debug-events helper tool can help identify whether the bug is in libinput at all. This tool is a direct hook to libinput without a desktop @@ -85,10 +85,4 @@ If the bug is triggered by replaying on your device, attach the recording to the bug report. -@note libinput does not affect the evemu recording. libinput and evemu talk -directly to the kernel's device nodes. An evemu recording is not influenced -by the libinput version or whether a libinput context is currently active. - -@dotfile evemu.gv - */ diff -Nru libinput-1.2.2/doc/seats.dox libinput-0.21.0/doc/seats.dox --- libinput-1.2.2/doc/seats.dox 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/seats.dox 2015-07-09 02:52:56.000000000 +0000 @@ -5,7 +5,7 @@ A seat has two identifiers, the physical name and the logical name. The physical name is summarized as the list of devices a process on the same physical seat has access to. The logical seat name is the seat name for a -logical group of devices. A compositor may use that to create additional +logical group of devices. A compositor may use that to create additonal seats as independent device sets. Alternatively, a compositor may limit itself to a single logical seat, leaving a second compositor to manage devices on the other logical seats. @@ -32,7 +32,7 @@ @section seats_and_features The effect of seat assignment -A logical set is interpreted as a group of devices that usually belong to a +A logical set is interprested as a group of devices that usually belong to a single user that interacts with a computer. Thus, the devices are semantically related. This means for devices within the same logical seat: diff -Nru libinput-1.2.2/doc/svg/edge-scrolling.svg libinput-0.21.0/doc/svg/edge-scrolling.svg --- libinput-1.2.2/doc/svg/edge-scrolling.svg 2016-02-08 01:33:11.000000000 +0000 +++ libinput-0.21.0/doc/svg/edge-scrolling.svg 2015-07-09 02:52:56.000000000 +0000 @@ -105,7 +105,7 @@ + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);marker-end:url(#Arrow1Lstart)" /> diff -Nru libinput-1.2.2/doc/svg/ptraccel-linear.svg libinput-0.21.0/doc/svg/ptraccel-linear.svg --- libinput-1.2.2/doc/svg/ptraccel-linear.svg 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/svg/ptraccel-linear.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,5486 +0,0 @@ - - - - -Gnuplot -Produced by GNUPLOT 5.0 patchlevel 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - 0.5 - - - - - 1 - - - - - 1.5 - - - - - 2 - - - - - 2.5 - - - - - 3 - - - - - 0 - - - - - 0.0005 - - - - - 0.001 - - - - - 0.0015 - - - - - 0.002 - - - - - 0.0025 - - - - - 0.003 - - - - - - - - - accel factor - - - - - speed in units/us - - - - - -1.0 - - - -1.0 - - - - - - -0.75 - - - -0.75 - - - - - - -0.5 - - - -0.5 - - - - - - -0.25 - - - -0.25 - - - - - - 0.0 - - - 0.0 - - - - - - 0.5 - - - 0.5 - - - - - - 1.0 - - - 1.0 - - - - - - - - - - - - - - - - - - diff -Nru libinput-1.2.2/doc/svg/ptraccel-low-dpi.svg libinput-0.21.0/doc/svg/ptraccel-low-dpi.svg --- libinput-1.2.2/doc/svg/ptraccel-low-dpi.svg 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/svg/ptraccel-low-dpi.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,3748 +0,0 @@ - - - - -Gnuplot -Produced by GNUPLOT 5.0 patchlevel 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 0 - - - - - 0.0005 - - - - - 0.001 - - - - - 0.0015 - - - - - 0.002 - - - - - 0.0025 - - - - - 0.003 - - - - - - - - - accel factor - - - - - speed in units/us - - - - - 200dpi - - - 200dpi - - - - - - 400dpi - - - 400dpi - - - - - - 800dpi - - - 800dpi - - - - - - 1000dpi - - - 1000dpi - - - - - - - - - - - - - - - - - - diff -Nru libinput-1.2.2/doc/svg/ptraccel-touchpad.svg libinput-0.21.0/doc/svg/ptraccel-touchpad.svg --- libinput-1.2.2/doc/svg/ptraccel-touchpad.svg 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/svg/ptraccel-touchpad.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,1723 +0,0 @@ - - - - -Gnuplot -Produced by GNUPLOT 5.0 patchlevel 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - 0.5 - - - - - 1 - - - - - 1.5 - - - - - 2 - - - - - 2.5 - - - - - 3 - - - - - 0 - - - - - 0.0005 - - - - - 0.001 - - - - - 0.0015 - - - - - 0.002 - - - - - 0.0025 - - - - - 0.003 - - - - - - - - - accel factor - - - - - speed in units/us - - - - - linear (mouse) - - - linear (mouse) - - - - - - touchpad - - - touchpad - - - - - - - - - - - - - - - - - - diff -Nru libinput-1.2.2/doc/svg/ptraccel-trackpoint.svg libinput-0.21.0/doc/svg/ptraccel-trackpoint.svg --- libinput-1.2.2/doc/svg/ptraccel-trackpoint.svg 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/svg/ptraccel-trackpoint.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,3689 +0,0 @@ - - - - -Gnuplot -Produced by GNUPLOT 5.0 patchlevel 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 0 - - - - - 0.0005 - - - - - 0.001 - - - - - 0.0015 - - - - - 0.002 - - - - - 0.0025 - - - - - 0.003 - - - - - - - - - accel factor - - - - - speed in units/us - - - - - linear (mouse) - - - linear (mouse) - - - - - - const accel 1 - - - const accel 1 - - - - - - const accel 2 - - - const accel 2 - - - - - - const accel 3 - - - const accel 3 - - - - - - - - - - - - - - - - - - diff -Nru libinput-1.2.2/doc/svg/twofinger-scrolling.svg libinput-0.21.0/doc/svg/twofinger-scrolling.svg --- libinput-1.2.2/doc/svg/twofinger-scrolling.svg 2016-02-08 01:33:11.000000000 +0000 +++ libinput-0.21.0/doc/svg/twofinger-scrolling.svg 2015-07-09 02:52:56.000000000 +0000 @@ -127,7 +127,7 @@ + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);marker-end:url(#Arrow1Lstart)" /> diff -Nru libinput-1.2.2/doc/tablet-support.dox libinput-0.21.0/doc/tablet-support.dox --- libinput-1.2.2/doc/tablet-support.dox 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/doc/tablet-support.dox 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -/** -@page tablet-support Tablet support - -This page provides details about the graphics tablet -support in libinput. Note that the term "tablet" in libinput refers to -graphics tablets only (e.g. Wacom Intuos), not to tablet devices like the -Apple iPad. - -@image html tablet.svg "Illustration of a graphics tablet" - -@section tablet-tools Tablet buttons vs. tablet tools - -Most tablets provide two types of devices. The pysical tablet often provides -a number of buttons and a touch ring or strip. Interaction on the drawing -surface of the tablet requires a tool, usually in the shape of a stylus. -The libinput interface exposed by devices with the @ref -LIBINPUT_DEVICE_CAP_TABLET_TOOL applies only to events generated by tools. - -Touch events on the tablet integrated into a screen itself are exposed -through the @ref LIBINPUT_DEVICE_CAP_TOUCH capability. Touch events on a -standalone tablet are exposed through the @ref LIBINPUT_DEVICE_CAP_POINTER -capability. In both cases, the kernel usually provides a separate event -node for the touch device, resulting in a separate libinput device. -See libinput_device_get_device_group() for information on how to associate -the touch part with other devices exposed by the same physical hardware. - -@section tablet-tip Tool tip events vs. button events - -The primary use of a tablet tool is to draw on the surface of the tablet. -When the tool tip comes into contact with the surface, libinput sends an -event of type @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, and again when the tip -ceases contact with the surface. - -Tablet tools may send button events; these are exclusively for extra buttons -unrelated to the tip. A button event is independent of the tip and can while -the tip is down or up. - -Some tablet tools' pressure detection is too sensitive, causing phantom -touches when the user only slightly brushes the surfaces. For example, some -tools are capable of detecting 1 gram of pressure. - -libinput uses a device-specific pressure threshold to determine when the tip -is considered logically down. As a result, libinput may send a nonzero -pressure value while the tip is logically up. Most application can and -should ignore pressure information until they receive the event of type @ref -LIBINPUT_EVENT_TABLET_TOOL_TIP. Applications that require extremely -fine-grained pressure sensitivity should use the pressure data instead of -the tip events to determine a logical tip down state and treat the tip -events like axis events otherwise. - -Note that the pressure threshold to trigger a logical tip event may be zero -on some devices. On tools without pressure sensitivity, determining when a -tip is down is device-specific. - -@section tablet-relative-motion Relative motion for tablet tools - -libinput calculates the relative motion vector for each event and converts -it to the same coordinate space that a normal mouse device would use. For -the caller, this means that the delta coordinates returned by -libinput_event_tablet_tool_get_dx() and -libinput_event_tablet_tool_get_dy() can be used identical to the delta -coordinates from any other pointer event. Any resolution differences between -the x and y axes are accommodated for, a delta of N/N represents a 45 degree -diagonal move on the tablet. - -The delta coordinates are available for all tablet events, it is up to the -caller to decide when a tool should be used in relative mode. It is -recommended that mouse and lens cursor tool default to relative mode and -all pen-like tools to absolute mode. - -If a tool in relative mode must not use pointer acceleration, callers -should use the absolute coordinates returned by -libinput_event_tablet_tool_get_x() and libinput_event_tablet_tool_get_y() -and calculate the delta themselves. Callers that require exact physical -distance should also use these functions to calculate delta movements. - -@section tablet-axes Special axes on tablet tools - -A tablet tool usually provides additional information beyond x/y positional -information and the tip state. A tool may provide the distance to the tablet -surface and the pressure exerted on the tip when in contact. Some tablets -additionally provide tilt information along the x and y axis. - -@image html tablet-axes.svg "Illustration of the distance, pressure and tilt axes" - -The granularity and precision of the distance and pressure axes varies -between tablet devices and cannot usually be mapped into a physical unit. -libinput normalizes distance and pressure into the [0, 1] range. - -While the normalization range is identical for these axes, a caller should -not interpret identical values as identical across axes, i.e. a value v1 on -the distance axis has no relation to the same value v1 on the pressure axis. - -The tilt axes provide the angle in degrees between a vertical line out of -the tablet and the top of the stylus. The angle is measured along the x and -y axis, respectively, a positive tilt angle thus means that the stylus' top -is tilted towards the logical right and/or bottom of the tablet. - -@section tablet-fake-proximity Handling of proximity events - -libinput's @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY events notify a caller -when a tool comes into sensor range or leaves the sensor range. On some -tools this range does not represent the physical range but a reduced -tool-specific logical range. If the range is reduced, this is done -transparent to the caller. - -For example, the Wacom mouse and lens cursor tools are usually -used in relative mode, lying flat on the tablet. Movement typically follows -the interaction normal mouse movements have, i.e. slightly lift the tool and -place it in a separate location. The proximity detection on Wacom -tablets however extends further than the user may lift the mouse, i.e. the -tool may not be lifted out of physical proximity. For such tools, libinput -provides software-emulated proximity. - -@section tablet-pressure-offset Pressure offset on worn-out tools - -When a tool is used for an extended period it can wear down physically. A -worn-down tool may never return a zero pressure value. Even when hovering -above the surface, the pressure value returned by the tool is nonzero, -creating a fake surface touch and making interaction with the tablet less -predictable. - -libinput automatically detects pressure offsets and rescales the remaining -pressure range into the available range, making pressure-offsets transparent -to the caller. A tool with a pressure offset will thus send a 0 pressure -value for the detected offset and nonzero pressure values for values higher -than that offset. - -Some limitations apply to avoid misdetection of pressure offsets, -specifically: -- pressure offset is only detected on proximity in, and if a device is - capable of detection distances, -- pressure offset is only detected if the distance between the tool and the - tablet is high enough, -- pressure offset is only used if it is 20% or less of the pressure range - available to the tool. A pressure offset higher than 20% indicates either - a misdetection or a tool that should be replaced, and -- if a pressure value less than the current pressure offset is seen, the - offset resets to that value. - -Pressure offsets are not detected on @ref LIBINPUT_TABLET_TOOL_TYPE_MOUSE -and @ref LIBINPUT_TABLET_TOOL_TYPE_LENS tools. - -@section tablet-serial-numbers Tracking unique tools - -Some tools provide hardware information that enables libinput to uniquely -identify the physical device. For example, tools compatible with the Wacom -Intuos 4, Intuos 5, Intuos Pro and Cintiq series are uniquely identifiable -through a serial number. libinput does not specify how a tool can be -identified uniquely, a caller should use libinput_tablet_tool_is_unique() to -check if the tool is unique. - -libinput creates a struct libinput_tablet_tool on the first proximity in of -this tool. By default, this struct is destroyed on proximity out and -re-initialized on the next proximity in. If a caller keeps a reference to -the tool by using libinput_tablet_tool_ref() libinput re-uses this struct -whenever that same physical tool comes into proximity on any tablet -recognized by libinput. It is possible to attach tool-specific virtual state -to the tool. For example, a graphics program such as the GIMP may assign a -specific color to each tool, allowing the artist to use the tools like -physical pens of different color. In multi-tablet setups it is also -possible to track the tool across devices. - -If the tool does not have a unique identifier, libinput creates a single -struct libinput_tablet_tool per tool type on each tablet the tool is used -on. - -@section tablet-tool-types Vendor-specific tablet tool types - -libinput supports a number of high-level tool types that describe the -general interaction expected with the tool. For example, a user would expect -a tool of type @ref LIBINPUT_TABLET_TOOL_TYPE_PEN to interact with a -graphics application taking pressure and tilt into account. The default -virtual tool assigned should be a drawing tool, e.g. a virtual pen or brush. -A tool of type @ref LIBINPUT_TABLET_TOOL_TYPE_ERASER would normally be -mapped to an eraser-like virtual tool. See @ref libinput_tablet_tool_type -for the list of all available tools. - -Vendors may provide more fine-grained information about the tool in use by -adding a hardware-specific tool ID. libinput provides this ID to the caller -with libinput_tablet_tool_get_tool_id() but makes no promises about the -content or format of the ID. - -libinput currently supports Wacom-style tool IDs as provided on the Wacom -Intuos 3, 4, 5, Wacon Cintiq and Wacom Intuos Pro series. The tool ID can -be used to distinguish between e.g. a Wacom Classic Pen or a Wacom Pro Pen. -It is the caller's responsibility to interpret the tool ID. - -@section tablet-bounds Out-of-bounds motion events - -Some tablets integrated into a screen (e.g. Wacom Cintiq 24HD, 27QHD and -13HD series, etc.) have a sensor larger than the display area. libinput uses -the range advertised by the kernel as the valid range unless device-specific -quirks are present. Events outside this range will produce coordinates that -may be negative or larger than the tablet's width and/or height. It is up to -the caller to ignore these events. - -@image html tablet-out-of-bounds.svg "Illustration of the out-of-bounds area on a tablet" - -In the image above, the display area is shown in black. The red area around -the display illustrates the sensor area that generates input events. Events -within this area will have negative coordinate or coordinates larger than -the width/height of the tablet. - -If events outside the logical bounds of the input area are scaled into a -custom range with libinput_event_tablet_tool_get_x_transformed() and -libinput_event_tablet_tool_get_y_transformed() the resulting value may be -less than 0 or larger than the upper range provided. It is up to the caller -to test for this and handle or ignore these events accordingly. - -*/ diff -Nru libinput-1.2.2/doc/tapping.dox libinput-0.21.0/doc/tapping.dox --- libinput-1.2.2/doc/tapping.dox 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/doc/tapping.dox 2015-07-15 04:18:08.000000000 +0000 @@ -28,23 +28,19 @@ libinput also supports "tap-and-drag" where a tap immediately followed by a finger down and that finger being held down emulates a button press. Moving the finger around can thus drag the selected item on the screen. -Tap-and-drag is optional and can be enabled or disabled with -libinput_device_config_tap_set_drag_enabled(). Most devices have -tap-and-drag enabled by default. -Also optional is a feature called "drag lock". With drag lock disabled, lifting +Optional is a feature called "drag lock". With drag lock disabled, lifting the finger will stop any drag process. When enabled, libinput will ignore a finger up event during a drag process, provided the finger is set down again within a implementation-specific timeout. Drag lock can be enabled and disabled with libinput_device_config_tap_set_drag_lock_enabled(). -Note that drag lock only applies if tap-and-drag is be enabled. @image html tap-n-drag.svg "Tap-and-drag process" The above diagram explains the process, a tap (a) followed by a finger held down (b) starts the drag process and logically holds the left mouse button down. A movement of the finger (c) will drag the selected item until the -finger is released (e). If needed and drag lock is enabled, the finger's +finger is relased (e). If needed and drag lock is enabled, the finger's position can be reset by lifting and quickly setting it down again on the touchpad (d). This will be interpreted as continuing move and is especially useful on small touchpads or with slow pointer acceleration. diff -Nru libinput-1.2.2/doc/tools.dox libinput-0.21.0/doc/tools.dox --- libinput-1.2.2/doc/tools.dox 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/tools.dox 2015-07-28 22:12:38.000000000 +0000 @@ -8,7 +8,7 @@ libinput ships with two tools to gather information about devices: @ref libinput-list-devices and @ref libinput-debug-events. Both tools must -be run as root to have access to the kernel's @c /dev/input/event* device +be run as root to have acess to the kernel's @c /dev/input/event* device files. @subsection libinput-list-devices @@ -97,6 +97,6 @@ See the @c --help output for information about the available options. @note The @c --grab flag puts an exclusive @c EVIOCGRAB on the device to -avoid interference with the desktop while testing. +avoid interference with the desktiop while testing. */ diff -Nru libinput-1.2.2/doc/touchpads.dox libinput-0.21.0/doc/touchpads.dox --- libinput-1.2.2/doc/touchpads.dox 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/doc/touchpads.dox 2015-08-03 21:42:14.000000000 +0000 @@ -71,7 +71,7 @@ SMBus. These touchpads usually also provide extra information. Apple touchpads -provide an ellipse and the orientation of the ellipse for each touch point. +provide an ellipsis and the orientation of the ellipsis for each touch point. Other touchpads provide a pressure value for each touch point (see @ref touchpads_pressure_handling). @@ -130,7 +130,7 @@ Pressure is usually directly related to contact area. Human fingers flatten out as the pressure on the pad increases, resulting in a bigger contact area -and the firmware then calculates that back into a pressure reading. +and the firmware then calculates that back into a ressure reading. libinput uses pressure to detect accidental palm contact and thumbs, though pressure data is often device-specific and unreliable. @@ -138,7 +138,7 @@ @subsection touchpads_circular Circular touchpads Only listed for completeness, circular touchpads have not been used in -laptops for a number of years. These touchpad shaped in an ellipse or +laptops for a number of years. These touchpad shaped in an ellipsis or straight. @subsection touchpads_tablets Graphics tablets diff -Nru libinput-1.2.2/doc/touchpad-tap-state-machine.svg libinput-0.21.0/doc/touchpad-tap-state-machine.svg --- libinput-1.2.2/doc/touchpad-tap-state-machine.svg 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/doc/touchpad-tap-state-machine.svg 2015-07-28 22:12:38.000000000 +0000 @@ -11,306 +11,306 @@ - + IDLE - + TOUCH - + first - + finger down - + finger up - + - + button 1 - + press - + timeout - + move > - + threshold - + second - + finger down - + TOUCH_2 - + - + second - + finger up - - - + + + - + button 2 - + press - + move > - + threshold - + timeout - + - + button 1 - + release - + - + button 2 - + release - - - - - + + + + + - + TAPPED - + - + timeout - - - + + + - + first - + finger down - - + + - + DRAGGING - + first - + finger up - + btn1 - + release - - - - + + + + - + IDLE - + third - + finger down - + TOUCH_3 - + button 3 - + press - + button 3 - + release - + move > - + threshold - + IDLE - + timeout - + - + first - + finger up - - - + + + - + IDLE - + fourth - + finger down - - + + - + DRAGGING_OR_DOUBLETAP - + timeout - + - + first - + finger up - - + + - + button 1 - + release - + button 1 - + press - + btn1 - + release - + second - + finger down - + move > - + threshold @@ -319,14 +319,14 @@ - + HOLD - + first - + finger up @@ -335,47 +335,49 @@ - + second - + finger down + + - + TOUCH_2_HOLD - + second - + finger up - + first - + finger up - + - + third - + finger down @@ -386,21 +388,21 @@ - + TOUCH_3_HOLD - + fourth - + finger down - + DEAD @@ -411,19 +413,19 @@ - + any finger up - + fourth - + finger up - + any finger up @@ -431,13 +433,13 @@ - + yes - + any finger up @@ -450,14 +452,14 @@ - + IDLE - + if finger - + count == 0 @@ -468,14 +470,14 @@ - + second - + finger up - + DRAGGING_2 @@ -484,9 +486,9 @@ - + first - + finger up @@ -497,9 +499,9 @@ - + second - + finger down @@ -510,29 +512,29 @@ - + third - + finger down - + btn1 - + release - + phys - + button - + press @@ -549,20 +551,20 @@ - + phys - + button - + press - - + + - + button 1 - + release @@ -577,12 +579,12 @@ - + DRAGGING_WAIT - + timeout @@ -593,34 +595,34 @@ - + first - + finger down - + TOUCH_TOUCH - + - + TOUCH_IDLE - - - - + + + + - + TOUCH_DEAD @@ -629,11 +631,18 @@ - - + + + + + + + + yes + - + TOUCH_DEAD @@ -644,53 +653,60 @@ - + TOUCH_IDLE - + TOUCH_TOUCH - + + + + TOUCH_IDLE + + + + - + TOUCH_IDLE - - - + + + - + TOUCH_IDLE - - + + - + TOUCH_TOUCH - + that finger - + TOUCH_IDLE - + TOUCH_DEAD @@ -701,9 +717,9 @@ - + that finger - + TOUCH_IDLE @@ -711,32 +727,32 @@ - + no - + TOUCH_TOUCH - - + + - + TOUCH_IDLE - + TOUCH_TOUCH - + TOUCH_DEAD @@ -745,139 +761,153 @@ - + TOUCH_IDLE - + TOUCH_TOUCH - + TOUCH_TOUCH - + TOUCH_IDLE - + TOUCH_IDLE - + TOUCH_TOUCH - + TOUCH_IDLE - + TOUCH_TOUCH - + that finger - + TOUCH_IDLE - + TOUCH_DEAD - + TOUCH_DEAD - + TOUCH_DEAD - + TOUCH_DEAD - + TOUCH_DEAD - + TOUCH_DEAD + + + + state == + + TOUCH_TOUCH + - + that finger state == - + TOUCH_TOUCH + + + + + + no + - + TOUCH_DEAD - + TOUCH_DEAD - + TOUCH_DEAD - + first - + finger down - + MULTITAP @@ -886,7 +916,7 @@ - + timeout @@ -895,25 +925,25 @@ - + IDLE - - + + - + MULTITAP_DOWN - + button 1 - + press @@ -922,39 +952,39 @@ - + first - + finger up - + button 1 - + release - + timeout - + second - + finger down - + move > - + threshold @@ -963,35 +993,89 @@ - - - - - - + + + + button 1 + + release + + + + + button 1 + + press + + + + + + + + + + + button 1 + + release + + + + + button 1 + + press + + + + + + + + + + + button 1 + + release + + + + + button 1 + + press + + + + + + + - + TOUCH_TOUCH - + TOUCH_IDLE - + phys - + button - + press @@ -1002,21 +1086,21 @@ - + DRAGGING_OR_TAP - + first - + finger up - + timeout @@ -1025,9 +1109,9 @@ - + move > - + threshold @@ -1042,7 +1126,7 @@ - + TOUCH_IDLE @@ -1052,59 +1136,59 @@ - + - -
+ +
drag lock
enabled?
 - + [Not supported by viewer] - + - +
no
 - + [Not supported by viewer] - + - +
yes
 - + [Not supported by viewer] - + thumb - + TOUCH_DEAD @@ -1113,141 +1197,5 @@ - - - - TOUCH_2_RELEASE - - - - - second - - finger up - - - - - - - timeout - - - - - - - move > - - threshold - - - - - - - - - - - - - first - - finger down - - - - - - - - - TOUCH_IDLE - - - - - - - first - - finger up - - - - - - - - - second - - finger down - - - - - - - TOUCH_DEAD - - - - - TOUCH_DEAD - - - - - - - - - - - - - - -
-
- no
-
- - - [Not supported by viewer] - - - - - - - -
-
- yes
-
- - - [Not supported by viewer] - - - - - - -
-
- drag
- disabled?
-
-
- - - [Not supported by viewer] - - - diff -Nru libinput-1.2.2/ltmain.sh libinput-0.21.0/ltmain.sh --- libinput-1.2.2/ltmain.sh 2016-03-02 03:16:07.000000000 +0000 +++ libinput-0.21.0/ltmain.sh 2015-08-04 00:31:35.000000000 +0000 @@ -1,12 +1,9 @@ -#! /bin/sh -## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.6 -# Provide generalized library-building support services. +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -26,2112 +23,881 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -PROGRAM=libtool -PACKAGE=libtool -VERSION=2.4.6 -package_revision=2.4.6 - - -## ------ ## -## Usage. ## -## ------ ## - -# Run './libtool --help' for help with using this script from the -# command line. - - -## ------------------------------- ## -## User overridable command paths. ## -## ------------------------------- ## - -# After configure completes, it has a better idea of some of the -# shell tools we need than the defaults used by the functions shared -# with bootstrap, so set those here where they can still be over- -# ridden by the user, but otherwise take precedence. - -: ${AUTOCONF="autoconf"} -: ${AUTOMAKE="automake"} - - -## -------------------------- ## -## Source external libraries. ## -## -------------------------- ## - -# Much of our low-level functionality needs to be sourced from external -# libraries, which are installed to $pkgauxdir. - -# Set a version string for this script. -scriptversion=2015-01-20.17; # UTC - -# General shell script boiler plate, and helper functions. -# Written by Gary V. Vaughan, 2004 - -# Copyright (C) 2004-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. - -# As a special exception to the GNU General Public License, if you distribute -# this file as part of a program or library that is built using GNU Libtool, -# you may include this file under the same distribution terms that you use -# for the rest of that program. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Please report bugs or propose patches to gary@gnu.org. +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -## ------ ## -## Usage. ## -## ------ ## - -# Evaluate this file near the top of your script to gain access to -# the functions and variables defined here: +# Usage: $progname [OPTION]... [MODE-ARG]... # -# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# Provide generalized library-building support services. # -# If you need to override any of the default environment variable -# settings, do that before evaluating this file. - +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --no-warn don't display warning messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message +# +# MODE must be one of the following: +# +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory +# +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. +# Try `$progname --help --mode=MODE' for a more detailed description of MODE. +# +# When reporting a bug, please describe a test case to reproduce it and +# include the following information: +# +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.4.2 +# automake: $automake_version +# autoconf: $autoconf_version +# +# Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . -## -------------------- ## -## Shell normalisation. ## -## -------------------- ## - -# Some shells need a little help to be as Bourne compatible as possible. -# Before doing anything else, make sure all that help has been provided! +PROGRAM=libtool +PACKAGE=libtool +VERSION=2.4.2 +TIMESTAMP="" +package_revision=1.3337 -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac -fi - -# NLS nuisances: We save the old values in case they are required later. -_G_user_locale= -_G_safe_locale= -for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test set = \"\${$_G_var+set}\"; then - save_$_G_var=\$$_G_var - $_G_var=C - export $_G_var - _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" - _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" - fi" -done - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -# Make sure IFS has a sensible default -sp=' ' -nl=' -' -IFS="$sp $nl" - -# There are apparently some retarded systems that use ';' as a PATH separator! -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh - - -## ------------------------- ## -## Locate command utilities. ## -## ------------------------- ## - - -# func_executable_p FILE -# ---------------------- -# Check that FILE is an executable regular file. -func_executable_p () +# A function that is used when there is no print builtin or printf. +func_fallback_echo () { - test -f "$1" && test -x "$1" -} - - -# func_path_progs PROGS_LIST CHECK_FUNC [PATH] -# -------------------------------------------- -# Search for either a program that responds to --version with output -# containing "GNU", or else returned by CHECK_FUNC otherwise, by -# trying all the directories in PATH with each of the elements of -# PROGS_LIST. -# -# CHECK_FUNC should accept the path to a candidate program, and -# set $func_check_prog_result if it truncates its output less than -# $_G_path_prog_max characters. -func_path_progs () -{ - _G_progs_list=$1 - _G_check_func=$2 - _G_PATH=${3-"$PATH"} - - _G_path_prog_max=0 - _G_path_prog_found=false - _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} - for _G_dir in $_G_PATH; do - IFS=$_G_save_IFS - test -z "$_G_dir" && _G_dir=. - for _G_prog_name in $_G_progs_list; do - for _exeext in '' .EXE; do - _G_path_prog=$_G_dir/$_G_prog_name$_exeext - func_executable_p "$_G_path_prog" || continue - case `"$_G_path_prog" --version 2>&1` in - *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; - *) $_G_check_func $_G_path_prog - func_path_progs_result=$func_check_prog_result - ;; - esac - $_G_path_prog_found && break 3 - done - done - done - IFS=$_G_save_IFS - test -z "$func_path_progs_result" && { - echo "no acceptable sed could be found in \$PATH" >&2 - exit 1 - } -} - - -# We want to be able to use the functions in this file before configure -# has figured out where the best binaries are kept, which means we have -# to search for them ourselves - except when the results are already set -# where we skip the searches. - -# Unless the user overrides by setting SED, search the path for either GNU -# sed, or the sed that truncates its output the least. -test -z "$SED" && { - _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for _G_i in 1 2 3 4 5 6 7; do - _G_sed_script=$_G_sed_script$nl$_G_sed_script - done - echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed - _G_sed_script= - - func_check_prog_sed () - { - _G_path_prog=$1 - - _G_count=0 - printf 0123456789 >conftest.in - while : - do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo '' >> conftest.nl - "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break - diff conftest.out conftest.nl >/dev/null 2>&1 || break - _G_count=`expr $_G_count + 1` - if test "$_G_count" -gt "$_G_path_prog_max"; then - # Best one so far, save it but keep looking for a better one - func_check_prog_result=$_G_path_prog - _G_path_prog_max=$_G_count - fi - # 10*(2^10) chars as input seems more than enough - test 10 -lt "$_G_count" && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out - } - - func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin - rm -f conftest.sed - SED=$func_path_progs_result + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' } +# NLS nuisances: We save the old values to restore during execute mode. +lt_user_locale= +lt_safe_locale= +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" +done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL -# Unless the user overrides by setting GREP, search the path for either GNU -# grep, or the grep that truncates its output the least. -test -z "$GREP" && { - func_check_prog_grep () - { - _G_path_prog=$1 - - _G_count=0 - _G_path_prog_max=0 - printf 0123456789 >conftest.in - while : - do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo 'GREP' >> conftest.nl - "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break - diff conftest.out conftest.nl >/dev/null 2>&1 || break - _G_count=`expr $_G_count + 1` - if test "$_G_count" -gt "$_G_path_prog_max"; then - # Best one so far, save it but keep looking for a better one - func_check_prog_result=$_G_path_prog - _G_path_prog_max=$_G_count - fi - # 10*(2^10) chars as input seems more than enough - test 10 -lt "$_G_count" && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out - } +$lt_unset CDPATH - func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin - GREP=$func_path_progs_result -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" -## ------------------------------- ## -## User overridable command paths. ## -## ------------------------------- ## -# All uppercase variable names are used for environment variables. These -# variables can be overridden by the user before calling a script that -# uses them if a suitable command of that name is not already available -# in the command search PATH. : ${CP="cp -f"} -: ${ECHO="printf %s\n"} -: ${EGREP="$GREP -E"} -: ${FGREP="$GREP -F"} -: ${LN_S="ln -s"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} +: ${Xsed="$SED -e 1s/^X//"} +# Global variables: +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -## -------------------- ## -## Useful sed snippets. ## -## -------------------- ## +exit_status=$EXIT_SUCCESS -sed_dirname='s|/[^/]*$||' -sed_basename='s|^.*/||' +# Make sure IFS has a sensible default +lt_nl=' +' +IFS=" $lt_nl" -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +dirname="s,/[^/]*$,," +basename="s,^.*/,," -# Same as above, but do not quote variable references. -sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' -# Sed substitution that converts a w32 file name or path -# that contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation -# Re-'\' parameter expansions in output of sed_double_quote_subst that -# were '\'-ed in input to the same. If an odd number of '\' preceded a -# '$' in input to sed_double_quote_subst, that '$' was protected from -# expansion. Since each input '\' is now two '\'s, look for any number -# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. -_G_bs='\\' -_G_bs2='\\\\' -_G_bs4='\\\\\\\\' -_G_dollar='\$' -sed_double_backslash="\ - s/$_G_bs4/&\\ -/g - s/^$_G_bs2$_G_dollar/$_G_bs&/ - s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g - s/\n//g" + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation -## ----------------- ## -## Global variables. ## -## ----------------- ## - -# Except for the global variables explicitly listed below, the following -# functions in the '^func_' namespace, and the '^require_' namespace -# variables initialised in the 'Resource management' section, sourcing -# this file will not pollute your global namespace with anything -# else. There's no portable way to scope variables in Bourne shell -# though, so actually running these functions will sometimes place -# results into a variable named after the function, and often use -# temporary variables in the '^_G_' namespace. If you are careful to -# avoid using those namespaces casually in your sourcing script, things -# should continue to work as you expect. And, of course, you can freely -# overwrite any of the functions or variables defined here before -# calling anything to customize them. +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# Allow overriding, eg assuming that you follow the convention of -# putting '$debug_cmd' at the start of all your functions, you can get -# bash to show function call trace with: -# -# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name -debug_cmd=${debug_cmd-":"} -exit_cmd=: +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' -# By convention, finish your script with: -# -# exit $exit_status -# -# so that you can set exit_status to non-zero if you want to indicate -# something went wrong during execution without actually bailing out at -# the point of failure. -exit_status=$EXIT_SUCCESS +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath=$0 +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} -# The name of this program. -progname=`$ECHO "$progpath" |$SED "$sed_basename"` +# The name of this program: +func_dirname_and_basename "$progpath" +progname=$func_basename_result -# Make sure we have an absolute progpath for reexecution: +# Make sure we have an absolute path for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` + progdir=$func_dirname_result progdir=`cd "$progdir" && pwd` - progpath=$progdir/$progname + progpath="$progdir/$progname" ;; *) - _G_IFS=$IFS + save_IFS="$IFS" IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS=$_G_IFS + IFS="$save_IFS" test -x "$progdir/$progname" && break done - IFS=$_G_IFS + IFS="$save_IFS" test -n "$progdir" || progdir=`pwd` - progpath=$progdir/$progname + progpath="$progdir/$progname" ;; esac +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed="${SED}"' -e 1s/^X//' +sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -## ----------------- ## -## Standard options. ## -## ----------------- ## - -# The following options affect the operation of the functions defined -# below, and should be set appropriately depending on run-time para- -# meters passed on the command line. +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-`\' parameter expansions in output of double_quote_subst that were +# `\'-ed in input to the same. If an odd number of `\' preceded a '$' +# in input to double_quote_subst, that '$' was protected from expansion. +# Since each input `\' is now two `\'s, look for any number of runs of +# four `\'s followed by two `\'s and then a '$'. `\' that '$'. +bs='\\' +bs2='\\\\' +bs4='\\\\\\\\' +dollar='\$' +sed_double_backslash="\ + s/$bs4/&\\ +/g + s/^$bs2$dollar/$bs&/ + s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g + s/\n//g" +# Standard options: opt_dry_run=false +opt_help=false opt_quiet=false opt_verbose=false +opt_warning=: -# Categories 'all' and 'none' are always available. Append any others -# you will pass as the first argument to func_warning from your own -# code. -warning_categories= - -# By default, display warnings according to 'opt_warning_types'. Set -# 'warning_func' to ':' to elide all warnings, or func_fatal_error to -# treat the next displayed warning as a fatal error. -warning_func=func_warn_and_continue - -# Set to 'all' to display all warnings, 'none' to suppress all -# warnings, or a space delimited list of some subset of -# 'warning_categories' to display only the listed warnings. -opt_warning_types=all - - -## -------------------- ## -## Resource management. ## -## -------------------- ## - -# This section contains definitions for functions that each ensure a -# particular resource (a file, or a non-empty configuration variable for -# example) is available, and if appropriate to extract default values -# from pertinent package files. Call them using their associated -# 'require_*' variable to ensure that they are executed, at most, once. -# -# It's entirely deliberate that calling these functions can set -# variables that don't obey the namespace limitations obeyed by the rest -# of this file, in order that that they be as useful as possible to -# callers. - - -# require_term_colors -# ------------------- -# Allow display of bold text on terminals that support it. -require_term_colors=func_require_term_colors -func_require_term_colors () -{ - $debug_cmd - - test -t 1 && { - # COLORTERM and USE_ANSI_COLORS environment variables take - # precedence, because most terminfo databases neglect to describe - # whether color sequences are supported. - test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} - - if test 1 = "$USE_ANSI_COLORS"; then - # Standard ANSI escape sequences - tc_reset='' - tc_bold=''; tc_standout='' - tc_red=''; tc_green='' - tc_blue=''; tc_cyan='' - else - # Otherwise trust the terminfo database after all. - test -n "`tput sgr0 2>/dev/null`" && { - tc_reset=`tput sgr0` - test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` - tc_standout=$tc_bold - test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` - test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` - test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` - test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` - test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` - } - fi - } - - require_term_colors=: +# func_echo arg... +# Echo program name prefixed message, along with the current mode +# name if it has been set yet. +func_echo () +{ + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } +# func_verbose arg... +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $opt_verbose && func_echo ${1+"$@"} -## ----------------- ## -## Function library. ## -## ----------------- ## - -# This section contains a variety of useful functions to call in your -# scripts. Take note of the portable wrappers for features provided by -# some modern shells, which will fall back to slower equivalents on -# less featureful shells. + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} -# func_append VAR VALUE -# --------------------- -# Append VALUE onto the existing contents of VAR. +# func_error arg... +# Echo program name prefixed message to standard error. +func_error () +{ + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 +} - # We should try to minimise forks, especially on Windows where they are - # unreasonably slow, so skip the feature probes when bash or zsh are - # being used: - if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then - : ${_G_HAVE_ARITH_OP="yes"} - : ${_G_HAVE_XSI_OPS="yes"} - # The += operator was introduced in bash 3.1 - case $BASH_VERSION in - [12].* | 3.0 | 3.0*) ;; - *) - : ${_G_HAVE_PLUSEQ_OP="yes"} - ;; - esac - fi +# func_warning arg... +# Echo program name prefixed warning message to standard error. +func_warning () +{ + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - # _G_HAVE_PLUSEQ_OP - # Can be empty, in which case the shell is probed, "yes" if += is - # useable or anything else if it does not work. - test -z "$_G_HAVE_PLUSEQ_OP" \ - && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ - && _G_HAVE_PLUSEQ_OP=yes - -if test yes = "$_G_HAVE_PLUSEQ_OP" -then - # This is an XSI compatible shell, allowing a faster implementation... - eval 'func_append () - { - $debug_cmd + # bash bug again: + : +} - eval "$1+=\$2" - }' -else - # ...otherwise fall back to using expr, which is often a shell builtin. - func_append () - { - $debug_cmd +# func_fatal_error arg... +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + func_error ${1+"$@"} + exit $EXIT_FAILURE +} - eval "$1=\$$1\$2" - } -fi - - -# func_append_quoted VAR VALUE -# ---------------------------- -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -if test yes = "$_G_HAVE_PLUSEQ_OP"; then - eval 'func_append_quoted () - { - $debug_cmd - - func_quote_for_eval "$2" - eval "$1+=\\ \$func_quote_for_eval_result" - }' -else - func_append_quoted () - { - $debug_cmd - - func_quote_for_eval "$2" - eval "$1=\$$1\\ \$func_quote_for_eval_result" - } -fi - - -# func_append_uniq VAR VALUE -# -------------------------- -# Append unique VALUE onto the existing contents of VAR, assuming -# entries are delimited by the first character of VALUE. For example: -# -# func_append_uniq options " --another-option option-argument" -# -# will only append to $options if " --another-option option-argument " -# is not already present somewhere in $options already (note spaces at -# each end implied by leading space in second argument). -func_append_uniq () -{ - $debug_cmd - - eval _G_current_value='`$ECHO $'$1'`' - _G_delim=`expr "$2" : '\(.\)'` - - case $_G_delim$_G_current_value$_G_delim in - *"$2$_G_delim"*) ;; - *) func_append "$@" ;; - esac -} - - -# func_arith TERM... -# ------------------ -# Set func_arith_result to the result of evaluating TERMs. - test -z "$_G_HAVE_ARITH_OP" \ - && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ - && _G_HAVE_ARITH_OP=yes - -if test yes = "$_G_HAVE_ARITH_OP"; then - eval 'func_arith () - { - $debug_cmd - - func_arith_result=$(( $* )) - }' -else - func_arith () - { - $debug_cmd - - func_arith_result=`expr "$@"` - } -fi - - -# func_basename FILE -# ------------------ -# Set func_basename_result to FILE with everything up to and including -# the last / stripped. -if test yes = "$_G_HAVE_XSI_OPS"; then - # If this shell supports suffix pattern removal, then use it to avoid - # forking. Hide the definitions single quotes in case the shell chokes - # on unsupported syntax... - _b='func_basename_result=${1##*/}' - _d='case $1 in - */*) func_dirname_result=${1%/*}$2 ;; - * ) func_dirname_result=$3 ;; - esac' - -else - # ...otherwise fall back to using sed. - _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' - _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` - if test "X$func_dirname_result" = "X$1"; then - func_dirname_result=$3 - else - func_append func_dirname_result "$2" - fi' -fi - -eval 'func_basename () -{ - $debug_cmd - - '"$_b"' -}' - - -# func_dirname FILE APPEND NONDIR_REPLACEMENT -# ------------------------------------------- -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -eval 'func_dirname () -{ - $debug_cmd - - '"$_d"' -}' - - -# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT -# -------------------------------------------------------- -# Perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# For efficiency, we do not delegate to the functions above but instead -# duplicate the functionality here. -eval 'func_dirname_and_basename () -{ - $debug_cmd - - '"$_b"' - '"$_d"' -}' - - -# func_echo ARG... -# ---------------- -# Echo program name prefixed message. -func_echo () -{ - $debug_cmd - - _G_message=$* - - func_echo_IFS=$IFS - IFS=$nl - for _G_line in $_G_message; do - IFS=$func_echo_IFS - $ECHO "$progname: $_G_line" - done - IFS=$func_echo_IFS -} - - -# func_echo_all ARG... -# -------------------- -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - - -# func_echo_infix_1 INFIX ARG... -# ------------------------------ -# Echo program name, followed by INFIX on the first line, with any -# additional lines not showing INFIX. -func_echo_infix_1 () -{ - $debug_cmd - - $require_term_colors - - _G_infix=$1; shift - _G_indent=$_G_infix - _G_prefix="$progname: $_G_infix: " - _G_message=$* - - # Strip color escape sequences before counting printable length - for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" - do - test -n "$_G_tc" && { - _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` - _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` - } - done - _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes - - func_echo_infix_1_IFS=$IFS - IFS=$nl - for _G_line in $_G_message; do - IFS=$func_echo_infix_1_IFS - $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 - _G_prefix=$_G_indent - done - IFS=$func_echo_infix_1_IFS -} - - -# func_error ARG... -# ----------------- -# Echo program name prefixed message to standard error. -func_error () -{ - $debug_cmd - - $require_term_colors - - func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 -} - - -# func_fatal_error ARG... -# ----------------------- -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () +# func_fatal_help arg... +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $debug_cmd - - func_error "$*" - exit $EXIT_FAILURE + func_error ${1+"$@"} + func_fatal_error "$help" } +help="Try \`$progname --help' for more information." ## default -# func_grep EXPRESSION FILENAME -# ----------------------------- +# func_grep expression filename # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { - $debug_cmd - $GREP "$1" "$2" >/dev/null 2>&1 } -# func_len STRING -# --------------- -# Set func_len_result to the length of STRING. STRING may not -# start with a hyphen. - test -z "$_G_HAVE_XSI_OPS" \ - && (eval 'x=a/b/c; - test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ - && _G_HAVE_XSI_OPS=yes - -if test yes = "$_G_HAVE_XSI_OPS"; then - eval 'func_len () - { - $debug_cmd - - func_len_result=${#1} - }' -else - func_len () - { - $debug_cmd - - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` - } -fi - - -# func_mkdir_p DIRECTORY-PATH -# --------------------------- +# func_mkdir_p directory-path # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - $debug_cmd - - _G_directory_path=$1 - _G_dir_list= + my_directory_path="$1" + my_dir_list= - if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then + if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - # Protect directory names starting with '-' - case $_G_directory_path in - -*) _G_directory_path=./$_G_directory_path ;; + # Protect directory names starting with `-' + case $my_directory_path in + -*) my_directory_path="./$my_directory_path" ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$_G_directory_path"; do + while test ! -d "$my_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - _G_dir_list=$_G_directory_path:$_G_dir_list + my_dir_list="$my_directory_path:$my_dir_list" # If the last portion added has no slash in it, the list is done - case $_G_directory_path in */*) ;; *) break ;; esac + case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` done - _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - func_mkdir_p_IFS=$IFS; IFS=: - for _G_dir in $_G_dir_list; do - IFS=$func_mkdir_p_IFS - # mkdir can fail with a 'File exist' error if two processes + save_mkdir_p_IFS="$IFS"; IFS=':' + for my_dir in $my_dir_list; do + IFS="$save_mkdir_p_IFS" + # mkdir can fail with a `File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$_G_dir" 2>/dev/null || : + $MKDIR "$my_dir" 2>/dev/null || : done - IFS=$func_mkdir_p_IFS + IFS="$save_mkdir_p_IFS" # Bail out if we (or some other process) failed to create a directory. - test -d "$_G_directory_path" || \ - func_fatal_error "Failed to create '$1'" + test -d "$my_directory_path" || \ + func_fatal_error "Failed to create \`$1'" fi } -# func_mktempdir [BASENAME] -# ------------------------- +# func_mktempdir [string] # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, BASENAME is the basename for that directory. +# given, STRING is the basename for that directory. func_mktempdir () { - $debug_cmd + my_template="${TMPDIR-/tmp}/${1-$progname}" - _G_template=${TMPDIR-/tmp}/${1-$progname} - - if test : = "$opt_dry_run"; then + if test "$opt_dry_run" = ":"; then # Return a directory name, but don't create it in dry-run mode - _G_tmpdir=$_G_template-$$ + my_tmpdir="${my_template}-$$" else # If mktemp works, use that first and foremost - _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - - if test ! -d "$_G_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - _G_tmpdir=$_G_template-${RANDOM-0}$$ - - func_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$_G_tmpdir" - umask $func_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$_G_tmpdir" || \ - func_fatal_error "cannot create temporary directory '$_G_tmpdir'" - fi - - $ECHO "$_G_tmpdir" -} - - -# func_normal_abspath PATH -# ------------------------ -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -func_normal_abspath () -{ - $debug_cmd - - # These SED scripts presuppose an absolute path with a trailing slash. - _G_pathcar='s|^/\([^/]*\).*$|\1|' - _G_pathcdr='s|^/[^/]*||' - _G_removedotparts=':dotsl - s|/\./|/|g - t dotsl - s|/\.$|/|' - _G_collapseslashes='s|/\{1,\}|/|g' - _G_finalslash='s|/*$|/|' - - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` - while :; do - # Processed it all yet? - if test / = "$func_normal_abspath_tpath"; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result"; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$_G_pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$_G_pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - - -# func_notquiet ARG... -# -------------------- -# Echo program name prefixed message only when not in quiet mode. -func_notquiet () -{ - $debug_cmd - - $opt_quiet || func_echo ${1+"$@"} - - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" -# func_relative_path SRCDIR DSTDIR -# -------------------------------- -# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. -func_relative_path () -{ - $debug_cmd - - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=$func_dirname_result - if test -z "$func_relative_path_tlibdir"; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test -n "$func_stripname_result"; then - func_append func_relative_path_result "/$func_stripname_result" - fi - - # Normalisation. If bindir is libdir, return '.' else relative path. - if test -n "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - fi - - test -n "$func_relative_path_result" || func_relative_path_result=. - - : -} - - -# func_quote_for_eval ARG... -# -------------------------- -# Aesthetically quote ARGs to be evaled later. -# This function returns two values: -# i) func_quote_for_eval_result -# double-quoted, suitable for a subsequent eval -# ii) func_quote_for_eval_unquoted_result -# has all characters that are still active within double -# quotes backslashified. -func_quote_for_eval () -{ - $debug_cmd - - func_quote_for_eval_unquoted_result= - func_quote_for_eval_result= - while test 0 -lt $#; do - case $1 in - *[\\\`\"\$]*) - _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; - *) - _G_unquoted_arg=$1 ;; - esac - if test -n "$func_quote_for_eval_unquoted_result"; then - func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" - else - func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" - fi - - case $_G_unquoted_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and variable expansion - # for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_quoted_arg=\"$_G_unquoted_arg\" - ;; - *) - _G_quoted_arg=$_G_unquoted_arg - ;; - esac - - if test -n "$func_quote_for_eval_result"; then - func_append func_quote_for_eval_result " $_G_quoted_arg" - else - func_append func_quote_for_eval_result "$_G_quoted_arg" - fi - shift - done -} - - -# func_quote_for_expand ARG -# ------------------------- -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - $debug_cmd - - case $1 in - *[\\\`\"]*) - _G_arg=`$ECHO "$1" | $SED \ - -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; - *) - _G_arg=$1 ;; - esac - - case $_G_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_arg=\"$_G_arg\" - ;; - esac - - func_quote_for_expand_result=$_G_arg -} - - -# func_stripname PREFIX SUFFIX NAME -# --------------------------------- -# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -if test yes = "$_G_HAVE_XSI_OPS"; then - eval 'func_stripname () - { - $debug_cmd - - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary variable first. - func_stripname_result=$3 - func_stripname_result=${func_stripname_result#"$1"} - func_stripname_result=${func_stripname_result%"$2"} - }' -else - func_stripname () - { - $debug_cmd - - case $2 in - .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; - *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; - esac - } -fi - - -# func_show_eval CMD [FAIL_EXP] -# ----------------------------- -# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - $debug_cmd - - _G_cmd=$1 - _G_fail_exp=${2-':'} - - func_quote_for_expand "$_G_cmd" - eval "func_notquiet $func_quote_for_expand_result" - - $opt_dry_run || { - eval "$_G_cmd" - _G_status=$? - if test 0 -ne "$_G_status"; then - eval "(exit $_G_status); $_G_fail_exp" - fi - } -} - - -# func_show_eval_locale CMD [FAIL_EXP] -# ------------------------------------ -# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () -{ - $debug_cmd - - _G_cmd=$1 - _G_fail_exp=${2-':'} - - $opt_quiet || { - func_quote_for_expand "$_G_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - $opt_dry_run || { - eval "$_G_user_locale - $_G_cmd" - _G_status=$? - eval "$_G_safe_locale" - if test 0 -ne "$_G_status"; then - eval "(exit $_G_status); $_G_fail_exp" - fi - } -} - - -# func_tr_sh -# ---------- -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - $debug_cmd - - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_verbose ARG... -# ------------------- -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $debug_cmd - - $opt_verbose && func_echo "$*" - - : -} - - -# func_warn_and_continue ARG... -# ----------------------------- -# Echo program name prefixed warning message to standard error. -func_warn_and_continue () -{ - $debug_cmd - - $require_term_colors - - func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 -} - - -# func_warning CATEGORY ARG... -# ---------------------------- -# Echo program name prefixed warning message to standard error. Warning -# messages can be filtered according to CATEGORY, where this function -# elides messages where CATEGORY is not listed in the global variable -# 'opt_warning_types'. -func_warning () -{ - $debug_cmd - - # CATEGORY must be in the warning_categories list! - case " $warning_categories " in - *" $1 "*) ;; - *) func_internal_error "invalid warning category '$1'" ;; - esac - - _G_category=$1 - shift - - case " $opt_warning_types " in - *" $_G_category "*) $warning_func ${1+"$@"} ;; - esac -} - - -# func_sort_ver VER1 VER2 -# ----------------------- -# 'sort -V' is not generally available. -# Note this deviates from the version comparison in automake -# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a -# but this should suffice as we won't be specifying old -# version formats or redundant trailing .0 in bootstrap.conf. -# If we did want full compatibility then we should probably -# use m4_version_compare from autoconf. -func_sort_ver () -{ - $debug_cmd - - printf '%s\n%s\n' "$1" "$2" \ - | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n -} - -# func_lt_ver PREV CURR -# --------------------- -# Return true if PREV and CURR are in the correct order according to -# func_sort_ver, otherwise false. Use it like this: -# -# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." -func_lt_ver () -{ - $debug_cmd - - test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` -} - - -# Local variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" -# time-stamp-time-zone: "UTC" -# End: -#! /bin/sh - -# Set a version string for this script. -scriptversion=2014-01-07.03; # UTC - -# A portable, pluggable option parser for Bourne shell. -# Written by Gary V. Vaughan, 2010 - -# Copyright (C) 2010-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Please report bugs or propose patches to gary@gnu.org. - - -## ------ ## -## Usage. ## -## ------ ## - -# This file is a library for parsing options in your shell scripts along -# with assorted other useful supporting features that you can make use -# of too. -# -# For the simplest scripts you might need only: -# -# #!/bin/sh -# . relative/path/to/funclib.sh -# . relative/path/to/options-parser -# scriptversion=1.0 -# func_options ${1+"$@"} -# eval set dummy "$func_options_result"; shift -# ...rest of your script... -# -# In order for the '--version' option to work, you will need to have a -# suitably formatted comment like the one at the top of this file -# starting with '# Written by ' and ending with '# warranty; '. -# -# For '-h' and '--help' to work, you will also need a one line -# description of your script's purpose in a comment directly above the -# '# Written by ' line, like the one at the top of this file. -# -# The default options also support '--debug', which will turn on shell -# execution tracing (see the comment above debug_cmd below for another -# use), and '--verbose' and the func_verbose function to allow your script -# to display verbose messages only when your user has specified -# '--verbose'. -# -# After sourcing this file, you can plug processing for additional -# options by amending the variables from the 'Configuration' section -# below, and following the instructions in the 'Option parsing' -# section further down. - -## -------------- ## -## Configuration. ## -## -------------- ## - -# You should override these variables in your script after sourcing this -# file so that they reflect the customisations you have added to the -# option parser. - -# The usage line for option parsing errors and the start of '-h' and -# '--help' output messages. You can embed shell variables for delayed -# expansion at the time the message is displayed, but you will need to -# quote other shell meta-characters carefully to prevent them being -# expanded when the contents are evaled. -usage='$progpath [OPTION]...' - -# Short help message in response to '-h' and '--help'. Add to this or -# override it after sourcing this library to reflect the full set of -# options your script accepts. -usage_message="\ - --debug enable verbose shell tracing - -W, --warnings=CATEGORY - report the warnings falling in CATEGORY [all] - -v, --verbose verbosely report processing - --version print version information and exit - -h, --help print short or long help message and exit -" - -# Additional text appended to 'usage_message' in response to '--help'. -long_help_message=" -Warning categories include: - 'all' show all warnings - 'none' turn off all the warnings - 'error' warnings are treated as fatal errors" - -# Help message printed before fatal option parsing errors. -fatal_help="Try '\$progname --help' for more information." - - - -## ------------------------- ## -## Hook function management. ## -## ------------------------- ## - -# This section contains functions for adding, removing, and running hooks -# to the main code. A hook is just a named list of of function, that can -# be run in order later on. - -# func_hookable FUNC_NAME -# ----------------------- -# Declare that FUNC_NAME will run hooks added with -# 'func_add_hook FUNC_NAME ...'. -func_hookable () -{ - $debug_cmd - - func_append hookable_fns " $1" -} - - -# func_add_hook FUNC_NAME HOOK_FUNC -# --------------------------------- -# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must -# first have been declared "hookable" by a call to 'func_hookable'. -func_add_hook () -{ - $debug_cmd - - case " $hookable_fns " in - *" $1 "*) ;; - *) func_fatal_error "'$1' does not accept hook functions." ;; - esac - - eval func_append ${1}_hooks '" $2"' -} - - -# func_remove_hook FUNC_NAME HOOK_FUNC -# ------------------------------------ -# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. -func_remove_hook () -{ - $debug_cmd - - eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' -} - - -# func_run_hooks FUNC_NAME [ARG]... -# --------------------------------- -# Run all hook functions registered to FUNC_NAME. -# It is assumed that the list of hook functions contains nothing more -# than a whitespace-delimited list of legal shell function names, and -# no effort is wasted trying to catch shell meta-characters or preserve -# whitespace. -func_run_hooks () -{ - $debug_cmd - - case " $hookable_fns " in - *" $1 "*) ;; - *) func_fatal_error "'$1' does not support hook funcions.n" ;; - esac - - eval _G_hook_fns=\$$1_hooks; shift - - for _G_hook in $_G_hook_fns; do - eval $_G_hook '"$@"' - - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift - done - - func_quote_for_eval ${1+"$@"} - func_run_hooks_result=$func_quote_for_eval_result -} - - - -## --------------- ## -## Option parsing. ## -## --------------- ## - -# In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, remove any -# options that you action, and then pass back the remaining unprocessed -# options in '_result', escaped suitably for -# 'eval'. Like this: -# -# my_options_prep () -# { -# $debug_cmd -# -# # Extend the existing usage message. -# usage_message=$usage_message' -# -s, --silent don'\''t print informational messages -# ' -# -# func_quote_for_eval ${1+"$@"} -# my_options_prep_result=$func_quote_for_eval_result -# } -# func_add_hook func_options_prep my_options_prep -# -# -# my_silent_option () -# { -# $debug_cmd -# -# # Note that for efficiency, we parse as many options as we can -# # recognise in a loop before passing the remainder back to the -# # caller on the first unrecognised argument we encounter. -# while test $# -gt 0; do -# opt=$1; shift -# case $opt in -# --silent|-s) opt_silent=: ;; -# # Separate non-argument short options: -# -s*) func_split_short_opt "$_G_opt" -# set dummy "$func_split_short_opt_name" \ -# "-$func_split_short_opt_arg" ${1+"$@"} -# shift -# ;; -# *) set dummy "$_G_opt" "$*"; shift; break ;; -# esac -# done -# -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result -# } -# func_add_hook func_parse_options my_silent_option -# -# -# my_option_validation () -# { -# $debug_cmd -# -# $opt_silent && $opt_verbose && func_fatal_help "\ -# '--silent' and '--verbose' options are mutually exclusive." -# -# func_quote_for_eval ${1+"$@"} -# my_option_validation_result=$func_quote_for_eval_result -# } -# func_add_hook func_validate_options my_option_validation -# -# You'll alse need to manually amend $usage_message to reflect the extra -# options you parse. It's preferable to append if you can, so that -# multiple option parsing hooks can be added safely. - - -# func_options [ARG]... -# --------------------- -# All the functions called inside func_options are hookable. See the -# individual implementations for details. -func_hookable func_options -func_options () -{ - $debug_cmd - - func_options_prep ${1+"$@"} - eval func_parse_options \ - ${func_options_prep_result+"$func_options_prep_result"} - eval func_validate_options \ - ${func_parse_options_result+"$func_parse_options_result"} + save_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$my_tmpdir" + umask $save_mktempdir_umask + fi - eval func_run_hooks func_options \ - ${func_validate_options_result+"$func_validate_options_result"} + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || \ + func_fatal_error "cannot create temporary directory \`$my_tmpdir'" + fi - # save modified positional parameters for caller - func_options_result=$func_run_hooks_result + $ECHO "$my_tmpdir" } -# func_options_prep [ARG]... -# -------------------------- -# All initialisations required before starting the option parse loop. -# Note that when calling hook functions, we pass through the list of -# positional parameters. If a hook function modifies that list, and -# needs to propogate that back to rest of this script, then the complete -# modified list must be put in 'func_run_hooks_result' before -# returning. -func_hookable func_options_prep -func_options_prep () +# func_quote_for_eval arg +# Aesthetically quote ARG to be evaled later. +# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT +# is double-quoted, suitable for a subsequent eval, whereas +# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters +# which are still active within double quotes backslashified. +func_quote_for_eval () { - $debug_cmd - - # Option defaults: - opt_verbose=false - opt_warning_types= - - func_run_hooks func_options_prep ${1+"$@"} + case $1 in + *[\\\`\"\$]*) + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + *) + func_quote_for_eval_unquoted_result="$1" ;; + esac - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result + case $func_quote_for_eval_unquoted_result in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and and variable + # expansion for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" + ;; + *) + func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" + esac } -# func_parse_options [ARG]... -# --------------------------- -# The main option parsing loop. -func_hookable func_parse_options -func_parse_options () +# func_quote_for_expand arg +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () { - $debug_cmd - - func_parse_options_result= + case $1 in + *[\\\`\"]*) + my_arg=`$ECHO "$1" | $SED \ + -e "$double_quote_subst" -e "$sed_double_backslash"` ;; + *) + my_arg="$1" ;; + esac - # this just eases exit handling - while test $# -gt 0; do - # Defer to hook functions for initial option parsing, so they - # get priority in the event of reusing an option name. - func_run_hooks func_parse_options ${1+"$@"} + case $my_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + my_arg="\"$my_arg\"" + ;; + esac - # Adjust func_parse_options positional parameters to match - eval set dummy "$func_run_hooks_result"; shift + func_quote_for_expand_result="$my_arg" +} - # Break out of the loop if we already parsed every option. - test $# -gt 0 || break - _G_opt=$1 - shift - case $_G_opt in - --debug|-x) debug_cmd='set -x' - func_echo "enabling shell trace mode" - $debug_cmd - ;; - - --no-warnings|--no-warning|--no-warn) - set dummy --warnings none ${1+"$@"} - shift - ;; +# func_show_eval cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + my_cmd="$1" + my_fail_exp="${2-:}" - --warnings|--warning|-W) - test $# = 0 && func_missing_arg $_G_opt && break - case " $warning_categories $1" in - *" $1 "*) - # trailing space prevents matching last $1 above - func_append_uniq opt_warning_types " $1" - ;; - *all) - opt_warning_types=$warning_categories - ;; - *none) - opt_warning_types=none - warning_func=: - ;; - *error) - opt_warning_types=$warning_categories - warning_func=func_fatal_error - ;; - *) - func_fatal_error \ - "unsupported warning category: '$1'" - ;; - esac - shift - ;; - - --verbose|-v) opt_verbose=: ;; - --version) func_version ;; - -\?|-h) func_usage ;; - --help) func_help ;; - - # Separate optargs to long options (plugins may need this): - --*=*) func_split_equals "$_G_opt" - set dummy "$func_split_equals_lhs" \ - "$func_split_equals_rhs" ${1+"$@"} - shift - ;; - - # Separate optargs to short options: - -W*) - func_split_short_opt "$_G_opt" - set dummy "$func_split_short_opt_name" \ - "$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-v*|-x*) - func_split_short_opt "$_G_opt" - set dummy "$func_split_short_opt_name" \ - "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; - esac - done + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + if ${opt_dry_run-false}; then :; else + eval "$my_cmd" + my_status=$? + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi } -# func_validate_options [ARG]... -# ------------------------------ -# Perform any sanity checks on option settings and/or unconsumed -# arguments. -func_hookable func_validate_options -func_validate_options () +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () { - $debug_cmd - - # Display all warnings if -W was not given. - test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" + my_cmd="$1" + my_fail_exp="${2-:}" - func_run_hooks func_validate_options ${1+"$@"} - - # Bail if the options were screwed! - $exit_cmd $EXIT_FAILURE + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi } +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} -## ----------------- ## -## Helper functions. ## -## ----------------- ## - -# This section contains the helper functions used by the rest of the -# hookable option parser framework in ascii-betical order. +# func_version +# Echo version message to standard output and exit. +func_version () +{ + $opt_debug + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { + s/^# // + s/^# *$// + s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ + p + }' < "$progpath" + exit $? +} -# func_fatal_help ARG... -# ---------------------- -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () +# func_usage +# Echo short help message to standard output and exit. +func_usage () { - $debug_cmd + $opt_debug - eval \$ECHO \""Usage: $usage"\" - eval \$ECHO \""$fatal_help"\" - func_error ${1+"$@"} - exit $EXIT_FAILURE + $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ + p + }' < "$progpath" + echo + $ECHO "run \`$progname --help | more' for full usage" + exit $? } - -# func_help -# --------- -# Echo long help message to standard output and exit. +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. func_help () { - $debug_cmd + $opt_debug - func_usage_message - $ECHO "$long_help_message" - exit 0 + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* + s*\$host*'"$host"'* + s*\$SHELL*'"$SHELL"'* + s*\$LTCC*'"$LTCC"'* + s*\$LTCFLAGS*'"$LTCFLAGS"'* + s*\$LD*'"$LD"'* + s/\$with_gnu_ld/'"$with_gnu_ld"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ + p + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret + fi } - -# func_missing_arg ARGNAME -# ------------------------ +# func_missing_arg argname # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $debug_cmd + $opt_debug - func_error "Missing argument for '$1'." + func_error "missing argument for $1." exit_cmd=exit } -# func_split_equals STRING -# ------------------------ -# Set func_split_equals_lhs and func_split_equals_rhs shell variables after -# splitting STRING at the '=' sign. -test -z "$_G_HAVE_XSI_OPS" \ - && (eval 'x=a/b/c; - test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ - && _G_HAVE_XSI_OPS=yes - -if test yes = "$_G_HAVE_XSI_OPS" -then - # This is an XSI compatible shell, allowing a faster implementation... - eval 'func_split_equals () - { - $debug_cmd - - func_split_equals_lhs=${1%%=*} - func_split_equals_rhs=${1#*=} - test "x$func_split_equals_lhs" = "x$1" \ - && func_split_equals_rhs= - }' -else - # ...otherwise fall back to using expr, which is often a shell builtin. - func_split_equals () - { - $debug_cmd - - func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` - func_split_equals_rhs= - test "x$func_split_equals_lhs" = "x$1" \ - || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` - } -fi #func_split_equals - - -# func_split_short_opt SHORTOPT -# ----------------------------- +# func_split_short_opt shortopt # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -if test yes = "$_G_HAVE_XSI_OPS" -then - # This is an XSI compatible shell, allowing a faster implementation... - eval 'func_split_short_opt () - { - $debug_cmd - - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"} - }' -else - # ...otherwise fall back to using expr, which is often a shell builtin. - func_split_short_opt () - { - $debug_cmd - - func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` - func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` - } -fi #func_split_short_opt - - -# func_usage -# ---------- -# Echo short help message to standard output and exit. -func_usage () +func_split_short_opt () { - $debug_cmd + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - func_usage_message - $ECHO "Run '$progname --help |${PAGER-more}' for full usage" - exit 0 -} + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation -# func_usage_message -# ------------------ -# Echo short help message to standard output. -func_usage_message () +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () { - $debug_cmd + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' - eval \$ECHO \""Usage: $usage"\" - echo - $SED -n 's|^# || - /^Written by/{ - x;p;x - } - h - /^Written by/q' < "$progpath" - echo - eval \$ECHO \""$usage_message"\" -} + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation +exit_cmd=: -# func_version -# ------------ -# Echo version message to standard output and exit. -func_version () -{ - $debug_cmd - printf '%s\n' "$progname $scriptversion" - $SED -n ' - /(C)/!b go - :more - /\./!{ - N - s|\n# | | - b more - } - :go - /^# Written by /,/# warranty; / { - s|^# || - s|^# *$|| - s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| - p - } - /^# Written by / { - s|^# || - p - } - /^warranty; /q' < "$progpath" - exit $? -} -# Local variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" -# time-stamp-time-zone: "UTC" -# End: +magic="%%%MAGIC variable%%%" +magic_exe="%%%MAGIC EXE variable%%%" -# Set a version string. -scriptversion='(GNU libtool) 2.4.6' +# Global variables. +nonopt= +preserve_args= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= -# func_echo ARG... -# ---------------- -# Libtool also displays the current mode in messages, so override -# funclib.sh func_echo with this custom definition. -func_echo () +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () { - $debug_cmd - - _G_message=$* - - func_echo_IFS=$IFS - IFS=$nl - for _G_line in $_G_message; do - IFS=$func_echo_IFS - $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" - done - IFS=$func_echo_IFS -} - + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation -# func_warning ARG... -# ------------------- -# Libtool warnings are not categorized, so override funclib.sh -# func_warning with this simpler definition. -func_warning () +# func_append_quoted var value +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +func_append_quoted () { - $debug_cmd - - $warning_func ${1+"$@"} -} - + func_quote_for_eval "${2}" + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +} # func_append_quoted may be replaced by extended shell implementation -## ---------------- ## -## Options parsing. ## -## ---------------- ## - -# Hook in the functions to make sure our own options are parsed during -# the option parsing loop. - -usage='$progpath [OPTION]... [MODE-ARG]...' - -# Short help message in response to '-h'. -usage_message="Options: - --config show all configuration variables - --debug enable verbose shell tracing - -n, --dry-run display commands without modifying any files - --features display basic configuration information and exit - --mode=MODE use operation mode MODE - --no-warnings equivalent to '-Wnone' - --preserve-dup-deps don't remove duplicate dependency libraries - --quiet, --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - -v, --verbose print more informational messages than default - --version print version information - -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] - -h, --help, --help-all print short, long, or detailed help message -" -# Additional text appended to 'usage_message' in response to '--help'. -func_help () +# func_arith arithmetic-term... +func_arith () { - $debug_cmd + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation - func_usage_message - $ECHO "$long_help_message -MODE must be one of the following: - - clean remove files from the build directory - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. When passed as first option, -'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. -Try '$progname --help --mode=MODE' for a more detailed description of MODE. - -When reporting a bug, please describe a test case to reproduce it and -include the following information: - - host-triplet: $host - shell: $SHELL - compiler: $LTCC - compiler flags: $LTCFLAGS - linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 - automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` - autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` - -Report bugs to . -GNU libtool home page: . -General help using GNU software: ." - exit 0 -} - - -# func_lo2o OBJECT-NAME -# --------------------- -# Transform OBJECT-NAME from a '.lo' suffix to the platform specific -# object suffix. +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation -lo2o=s/\\.lo\$/.$objext/ -o2lo=s/\\.$objext\$/.lo/ -if test yes = "$_G_HAVE_XSI_OPS"; then - eval 'func_lo2o () - { - case $1 in - *.lo) func_lo2o_result=${1%.lo}.$objext ;; - * ) func_lo2o_result=$1 ;; - esac - }' +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation - # func_xform LIBOBJ-OR-SOURCE - # --------------------------- - # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) - # suffix to a '.lo' libtool-object suffix. - eval 'func_xform () - { - func_xform_result=${1%.*}.lo - }' -else - # ...otherwise fall back to using sed. - func_lo2o () - { - func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` - } - func_xform () - { - func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` - } -fi +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation -# func_fatal_configuration ARG... -# ------------------------------- +# func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func__fatal_error ${1+"$@"} \ - "See the $PACKAGE documentation for more information." \ - "Fatal configuration error." + func_error ${1+"$@"} + func_error "See the $PACKAGE documentation for more information." + func_fatal_error "Fatal configuration error." } # func_config -# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -2149,19 +915,17 @@ exit $? } - # func_features -# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test yes = "$build_libtool_libs"; then + if test "$build_libtool_libs" = yes; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test yes = "$build_old_libs"; then + if test "$build_old_libs" = yes; then echo "enable static libraries" else echo "disable static libraries" @@ -2170,297 +934,289 @@ exit $? } - -# func_enable_tag TAGNAME -# ----------------------- +# func_enable_tag tagname # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname=$1 + # Global variable: + tagname="$1" - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf=/$re_begincf/,/$re_endcf/p - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf="/$re_begincf/,/$re_endcf/p" + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } - # func_check_version_match -# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi - - exit $EXIT_MISMATCH fi -} + exit $EXIT_MISMATCH + fi +} -# libtool_options_prep [ARG]... -# ----------------------------- -# Preparation for options parsed by libtool. -libtool_options_prep () -{ - $debug_mode - # Option defaults: - opt_config=false - opt_dlopen= - opt_dry_run=false - opt_help=false - opt_mode= - opt_preserve_dup_deps=false - opt_quiet=false +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac - nonopt= - preserve_args= - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac - # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result -} -func_add_hook func_options_prep libtool_options_prep +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_warning=: +opt_verbose=: +opt_silent=false +opt_verbose=false -# libtool_parse_options [ARG]... -# --------------------------------- -# Provide handling for libtool specific options. -libtool_parse_options () +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. { - $debug_cmd - - # Perform our own loop to consume as many options as possible in - # each iteration. - while test $# -gt 0; do - _G_opt=$1 - shift - case $_G_opt in - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - - --config) func_config ;; - - --dlopen|-dlopen) - opt_dlopen="${opt_dlopen+$opt_dlopen -}$1" - shift - ;; - - --preserve-dup-deps) - opt_preserve_dup_deps=: ;; - - --features) func_features ;; - - --finish) set dummy --mode finish ${1+"$@"}; shift ;; - - --help) opt_help=: ;; - - --help-all) opt_help=': help-all' ;; - - --mode) test $# = 0 && func_missing_arg $_G_opt && break - opt_mode=$1 - case $1 in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $_G_opt" - exit_cmd=exit - break - ;; - esac - shift - ;; - - --no-silent|--no-quiet) - opt_quiet=false - func_append preserve_args " $_G_opt" - ;; - - --no-warnings|--no-warning|--no-warn) - opt_warning=false - func_append preserve_args " $_G_opt" - ;; - - --no-verbose) - opt_verbose=false - func_append preserve_args " $_G_opt" - ;; - - --silent|--quiet) - opt_quiet=: - opt_verbose=false - func_append preserve_args " $_G_opt" - ;; - - --tag) test $# = 0 && func_missing_arg $_G_opt && break - opt_tag=$1 - func_append preserve_args " $_G_opt $1" - func_enable_tag "$1" - shift - ;; - - --verbose|-v) opt_quiet=false - opt_verbose=: - func_append preserve_args " $_G_opt" - ;; + # this just eases exit handling + while test $# -gt 0; do + opt="$1" + shift + case $opt in + --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" + $opt_debug + ;; + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" + shift + ;; + --preserve-dup-deps) + opt_preserve_dup_deps=: + ;; + --features) + opt_features=: +func_features + ;; + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) + opt_silent=false +func_append preserve_args " $opt" + ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) + opt_verbose=false +func_append preserve_args " $opt" + ;; + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" + shift + ;; + + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + + # Separate optargs to long options: + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done - # An option not handled by this hook function: - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; - esac - done + # Validate options: + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result -} -func_add_hook func_parse_options libtool_parse_options + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match -# libtool_validate_options [ARG]... -# --------------------------------- -# Perform any sanity checks on option settings and/or unconsumed -# arguments. -libtool_validate_options () -{ - # save first non-option argument - if test 0 -lt $#; then - nonopt=$1 - shift + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi - # preserve --debug - test : = "$debug_cmd" || func_append preserve_args " --debug" + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" - case $host in - # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 - # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi - $opt_help || { - # Sanity checks first: - func_check_version_match - - test yes != "$build_libtool_libs" \ - && test yes != "$build_old_libs" \ - && func_fatal_configuration "not configured to build any kind of library" - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test execute != "$opt_mode"; then - func_error "unrecognized option '-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help=$help - help="Try '$progname --help --mode=$opt_mode' for more information." - } + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - # Pass back the unparsed argument list - func_quote_for_eval ${1+"$@"} - libtool_validate_options_result=$func_quote_for_eval_result -} -func_add_hook func_validate_options libtool_validate_options + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} -# Process options as early as possible so that --help and --version -# can return quickly. -func_options ${1+"$@"} -eval set dummy "$func_options_result"; shift @@ -2468,52 +1224,24 @@ ## Main. ## ## ----------- ## -magic='%%%MAGIC variable%%%' -magic_exe='%%%MAGIC EXE variable%%%' - -# Global variables. -extracted_archives= -extracted_serial=0 - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# func_generated_by_libtool -# True iff stdin has been generated by Libtool. This function is only -# a basic sanity check; it will hardly flush out determined imposters. -func_generated_by_libtool_p () -{ - $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -} - # func_lalib_p file -# True iff FILE is a libtool '.la' library or '.lo' object file. +# True iff FILE is a libtool `.la' library or `.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p + $SED -e 4q "$1" 2>/dev/null \ + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 } # func_lalib_unsafe_p file -# True iff FILE is a libtool '.la' library or '.lo' object file. +# True iff FILE is a libtool `.la' library or `.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if 'file' does not exist. +# fatal anyway. Works if `file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -2521,13 +1249,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case $lalib_p_line in + case "$lalib_p_line" in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test yes = "$lalib_p" + test "$lalib_p" = yes } # func_ltwrapper_script_p file @@ -2536,8 +1264,7 @@ # determined imposters. func_ltwrapper_script_p () { - test -f "$1" && - $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p + func_lalib_p "$1" } # func_ltwrapper_executable_p file @@ -2562,7 +1289,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" } # func_ltwrapper_p file @@ -2581,13 +1308,11 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $debug_cmd - + $opt_debug save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$sp$nl - eval cmd=\"$cmd\" IFS=$save_ifs + eval cmd=\"$cmd\" func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -2599,11 +1324,10 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# 'FILE.' does not work on cygwin managed mounts. +# `FILE.' does not work on cygwin managed mounts. func_source () { - $debug_cmd - + $opt_debug case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -2630,10 +1354,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case $lt_sysroot:$1 in + case "$lt_sysroot:$1" in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result='='$func_stripname_result + func_replace_sysroot_result="=$func_stripname_result" ;; *) # Including no sysroot. @@ -2650,8 +1374,7 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $debug_cmd - + $opt_debug if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -2670,7 +1393,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -2695,7 +1418,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with '--tag'" + func_fatal_error "specify a tag with \`--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -2711,15 +1434,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=$1 - if test yes = "$build_libtool_libs"; then - write_lobj=\'$2\' + write_libobj=${1} + if test "$build_libtool_libs" = yes; then + write_lobj=\'${2}\' else write_lobj=none fi - if test yes = "$build_old_libs"; then - write_oldobj=\'$3\' + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' else write_oldobj=none fi @@ -2727,7 +1450,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$sed_naive_backslashify"` + $SED -e "$lt_sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -2792,19 +1514,18 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $debug_cmd - + $opt_debug # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result= + func_convert_core_path_wine_to_w32_result="" if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result"; then + if test -n "$func_convert_core_file_wine_to_w32_result" ; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -2833,8 +1554,7 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $debug_cmd - + $opt_debug if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -2843,7 +1563,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" fi } #end: func_cygpath @@ -2854,11 +1574,10 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $debug_cmd - + $opt_debug # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -2869,14 +1588,13 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $debug_cmd - - if test -z "$2" && test -n "$1"; then + $opt_debug + if test -z "$2" && test -n "$1" ; then func_error "Could not determine host file name corresponding to" - func_error " '$1'" + func_error " \`$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result=$1 + func_to_host_file_result="$1" fi } # end func_convert_file_check @@ -2888,11 +1606,10 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $debug_cmd - + $opt_debug if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " '$3'" + func_error " \`$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -2901,7 +1618,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result=$3 + func_to_host_path_result="$3" fi fi } @@ -2913,10 +1630,9 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $debug_cmd - + $opt_debug case $4 in - $1 ) func_to_host_path_result=$3$func_to_host_path_result + $1 ) func_to_host_path_result="$3$func_to_host_path_result" ;; esac case $4 in @@ -2930,7 +1646,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via '$to_host_file_cmd ARG' +# invoked via `$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -2941,8 +1657,7 @@ # in func_to_host_file_result. func_to_host_file () { - $debug_cmd - + $opt_debug $to_host_file_cmd "$1" } # end func_to_host_file @@ -2954,8 +1669,7 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $debug_cmd - + $opt_debug case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -2973,7 +1687,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result=$1 + func_to_host_file_result="$1" } # end func_convert_file_noop @@ -2984,12 +1698,11 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $debug_cmd - - func_to_host_file_result=$1 + $opt_debug + func_to_host_file_result="$1" if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result=$func_convert_core_msys_to_w32_result + func_to_host_file_result="$func_convert_core_msys_to_w32_result" fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -3001,9 +1714,8 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $debug_cmd - - func_to_host_file_result=$1 + $opt_debug + func_to_host_file_result="$1" if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -3019,12 +1731,11 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $debug_cmd - - func_to_host_file_result=$1 + $opt_debug + func_to_host_file_result="$1" if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result=$func_convert_core_file_wine_to_w32_result + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -3036,13 +1747,12 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $debug_cmd - - func_to_host_file_result=$1 + $opt_debug + func_to_host_file_result="$1" if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result=$func_cygpath_result + func_to_host_file_result="$func_cygpath_result" fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -3055,14 +1765,13 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $debug_cmd - - func_to_host_file_result=$1 + $opt_debug + func_to_host_file_result="$1" if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result=$func_cygpath_result + func_to_host_file_result="$func_cygpath_result" fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -3072,7 +1781,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via '$to_host_path_cmd ARG' +# invoked via `$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -3096,11 +1805,10 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $debug_cmd - + $opt_debug if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd=func_convert_path_$func_stripname_result + to_host_path_cmd="func_convert_path_${func_stripname_result}" fi } @@ -3110,8 +1818,7 @@ # in func_to_host_path_result. func_to_host_path () { - $debug_cmd - + $opt_debug func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -3122,7 +1829,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result=$1 + func_to_host_path_result="$1" } # end func_convert_path_noop @@ -3133,9 +1840,8 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $debug_cmd - - func_to_host_path_result=$1 + $opt_debug + func_to_host_path_result="$1" if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -3143,7 +1849,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result=$func_convert_core_msys_to_w32_result + func_to_host_path_result="$func_convert_core_msys_to_w32_result" func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -3157,9 +1863,8 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $debug_cmd - - func_to_host_path_result=$1 + $opt_debug + func_to_host_path_result="$1" if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -3178,15 +1883,14 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $debug_cmd - - func_to_host_path_result=$1 + $opt_debug + func_to_host_path_result="$1" if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result=$func_convert_core_path_wine_to_w32_result + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -3200,16 +1904,15 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $debug_cmd - - func_to_host_path_result=$1 + $opt_debug + func_to_host_path_result="$1" if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result=$func_cygpath_result + func_to_host_path_result="$func_cygpath_result" func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -3224,9 +1927,8 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $debug_cmd - - func_to_host_path_result=$1 + $opt_debug + func_to_host_path_result="$1" if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -3235,7 +1937,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result=$func_cygpath_result + func_to_host_path_result="$func_cygpath_result" func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -3244,31 +1946,13 @@ # end func_convert_path_nix_to_cygwin -# func_dll_def_p FILE -# True iff FILE is a Windows DLL '.def' file. -# Keep in sync with _LT_DLL_DEF_P in libtool.m4 -func_dll_def_p () -{ - $debug_cmd - - func_dll_def_p_tmp=`$SED -n \ - -e 's/^[ ]*//' \ - -e '/^\(;.*\)*$/d' \ - -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ - -e q \ - "$1"` - test DEF = "$func_dll_def_p_tmp" -} - - # func_mode_compile arg... func_mode_compile () { - $debug_cmd - + $opt_debug # Get the compilation command and the source file. base_compile= - srcfile=$nonopt # always keep a non-empty value in "srcfile" + srcfile="$nonopt" # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -3281,12 +1965,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg=$arg + lastarg="$arg" arg_mode=normal ;; target ) - libobj=$arg + libobj="$arg" arg_mode=normal continue ;; @@ -3296,7 +1980,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify '-o' more than once" + func_fatal_error "you cannot specify \`-o' more than once" arg_mode=target continue ;; @@ -3325,12 +2009,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs=$IFS; IFS=, + save_ifs="$IFS"; IFS=',' for arg in $args; do - IFS=$save_ifs + IFS="$save_ifs" func_append_quoted lastarg "$arg" done - IFS=$save_ifs + IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -3343,8 +2027,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg=$srcfile - srcfile=$arg + lastarg="$srcfile" + srcfile="$arg" ;; esac # case $arg ;; @@ -3359,13 +2043,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with '-o'" + func_fatal_error "you must specify a target with \`-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj=$func_basename_result + libobj="$func_basename_result" } ;; esac @@ -3385,7 +2069,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from '$libobj'" + func_fatal_error "cannot determine name of library object from \`$libobj'" ;; esac @@ -3394,8 +2078,8 @@ for arg in $later; do case $arg in -shared) - test yes = "$build_libtool_libs" \ - || func_fatal_configuration "cannot build a shared library" + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" build_old_libs=no continue ;; @@ -3421,17 +2105,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name '$libobj' may not contain shell special characters." + && func_warning "libobj name \`$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname=$func_basename_result - xdir=$func_dirname_result - lobj=$xdir$objdir/$objname + objname="$func_basename_result" + xdir="$func_dirname_result" + lobj=${xdir}$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test yes = "$build_old_libs"; then + if test "$build_old_libs" = yes; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -3443,16 +2127,16 @@ pic_mode=default ;; esac - if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test no = "$compiler_c_o"; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext - lockfile=$output_obj.lock + if test "$compiler_c_o" = no; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" else output_obj= need_locks=no @@ -3461,12 +2145,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test yes = "$need_locks"; then + if test "$need_locks" = yes; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test warn = "$need_locks"; then + elif test "$need_locks" = warn; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -3474,7 +2158,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support '-c' and '-o' together. If you +your compiler does not support \`-c' and \`-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -3496,11 +2180,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test yes = "$build_libtool_libs"; then + if test "$build_libtool_libs" = yes; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test no != "$pic_mode"; then + if test "$pic_mode" != no; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -3517,7 +2201,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test warn = "$need_locks" && + if test "$need_locks" = warn && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -3528,7 +2212,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support '-c' and '-o' together. If you +your compiler does not support \`-c' and \`-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -3544,20 +2228,20 @@ fi # Allow error messages only from the first compilation. - if test yes = "$suppress_opt"; then + if test "$suppress_opt" = yes; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test yes = "$build_old_libs"; then - if test yes != "$pic_mode"; then + if test "$build_old_libs" = yes; then + if test "$pic_mode" != yes; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test yes = "$compiler_c_o"; then + if test "$compiler_c_o" = yes; then func_append command " -o $obj" fi @@ -3566,7 +2250,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test warn = "$need_locks" && + if test "$need_locks" = warn && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -3577,7 +2261,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support '-c' and '-o' together. If you +your compiler does not support \`-c' and \`-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -3597,7 +2281,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test no != "$need_locks"; then + if test "$need_locks" != no; then removelist=$lockfile $RM "$lockfile" fi @@ -3607,7 +2291,7 @@ } $opt_help || { - test compile = "$opt_mode" && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () @@ -3627,7 +2311,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -3646,16 +2330,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a '.o' file suitable for static linking - -static only build a '.o' file suitable for static linking + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a 'standard' object file +COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix '.c' with the -library object suffix, '.lo'." +SOURCEFILE, then substituting the C source code suffix \`.c' with the +library object suffix, \`.lo'." ;; execute) @@ -3668,7 +2352,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to '-dlopen' +This mode sets the library path environment variable according to \`-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -3687,7 +2371,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the '--dry-run' option if you just want to see what would be executed." +the \`--dry-run' option if you just want to see what would be executed." ;; install) @@ -3697,7 +2381,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the 'install' or 'cp' program. +either the \`install' or \`cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -3723,7 +2407,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -3737,8 +2421,7 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE use a list of object files found in FILE to specify objects - -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) + -objectlist FILE Use a list of object files found in FILE to specify objects -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -3758,20 +2441,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with '-') are ignored. +All other options (arguments beginning with \`-') are ignored. -Every other argument is treated as a filename. Files ending in '.la' are +Every other argument is treated as a filename. Files ending in \`.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in '.la', then a libtool library is created, -only library objects ('.lo' files) may be specified, and '-rpath' is +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +only library objects (\`.lo' files) may be specified, and \`-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created -using 'ar' and 'ranlib', or on Windows using 'lib'. +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +using \`ar' and \`ranlib', or on Windows using \`lib'. -If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file +If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -3782,7 +2465,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -3790,17 +2473,17 @@ ;; *) - func_fatal_help "invalid operation mode '$opt_mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac echo - $ECHO "Try '$progname --help' for more information about other modes." + $ECHO "Try \`$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test : = "$opt_help"; then + if test "$opt_help" = :; then func_mode_help else { @@ -3808,7 +2491,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | $SED -n '1p; 2,$s/^Usage:/ or: /p' + } | sed -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -3816,7 +2499,7 @@ func_mode_help done } | - $SED '1d + sed '1d /^When reporting/,/^Report/{ H d @@ -3833,17 +2516,16 @@ # func_mode_execute arg... func_mode_execute () { - $debug_cmd - + $opt_debug # The first argument is the command name. - cmd=$nonopt + cmd="$nonopt" test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "'$file' is not a file" + || func_fatal_help "\`$file' is not a file" dir= case $file in @@ -3853,7 +2535,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "'$lib' is not a valid libtool archive" + || func_fatal_help "\`$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -3864,18 +2546,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "'$file' was not linked with '-export-dynamic'" + func_warning "\`$file' was not linked with \`-export-dynamic'" continue fi func_dirname "$file" "" "." - dir=$func_dirname_result + dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" fi fi ;; @@ -3883,18 +2565,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir=$func_dirname_result + dir="$func_dirname_result" ;; *) - func_warning "'-dlopen' is ignored for non-libtool libraries and objects" + func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir=$absdir + test -n "$absdir" && dir="$absdir" # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -3906,7 +2588,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic=$magic + libtool_execute_magic="$magic" # Check if any of the arguments is a wrapper script. args= @@ -3919,12 +2601,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file=$progdir/$program + file="$progdir/$program" elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file=$progdir/$program + file="$progdir/$program" fi ;; esac @@ -3932,15 +2614,7 @@ func_append_quoted args "$file" done - if $opt_dry_run; then - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - else + if test "X$opt_dry_run" = Xfalse; then if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -3957,18 +2631,25 @@ done # Now prepare to actually exec the command. - exec_cmd=\$cmd$args + exec_cmd="\$cmd$args" + else + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS fi } -test execute = "$opt_mode" && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $debug_cmd - + $opt_debug libs= libdirs= admincmds= @@ -3982,11 +2663,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "'$opt' is not a valid libtool archive" + func_warning "\`$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument '$opt'" + func_fatal_error "invalid argument \`$opt'" fi done @@ -4001,12 +2682,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and '=' prefixes from $lib" + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -4031,7 +2712,7 @@ fi # Exit here if they wanted silent mode. - $opt_quiet && exit $EXIT_SUCCESS + $opt_silent && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -4042,27 +2723,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the '-LLIBDIR'" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the '$shlibpath_var' environment variable" + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the '$runpath_var' environment variable" + echo " - add LIBDIR to the \`$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the '$flag' linker flag" + $ECHO " - use the \`$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" fi echo @@ -4081,20 +2762,18 @@ exit $EXIT_SUCCESS } -test finish = "$opt_mode" && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $debug_cmd - + $opt_debug # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac - then + case $nonopt in *shtool*) :;; *) false;; esac; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -4121,7 +2800,7 @@ opts= prev= install_type= - isdir=false + isdir=no stripme= no_mode=: for arg @@ -4134,7 +2813,7 @@ fi case $arg in - -d) isdir=: ;; + -d) isdir=yes ;; -f) if $install_cp; then :; else prev=$arg @@ -4152,7 +2831,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test X-m = "X$prev" && test -n "$install_override_mode"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -4177,7 +2856,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the '$prev' option requires an argument" + func_fatal_help "the \`$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -4199,19 +2878,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=: - if $isdir; then - destdir=$dest + test -d "$dest" && isdir=yes + if test "$isdir" = yes; then + destdir="$dest" destname= else func_dirname_and_basename "$dest" "" "." - destdir=$func_dirname_result - destname=$func_basename_result + destdir="$func_dirname_result" + destname="$func_basename_result" # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "'$dest' is not a directory" + func_fatal_help "\`$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -4220,7 +2899,7 @@ case $file in *.lo) ;; *) - func_fatal_help "'$destdir' must be an absolute directory name" + func_fatal_help "\`$destdir' must be an absolute directory name" ;; esac done @@ -4229,7 +2908,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic=$magic + libtool_install_magic="$magic" staticlibs= future_libdirs= @@ -4249,7 +2928,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "'$file' is not a valid libtool archive" + || func_fatal_help "\`$file' is not a valid libtool archive" library_names= old_library= @@ -4271,7 +2950,7 @@ fi func_dirname "$file" "/" "" - dir=$func_dirname_result + dir="$func_dirname_result" func_append dir "$objdir" if test -n "$relink_command"; then @@ -4285,7 +2964,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -4294,36 +2973,29 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking '$file'" + func_warning "relinking \`$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname=$1 + realname="$1" shift - srcname=$realname - test -n "$relink_command" && srcname=${realname}T + srcname="$realname" + test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme=$stripme + tstripme="$stripme" case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme= - ;; - esac - ;; - os2*) - case $realname in - *_dll.a) - tstripme= + tstripme="" ;; esac ;; @@ -4334,7 +3006,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try 'ln -sf' first, because the 'ln' binary might depend on + # Try `ln -sf' first, because the `ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -4345,14 +3017,14 @@ fi # Do each command in the postinstall commands. - lib=$destdir/$realname + lib="$destdir/$realname" func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name=$func_basename_result - instname=$dir/${name}i + name="$func_basename_result" + instname="$dir/$name"i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -4364,11 +3036,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile=$destdir/$destname + destfile="$destdir/$destname" else func_basename "$file" - destfile=$func_basename_result - destfile=$destdir/$destfile + destfile="$func_basename_result" + destfile="$destdir/$destfile" fi # Deduce the name of the destination old-style object file. @@ -4378,11 +3050,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest=$destfile + staticdest="$destfile" destfile= ;; *) - func_fatal_help "cannot copy a libtool object to '$destfile'" + func_fatal_help "cannot copy a libtool object to \`$destfile'" ;; esac @@ -4391,7 +3063,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test yes = "$build_old_libs"; then + if test "$build_old_libs" = yes; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -4403,23 +3075,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile=$destdir/$destname + destfile="$destdir/$destname" else func_basename "$file" - destfile=$func_basename_result - destfile=$destdir/$destfile + destfile="$func_basename_result" + destfile="$destdir/$destfile" fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext= + stripped_ext="" case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=.exe + stripped_ext=".exe" fi ;; esac @@ -4447,19 +3119,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script '$wrapper'" + func_fatal_error "invalid libtool wrapper script \`$wrapper'" - finalize=: + finalize=yes for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "'$lib' has not been installed in '$libdir'" - finalize=false + func_warning "\`$lib' has not been installed in \`$libdir'" + finalize=no fi done @@ -4467,29 +3139,29 @@ func_source "$wrapper" outputname= - if test no = "$fast_install" && test -n "$relink_command"; then + if test "$fast_install" = no && test -n "$relink_command"; then $opt_dry_run || { - if $finalize; then + if test "$finalize" = yes; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file=$func_basename_result - outputname=$tmpdir/$file + file="$func_basename_result" + outputname="$tmpdir/$file" # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_quiet || { + $opt_silent || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink '$file' with the above command before installing it" + func_error "error: relink \`$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file=$outputname + file="$outputname" else - func_warning "cannot relink '$file'" + func_warning "cannot relink \`$file'" fi } else @@ -4526,10 +3198,10 @@ for file in $staticlibs; do func_basename "$file" - name=$func_basename_result + name="$func_basename_result" # Set up the ranlib parameters. - oldlib=$destdir/$name + oldlib="$destdir/$name" func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -4544,18 +3216,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run '$progname --finish$future_libdirs'" + func_warning "remember to run \`$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test install = "$opt_mode" && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -4563,17 +3235,16 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $debug_cmd - - my_outputname=$1 - my_originator=$2 - my_pic_p=${3-false} - my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` + $opt_debug + my_outputname="$1" + my_originator="$2" + my_pic_p="${3-no}" + my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms=${my_outputname}S.c + my_dlsyms="${my_outputname}S.c" else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -4584,7 +3255,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist=$output_objdir/$my_outputname.nm + nlist="$output_objdir/${my_outputname}.nm" func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -4592,36 +3263,34 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ +/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE -/* DATA imports from DLLs on WIN32 can't be const, because runtime +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined __osf__ +#elif defined(__osf__) /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif -#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) - /* External symbol declarations for the compiler. */\ " - if test yes = "$dlself"; then - func_verbose "generating symbol list for '$output'" + if test "$dlself" = yes; then + func_verbose "generating symbol list for \`$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -4629,7 +3298,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from '$func_to_tool_file_result'" + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -4649,10 +3318,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols=$output_objdir/$outputname.exp + export_symbols="$output_objdir/$outputname.exp" $opt_dry_run || { $RM $export_symbols - eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -4662,7 +3331,7 @@ } else $opt_dry_run || { - eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -4676,22 +3345,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from '$dlprefile'" + func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" - name=$func_basename_result + name="$func_basename_result" case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename= + dlprefile_dlbasename="" if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname"; then + if test -n "$dlprefile_dlname" ; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename=$func_basename_result + dlprefile_dlbasename="$func_basename_result" else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -4699,7 +3368,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename"; then + if test -n "$dlprefile_dlbasename" ; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -4755,11 +3424,6 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - func_show_eval '$RM "${nlist}I"' - if test -n "$global_symbol_to_import"; then - eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' - fi - echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -4768,30 +3432,11 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[];\ -" - - if test -s "$nlist"I; then - echo >> "$output_objdir/$my_dlsyms" "\ -static void lt_syminit(void) -{ - LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; - for (; symbol->name; ++symbol) - {" - $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" - echo >> "$output_objdir/$my_dlsyms" "\ - } -}" - fi - echo >> "$output_objdir/$my_dlsyms" "\ +lt_${my_prefix}_LTX_preloaded_symbols[]; LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{ {\"$my_originator\", (void *) 0}," - - if test -s "$nlist"I; then - echo >> "$output_objdir/$my_dlsyms" "\ - {\"@INIT@\", (void *) <_syminit}," - fi +{\ + { \"$my_originator\", (void *) 0 }," case $need_lib_prefix in no) @@ -4833,7 +3478,9 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - $my_pic_p && pic_flag_for_symtable=" $pic_flag" + if test "X$my_pic_p" != Xno; then + pic_flag_for_symtable=" $pic_flag" + fi ;; esac ;; @@ -4850,10 +3497,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' # Transform the symbol file into the correct name. - symfileobj=$output_objdir/${my_outputname}S.$objext + symfileobj="$output_objdir/${my_outputname}S.$objext" case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -4871,7 +3518,7 @@ esac ;; *) - func_fatal_error "unknown suffix for '$my_dlsyms'" + func_fatal_error "unknown suffix for \`$my_dlsyms'" ;; esac else @@ -4885,32 +3532,6 @@ fi } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $debug_cmd - - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $debug_cmd - - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_win32_libid arg # return the library type of file 'arg' # @@ -4920,9 +3541,8 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $debug_cmd - - win32_libid_type=unknown + $opt_debug + win32_libid_type="unknown" win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -4932,29 +3552,16 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - case $nm_interface in - "MS dumpbin") - if func_cygming_ms_implib_p "$1" || - func_cygming_gnu_implib_p "$1" - then - win32_nmres=import - else - win32_nmres= - fi - ;; - *) - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s|.*|import| + s,.*,import, p q } }'` - ;; - esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -4986,8 +3593,7 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $debug_cmd - + $opt_debug sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -5004,8 +3610,7 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $debug_cmd - + $opt_debug match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -5041,8 +3646,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive that possess that section. Heuristic: eliminate - # all those that have a first or second character that is + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -5053,6 +3658,30 @@ $SED -e '/^\./d;/^.\./d;q' } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -5066,17 +3695,16 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $debug_cmd - - if func_cygming_gnu_implib_p "$1"; then + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1"; then + elif func_cygming_ms_implib_p "$1" ; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result= + sharedlib_from_linklib_result="" fi } @@ -5084,11 +3712,10 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $debug_cmd - - f_ex_an_ar_dir=$1; shift - f_ex_an_ar_oldlib=$1 - if test yes = "$lock_old_archive_extraction"; then + $opt_debug + f_ex_an_ar_dir="$1"; shift + f_ex_an_ar_oldlib="$1" + if test "$lock_old_archive_extraction" = yes; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -5097,7 +3724,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test yes = "$lock_old_archive_extraction"; then + if test "$lock_old_archive_extraction" = yes; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -5111,23 +3738,22 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $debug_cmd - - my_gentop=$1; shift + $opt_debug + my_gentop="$1"; shift my_oldlibs=${1+"$@"} - my_oldobjs= - my_xlib= - my_xabs= - my_xdir= + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib=$func_basename_result + my_xlib="$func_basename_result" my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -5139,7 +3765,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir=$my_gentop/$my_xlib_u + my_xdir="$my_gentop/$my_xlib_u" func_mkdir_p "$my_xdir" @@ -5152,23 +3778,22 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - func_basename "$darwin_archive" - darwin_base_archive=$func_basename_result + darwin_base_archive=`basename "$darwin_archive"` darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches; do - func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" - $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" - cd "unfat-$$/$darwin_base_archive-$darwin_arch" - func_extract_an_archive "`pwd`" "$darwin_base_archive" + for darwin_arch in $darwin_arches ; do + func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + func_extract_an_archive "`pwd`" "${darwin_base_archive}" cd "$darwin_curdir" - $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" + $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -5190,7 +3815,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result=$my_oldobjs + func_extract_archives_result="$my_oldobjs" } @@ -5205,7 +3830,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory where it is stored is +# will assume that the directory in which it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -5216,7 +3841,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -5273,9 +3898,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ that is used only on +# /script/ and the wrapper /executable/ which is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options that match +# (application programs are unlikely to have options which match # this pattern). # # There are only two supported options: --lt-debug and @@ -5308,7 +3933,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 fi } @@ -5319,7 +3944,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -5333,7 +3958,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -5343,7 +3968,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -5418,13 +4043,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test yes = "$fast_install"; then + if test "$fast_install" = yes; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -5441,7 +4066,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - \$ECHO \"\$relink_command_output\" >&2 + $ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -5476,7 +4101,7 @@ fi # Export our shlibpath_var if we have one. - if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -5496,7 +4121,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -5515,7 +4140,7 @@ cat < #include -#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) - /* declarations of non-ANSI functions */ -#if defined __MINGW32__ +#if defined(__MINGW32__) # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined __CYGWIN__ +#elif defined(__CYGWIN__) # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined other_platform || defined ... */ +/* #elif defined (other platforms) ... */ #endif /* portability defines, excluding path handling macros */ -#if defined _MSC_VER +#if defined(_MSC_VER) # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -#elif defined __MINGW32__ +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined __CYGWIN__ +#elif defined(__CYGWIN__) # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined other platforms ... */ +/* #elif defined (other platforms) ... */ #endif -#if defined PATH_MAX +#if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX -#elif defined MAXPATHLEN +#elif defined(MAXPATHLEN) # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -5607,8 +4234,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ - defined __OS2__ +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -5641,10 +4268,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free (stale); stale = 0; } \ + if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#if defined LT_DEBUGWRAPPER +#if defined(LT_DEBUGWRAPPER) static int lt_debug = 1; #else static int lt_debug = 0; @@ -5673,16 +4300,11 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + int len = strlen (new_value); + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[--len] = '\0'; + new_value[len-1] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -6460,47 +5082,27 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $debug_cmd - + $opt_debug case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } -# func_suncc_cstd_abi -# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! -# Several compiler flags select an ABI that is incompatible with the -# Cstd library. Avoid specifying it if any are in CXXFLAGS. -func_suncc_cstd_abi () -{ - $debug_cmd - - case " $compile_command " in - *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) - suncc_use_cstd_abi=no - ;; - *) - suncc_use_cstd_abi=yes - ;; - esac -} - # func_mode_link arg... func_mode_link () { - $debug_cmd - + $opt_debug case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # what system we are compiling for in order to pass an extra + # which system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll that has undefined symbols, in which case not + # to make a dll which has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -6544,11 +5146,10 @@ module=no no_install=no objs= - os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=false + preload=no prev= prevarg= release= @@ -6560,7 +5161,7 @@ vinfo= vinfo_number=no weak_libs= - single_module=$wl-single_module + single_module="${wl}-single_module" func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -6568,15 +5169,15 @@ do case $arg in -shared) - test yes != "$build_libtool_libs" \ - && func_fatal_configuration "cannot build a shared library" + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -6609,7 +5210,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg=$1 + arg="$1" shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -6626,21 +5227,21 @@ case $prev in bindir) - bindir=$arg + bindir="$arg" prev= continue ;; dlfiles|dlprefiles) - $preload || { + if test "$preload" = no; then # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=: - } + preload=yes + fi case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test no = "$dlself"; then + if test "$dlself" = no; then dlself=needless export_dynamic=yes fi @@ -6648,9 +5249,9 @@ continue ;; self) - if test dlprefiles = "$prev"; then + if test "$prev" = dlprefiles; then dlself=yes - elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then dlself=yes else dlself=needless @@ -6660,7 +5261,7 @@ continue ;; *) - if test dlfiles = "$prev"; then + if test "$prev" = dlfiles; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -6671,14 +5272,14 @@ esac ;; expsyms) - export_symbols=$arg + export_symbols="$arg" test -f "$arg" \ - || func_fatal_error "symbol file '$arg' does not exist" + || func_fatal_error "symbol file \`$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex=$arg + export_symbols_regex="$arg" prev= continue ;; @@ -6696,13 +5297,7 @@ continue ;; inst_prefix) - inst_prefix_dir=$arg - prev= - continue - ;; - mllvm) - # Clang does not use LLVM to link, so we can simply discard any - # '-mllvm $arg' options when doing the link step. + inst_prefix_dir="$arg" prev= continue ;; @@ -6726,21 +5321,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test none = "$pic_object" && - test none = "$non_pic_object"; then - func_fatal_error "cannot find name of object for '$arg'" + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir=$func_dirname_result + xdir="$func_dirname_result" - if test none != "$pic_object"; then + if test "$pic_object" != none; then # Prepend the subdirectory the object is found in. - pic_object=$xdir$pic_object + pic_object="$xdir$pic_object" - if test dlfiles = "$prev"; then - if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then func_append dlfiles " $pic_object" prev= continue @@ -6751,7 +5346,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test dlprefiles = "$prev"; then + if test "$prev" = dlprefiles; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -6759,23 +5354,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg=$pic_object + arg="$pic_object" fi # Non-PIC object. - if test none != "$non_pic_object"; then + if test "$non_pic_object" != none; then # Prepend the subdirectory the object is found in. - non_pic_object=$xdir$non_pic_object + non_pic_object="$xdir$non_pic_object" # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test none = "$pic_object"; then - arg=$non_pic_object + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object=$pic_object + non_pic_object="$pic_object" func_append non_pic_objects " $non_pic_object" fi else @@ -6783,7 +5378,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir=$func_dirname_result + xdir="$func_dirname_result" func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -6791,29 +5386,24 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "'$arg' is not a valid libtool object" + func_fatal_error "\`$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file '$arg' does not exist" + func_fatal_error "link input file \`$arg' does not exist" fi arg=$save_arg prev= continue ;; - os2dllname) - os2dllname=$arg - prev= - continue - ;; precious_regex) - precious_files_regex=$arg + precious_files_regex="$arg" prev= continue ;; release) - release=-$arg + release="-$arg" prev= continue ;; @@ -6825,7 +5415,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test rpath = "$prev"; then + if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -6840,7 +5430,7 @@ continue ;; shrext) - shrext_cmds=$arg + shrext_cmds="$arg" prev= continue ;; @@ -6880,7 +5470,7 @@ esac fi # test -n "$prev" - prevarg=$arg + prevarg="$arg" case $arg in -all-static) @@ -6894,7 +5484,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "'-allow-undefined' must not be used because it is the default" + func_fatal_error "\`-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -6926,7 +5516,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test X-export-symbols = "X$arg"; then + if test "X$arg" = "X-export-symbols"; then prev=expsyms else prev=expsyms_regex @@ -6960,9 +5550,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between '-L' and '$1'" + func_fatal_error "require no space between \`-L' and \`$1'" else - func_fatal_error "need path for '-L' option" + func_fatal_error "need path for \`-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -6973,8 +5563,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of '$dir'" - dir=$absdir + func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" ;; esac case "$deplibs " in @@ -7009,7 +5599,7 @@ ;; -l*) - if test X-lc = "X$arg" || test X-lm = "X$arg"; then + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -7017,11 +5607,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test X-lc = "X$arg" && continue + test "X$arg" = "X-lc" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test X-lc = "X$arg" && continue + test "X$arg" = "X-lc" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -7030,16 +5620,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test X-lc = "X$arg" && continue + test "X$arg" = "X-lc" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test X-lc = "X$arg" && continue + test "X$arg" = "X-lc" && continue ;; esac - elif test X-lc_r = "X$arg"; then + elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -7049,11 +5639,6 @@ continue ;; - -mllvm) - prev=mllvm - continue - ;; - -module) module=yes continue @@ -7083,7 +5668,7 @@ ;; -multi_module) - single_module=$wl-multi_module + single_module="${wl}-multi_module" continue ;; @@ -7097,8 +5682,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "'-no-install' is ignored for $host" - func_warning "assuming '-no-fast-install' instead" + func_warning "\`-no-install' is ignored for $host" + func_warning "assuming \`-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -7116,11 +5701,6 @@ continue ;; - -os2dllname) - prev=os2dllname - continue - ;; - -o) prev=output ;; -precious-files-regex) @@ -7208,14 +5788,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs=$IFS; IFS=, + save_ifs="$IFS"; IFS=',' for flag in $args; do - IFS=$save_ifs + IFS="$save_ifs" func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS=$save_ifs + IFS="$save_ifs" func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -7224,15 +5804,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs=$IFS; IFS=, + save_ifs="$IFS"; IFS=',' for flag in $args; do - IFS=$save_ifs + IFS="$save_ifs" func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS=$save_ifs + IFS="$save_ifs" func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -7255,7 +5835,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + arg="$func_quote_for_eval_result" ;; # Flags to be passed through unchanged, with rationale: @@ -7267,46 +5847,25 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - # -stdlib=* select c++ std lib with clang + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; - -Z*) - if test os2 = "`expr $host : '.*\(os2\)'`"; then - # OS/2 uses -Zxxx to specify OS/2-specific options - compiler_flags="$compiler_flags $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case $arg in - -Zlinker | -Zstack) - prev=xcompiler - ;; - esac - continue - else - # Otherwise treat like 'Some other compiler flag' below - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result - fi - ;; - # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + arg="$func_quote_for_eval_result" ;; *.$objext) @@ -7327,21 +5886,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test none = "$pic_object" && - test none = "$non_pic_object"; then - func_fatal_error "cannot find name of object for '$arg'" + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir=$func_dirname_result + xdir="$func_dirname_result" - test none = "$pic_object" || { + if test "$pic_object" != none; then # Prepend the subdirectory the object is found in. - pic_object=$xdir$pic_object + pic_object="$xdir$pic_object" - if test dlfiles = "$prev"; then - if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then func_append dlfiles " $pic_object" prev= continue @@ -7352,7 +5911,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test dlprefiles = "$prev"; then + if test "$prev" = dlprefiles; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -7360,23 +5919,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg=$pic_object - } + arg="$pic_object" + fi # Non-PIC object. - if test none != "$non_pic_object"; then + if test "$non_pic_object" != none; then # Prepend the subdirectory the object is found in. - non_pic_object=$xdir$non_pic_object + non_pic_object="$xdir$non_pic_object" # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test none = "$pic_object"; then - arg=$non_pic_object + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object=$pic_object + non_pic_object="$pic_object" func_append non_pic_objects " $non_pic_object" fi else @@ -7384,7 +5943,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir=$func_dirname_result + xdir="$func_dirname_result" func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -7392,7 +5951,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "'$arg' is not a valid libtool object" + func_fatal_error "\`$arg' is not a valid libtool object" fi fi ;; @@ -7408,11 +5967,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test dlfiles = "$prev"; then + if test "$prev" = dlfiles; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test dlprefiles = "$prev"; then + elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -7427,7 +5986,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + arg="$func_quote_for_eval_result" ;; esac # arg @@ -7439,9 +5998,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the '$prevarg' option requires an argument" + func_fatal_help "the \`$prevarg' option requires an argument" - if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -7450,23 +6009,20 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname=$func_basename_result - libobjs_save=$libobjs + outputname="$func_basename_result" + libobjs_save="$libobjs" if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - # Definition is injected by LT_CONFIG during libtool generation. - func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" - func_dirname "$output" "/" "" - output_objdir=$func_dirname_result$objdir + output_objdir="$func_dirname_result$objdir" func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -7489,7 +6045,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps; then + if $opt_preserve_dup_deps ; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -7497,7 +6053,7 @@ func_append libs " $deplib" done - if test lib = "$linkmode"; then + if test "$linkmode" = lib; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -7529,7 +6085,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" ;; esac done @@ -7537,7 +6093,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=false + alldeplibs=no newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -7549,29 +6105,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test lib,link = "$linkmode,$pass"; then + if test "$linkmode,$pass" = "lib,link"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs=$tmp_deplibs + deplibs="$tmp_deplibs" fi - if test lib,link = "$linkmode,$pass" || - test prog,scan = "$linkmode,$pass"; then - libs=$deplibs + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" deplibs= fi - if test prog = "$linkmode"; then + if test "$linkmode" = prog; then case $pass in - dlopen) libs=$dlfiles ;; - dlpreopen) libs=$dlprefiles ;; + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test lib,dlpreopen = "$linkmode,$pass"; then + if test "$linkmode,$pass" = "lib,dlpreopen"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -7592,26 +6148,26 @@ esac done done - libs=$dlprefiles + libs="$dlprefiles" fi - if test dlopen = "$pass"; then + if test "$pass" = dlopen; then # Collect dlpreopened libraries - save_deplibs=$deplibs + save_deplibs="$deplibs" deplibs= fi for deplib in $libs; do lib= - found=false + found=no case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test prog,link = "$linkmode,$pass"; then + if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test lib = "$linkmode"; then + if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -7621,13 +6177,13 @@ continue ;; -l*) - if test lib != "$linkmode" && test prog != "$linkmode"; then - func_warning "'-l' is ignored for archives/objects" + if test "$linkmode" != lib && test "$linkmode" != prog; then + func_warning "\`-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test lib = "$linkmode"; then + if test "$linkmode" = lib; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -7635,22 +6191,31 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib=$searchdir/lib$name$search_ext + lib="$searchdir/lib${name}${search_ext}" if test -f "$lib"; then - if test .la = "$search_ext"; then - found=: + if test "$search_ext" = ".la"; then + found=yes else - found=false + found=no fi break 2 fi done done - if $found; then - # deplib is a libtool library + if test "$found" != yes; then + # deplib doesn't seem to be a libtool library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + else # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test yes = "$allow_libtool_libs_with_static_runtimes"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -7658,19 +6223,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll=$l + ll="$l" done - if test "X$ll" = "X$old_library"; then # only static version available - found=false + if test "X$ll" = "X$old_library" ; then # only static version available + found=no func_dirname "$lib" "" "." - ladir=$func_dirname_result + ladir="$func_dirname_result" lib=$ladir/$old_library - if test prog,link = "$linkmode,$pass"; then + if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -7679,25 +6244,15 @@ *) ;; esac fi - else - # deplib doesn't seem to be a libtool library - if test prog,link = "$linkmode,$pass"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" - fi - continue fi ;; # -l *.ltframework) - if test prog,link = "$linkmode,$pass"; then + if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test lib = "$linkmode"; then + if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -7710,18 +6265,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test conv = "$pass" && continue + test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test conv = "$pass"; then + if test "$pass" = conv; then deplibs="$deplib $deplibs" continue fi - if test scan = "$pass"; then + if test "$pass" = scan; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -7732,13 +6287,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "'-L' is ignored for archives/objects" + func_warning "\`-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test link = "$pass"; then + if test "$pass" = link; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -7756,7 +6311,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test conv = "$pass"; then + if test "$pass" = conv; then deplibs="$deplib $deplibs" continue fi @@ -7767,26 +6322,21 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=false + valid_a_lib=no case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=: + valid_a_lib=yes fi ;; pass_all) - valid_a_lib=: + valid_a_lib=yes ;; esac - if $valid_a_lib; then - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - else + if test "$valid_a_lib" != yes; then echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -7794,13 +6344,18 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." + else + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test link != "$pass"; then + if test "$pass" != link; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -7811,10 +6366,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test conv = "$pass"; then + if test "$pass" = conv; then deplibs="$deplib $deplibs" - elif test prog = "$linkmode"; then - if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then + elif test "$linkmode" = prog; then + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -7827,20 +6382,22 @@ continue ;; %DEPLIBS%) - alldeplibs=: + alldeplibs=yes continue ;; esac # case $deplib - $found || test -f "$lib" \ - || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" + if test "$found" = yes || test -f "$lib"; then : + else + func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" + fi # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "'$lib' is not a valid libtool archive" + || func_fatal_error "\`$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir=$func_dirname_result + ladir="$func_dirname_result" dlname= dlopen= @@ -7870,30 +6427,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test lib,link = "$linkmode,$pass" || - test prog,scan = "$linkmode,$pass" || - { test prog != "$linkmode" && test lib != "$linkmode"; }; then + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test conv = "$pass"; then + if test "$pass" = conv; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for '$lib'" + func_fatal_error "cannot find name of link library for \`$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test prog != "$linkmode" && test lib != "$linkmode"; then - func_fatal_error "'$lib' is not a convenience library" + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -7907,26 +6464,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test yes = "$prefer_static_libs" || - test built,no = "$prefer_static_libs,$installed"; }; then + { test "$prefer_static_libs" = yes || + test "$prefer_static_libs,$installed" = "built,no"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib=$l + linklib="$l" done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for '$lib'" + func_fatal_error "cannot find name of link library for \`$lib'" fi # This library was specified with -dlopen. - if test dlopen = "$pass"; then - test -z "$libdir" \ - && func_fatal_error "cannot -dlopen a convenience library: '$lib'" + if test "$pass" = dlopen; then + if test -z "$libdir"; then + func_fatal_error "cannot -dlopen a convenience library: \`$lib'" + fi if test -z "$dlname" || - test yes != "$dlopen_support" || - test no = "$build_libtool_libs" - then + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -7940,40 +6497,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of '$ladir'" + func_warning "cannot determine absolute directory name of \`$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir=$ladir + abs_ladir="$ladir" fi ;; esac func_basename "$lib" - laname=$func_basename_result + laname="$func_basename_result" # Find the relevant object directory and library name. - if test yes = "$installed"; then + if test "X$installed" = Xyes; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library '$lib' was moved." - dir=$ladir - absdir=$abs_ladir - libdir=$abs_ladir + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" else - dir=$lt_sysroot$libdir - absdir=$lt_sysroot$libdir + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" fi - test yes = "$hardcode_automatic" && avoidtemprpath=yes + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir=$ladir - absdir=$abs_ladir + dir="$ladir" + absdir="$abs_ladir" # Remove this search path later func_append notinst_path " $abs_ladir" else - dir=$ladir/$objdir - absdir=$abs_ladir/$objdir + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -7982,11 +6539,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test dlpreopen = "$pass"; then - if test -z "$libdir" && test prog = "$linkmode"; then - func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" + if test "$pass" = dlpreopen; then + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" fi - case $host in + case "$host" in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -8030,9 +6587,9 @@ if test -z "$libdir"; then # Link the convenience library - if test lib = "$linkmode"; then + if test "$linkmode" = lib; then deplibs="$dir/$old_library $deplibs" - elif test prog,link = "$linkmode,$pass"; then + elif test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -8042,14 +6599,14 @@ fi - if test prog = "$linkmode" && test link != "$pass"; then + if test "$linkmode" = prog && test "$pass" != link; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=false - if test no != "$link_all_deplibs" || test -z "$library_names" || - test no = "$build_libtool_libs"; then - linkalldeplibs=: + linkalldeplibs=no + if test "$link_all_deplibs" != no || test -z "$library_names" || + test "$build_libtool_libs" = no; then + linkalldeplibs=yes fi tmp_libs= @@ -8061,14 +6618,14 @@ ;; esac # Need to link against all dependency_libs? - if $linkalldeplibs; then + if test "$linkalldeplibs" = yes; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -8078,15 +6635,15 @@ continue fi # $linkmode = prog... - if test prog,link = "$linkmode,$pass"; then + if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { { test no = "$prefer_static_libs" || - test built,yes = "$prefer_static_libs,$installed"; } || + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. - case $temp_rpath: in + case "$temp_rpath:" in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -8115,9 +6672,9 @@ esac fi # $linkmode,$pass = prog,link... - if $alldeplibs && - { test pass_all = "$deplibs_check_method" || - { test yes = "$build_libtool_libs" && + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -8126,19 +6683,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test built = "$use_static_libs" && test yes = "$installed"; then + if test "$use_static_libs" = built && test "$installed" = yes; then use_static_libs=no fi if test -n "$library_names" && - { test no = "$use_static_libs" || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc* | *os2*) + *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test no = "$installed"; then + if test "$installed" = no; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -8148,24 +6705,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule= + dlopenmodule="" for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule=$dlpremoduletest + dlopenmodule="$dlpremoduletest" break fi done - if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then + if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then echo - if test prog = "$linkmode"; then + if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test lib = "$linkmode" && - test yes = "$hardcode_into_libs"; then + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -8193,43 +6750,43 @@ # figure out the soname set dummy $library_names shift - realname=$1 + realname="$1" shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname=$dlname + soname="$dlname" elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc* | *os2*) + *cygwin* | mingw* | *cegcc*) func_arith $current - $age major=$func_arith_result - versuffix=-$major + versuffix="-$major" ;; esac eval soname=\"$soname_spec\" else - soname=$realname + soname="$realname" fi # Make a new name for the extract_expsyms_cmds to use - soroot=$soname + soroot="$soname" func_basename "$soroot" - soname=$func_basename_result + soname="$func_basename_result" func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from '$soname'" + func_verbose "extracting exported symbol list from \`$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for '$soname'" + func_verbose "generating import library for \`$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -8237,58 +6794,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test prog = "$linkmode" || test relink != "$opt_mode"; then + if test "$linkmode" = prog || test "$opt_mode" != relink; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test no = "$hardcode_direct"; then - add=$dir/$linklib + if test "$hardcode_direct" = no; then + add="$dir/$linklib" case $host in - *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; - *-*-sysv4*uw2*) add_dir=-L$dir ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir=-L$dir ;; + *-*-unixware7*) add_dir="-L$dir" ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we cannot + # if the lib is a (non-dlopened) module then we can not # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null; then + $GREP ": [^:]* bundle" >/dev/null ; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library"; then + if test -z "$old_library" ; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add=$dir/$old_library + add="$dir/$old_library" fi elif test -n "$old_library"; then - add=$dir/$old_library + add="$dir/$old_library" fi fi esac - elif test no = "$hardcode_minus_L"; then + elif test "$hardcode_minus_L" = no; then case $host in - *-*-sunos*) add_shlibpath=$dir ;; + *-*-sunos*) add_shlibpath="$dir" ;; esac - add_dir=-L$dir - add=-l$name - elif test no = "$hardcode_shlibpath_var"; then - add_shlibpath=$dir - add=-l$name + add_dir="-L$dir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = no; then + add_shlibpath="$dir" + add="-l$name" else lib_linked=no fi ;; relink) - if test yes = "$hardcode_direct" && - test no = "$hardcode_direct_absolute"; then - add=$dir/$linklib - elif test yes = "$hardcode_minus_L"; then - add_dir=-L$absdir + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -8297,10 +6854,10 @@ ;; esac fi - add=-l$name - elif test yes = "$hardcode_shlibpath_var"; then - add_shlibpath=$dir - add=-l$name + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + add_shlibpath="$dir" + add="-l$name" else lib_linked=no fi @@ -8308,7 +6865,7 @@ *) lib_linked=no ;; esac - if test yes != "$lib_linked"; then + if test "$lib_linked" != yes; then func_fatal_configuration "unsupported hardcode properties" fi @@ -8318,15 +6875,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test prog = "$linkmode"; then + if test "$linkmode" = prog; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test yes != "$hardcode_direct" && - test yes != "$hardcode_minus_L" && - test yes = "$hardcode_shlibpath_var"; then + if test "$hardcode_direct" != yes && + test "$hardcode_minus_L" != yes && + test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -8335,33 +6892,33 @@ fi fi - if test prog = "$linkmode" || test relink = "$opt_mode"; then + if test "$linkmode" = prog || test "$opt_mode" = relink; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test yes = "$hardcode_direct" && - test no = "$hardcode_direct_absolute"; then - add=$libdir/$linklib - elif test yes = "$hardcode_minus_L"; then - add_dir=-L$libdir - add=-l$name - elif test yes = "$hardcode_shlibpath_var"; then + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add=-l$name - elif test yes = "$hardcode_automatic"; then + add="-l$name" + elif test "$hardcode_automatic" = yes; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib"; then - add=$inst_prefix_dir$libdir/$linklib + test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" else - add=$libdir/$linklib + add="$libdir/$linklib" fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir=-L$libdir + add_dir="-L$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -8370,10 +6927,10 @@ ;; esac fi - add=-l$name + add="-l$name" fi - if test prog = "$linkmode"; then + if test "$linkmode" = prog; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -8381,43 +6938,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test prog = "$linkmode"; then + elif test "$linkmode" = prog; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test unsupported != "$hardcode_direct"; then - test -n "$old_library" && linklib=$old_library + if test "$hardcode_direct" != unsupported; then + test -n "$old_library" && linklib="$old_library" compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test yes = "$build_libtool_libs"; then + elif test "$build_libtool_libs" = yes; then # Not a shared library - if test pass_all != "$deplibs_check_method"; then + if test "$deplibs_check_method" != pass_all; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system cannot link to static lib archive $lib." + $ECHO "*** Warning: This system can not link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test yes = "$module"; then + if test "$module" = yes; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using 'nm' or equivalent, but libtool could" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** 'nm' from GNU binutils and a full rebuild may help." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi - if test no = "$build_old_libs"; then + if test "$build_old_libs" = no; then build_libtool_libs=module build_old_libs=yes else @@ -8430,11 +6987,11 @@ fi fi # link shared/static library? - if test lib = "$linkmode"; then + if test "$linkmode" = lib; then if test -n "$dependency_libs" && - { test yes != "$hardcode_into_libs" || - test yes = "$build_old_libs" || - test yes = "$link_static"; }; then + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || + test "$link_static" = yes; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -8448,12 +7005,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs=$temp_deplibs + dependency_libs="$temp_deplibs" fi func_append newlib_search_path " $absdir" # Link against this library - test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -8463,7 +7020,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -8472,12 +7029,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test no != "$link_all_deplibs"; then + if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path=$deplib ;; + -L*) path="$deplib" ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -8485,12 +7042,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of '$dir'" - absdir=$dir + func_warning "cannot determine absolute directory name of \`$dir'" + absdir="$dir" fi ;; esac @@ -8498,35 +7055,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names"; then - for tmp in $deplibrary_names; do + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl"; then - depdepl=$absdir/$objdir/$depdepl - darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl" ; then + depdepl="$absdir/$objdir/$depdepl" + darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" - func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi ;; *) - path=-L$absdir/$objdir + path="-L$absdir/$objdir" ;; esac else - eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "'$deplib' is not a valid libtool archive" + func_fatal_error "\`$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "'$deplib' seems to be moved" + func_warning "\`$deplib' seems to be moved" - path=-L$absdir + path="-L$absdir" fi ;; esac @@ -8538,23 +7095,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test link = "$pass"; then - if test prog = "$linkmode"; then + if test "$pass" = link; then + if test "$linkmode" = "prog"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs=$newdependency_libs - if test dlpreopen = "$pass"; then + dependency_libs="$newdependency_libs" + if test "$pass" = dlpreopen; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test dlopen != "$pass"; then - test conv = "$pass" || { + if test "$pass" != dlopen; then + if test "$pass" != conv; then # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -8564,12 +7121,12 @@ esac done newlib_search_path= - } + fi - if test prog,link = "$linkmode,$pass"; then - vars="compile_deplibs finalize_deplibs" + if test "$linkmode,$pass" != "prog,link"; then + vars="deplibs" else - vars=deplibs + vars="compile_deplibs finalize_deplibs" fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -8627,93 +7184,62 @@ eval $var=\"$tmp_libs\" done # for var fi - - # Add Sun CC postdeps if required: - test CXX = "$tagname" && { - case $host_os in - linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C++ 5.9 - func_suncc_cstd_abi - - if test no != "$suncc_use_cstd_abi"; then - func_append postdeps ' -library=Cstd -library=Crun' - fi - ;; - esac - ;; - - solaris*) - func_cc_basename "$CC" - case $func_cc_basename_result in - CC* | sunCC*) - func_suncc_cstd_abi - - if test no != "$suncc_use_cstd_abi"; then - func_append postdeps ' -library=Cstd -library=Crun' - fi - ;; - esac - ;; - esac - } - # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs; do + for i in $dependency_libs ; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i= + i="" ;; esac - if test -n "$i"; then + if test -n "$i" ; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test prog = "$linkmode"; then - dlfiles=$newdlfiles + if test "$linkmode" = prog; then + dlfiles="$newdlfiles" fi - if test prog = "$linkmode" || test lib = "$linkmode"; then - dlprefiles=$newdlprefiles + if test "$linkmode" = prog || test "$linkmode" = lib; then + dlprefiles="$newdlprefiles" fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then - func_warning "'-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "'-l' and '-L' are ignored for archives" ;; + func_warning "\`-l' and \`-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "'-rpath' is ignored for archives" + func_warning "\`-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "'-R' is ignored for archives" + func_warning "\`-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "'-version-info/-version-number' is ignored for archives" + func_warning "\`-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "'-release' is ignored for archives" + func_warning "\`-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "'-export-symbols' is ignored for archives" + func_warning "\`-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs=$output + oldlibs="$output" func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form 'libNAME.la'. + # Make sure we only generate libraries of the form `libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -8722,10 +7248,10 @@ eval libname=\"$libname_spec\" ;; *) - test no = "$module" \ - && func_fatal_help "libtool library '$output' must begin with 'lib'" + test "$module" = no && \ + func_fatal_help "libtool library \`$output' must begin with \`lib'" - if test no != "$need_lib_prefix"; then + if test "$need_lib_prefix" != no; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -8739,8 +7265,8 @@ esac if test -n "$objs"; then - if test pass_all != "$deplibs_check_method"; then - func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" + if test "$deplibs_check_method" != pass_all; then + func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -8749,21 +7275,21 @@ fi fi - test no = "$dlself" \ - || func_warning "'-dlopen self' is ignored for libtool libraries" + test "$dlself" != no && \ + func_warning "\`-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test 1 -lt "$#" \ - && func_warning "ignoring multiple '-rpath's for a libtool library" + test "$#" -gt 1 && \ + func_warning "ignoring multiple \`-rpath's for a libtool library" - install_libdir=$1 + install_libdir="$1" oldlibs= if test -z "$rpath"; then - if test yes = "$build_libtool_libs"; then + if test "$build_libtool_libs" = yes; then # Building a libtool convenience library. - # Some compilers have problems with a '.al' extension so + # Some compilers have problems with a `.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -8772,20 +7298,20 @@ fi test -n "$vinfo" && \ - func_warning "'-version-info/-version-number' is ignored for convenience libraries" + func_warning "\`-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "'-release' is ignored for convenience libraries" + func_warning "\`-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs=$IFS; IFS=: + save_ifs="$IFS"; IFS=':' set dummy $vinfo 0 0 0 shift - IFS=$save_ifs + IFS="$save_ifs" test -n "$7" && \ - func_fatal_help "too many parameters to '-version-info'" + func_fatal_help "too many parameters to \`-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -8793,42 +7319,42 @@ case $vinfo_number in yes) - number_major=$1 - number_minor=$2 - number_revision=$3 + number_major="$1" + number_minor="$2" + number_revision="$3" # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # that has an extra 1 added just for fun + # which has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|freebsd-elf|linux|osf|windows|none) + darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age=$number_minor - revision=$number_revision + age="$number_minor" + revision="$number_revision" ;; - freebsd-aout|qnx|sunos) - current=$number_major - revision=$number_minor - age=0 + freebsd-aout|freebsd-elf|qnx|sunos) + current="$number_major" + revision="$number_minor" + age="0" ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age=$number_minor - revision=$number_minor + age="$number_minor" + revision="$number_minor" lt_irix_increment=no ;; esac ;; no) - current=$1 - revision=$2 - age=$3 + current="$1" + revision="$2" + age="$3" ;; esac @@ -8836,30 +7362,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT '$current' must be a nonnegative integer" - func_fatal_error "'$vinfo' is not valid version information" + func_error "CURRENT \`$current' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION '$revision' must be a nonnegative integer" - func_fatal_error "'$vinfo' is not valid version information" + func_error "REVISION \`$revision' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE '$age' must be a nonnegative integer" - func_fatal_error "'$vinfo' is not valid version information" + func_error "AGE \`$age' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE '$age' is greater than the current interface number '$current'" - func_fatal_error "'$vinfo' is not valid version information" + func_error "AGE \`$age' is greater than the current interface number \`$current'" + func_fatal_error "\`$vinfo' is not valid version information" fi # Calculate the version variables. @@ -8874,36 +7400,26 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix=$major.$age.$revision + versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - # On Darwin other compilers - case $CC in - nagfor*) - verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" - ;; - *) - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - esac ;; freebsd-aout) - major=.$current - versuffix=.$current.$revision + major=".$current" + versuffix=".$current.$revision"; ;; freebsd-elf) - func_arith $current - $age - major=.$func_arith_result - versuffix=$major.$age.$revision + major=".$current" + versuffix=".$current" ;; irix | nonstopux) - if test no = "$lt_irix_increment"; then + if test "X$lt_irix_increment" = "Xno"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -8914,74 +7430,69 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring=$verstring_prefix$major.$revision + verstring="$verstring_prefix$major.$revision" # Add in all the interfaces that we are compatible with. loop=$revision - while test 0 -ne "$loop"; do + while test "$loop" -ne 0; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring=$verstring_prefix$major.$iface:$verstring + verstring="$verstring_prefix$major.$iface:$verstring" done - # Before this point, $major must not contain '.'. + # Before this point, $major must not contain `.'. major=.$major - versuffix=$major.$revision + versuffix="$major.$revision" ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix=$major.$age.$revision + versuffix="$major.$age.$revision" ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=.$current.$age.$revision - verstring=$current.$age.$revision + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" # Add in all the interfaces that we are compatible with. loop=$age - while test 0 -ne "$loop"; do + while test "$loop" -ne 0; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring=$verstring:$iface.0 + verstring="$verstring:${iface}.0" done # Make executables depend on our current version. - func_append verstring ":$current.0" + func_append verstring ":${current}.0" ;; qnx) - major=.$current - versuffix=.$current - ;; - - sco) - major=.$current - versuffix=.$current + major=".$current" + versuffix=".$current" ;; sunos) - major=.$current - versuffix=.$current.$revision + major=".$current" + versuffix=".$current.$revision" ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 file systems. + # extension on DOS 8.3 filesystems. func_arith $current - $age major=$func_arith_result - versuffix=-$major + versuffix="-$major" ;; *) - func_fatal_configuration "unknown library version type '$version_type'" + func_fatal_configuration "unknown library version type \`$version_type'" ;; esac @@ -8995,45 +7506,42 @@ verstring= ;; *) - verstring=0.0 + verstring="0.0" ;; esac - if test no = "$need_version"; then + if test "$need_version" = no; then versuffix= else - versuffix=.0.0 + versuffix=".0.0" fi fi # Remove version info from name if versioning should be avoided - if test yes,no = "$avoid_version,$need_version"; then + if test "$avoid_version" = yes && test "$need_version" = no; then major= versuffix= - verstring= + verstring="" fi # Check to see if the archive will have undefined symbols. - if test yes = "$allow_undefined"; then - if test unsupported = "$allow_undefined_flag"; then - if test yes = "$build_old_libs"; then - func_warning "undefined symbols not allowed in $host shared libraries; building static only" - build_libtool_libs=no - else - func_fatal_error "can't build $host shared library unless -no-undefined is specified" - fi + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + func_warning "undefined symbols not allowed in $host shared libraries" + build_libtool_libs=no + build_old_libs=yes fi else # Don't allow undefined symbols. - allow_undefined_flag=$no_undefined_flag + allow_undefined_flag="$no_undefined_flag" fi fi - func_generate_dlsyms "$libname" "$libname" : + func_generate_dlsyms "$libname" "$libname" "yes" func_append libobjs " $symfileobj" - test " " = "$libobjs" && libobjs= + test "X$libobjs" = "X " && libobjs= - if test relink != "$opt_mode"; then + if test "$opt_mode" != relink; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -9042,8 +7550,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) - if test -n "$precious_files_regex"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -9059,11 +7567,11 @@ fi # Now set the variables for building old libraries. - if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -9084,13 +7592,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles=$dlfiles + old_dlfiles="$dlfiles" dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -9100,7 +7608,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles=$dlprefiles + old_dlprefiles="$dlprefiles" dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -9109,7 +7617,7 @@ esac done - if test yes = "$build_libtool_libs"; then + if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -9133,7 +7641,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test yes = "$build_libtool_need_lc"; then + if test "$build_libtool_need_lc" = "yes"; then func_append deplibs " -lc" fi ;; @@ -9149,9 +7657,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release= - versuffix= - major= + release="" + versuffix="" + major="" newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -9180,20 +7688,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test yes = "$allow_libtool_libs_with_static_runtimes"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i= + i="" ;; esac fi - if test -n "$i"; then + if test -n "$i" ; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then func_append newdeplibs " $i" else droppeddeps=yes @@ -9223,20 +7731,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test yes = "$allow_libtool_libs_with_static_runtimes"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i= + i="" ;; esac fi - if test -n "$i"; then + if test -n "$i" ; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then func_append newdeplibs " $i" else droppeddeps=yes @@ -9273,24 +7781,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test yes = "$allow_libtool_libs_with_static_runtimes"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib= + a_deplib="" ;; esac fi - if test -n "$a_deplib"; then + if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test yes = "$want_nocaseglob"; then + if test "$want_nocaseglob" = yes; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -9308,25 +7816,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib=$potent_lib + potlib="$potent_lib" while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | $SED 's/.* -> //'` + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; - *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib= + a_deplib="" break 2 fi done done fi - if test -n "$a_deplib"; then + if test -n "$a_deplib" ; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -9334,7 +7842,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib"; then + if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -9357,30 +7865,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test yes = "$allow_libtool_libs_with_static_runtimes"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib= + a_deplib="" ;; esac fi - if test -n "$a_deplib"; then + if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib=$potent_lib # see symlink-check above in file_magic test + potlib="$potent_lib" # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib= + a_deplib="" break 2 fi done done fi - if test -n "$a_deplib"; then + if test -n "$a_deplib" ; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -9388,7 +7896,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib"; then + if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -9404,18 +7912,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs= + newdeplibs="" tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test yes = "$allow_libtool_libs_with_static_runtimes"; then - for i in $predeps $postdeps; do + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test none = "$deplibs_check_method"; then + if test "X$deplibs_check_method" = "Xnone"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -9439,8 +7947,8 @@ ;; esac - if test yes = "$droppeddeps"; then - if test yes = "$module"; then + if test "$droppeddeps" = yes; then + if test "$module" = yes; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -9449,12 +7957,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using 'nm' or equivalent, but libtool could" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** 'nm' from GNU binutils and a full rebuild may help." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi - if test no = "$build_old_libs"; then - oldlibs=$output_objdir/$libname.$libext + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module build_old_libs=yes else @@ -9465,14 +7973,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test no = "$allow_undefined"; then + if test "$allow_undefined" = no; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test no = "$build_old_libs"; then - oldlibs=$output_objdir/$libname.$libext + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module build_old_libs=yes else @@ -9518,7 +8026,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs=$new_libs + deplibs="$new_libs" # All the library-specific variables (install_libdir is set above). library_names= @@ -9526,25 +8034,25 @@ dlname= # Test again, we may have decided not to build it any more - if test yes = "$build_libtool_libs"; then - # Remove $wl instances when linking with ld. + if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test yes = "$hardcode_into_libs"; then + if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath=$finalize_rpath - test relink = "$opt_mode" || rpath=$compile_rpath$rpath + rpath="$finalize_rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs=$libdir + hardcode_libdirs="$libdir" else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -9569,7 +8077,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir=$hardcode_libdirs + libdir="$hardcode_libdirs" eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -9583,8 +8091,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath=$finalize_shlibpath - test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath + shlibpath="$finalize_shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -9594,19 +8102,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname=$1 + realname="$1" shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname=$realname + soname="$realname" fi if test -z "$dlname"; then dlname=$soname fi - lib=$output_objdir/$realname + lib="$output_objdir/$realname" linknames= for link do @@ -9620,7 +8128,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols=$output_objdir/$libname.uexp + export_symbols="$output_objdir/$libname.uexp" func_append delfiles " $export_symbols" fi @@ -9629,31 +8137,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - func_dll_def_p "$export_symbols" || { + if test "x`$SED 1q $export_symbols`" != xEXPORTS; then # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols=$export_symbols + orig_export_symbols="$export_symbols" export_symbols= always_export_symbols=yes - } + fi fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for '$libname.la'" - export_symbols=$output_objdir/$libname.exp + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs=$IFS; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd1 in $cmds; do - IFS=$save_ifs + IFS="$save_ifs" # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -9667,7 +8175,7 @@ try_normal_branch=no ;; esac - if test yes = "$try_normal_branch" \ + if test "$try_normal_branch" = yes \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -9678,7 +8186,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=$output_objdir/$output_la.nm + output=${output_objdir}/${output_la}.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -9701,8 +8209,8 @@ break fi done - IFS=$save_ifs - if test -n "$export_symbols_regex" && test : != "$skipped_export"; then + IFS="$save_ifs" + if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -9710,16 +8218,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols=$export_symbols - test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test : != "$skipped_export" && test -n "$orig_export_symbols"; then + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for '$libname.la' to tag DATA exports" + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands, which not all seds can handle. GNU sed should be fine + # 's' commands which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -9738,11 +8246,11 @@ ;; esac done - deplibs=$tmp_deplibs + deplibs="$tmp_deplibs" if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test yes = "$compiler_needs_object" && + test "$compiler_needs_object" = yes && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -9753,7 +8261,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop=$output_objdir/${outputname}x + gentop="$output_objdir/${outputname}x" func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -9762,18 +8270,18 @@ fi fi - if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test relink = "$opt_mode"; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test yes = "$module" && test -n "$module_cmds"; then + if test "$module" = yes && test -n "$module_cmds" ; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -9791,7 +8299,7 @@ fi fi - if test : != "$skipped_export" && + if test "X$skipped_export" != "X:" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -9824,8 +8332,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then - output=$output_objdir/$output_la.lnkscript + if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then + output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -9837,14 +8345,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then - output=$output_objdir/$output_la.lnk + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test yes = "$compiler_needs_object"; then + if test "$compiler_needs_object" = yes; then firstobj="$1 " shift fi @@ -9859,7 +8367,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-$k.$objext + output=$output_objdir/$output_la-${k}.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -9871,13 +8379,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test -z "$objlist" || + if test "X$objlist" = X || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test 1 -eq "$k"; then + if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -9887,10 +8395,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-$k.$objext + last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-$k.$objext + output=$output_objdir/$output_la-${k}.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -9902,9 +8410,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds$reload_cmds\" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi func_append delfiles " $output" @@ -9912,9 +8420,9 @@ output= fi - ${skipped_export-false} && { - func_verbose "generating symbol list for '$libname.la'" - export_symbols=$output_objdir/$libname.exp + if ${skipped_export-false}; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -9923,16 +8431,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - } + fi test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs=$IFS; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $concat_cmds; do - IFS=$save_ifs - $opt_quiet || { + IFS="$save_ifs" + $opt_silent || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -9940,7 +8448,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test relink = "$opt_mode"; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -9949,7 +8457,7 @@ exit $lt_exit } done - IFS=$save_ifs + IFS="$save_ifs" if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -9957,18 +8465,18 @@ fi fi - ${skipped_export-false} && { + if ${skipped_export-false}; then if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols=$export_symbols - test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for '$libname.la' to tag DATA exports" + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands, which not all seds can handle. GNU sed should be fine + # 's' commands which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -9977,7 +8485,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - } + fi libobjs=$output # Restore the value of output. @@ -9991,7 +8499,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test yes = "$module" && test -n "$module_cmds"; then + if test "$module" = yes && test -n "$module_cmds" ; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -10013,7 +8521,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop=$output_objdir/${outputname}x + gentop="$output_objdir/${outputname}x" func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -10021,12 +8529,11 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs=$IFS; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do - IFS=$sp$nl + IFS="$save_ifs" eval cmd=\"$cmd\" - IFS=$save_ifs - $opt_quiet || { + $opt_silent || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -10034,7 +8541,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test relink = "$opt_mode"; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -10043,10 +8550,10 @@ exit $lt_exit } done - IFS=$save_ifs + IFS="$save_ifs" # Restore the uninstalled library and exit - if test relink = "$opt_mode"; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -10066,39 +8573,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test yes = "$module" || test yes = "$export_dynamic"; then + if test "$module" = yes || test "$export_dynamic" = yes; then # On all known operating systems, these are identical. - dlname=$soname + dlname="$soname" fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then - func_warning "'-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "'-l' and '-L' are ignored for objects" ;; + func_warning "\`-l' and \`-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "'-rpath' is ignored for objects" + func_warning "\`-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "'-R' is ignored for objects" + func_warning "\`-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "'-version-info' is ignored for objects" + func_warning "\`-version-info' is ignored for objects" test -n "$release" && \ - func_warning "'-release' is ignored for objects" + func_warning "\`-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object '$output' from non-libtool objects" + func_fatal_error "cannot build library object \`$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -10106,7 +8613,7 @@ ;; *) libobj= - obj=$output + obj="$output" ;; esac @@ -10119,19 +8626,17 @@ # the extraction. reload_conv_objs= gentop= - # if reload_cmds runs $LD directly, get rid of -Wl from - # whole_archive_flag_spec and hope we can get by with turning comma - # into space. - case $reload_cmds in - *\$LD[\ \$]*) wl= ;; - esac + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. + wl= + if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else - gentop=$output_objdir/${obj}x + gentop="$output_objdir/${obj}x" func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -10140,12 +8645,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test yes = "$build_libtool_libs" || libobjs=$non_pic_objects + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" # Create the old-style object. - reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - output=$obj + output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -10157,7 +8662,7 @@ exit $EXIT_SUCCESS fi - test yes = "$build_libtool_libs" || { + if test "$build_libtool_libs" != yes; then if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -10167,12 +8672,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - } + fi - if test -n "$pic_flag" || test default != "$pic_mode"; then + if test -n "$pic_flag" || test "$pic_mode" != default; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output=$libobj + output="$libobj" func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -10189,14 +8694,16 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "'-version-info' is ignored for programs" + func_warning "\`-version-info' is ignored for programs" test -n "$release" && \ - func_warning "'-release' is ignored for programs" + func_warning "\`-release' is ignored for programs" - $preload \ - && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ - && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." + test "$preload" = yes \ + && test "$dlopen_support" = unknown \ + && test "$dlopen_self" = unknown \ + && test "$dlopen_self_static" = unknown && \ + func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -10210,11 +8717,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test CXX = "$tagname"; then + if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " $wl-bind_at_load" - func_append finalize_command " $wl-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi @@ -10250,7 +8757,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs=$new_libs + compile_deplibs="$new_libs" func_append compile_command " $compile_deplibs" @@ -10274,7 +8781,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs=$libdir + hardcode_libdirs="$libdir" else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -10297,7 +8804,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` + testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -10314,10 +8821,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir=$hardcode_libdirs + libdir="$hardcode_libdirs" eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath=$rpath + compile_rpath="$rpath" rpath= hardcode_libdirs= @@ -10325,7 +8832,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs=$libdir + hardcode_libdirs="$libdir" else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -10350,43 +8857,45 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir=$hardcode_libdirs + libdir="$hardcode_libdirs" eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath=$rpath + finalize_rpath="$rpath" - if test -n "$libobjs" && test yes = "$build_old_libs"; then + if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" false + func_generate_dlsyms "$outputname" "@PROGRAM@" "no" # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=: + wrappers_required=yes case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=false + wrappers_required=no ;; *cygwin* | *mingw* ) - test yes = "$build_libtool_libs" || wrappers_required=false + if test "$build_libtool_libs" != yes; then + wrappers_required=no + fi ;; *) - if test no = "$need_relink" || test yes != "$build_libtool_libs"; then - wrappers_required=false + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + wrappers_required=no fi ;; esac - $wrappers_required || { + if test "$wrappers_required" = no; then # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command=$compile_command$compile_rpath + link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -10399,12 +8908,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.$objext"; then - func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' fi exit $exit_status - } + fi if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -10434,9 +8943,9 @@ fi fi - if test yes = "$no_install"; then + if test "$no_install" = yes; then # We don't need to create a wrapper script. - link_command=$compile_var$compile_command$compile_rpath + link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -10453,28 +8962,27 @@ exit $EXIT_SUCCESS fi - case $hardcode_action,$fast_install in - relink,*) - # Fast installation is not supported - link_command=$compile_var$compile_command$compile_rpath - relink_command=$finalize_var$finalize_command$finalize_rpath - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "'$output' will be relinked during installation" - ;; - *,yes) - link_command=$finalize_var$compile_command$finalize_rpath - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - ;; - *,no) - link_command=$compile_var$compile_command$compile_rpath - relink_command=$finalize_var$finalize_command$finalize_rpath - ;; - *,needless) - link_command=$finalize_var$compile_command$finalize_rpath - relink_command= - ;; - esac + if test "$hardcode_action" = relink; then + # Fast installation is not supported + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "\`$output' will be relinked during installation" + else + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + else + # fast_install is set to needless + relink_command= + fi + else + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + fi + fi # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -10531,8 +9039,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource=$output_path/$objdir/lt-$output_name.c - cwrapper=$output_path/$output_name.exe + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -10553,7 +9061,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host"; then + if test "x$build" = "x$host" ; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -10576,27 +9084,25 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - case $build_libtool_libs in - convenience) - oldobjs="$libobjs_save $symfileobj" - addlibs=$convenience - build_libtool_libs=no - ;; - module) - oldobjs=$libobjs_save - addlibs=$old_convenience + if test "$build_libtool_libs" = convenience; then + oldobjs="$libobjs_save $symfileobj" + addlibs="$convenience" + build_libtool_libs=no + else + if test "$build_libtool_libs" = module; then + oldobjs="$libobjs_save" build_libtool_libs=no - ;; - *) + else oldobjs="$old_deplibs $non_pic_objects" - $preload && test -f "$symfileobj" \ - && func_append oldobjs " $symfileobj" - addlibs=$old_convenience - ;; - esac + if test "$preload" = yes && test -f "$symfileobj"; then + func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" + fi if test -n "$addlibs"; then - gentop=$output_objdir/${outputname}x + gentop="$output_objdir/${outputname}x" func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -10604,13 +9110,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop=$output_objdir/${outputname}x + gentop="$output_objdir/${outputname}x" func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -10631,7 +9137,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop=$output_objdir/${outputname}x + gentop="$output_objdir/${outputname}x" func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -10640,7 +9146,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase=$func_basename_result + objbase="$func_basename_result" case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -10709,18 +9215,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj"; then + if test "$obj" = "$last_oldobj" ; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test -z "$oldobjs"; then + if test "X$oldobjs" = "X" ; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -10737,7 +9243,7 @@ case $output in *.la) old_library= - test yes = "$build_old_libs" && old_library=$libname.$libext + test "$build_old_libs" = yes && old_library="$libname.$libext" func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -10752,31 +9258,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test yes = "$hardcode_automatic"; then + if test "$hardcode_automatic" = yes ; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test yes = "$installed"; then + if test "$installed" = yes; then if test -z "$install_libdir"; then break fi - output=$output_objdir/${outputname}i + output="$output_objdir/$outputname"i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name=$func_basename_result + name="$func_basename_result" func_resolve_sysroot "$deplib" - eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "'$deplib' is not a valid libtool archive" + func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -10792,23 +9298,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs=$newdependency_libs + dependency_libs="$newdependency_libs" newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name=$func_basename_result - eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "'$lib' is not a valid libtool archive" + func_fatal_error "\`$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles=$newdlfiles + dlfiles="$newdlfiles" newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -10818,34 +9324,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name=$func_basename_result - eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "'$lib' is not a valid libtool archive" + func_fatal_error "\`$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles=$newdlprefiles + dlprefiles="$newdlprefiles" else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles=$newdlfiles + dlfiles="$newdlfiles" newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles=$newdlprefiles + dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin @@ -10861,9 +9367,10 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test -n "$bindir"; then + if test "x$bindir" != x ; + then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result/$dlname + tdlname=$func_relative_path_result$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -10872,7 +9379,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -10886,7 +9393,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that cannot go in dependency_libs. +# Linker flags that can not go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -10912,7 +9419,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test no,yes = "$installed,$need_relink"; then + if test "$installed" = no && test "$need_relink" = yes; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -10927,29 +9434,27 @@ exit $EXIT_SUCCESS } -if test link = "$opt_mode" || test relink = "$opt_mode"; then - func_mode_link ${1+"$@"} -fi +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} # func_mode_uninstall arg... func_mode_uninstall () { - $debug_cmd - - RM=$nonopt + $opt_debug + RM="$nonopt" files= - rmforce=false + rmforce= exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic=$magic + libtool_install_magic="$magic" for arg do case $arg in - -f) func_append RM " $arg"; rmforce=: ;; + -f) func_append RM " $arg"; rmforce=yes ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -10962,18 +9467,18 @@ for file in $files; do func_dirname "$file" "" "." - dir=$func_dirname_result - if test . = "$dir"; then - odir=$objdir + dir="$func_dirname_result" + if test "X$dir" = X.; then + odir="$objdir" else - odir=$dir/$objdir + odir="$dir/$objdir" fi func_basename "$file" - name=$func_basename_result - test uninstall = "$opt_mode" && odir=$dir + name="$func_basename_result" + test "$opt_mode" = uninstall && odir="$dir" # Remember odir for removal later, being careful to avoid duplicates - if test clean = "$opt_mode"; then + if test "$opt_mode" = clean; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -10988,11 +9493,11 @@ elif test -d "$file"; then exit_status=1 continue - elif $rmforce; then + elif test "$rmforce" = yes; then continue fi - rmfiles=$file + rmfiles="$file" case $name in *.la) @@ -11006,7 +9511,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case $opt_mode in + case "$opt_mode" in clean) case " $library_names " in *" $dlname "*) ;; @@ -11017,12 +9522,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' + func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -11038,19 +9543,21 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && test none != "$pic_object"; then + if test -n "$pic_object" && + test "$pic_object" != none; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && test none != "$non_pic_object"; then + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test clean = "$opt_mode"; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -11077,12 +9584,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.$objext" - if test yes = "$fast_install" && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name"; then - func_append rmfiles " $odir/lt-$noexename.c" + if test "X$noexename" != "X$name" ; then + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -11091,7 +9598,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the $objdir's in the directories where we deleted files + # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -11101,17 +9608,16 @@ exit $exit_status } -if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then - func_mode_uninstall ${1+"$@"} -fi +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} test -z "$opt_mode" && { - help=$generic_help + help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode '$opt_mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -11122,7 +9628,7 @@ # The TAGs below are defined such that we never get into a situation -# where we disable both kinds of libraries. Given conflicting +# in which we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -11145,3 +9651,5 @@ # mode:shell-script # sh-indentation:2 # End: +# vi:sw=2 + diff -Nru libinput-1.2.2/m4/libtool.m4 libinput-0.21.0/m4/libtool.m4 --- libinput-1.2.2/m4/libtool.m4 2016-03-02 03:16:07.000000000 +0000 +++ libinput-0.21.0/m4/libtool.m4 2015-08-04 00:31:35.000000000 +0000 @@ -1,6 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -8,30 +10,36 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 2014 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of of the License, or -# (at your option) any later version. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. # -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program or library that is built -# using GNU Libtool, you may include this file under the same -# distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 58 LT_INIT +# serial 57 LT_INIT # LT_PREREQ(VERSION) @@ -59,7 +67,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -83,7 +91,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS=$ltmain +LIBTOOL_DEPS="$ltmain" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -103,43 +111,26 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) -# _LT_PREPARE_CC_BASENAME -# ----------------------- -m4_defun([_LT_PREPARE_CC_BASENAME], [ -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -func_cc_basename () -{ - for cc_temp in @S|@*""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac - done - func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -} -])# _LT_PREPARE_CC_BASENAME - - # _LT_CC_BASENAME(CC) # ------------------- -# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, -# but that macro is also expanded into generated libtool script, which -# arranges for $SED and $ECHO to be set by different means. +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. m4_defun([_LT_CC_BASENAME], -[m4_require([_LT_PREPARE_CC_BASENAME])dnl -AC_REQUIRE([_LT_DECL_SED])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -func_cc_basename $1 -cc_basename=$func_cc_basename_result +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -186,16 +177,15 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl -m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options that allow our +# See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}"; then +if test -n "\${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}"; then +if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi @@ -208,7 +198,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test set != "${COLLECT_NAMES+set}"; then + if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -219,14 +209,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld=$lt_cv_prog_gnu_ld +with_gnu_ld="$lt_cv_prog_gnu_ld" -old_CC=$CC -old_CFLAGS=$CFLAGS +old_CC="$CC" +old_CFLAGS="$CFLAGS" # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -279,14 +269,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from 'configure', and 'config.status' +# Note that this code is called both from `configure', and `config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# 'config.status' has no value for ac_aux_dir unless we are using Automake, +# `config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain=$ac_aux_dir/ltmain.sh +ltmain="$ac_aux_dir/ltmain.sh" ])# _LT_PROG_LTMAIN @@ -296,7 +286,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the 'libtool' +# in macros and then make a single call at the end using the `libtool' # label. @@ -431,8 +421,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to 'config.status' so that its -# declaration there will have the same value as in 'configure'. VARNAME +# Quote a variable value, and forward it to `config.status' so that its +# declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -456,7 +446,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags='_LT_TAGS'dnl +available_tags="_LT_TAGS"dnl ]) @@ -484,7 +474,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -510,8 +500,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into 'config.status', and then the shell code to quote escape them in -# for loops in 'config.status'. Finally, any additional code accumulated +# into `config.status', and then the shell code to quote escape them in +# for loops in `config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -557,7 +547,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -570,7 +560,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -586,7 +576,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# '#!' sequence but before initialization text begins. After this +# `#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -608,7 +598,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test 0 = "$lt_write_fail" && chmod +x $1[]dnl +test $lt_write_fail = 0 && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -631,7 +621,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -'$as_me' creates a local libtool stub from the current configuration, +\`$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -653,7 +643,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test 0 != $[#] +while test $[#] != 0 do case $[1] in --version | --v* | -V ) @@ -666,10 +656,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try '$[0] --help' for more information.]) ;; +Try \`$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try '$[0] --help' for more information.]) ;; +Try \`$[0] --help' for more information.]) ;; esac shift done @@ -695,7 +685,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test yes = "$silent" && +test "$silent" = yes && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -715,31 +705,27 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options that allow our + # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}"; then + if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi - cfgfile=${ofile}T + cfgfile="${ofile}T" trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL -# Generated automatically by $as_me ($PACKAGE) $VERSION + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. - -# Provide generalized library-building support services. -# Written by Gordon Matzigkeit, 1996 - +# _LT_COPYING _LT_LIBTOOL_TAGS -# Configured defaults for sys_lib_dlsearch_path munging. -: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} - # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -747,24 +733,13 @@ _LT_EOF - cat <<'_LT_EOF' >> "$cfgfile" - -# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE - -_LT_PREPARE_MUNGE_PATH_LIST -_LT_PREPARE_CC_BASENAME - -# ### END FUNCTIONS SHARED WITH CONFIGURE - -_LT_EOF - case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test set != "${COLLECT_NAMES+set}"; then +if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -781,6 +756,8 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) + _LT_PROG_REPLACE_SHELLFNS + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -798,6 +775,7 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -996,7 +974,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "$LT_MULTI_MODULE"; then + if test -z "${LT_MULTI_MODULE}"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -1014,7 +992,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1032,7 +1010,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS=$save_LDFLAGS + LDFLAGS="$save_LDFLAGS" ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1054,7 +1032,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1064,32 +1042,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test yes = "$lt_cv_apple_cc_single_mod"; then + if test "$lt_cv_apple_cc_single_mod" = "yes"; then _lt_dar_single_mod='$single_module' fi - if test yes = "$lt_cv_ld_exported_symbols_list"; then - _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1109,29 +1087,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test yes = "$lt_cv_ld_force_load"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in - ifort*|nagfor*) _lt_dar_can_shared=yes ;; + ifort*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test yes = "$_lt_dar_can_shared"; then + if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" m4_if([$1], [CXX], -[ if test yes != "$lt_cv_apple_cc_single_mod"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi ],[]) else @@ -1151,7 +1129,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test set = "${lt_cv_aix_libpath+set}"; then +if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1169,7 +1147,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1189,8 +1167,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script that will find a shell with a builtin -# printf (that we can use as an echo command). +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1218,10 +1196,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case $ECHO in +case "$ECHO" in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1247,17 +1225,16 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], - [Search for dependent libraries within DIR (or the compiler's sysroot - if not specified).])], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case $with_sysroot in #( +case ${with_sysroot} in #( yes) - if test yes = "$GCC"; then + if test "$GCC" = yes; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1267,14 +1244,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([$with_sysroot]) + AC_MSG_RESULT([${with_sysroot}]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and where our libraries should be installed.])]) +[dependent libraries, and in which our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1282,33 +1259,31 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test no = "$enable_libtool_lock" || enable_libtool_lock=yes +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out what ABI is being produced by ac_compile, and set mode - # options accordingly. + # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE=32 + HPUX_IA64_MODE="32" ;; *ELF-64*) - HPUX_IA64_MODE=64 + HPUX_IA64_MODE="64" ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. + # Find out which ABI we are using. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test yes = "$lt_cv_prog_gnu_ld"; then + if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1337,46 +1312,9 @@ rm -rf conftest* ;; -mips64*-*linux*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - emul=elf - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - emul="${emul}32" - ;; - *64-bit*) - emul="${emul}64" - ;; - esac - case `/usr/bin/file conftest.$ac_objext` in - *MSB*) - emul="${emul}btsmip" - ;; - *LSB*) - emul="${emul}ltsmip" - ;; - esac - case `/usr/bin/file conftest.$ac_objext` in - *N32*) - emul="${emul}n32" - ;; - esac - LD="${LD-ld} -m $emul" - fi - rm -rf conftest* - ;; - x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. Note that the listed cases only cover the - # situations where additional linker options are needed (such as when - # doing 32-bit compilation for a host where ld defaults to 64-bit, or - # vice versa); the common cases where no linker options are needed do - # not appear in the list. + # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1386,14 +1324,7 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -1438,20 +1369,19 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS=$CFLAGS + SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test yes != "$lt_cv_cc_needs_belf"; then + if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS=$SAVE_CFLAGS + CFLAGS="$SAVE_CFLAGS" fi ;; *-*solaris*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. + # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1459,7 +1389,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*|x86_64-*-solaris*) + i?86-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1468,7 +1398,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD=${LD-ld}_sol2 + LD="${LD-ld}_sol2" fi ;; *) @@ -1484,7 +1414,7 @@ ;; esac -need_locks=$enable_libtool_lock +need_locks="$enable_libtool_lock" ])# _LT_ENABLE_LOCK @@ -1503,11 +1433,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test 0 -eq "$ac_status"; then + if test "$ac_status" -eq 0; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test 0 -ne "$ac_status"; then + if test "$ac_status" -ne 0; then lt_cv_ar_at_file=@ fi fi @@ -1515,7 +1445,7 @@ ]) ]) -if test no = "$lt_cv_ar_at_file"; then +if test "x$lt_cv_ar_at_file" = xno; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1546,7 +1476,7 @@ if test -n "$RANLIB"; then case $host_os in - bitrig* | openbsd*) + openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1582,7 +1512,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment + lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1609,7 +1539,7 @@ $RM conftest* ]) -if test yes = "[$]$2"; then +if test x"[$]$2" = xyes; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1631,7 +1561,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS=$LDFLAGS + save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1650,10 +1580,10 @@ fi fi $RM -r conftest* - LDFLAGS=$save_LDFLAGS + LDFLAGS="$save_LDFLAGS" ]) -if test yes = "[$]$2"; then +if test x"[$]$2" = xyes; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1674,7 +1604,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring=ABCD + teststring="ABCD" case $build_os in msdosdjgpp*) @@ -1714,7 +1644,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1764,23 +1694,22 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8; do + for i in 1 2 3 4 5 6 7 8 ; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test 17 != "$i" # 1/2 MB should be enough + test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1796,7 +1725,7 @@ ;; esac ]) -if test -n "$lt_cv_sys_max_cmd_len"; then +if test -n $lt_cv_sys_max_cmd_len ; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1824,7 +1753,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test yes = "$cross_compiling"; then : +if test "$cross_compiling" = yes; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1871,9 +1800,9 @@ # endif #endif -/* When -fvisibility=hidden is used, assume the code has been annotated +/* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1899,7 +1828,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1920,7 +1849,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test yes != "$enable_dlopen"; then +if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1930,52 +1859,44 @@ case $host_os in beos*) - lt_cv_dlopen=load_add_on + lt_cv_dlopen="load_add_on" lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen=LoadLibrary + lt_cv_dlopen="LoadLibrary" lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen=dlopen + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ - lt_cv_dlopen=dyld + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; - tpf*) - # Don't try to run any link tests for TPF. We know it's impossible - # because TPF is a cross-compiler, and we know how we open DSOs. - lt_cv_dlopen=dlopen - lt_cv_dlopen_libs= - lt_cv_dlopen_self=no - ;; - *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen=shl_load], + [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen=dlopen], + [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ]) ]) ]) @@ -1984,21 +1905,21 @@ ;; esac - if test no = "$lt_cv_dlopen"; then - enable_dlopen=no - else + if test "x$lt_cv_dlopen" != xno; then enable_dlopen=yes + else + enable_dlopen=no fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS=$CPPFLAGS - test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS=$LDFLAGS + save_LDFLAGS="$LDFLAGS" wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS=$LIBS + save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -2008,7 +1929,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test yes = "$lt_cv_dlopen_self"; then + if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -2018,9 +1939,9 @@ ]) fi - CPPFLAGS=$save_CPPFLAGS - LDFLAGS=$save_LDFLAGS - LIBS=$save_LIBS + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" ;; esac @@ -2112,8 +2033,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links=nottested -if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then +hard_links="nottested" +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2123,8 +2044,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test no = "$hard_links"; then - AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) + if test "$hard_links" = no; then + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) need_locks=warn fi else @@ -2151,8 +2072,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", - [Define to the sub-directory where libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", + [Define to the sub-directory in which libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2164,15 +2085,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then # We can hardcode non-existent directories. - if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && - test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2186,12 +2107,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || - test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then # Fast installation is not supported enable_fast_install=no -elif test yes = "$shlibpath_overrides_runpath" || - test no = "$enable_shared"; then +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2215,7 +2136,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP"; then + if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2233,47 +2154,6 @@ ])# _LT_CMD_STRIPLIB -# _LT_PREPARE_MUNGE_PATH_LIST -# --------------------------- -# Make sure func_munge_path_list() is defined correctly. -m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], -[[# func_munge_path_list VARIABLE PATH -# ----------------------------------- -# VARIABLE is name of variable containing _space_ separated list of -# directories to be munged by the contents of PATH, which is string -# having a format: -# "DIR[:DIR]:" -# string "DIR[ DIR]" will be prepended to VARIABLE -# ":DIR[:DIR]" -# string "DIR[ DIR]" will be appended to VARIABLE -# "DIRP[:DIRP]::[DIRA:]DIRA" -# string "DIRP[ DIRP]" will be prepended to VARIABLE and string -# "DIRA[ DIRA]" will be appended to VARIABLE -# "DIR[:DIR]" -# VARIABLE will be replaced by "DIR[ DIR]" -func_munge_path_list () -{ - case x@S|@2 in - x) - ;; - *:) - eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" - ;; - x:*) - eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" - ;; - *::*) - eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" - eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" - ;; - *) - eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" - ;; - esac -} -]])# _LT_PREPARE_PATH_LIST - - # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2284,18 +2164,17 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test yes = "$GCC"; then +if test "$GCC" = yes; then case $host_os in - darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; - *) lt_awk_arg='/^libraries:/' ;; + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; - *) lt_sed_strip_eq='s|=/|/|g' ;; + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2311,35 +2190,28 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary... + # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= - lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - # ...but if some path component already ends with the multilib dir we assume - # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). - case "$lt_multi_os_dir; $lt_search_path_spec " in - "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) - lt_multi_os_dir= - ;; - esac + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" - elif test -n "$lt_multi_os_dir"; then + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS = " "; FS = "/|\n";} { - lt_foo = ""; - lt_count = 0; +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo = "/" $lt_i lt_foo; + lt_foo="/" $lt_i lt_foo; } else { lt_count--; } @@ -2353,7 +2225,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2362,7 +2234,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=.so +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2379,17 +2251,14 @@ # flags to be left without arguments need_version=unknown -AC_ARG_VAR([LT_SYS_LIBRARY_PATH], -[User-defined run-time library search path.]) - case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='$libname$release$shared_ext$major' + soname_spec='${libname}${release}${shared_ext}$major' ;; aix[[4-9]]*) @@ -2397,91 +2266,41 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 supports IA64 - library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line '#! .'. This would cause the generated library to - # depend on '.', always an invalid library. This was fixed in + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # Using Import Files as archive members, it is possible to support - # filename-based versioning of shared library archives on AIX. While - # this would work for both with and without runtime linking, it will - # prevent static linking of such archives. So we do filename-based - # shared library versioning with .so extension only, which is used - # when both runtime linking and shared linking is enabled. - # Unfortunately, runtime linking may impact performance, so we do - # not want this to be the default eventually. Also, we use the - # versioned .so libs for executables only if there is the -brtl - # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. - # To allow for filename-based versioning support, we need to create - # libNAME.so.V as an archive file, containing: - # *) an Import File, referring to the versioned filename of the - # archive as well as the shared archive member, telling the - # bitwidth (32 or 64) of that shared object, and providing the - # list of exported symbols of that shared object, eventually - # decorated with the 'weak' keyword - # *) the shared object with the F_LOADONLY flag set, to really avoid - # it being seen by the linker. - # At run time we better use the real file rather than another symlink, - # but for link time we create the symlink libNAME.so -> libNAME.so.V - - case $with_aix_soname,$aix_use_runtimelinking in - # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - aix,yes) # traditional libtool - dynamic_linker='AIX unversionable lib.so' + if test "$aix_use_runtimelinking" = yes; then # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - ;; - aix,no) # traditional AIX only - dynamic_linker='AIX lib.a[(]lib.so.V[)]' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='$libname$release.a $libname.a' - soname_spec='$libname$release$shared_ext$major' - ;; - svr4,*) # full svr4 only - dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,yes) # both, prefer svr4 - dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # unpreferred sharedlib libNAME.a needs extra handling - postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' - postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,no) # both, prefer aix - dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" - library_names_spec='$libname$release.a $libname.a' - soname_spec='$libname$release$shared_ext$major' - # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling - postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' - postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' - ;; - esac + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi shlibpath_var=LIBPATH fi ;; @@ -2491,18 +2310,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='$libname$shared_ext' + library_names_spec='${libname}${shared_ext}' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2510,8 +2329,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2523,7 +2342,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=.dll + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -2532,8 +2351,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2549,17 +2368,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac dynamic_linker='Win32 ld.exe' @@ -2568,8 +2387,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' - library_names_spec='$libname.dll.lib' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' case $build_os in mingw*) @@ -2596,7 +2415,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec=$LIB + sys_lib_search_path_spec="$LIB" if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2609,8 +2428,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2623,7 +2442,7 @@ *) # Assume MSVC wrapper - library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2636,8 +2455,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' - soname_spec='$libname$release$major$shared_ext' + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2650,8 +2469,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2669,13 +2488,12 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; esac @@ -2700,15 +2518,26 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=no + shlibpath_overrides_runpath=yes sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2726,15 +2555,14 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - if test 32 = "$HPUX_IA64_MODE"; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2742,8 +2570,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2752,8 +2580,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2766,8 +2594,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2778,7 +2606,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test yes = "$lt_cv_prog_gnu_ld"; then + if test "$lt_cv_prog_gnu_ld" = yes; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2786,8 +2614,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='$libname$release$shared_ext$major' - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2806,8 +2634,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" - sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" hardcode_into_libs=yes ;; @@ -2816,33 +2644,13 @@ dynamic_linker=no ;; -linux*android*) - version_type=none # Android doesn't support versioned libraries. - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext' - soname_spec='$libname$release$shared_ext' - finish_cmds= - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - dynamic_linker='Android linker' - # Don't embed -rpath directories since the linker doesn't support them. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - ;; - # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2870,15 +2678,11 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are - # searched for libraries, however this is still not possible. Aside from not - # being certain /sbin/ldconfig is available, command - # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, - # even though it is searched at run-time. Try to do the best guess by - # appending ld.so.conf contents (and includes) to the search path. + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2895,12 +2699,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2910,7 +2714,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2919,68 +2723,58 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd* | bitrig*) +openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec=/usr/lib + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - need_version=no - else - need_version=yes - fi - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi ;; os2*) libname_spec='$name' - version_type=windows - shrext_cmds=.dll - need_version=no + shrext_cmds=".dll" need_lib_prefix=no - # OS/2 can only load a DLL with a base name of 8 characters or less. - soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; - v=$($ECHO $release$versuffix | tr -d .-); - n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); - $ECHO $n$v`$shared_ext' - library_names_spec='${libname}_dll.$libext' + library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' - shlibpath_var=BEGINLIBPATH - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' + shlibpath_var=LIBPATH ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='$libname$release$shared_ext$major' - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; rdos*) @@ -2991,8 +2785,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -3002,11 +2796,11 @@ sunos4*) version_type=sunos - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test yes = "$with_gnu_ld"; then + if test "$with_gnu_ld" = yes; then need_lib_prefix=no fi need_version=yes @@ -3014,8 +2808,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -3036,24 +2830,24 @@ ;; sysv4*MP*) - if test -d /usr/nec; then + if test -d /usr/nec ;then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' - soname_spec='$libname$shared_ext.$major' + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=sco + version_type=freebsd-elf need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test yes = "$with_gnu_ld"; then + if test "$with_gnu_ld" = yes; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -3071,7 +2865,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -3079,8 +2873,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -3089,30 +2883,20 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test no = "$dynamic_linker" && can_build_shared=no +test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test yes = "$GCC"; then +if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then - sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" fi - -if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then - sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" fi -# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... -configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec - -# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code -func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" - -# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool -configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -3145,41 +2929,39 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], - [Detected run-time system search path for libraries]) -_LT_DECL([], [configure_time_lt_sys_library_path], [2], - [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], + [Run-time system search path for libraries]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program that can recognize shared library +# find a file program which can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD=$MAGIC_CMD - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$1"; then - lt_cv_path_MAGIC_CMD=$ac_dir/"$1" + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD=$lt_cv_path_MAGIC_CMD + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -3202,11 +2984,11 @@ break fi done - IFS=$lt_save_ifs - MAGIC_CMD=$lt_save_MAGIC_CMD + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" ;; esac]) -MAGIC_CMD=$lt_cv_path_MAGIC_CMD +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3224,7 +3006,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program that can recognize a shared library +# find a file program which can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3251,16 +3033,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test no = "$withval" || with_gnu_ld=yes], + [test "$withval" = no || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test yes = "$GCC"; then +if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return, which upsets mingw + # gcc leaves a trailing carriage return which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3274,7 +3056,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD=$ac_prog + test -z "$LD" && LD="$ac_prog" ;; "") # If it fails, then pretend we aren't using GCC. @@ -3285,37 +3067,37 @@ with_gnu_ld=unknown ;; esac -elif test yes = "$with_gnu_ld"; then +elif test "$with_gnu_ld" = yes; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD=$ac_dir/$ac_prog + lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i -cat conftest.i conftest.i >conftest2.i -: ${lt_DD:=$DD} -AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], -[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then - cmp -s conftest.i conftest.out \ - && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: -fi]) -rm -f conftest.i conftest2.i conftest.out]) -])# _LT_PATH_DD - - -# _LT_CMD_TRUNCATE -# ---------------- -# find command to truncate a binary pipe -m4_defun([_LT_CMD_TRUNCATE], -[m4_require([_LT_PATH_DD]) -AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], -[printf 0123456789abcdef0123456789abcdef >conftest.i -cat conftest.i conftest.i >conftest2.i -lt_cv_truncate_bin= -if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then - cmp -s conftest.i conftest.out \ - && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" -fi -rm -f conftest.i conftest2.i conftest.out -test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) -_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], - [Command to truncate a binary pipe]) -])# _LT_CMD_TRUNCATE - - # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3438,13 +3183,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# 'unknown' -- same as none, but documents that we really don't know. +# `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# that responds to the $file_magic_cmd with a given extended regex. -# If you have 'file' or equivalent on your system and you're not sure -# whether 'pass_all' will *always* work, you probably want this one. +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3471,7 +3216,8 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3507,6 +3253,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3545,7 +3295,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3567,8 +3317,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd* | bitrig*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3621,9 +3371,6 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; -os2*) - lt_cv_deplibs_check_method=pass_all - ;; esac ]) @@ -3664,38 +3411,33 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM=$NM + lt_cv_path_NM="$NM" else - lt_nm_to_check=${ac_tool_prefix}nm + lt_nm_to_check="${ac_tool_prefix}nm" if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. - tmp_nm=$ac_dir/$lt_tmp_nm - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # Adding the `sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty - case $build_os in - mingw*) lt_bad_file=conftest.nm/nofile ;; - *) lt_bad_file=/dev/null ;; - esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in - *$lt_bad_file* | *'Invalid file or object type'*) + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break 2 + break ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break 2 + break ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3706,21 +3448,21 @@ esac fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" done : ${lt_cv_path_NM=no} fi]) -if test no != "$lt_cv_path_NM"; then - NM=$lt_cv_path_NM +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols -headers" + DUMPBIN="$DUMPBIN -symbols" ;; *) DUMPBIN=: @@ -3728,8 +3470,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test : != "$DUMPBIN"; then - NM=$DUMPBIN + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" fi fi test -z "$NM" && NM=nm @@ -3775,8 +3517,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh; - # decide which one to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3788,7 +3530,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd=$ECHO + lt_cv_sharedlib_from_linklib_cmd="$ECHO" ;; esac ]) @@ -3815,28 +3557,13 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test yes != "$lt_cv_path_mainfest_tool"; then +if test "x$lt_cv_path_mainfest_tool" != xyes; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL -# _LT_DLL_DEF_P([FILE]) -# --------------------- -# True iff FILE is a Windows DLL '.def' file. -# Keep in sync with func_dll_def_p in the libtool script -AC_DEFUN([_LT_DLL_DEF_P], -[dnl - test DEF = "`$SED -n dnl - -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace - -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments - -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl - -e q dnl Only consider the first "real" line - $1`" dnl -])# _LT_DLL_DEF_P - - # LT_LIB_M # -------- # check for math library @@ -3848,11 +3575,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM=-lm) + AC_CHECK_LIB(m, cos, LIBM="-lm") ;; esac AC_SUBST([LIBM]) @@ -3871,7 +3598,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test yes = "$GCC"; then +if test "$GCC" = yes; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3923,7 +3650,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then symcode='[[ABCDEGRST]]' fi ;; @@ -3956,44 +3683,14 @@ symcode='[[ABCDGIRSTW]]' ;; esac -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" - # Adjust the below global symbol transforms to fixup imported variables. - lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" - lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" - lt_c_name_lib_hook="\ - -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ - -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" -else - # Disable hooks by default. - lt_cv_sys_global_symbol_to_import= - lt_cdecl_hook= - lt_c_name_hook= - lt_c_name_lib_hook= -fi - # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ -$lt_cdecl_hook\ -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ -$lt_c_name_hook\ -" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" - -# Transform an extracted symbol line into symbol name with lib prefix and -# symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ -$lt_c_name_lib_hook\ -" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -4011,24 +3708,21 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function, - # D for any global variable and I for any imported variable. + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ -" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ -" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ -" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ -" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -4068,11 +3762,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE -/* DATA imports from DLLs on WIN32 can't be const, because runtime +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined __osf__ +#elif defined(__osf__) /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -4098,7 +3792,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -4118,9 +3812,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS=conftstm.$ac_objext + LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -4141,7 +3835,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test yes = "$pipe_works"; then + if test "$pipe_works" = yes; then break else lt_cv_sys_global_symbol_pipe= @@ -4168,16 +3862,12 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], - [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], - [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -4193,18 +3883,17 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test yes = "$GXX"; then + if test "$GXX" = yes; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4215,8 +3904,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the '-m68020' flag to GCC prevents building anything better, - # like '-m68040'. + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4232,11 +3921,6 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - case $host_os in - os2*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' - ;; - esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -4286,7 +3970,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4327,14 +4011,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' - if test ia64 != "$host_cpu"; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4363,7 +4047,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4371,7 +4055,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64, which still supported -KPIC. + # old Intel C++ for x86_64 which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4516,18 +4200,17 @@ fi ], [ - if test yes = "$GCC"; then + if test "$GCC" = yes; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4538,8 +4221,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the '-m68020' flag to GCC prevents building anything better, - # like '-m68040'. + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4556,11 +4239,6 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - case $host_os in - os2*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' - ;; - esac ;; darwin* | rhapsody*) @@ -4631,7 +4309,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4639,30 +4317,11 @@ fi ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - case $cc_basename in - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - case $host_os in - os2*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' - ;; - esac ;; hpux9* | hpux10* | hpux11*) @@ -4678,7 +4337,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4687,9 +4346,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in - # old Intel for x86_64, which still supported -KPIC. + # old Intel for x86_64 which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4714,12 +4373,6 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - tcc*) - # Fabrice Bellard et al's Tiny C Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4817,7 +4470,7 @@ ;; sysv4*MP*) - if test -d /usr/nec; then + if test -d /usr/nec ;then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4846,7 +4499,7 @@ fi ]) case $host_os in - # For platforms that do not support PIC, -DPIC is meaningless: + # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4912,21 +4565,17 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to GNU nm, but means don't demangle to AIX nm. - # Without the "-l" option, or with the "-B" option, AIX nm treats - # weak defined symbols like other global defined symbols, whereas - # GNU nm marks them as "W". - # While the 'weak' keyword is ignored in the Export File, we need - # it in the Import File for the 'aix-soname' feature, so we have - # to replace the "-B" option with "-P" for AIX nm. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4972,9 +4621,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ' (' and ')$', so one must not match beginning or - # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', - # as well as any symbol that contains 'd'. + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4990,7 +4639,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test yes != "$GCC"; then + if test "$GCC" != yes; then with_gnu_ld=no fi ;; @@ -4998,7 +4647,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd* | bitrig*) + openbsd*) with_gnu_ld=no ;; esac @@ -5008,7 +4657,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test yes = "$with_gnu_ld"; then + if test "$with_gnu_ld" = yes; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -5030,24 +4679,24 @@ esac fi - if test yes = "$lt_use_gnu_ld_interface"; then + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='$wl' + wlarc='${wl}' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5060,7 +4709,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test ia64 != "$host_cpu"; then + if test "$host_cpu" != ia64; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -5079,7 +4728,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5095,7 +4744,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -5105,7 +4754,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5113,89 +4762,61 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file, use it as - # is; otherwise, prepend EXPORTS... - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test linux-dietlibc = "$host_os"; then + if test "$host_os" = linux-dietlibc; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test no = "$tmp_diet" + && test "$tmp_diet" = no then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -5206,47 +4827,42 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; - nagfor*) # NAGFOR 5.3 - tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test yes = "$supports_anon_versioning"; then + if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi case $cc_basename in - tcc*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' - ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test yes = "$supports_anon_versioning"; then + if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -5260,8 +4876,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -5279,8 +4895,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -5292,7 +4908,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -5307,9 +4923,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -5326,15 +4942,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -5350,7 +4966,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -5358,57 +4974,34 @@ ;; aix[[4-9]]*) - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag= + no_entry_flag="" else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to GNU nm, but means don't demangle to AIX nm. - # Without the "-l" option, or with the "-B" option, AIX nm treats - # weak defined symbols like other global defined symbols, whereas - # GNU nm marks them as "W". - # While the 'weak' keyword is ignored in the Export File, we need - # it in the Import File for the 'aix-soname' feature, so we have - # to replace the "-B" option with "-P" for AIX nm. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # have runtime linking enabled, and use it for executables. - # For shared libraries, we enable/disable runtime linking - # depending on the kind of the shared library created - - # when "with_aix_soname,aix_use_runtimelinking" is: - # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables - # "aix,yes" lib.so shared, rtl:yes, for executables - # lib.a static archive - # "both,no" lib.so.V(shr.o) shared, rtl:yes - # lib.a(lib.so.V) shared, rtl:no, for executables - # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a(lib.so.V) shared, rtl:no - # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a static archive + # need to do runtime linking. case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes break fi done - if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then - # With aix-soname=svr4, we create the lib.so.V shared archives only, - # so we don't have lib.a shared libs to link our executables. - # We have to force runtime linking in this case. - aix_use_runtimelinking=yes - LDFLAGS="$LDFLAGS -Wl,-brtl" - fi ;; esac @@ -5427,21 +5020,13 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='$wl-f,' - case $with_aix_soname,$aix_use_runtimelinking in - aix,*) ;; # traditional, no import file - svr4,* | *,yes) # use import file - # The Import File defines what to hardcode. - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - ;; - esac + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - if test yes = "$GCC"; then + if test "$GCC" = yes; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`$CC -print-prog-name=collect2` + collect2name=`${CC} -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5460,80 +5045,61 @@ ;; esac shared_flag='-shared' - if test yes = "$aix_use_runtimelinking"; then - shared_flag="$shared_flag "'$wl-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' fi - # Need to ensure runtime linking is disabled for the traditional - # shared library, or the linker may eventually find shared libraries - # /with/ Import File - we do not want to mix them. - shared_flag_aix='-shared' - shared_flag_svr4='-shared $wl-G' else # not using gcc - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test yes = "$aix_use_runtimelinking"; then - shared_flag='$wl-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='$wl-bM:SRE' + shared_flag='${wl}-bM:SRE' fi - shared_flag_aix='$wl-bM:SRE' - shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else - if test ia64 = "$host_cpu"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' - if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' - # -brtl affects multiple linker settings, -berok does not and is overridden later - compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' - if test svr4 != "$with_aix_soname"; then - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' - fi - if test aix != "$with_aix_soname"; then - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' - else - # used by -dlpreopen to get the symbols - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' - fi - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -5542,7 +5108,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5572,17 +5138,16 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=.dll + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; - else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5591,18 +5156,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile=$lt_outputfile.exe - lt_tool_outputfile=$lt_tool_outputfile.exe - ;; - esac~ - if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5611,7 +5176,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=.dll + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5661,33 +5226,33 @@ ;; hpux9*) - if test yes = "$GCC"; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; hpux10*) - if test yes,no = "$GCC,$with_gnu_ld"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test no = "$with_gnu_ld"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5695,25 +5260,25 @@ ;; hpux11*) - if test yes,no = "$GCC,$with_gnu_ld"; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5721,14 +5286,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test no = "$with_gnu_ld"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5739,7 +5304,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5750,16 +5315,16 @@ ;; irix5* | irix6* | nonstopux*) - if test yes = "$GCC"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5772,31 +5337,21 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS=$save_LDFLAGS]) - if test yes = "$lt_cv_irix_exported_symbol"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - linux*) - case $cc_basename in - tcc*) - # Fabrice Bellard et al's Tiny C Compiler - _LT_TAGVAR(ld_shlibs, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5811,7 +5366,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5819,19 +5374,27 @@ *nto* | *qnx*) ;; - openbsd* | bitrig*) + openbsd*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5842,53 +5405,33 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) - if test yes = "$GCC"; then - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test yes = "$GCC"; then - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5899,24 +5442,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test yes = "$GCC"; then - wlarc='$wl' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='$wl' - _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5926,11 +5469,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands '-z linker_flag'. GCC discards it without '$wl', + # but understands `-z linker_flag'. GCC discards it without `$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test yes = "$GCC"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + if test "$GCC" = yes; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5940,10 +5483,10 @@ ;; sunos4*) - if test sequent = "$host_vendor"; then + if test "x$host_vendor" = xsequent; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5992,43 +5535,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test yes = "$GCC"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We CANNOT use -z defs as we might desire, because we do not + # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' runpath_var='LD_RUN_PATH' - if test yes = "$GCC"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -6043,17 +5586,17 @@ ;; esac - if test sni = "$host_vendor"; then + if test x$host_vendor = xsni; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -6070,7 +5613,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test yes,yes = "$GCC,$enable_shared"; then + if test "$enable_shared" = yes && test "$GCC" = yes; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -6150,12 +5693,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting $shlibpath_var if the + "absolute", i.e impossible to change by setting ${shlibpath_var} if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -6196,10 +5739,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to 'libtool'. +# the compiler configuration to `libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC=$CC +lt_save_CC="$CC" AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -6239,18 +5782,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report what library types will actually be built + # Report which library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test no = "$can_build_shared" && enable_shared=no + test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test yes = "$enable_shared" && enable_static=no + test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -6258,12 +5801,8 @@ ;; aix[[4-9]]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no fi ;; esac @@ -6271,13 +5810,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test yes = "$enable_shared" || enable_static=yes + test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC=$lt_save_CC +CC="$lt_save_CC" ])# _LT_LANG_C_CONFIG @@ -6285,14 +5824,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to 'libtool'. +# the compiler configuration to `libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test no != "$CXX" && - ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || - (test g++ != "$CXX"))); then +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -6334,7 +5873,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test yes != "$_lt_caught_CXX_error"; then +if test "$_lt_caught_CXX_error" != yes; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -6376,35 +5915,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test yes = "$GXX"; then + if test "$GXX" = yes; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test yes = "$GXX"; then + if test "$GXX" = yes; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test yes = "$with_gnu_ld"; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='$wl' + wlarc='${wl}' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -6440,30 +5979,18 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag= + no_entry_flag="" else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # have runtime linking enabled, and use it for executables. - # For shared libraries, we enable/disable runtime linking - # depending on the kind of the shared library created - - # when "with_aix_soname,aix_use_runtimelinking" is: - # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables - # "aix,yes" lib.so shared, rtl:yes, for executables - # lib.a static archive - # "both,no" lib.so.V(shr.o) shared, rtl:yes - # lib.a(lib.so.V) shared, rtl:no, for executables - # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a(lib.so.V) shared, rtl:no - # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a static archive + # need to do runtime linking. case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6473,13 +6000,6 @@ ;; esac done - if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then - # With aix-soname=svr4, we create the lib.so.V shared archives only, - # so we don't have lib.a shared libs to link our executables. - # We have to force runtime linking in this case. - aix_use_runtimelinking=yes - LDFLAGS="$LDFLAGS -Wl,-brtl" - fi ;; esac @@ -6498,21 +6018,13 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='$wl-f,' - case $with_aix_soname,$aix_use_runtimelinking in - aix,*) ;; # no import file - svr4,* | *,yes) # use import file - # The Import File defines what to hardcode. - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - ;; - esac + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - if test yes = "$GXX"; then + if test "$GXX" = yes; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`$CC -print-prog-name=collect2` + collect2name=`${CC} -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6530,84 +6042,64 @@ fi esac shared_flag='-shared' - if test yes = "$aix_use_runtimelinking"; then - shared_flag=$shared_flag' $wl-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' fi - # Need to ensure runtime linking is disabled for the traditional - # shared library, or the linker may eventually find shared libraries - # /with/ Import File - we do not want to mix them. - shared_flag_aix='-shared' - shared_flag_svr4='-shared $wl-G' else # not using gcc - if test ia64 = "$host_cpu"; then + if test "$host_cpu" = ia64; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test yes = "$aix_use_runtimelinking"; then - shared_flag='$wl-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='$wl-bM:SRE' + shared_flag='${wl}-bM:SRE' fi - shared_flag_aix='$wl-bM:SRE' - shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - # The "-G" linker flag allows undefined symbols. - _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else - if test ia64 = "$host_cpu"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' - if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' - # -brtl affects multiple linker settings, -berok does not and is overridden later - compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' - if test svr4 != "$with_aix_soname"; then - # This is similar to how AIX traditionally builds its shared - # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' - fi - if test aix != "$with_aix_soname"; then - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' - else - # used by -dlpreopen to get the symbols - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' - fi - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + # This is similar to how AIX traditionally builds its shared + # libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -6617,7 +6109,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6645,58 +6137,57 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=.dll + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; - else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile=$lt_outputfile.exe - lt_tool_outputfile=$lt_tool_outputfile.exe - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file, use it as - # is; otherwise, prepend EXPORTS... - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6707,34 +6198,6 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - dgux*) case $cc_basename in ec++*) @@ -6769,15 +6232,18 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6789,7 +6255,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6798,11 +6264,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test yes = "$GXX"; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + if test "$GXX" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6812,15 +6278,15 @@ ;; hpux10*|hpux11*) - if test no = "$with_gnu_ld"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; esac fi @@ -6846,13 +6312,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6863,20 +6329,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test yes = "$GXX"; then - if test no = "$with_gnu_ld"; then + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6891,22 +6357,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6915,22 +6381,22 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test yes = "$GXX"; then - if test no = "$with_gnu_ld"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6938,8 +6404,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6948,10 +6414,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6965,59 +6431,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -7031,18 +6497,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -7050,10 +6516,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -7111,17 +6577,22 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd* | bitrig*) + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -7137,9 +6608,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -7157,17 +6628,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -7182,21 +6653,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test yes,no = "$GXX,$with_gnu_ld"; then - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -7242,9 +6713,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -7252,7 +6723,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands '-z linker_flag'. + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -7269,30 +6740,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test yes,no = "$GXX,$with_gnu_ld"; then - _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require '-G' NOT '-shared' on this + # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -7300,11 +6771,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac fi @@ -7313,52 +6784,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We CANNOT use -z defs as we might desire, because we do not + # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -7389,10 +6860,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - _LT_TAGVAR(GCC, $1)=$GXX - _LT_TAGVAR(LD, $1)=$LD + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7419,7 +6890,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test yes != "$_lt_caught_CXX_error" +fi # test "$_lt_caught_CXX_error" != yes AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -7441,14 +6912,13 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case @S|@2 in - .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; - *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7532,13 +7002,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $prev$p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test x-L = "$p" || - test x-R = "$p"; then + if test $p = "-L" || + test $p = "-R"; then prev=$p continue fi @@ -7554,16 +7024,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test no = "$pre_test_object_deps_done"; then - case $prev in + if test "$pre_test_object_deps_done" = no; then + case ${prev} in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p + _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" fi ;; # The "-l" case would never come before the object being @@ -7571,9 +7041,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)=$prev$p + _LT_TAGVAR(postdeps, $1)="${prev}${p}" else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi prev= @@ -7588,15 +7058,15 @@ continue fi - if test no = "$pre_test_object_deps_done"; then + if test "$pre_test_object_deps_done" = no; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)=$p + _LT_TAGVAR(predep_objects, $1)="$p" else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)=$p + _LT_TAGVAR(postdep_objects, $1)="$p" else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7627,6 +7097,51 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; esac ]) @@ -7635,7 +7150,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7655,10 +7170,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. +# to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test no = "$F77"; then +if test -z "$F77" || test "X$F77" = "Xno"; then _lt_disable_F77=yes fi @@ -7695,7 +7210,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test yes != "$_lt_disable_F77"; then +if test "$_lt_disable_F77" != yes; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7717,7 +7232,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC=$CC + lt_save_CC="$CC" lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7731,25 +7246,21 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test no = "$can_build_shared" && enable_shared=no + test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test yes = "$enable_shared" && enable_static=no + test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no fi ;; esac @@ -7757,11 +7268,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test yes = "$enable_shared" || enable_static=yes + test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)=$G77 - _LT_TAGVAR(LD, $1)=$LD + _LT_TAGVAR(GCC, $1)="$G77" + _LT_TAGVAR(LD, $1)="$LD" ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7778,9 +7289,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test yes != "$_lt_disable_F77" + CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" +fi # test "$_lt_disable_F77" != yes AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7790,11 +7301,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. +# to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test no = "$FC"; then +if test -z "$FC" || test "X$FC" = "Xno"; then _lt_disable_FC=yes fi @@ -7831,7 +7342,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test yes != "$_lt_disable_FC"; then +if test "$_lt_disable_FC" != yes; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7853,7 +7364,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC=$CC + lt_save_CC="$CC" lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7869,25 +7380,21 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test no = "$can_build_shared" && enable_shared=no + test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test yes = "$enable_shared" && enable_static=no + test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no fi ;; esac @@ -7895,11 +7402,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test yes = "$enable_shared" || enable_static=yes + test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu - _LT_TAGVAR(LD, $1)=$LD + _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" + _LT_TAGVAR(LD, $1)="$LD" ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7919,7 +7426,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test yes != "$_lt_disable_FC" +fi # test "$_lt_disable_FC" != yes AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7929,7 +7436,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. +# to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7963,7 +7470,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)=$LD +_LT_TAGVAR(LD, $1)="$LD" _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -8000,7 +7507,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. +# to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -8034,7 +7541,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)=$LD +_LT_TAGVAR(LD, $1)="$LD" _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -8071,7 +7578,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. +# to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -8087,7 +7594,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code=$lt_simple_compile_test_code +lt_simple_link_test_code="$lt_simple_compile_test_code" # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -8097,7 +7604,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC=$CC +lt_save_CC="$CC" lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -8126,7 +7633,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -8237,7 +7744,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f "$lt_ac_sed" && continue + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -8254,9 +7761,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test 10 -lt "$lt_ac_count" && break + test $lt_ac_count -gt 10 && break lt_ac_count=`expr $lt_ac_count + 1` - if test "$lt_ac_count" -gt "$lt_ac_max"; then + if test $lt_ac_count -gt $lt_ac_max; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -8280,7 +7787,27 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +AC_MSG_RESULT([$xsi_shell]) +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) + +AC_MSG_CHECKING([whether the shell understands "+="]) +lt_shell_append=no +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +AC_MSG_RESULT([$lt_shell_append]) +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -8304,9 +7831,102 @@ ])# _LT_CHECK_SHELL_FEATURES +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) + + +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi + +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) + # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine what file name conversion functions should be used by +# Determine which file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff -Nru libinput-1.2.2/m4/lt~obsolete.m4 libinput-0.21.0/m4/lt~obsolete.m4 --- libinput-1.2.2/m4/lt~obsolete.m4 2016-03-02 03:16:07.000000000 +0000 +++ libinput-0.21.0/m4/lt~obsolete.m4 2015-08-04 00:31:35.000000000 +0000 @@ -1,7 +1,6 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -12,7 +11,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -26,7 +25,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru libinput-1.2.2/m4/ltoptions.m4 libinput-0.21.0/m4/ltoptions.m4 --- libinput-1.2.2/m4/ltoptions.m4 2016-03-02 03:16:07.000000000 +0000 +++ libinput-0.21.0/m4/ltoptions.m4 2015-08-04 00:31:35.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 8 ltoptions.m4 +# serial 7 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option '$2'])])[]dnl + [m4_warning([Unknown $1 option `$2'])])[]dnl ]) @@ -75,15 +75,13 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl 'shared' nor 'disable-shared' was passed, we enable building of shared + dnl `shared' nor `disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], - [_LT_WITH_AIX_SONAME([aix])]) + [_LT_ENABLE_FAST_INSTALL]) ]) ])# _LT_SET_OPTIONS @@ -114,7 +112,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the 'dlopen' option into LT_INIT's first parameter.]) +put the `dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -150,7 +148,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the 'win32-dll' option into LT_INIT's first parameter.]) +put the `win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -159,9 +157,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the 'shared' and -# 'disable-shared' LT_INIT options. -# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -174,14 +172,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -213,9 +211,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the 'static' and -# 'disable-static' LT_INIT options. -# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -228,14 +226,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -267,9 +265,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the 'fast-install' -# and 'disable-fast-install' LT_INIT options. -# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -282,14 +280,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -306,14 +304,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the 'fast-install' option into LT_INIT's first parameter.]) +the `fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the 'disable-fast-install' option into LT_INIT's first parameter.]) +the `disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -321,64 +319,11 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) -# _LT_WITH_AIX_SONAME([DEFAULT]) -# ---------------------------------- -# implement the --with-aix-soname flag, and support the `aix-soname=aix' -# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT -# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. -m4_define([_LT_WITH_AIX_SONAME], -[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl -shared_archive_member_spec= -case $host,$enable_shared in -power*-*-aix[[5-9]]*,yes) - AC_MSG_CHECKING([which variant of shared library versioning to provide]) - AC_ARG_WITH([aix-soname], - [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], - [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], - [case $withval in - aix|svr4|both) - ;; - *) - AC_MSG_ERROR([Unknown argument to --with-aix-soname]) - ;; - esac - lt_cv_with_aix_soname=$with_aix_soname], - [AC_CACHE_VAL([lt_cv_with_aix_soname], - [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) - with_aix_soname=$lt_cv_with_aix_soname]) - AC_MSG_RESULT([$with_aix_soname]) - if test aix != "$with_aix_soname"; then - # For the AIX way of multilib, we name the shared archive member - # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', - # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. - # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, - # the AIX toolchain works better with OBJECT_MODE set (default 32). - if test 64 = "${OBJECT_MODE-32}"; then - shared_archive_member_spec=shr_64 - else - shared_archive_member_spec=shr - fi - fi - ;; -*) - with_aix_soname=aix - ;; -esac - -_LT_DECL([], [shared_archive_member_spec], [0], - [Shared archive member basename, for filename based shared library versioning on AIX])dnl -])# _LT_WITH_AIX_SONAME - -LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) -LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) -LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) - - # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' +# implement the --with-pic flag, and support the `pic-only' and `no-pic' # LT_INIT options. -# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -389,17 +334,19 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for lt_pkg in $withval; do - IFS=$lt_save_ifs + IFS="$lt_save_ifs" if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS=$lt_save_ifs + IFS="$lt_save_ifs" ;; esac], - [pic_mode=m4_default([$1], [default])]) + [pic_mode=default]) + +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -412,7 +359,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the 'pic-only' option into LT_INIT's first parameter.]) +put the `pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -Nru libinput-1.2.2/m4/ltsugar.m4 libinput-0.21.0/m4/ltsugar.m4 --- libinput-1.2.2/m4/ltsugar.m4 2016-03-02 03:16:07.000000000 +0000 +++ libinput-0.21.0/m4/ltsugar.m4 2015-08-04 00:31:35.000000000 +0000 @@ -1,7 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -34,7 +33,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59, which quotes differently. +# Autoconf-2.59 which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -45,7 +44,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -Nru libinput-1.2.2/m4/ltversion.m4 libinput-0.21.0/m4/ltversion.m4 --- libinput-1.2.2/m4/ltversion.m4 2016-03-02 03:16:07.000000000 +0000 +++ libinput-0.21.0/m4/ltversion.m4 2015-08-04 00:31:35.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru libinput-1.2.2/Makefile.in libinput-0.21.0/Makefile.in --- libinput-1.2.2/Makefile.in 2016-03-15 00:23:56.000000000 +0000 +++ libinput-0.21.0/Makefile.in 2015-08-04 00:58:30.000000000 +0000 @@ -161,8 +161,8 @@ CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \ - README compile config.guess config.sub depcomp install-sh \ - ltmain.sh missing + compile config.guess config.sub depcomp install-sh ltmain.sh \ + missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -267,12 +267,9 @@ LIBUDEV_LIBS = @LIBUDEV_LIBS@ LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@ LIBUNWIND_LIBS = @LIBUNWIND_LIBS@ -LIBWACOM_CFLAGS = @LIBWACOM_CFLAGS@ -LIBWACOM_LIBS = @LIBWACOM_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ diff -Nru libinput-1.2.2/README libinput-0.21.0/README --- libinput-1.2.2/README 2016-02-24 06:33:24.000000000 +0000 +++ libinput-0.21.0/README 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -foo diff -Nru libinput-1.2.2/src/evdev.c libinput-0.21.0/src/evdev.c --- libinput-1.2.2/src/evdev.c 2016-03-15 00:22:40.000000000 +0000 +++ libinput-0.21.0/src/evdev.c 2015-08-03 04:55:20.000000000 +0000 @@ -212,9 +212,9 @@ (void)i; /* no, we really don't care about the return value */ } -void -evdev_transform_absolute(struct evdev_device *device, - struct device_coords *point) +static void +transform_absolute(struct evdev_device *device, + struct device_coords *point) { if (!device->abs.apply_calibration) return; @@ -222,19 +222,6 @@ matrix_mult_vec(&device->abs.calibration, &point->x, &point->y); } -void -evdev_transform_relative(struct evdev_device *device, - struct device_coords *point) -{ - struct matrix rel_matrix; - - if (!device->abs.apply_calibration) - return; - - matrix_to_relative(&rel_matrix, &device->abs.calibration); - matrix_mult_vec(&rel_matrix, &point->x, &point->y); -} - static inline double scale_axis(const struct input_absinfo *absinfo, double val, double to_range) { @@ -302,9 +289,6 @@ case EVDEV_NONE: return; case EVDEV_RELATIVE_MOTION: - if (!(device->seat_caps & EVDEV_DEVICE_POINTER)) - break; - normalize_delta(device, &device->rel, &unaccel); raw.x = device->rel.x; raw.y = device->rel.y; @@ -313,20 +297,13 @@ /* Use unaccelerated deltas for pointing stick scroll */ if (evdev_post_trackpoint_scroll(device, unaccel, time)) - break; + break; - if (device->pointer.filter) { - /* Apply pointer acceleration. */ - accel = filter_dispatch(device->pointer.filter, - &unaccel, - device, - time); - } else { - log_bug_libinput(libinput, - "%s: accel filter missing\n", - udev_device_get_devnode(device->udev_device)); - accel = unaccel; - } + /* Apply pointer acceleration. */ + accel = filter_dispatch(device->pointer.filter, + &unaccel, + device, + time); if (normalized_is_zero(accel) && normalized_is_zero(unaccel)) break; @@ -353,7 +330,7 @@ seat->slot_map |= 1 << seat_slot; point = device->mt.slots[slot].point; - evdev_transform_absolute(device, &point); + transform_absolute(device, &point); touch_notify_touch_down(base, time, slot, seat_slot, &point); @@ -368,7 +345,7 @@ if (seat_slot == -1) break; - evdev_transform_absolute(device, &point); + transform_absolute(device, &point); touch_notify_touch_motion(base, time, slot, seat_slot, &point); break; @@ -407,13 +384,13 @@ seat->slot_map |= 1 << seat_slot; point = device->abs.point; - evdev_transform_absolute(device, &point); + transform_absolute(device, &point); touch_notify_touch_down(base, time, -1, seat_slot, &point); break; case EVDEV_ABSOLUTE_MOTION: point = device->abs.point; - evdev_transform_absolute(device, &point); + transform_absolute(device, &point); if (device->seat_caps & EVDEV_DEVICE_TOUCH) { seat_slot = device->abs.seat_slot; @@ -452,22 +429,8 @@ static enum evdev_key_type get_key_type(uint16_t code) { - switch (code) { - case BTN_TOOL_PEN: - case BTN_TOOL_RUBBER: - case BTN_TOOL_BRUSH: - case BTN_TOOL_PENCIL: - case BTN_TOOL_AIRBRUSH: - case BTN_TOOL_MOUSE: - case BTN_TOOL_LENS: - case BTN_TOOL_QUINTTAP: - case BTN_TOOL_DOUBLETAP: - case BTN_TOOL_TRIPLETAP: - case BTN_TOOL_QUADTAP: - case BTN_TOOL_FINGER: - case BTN_TOUCH: + if (code == BTN_TOUCH) return EVDEV_KEY_TYPE_NONE; - } if (code >= KEY_ESC && code <= KEY_MICMUTE) return EVDEV_KEY_TYPE_KEY; @@ -649,7 +612,7 @@ } } -void +static void evdev_notify_axis(struct evdev_device *device, uint64_t time, uint32_t axes, @@ -675,25 +638,6 @@ &discrete); } -static inline bool -evdev_reject_relative(struct evdev_device *device, - const struct input_event *e, - uint64_t time) -{ - struct libinput *libinput = device->base.seat->libinput; - - if ((e->code == REL_X || e->code == REL_Y) && - (device->seat_caps & EVDEV_DEVICE_POINTER) == 0) { - log_bug_libinput_ratelimit(libinput, - &device->nonpointer_rel_limit, - "REL_X/Y from device '%s', but this device is not a pointer\n", - device->devname); - return true; - } - - return false; -} - static inline void evdev_process_relative(struct evdev_device *device, struct input_event *e, uint64_t time) @@ -701,9 +645,6 @@ struct normalized_coords wheel_degrees = { 0.0, 0.0 }; struct discrete_coords discrete = { 0.0, 0.0 }; - if (evdev_reject_relative(device, e, time)) - return; - switch (e->code) { case REL_X: if (device->pending_event != EVDEV_RELATIVE_MOTION) @@ -975,7 +916,6 @@ NULL, /* device_removed */ NULL, /* device_suspended */ NULL, /* device_resumed */ - NULL, /* post_added */ }; static uint32_t @@ -1205,7 +1145,7 @@ return 0; } -void +static void evdev_init_calibration(struct evdev_device *device, struct evdev_dispatch *dispatch) { @@ -1398,10 +1338,20 @@ rc = libevdev_next_event(device->evdev, LIBEVDEV_READ_FLAG_NORMAL, &ev); if (rc == LIBEVDEV_READ_STATUS_SYNC) { - log_info_ratelimit(libinput, - &device->syn_drop_limit, - "SYN_DROPPED event from \"%s\" - some input events have been lost.\n", - device->devname); + switch (ratelimit_test(&device->syn_drop_limit)) { + case RATELIMIT_PASS: + log_info(libinput, "SYN_DROPPED event from " + "\"%s\" - some input events have " + "been lost.\n", device->devname); + break; + case RATELIMIT_THRESHOLD: + log_info(libinput, "SYN_DROPPED flood " + "from \"%s\"\n", + device->devname); + break; + case RATELIMIT_EXCEEDED: + break; + } /* send one more sync event so we handle all currently pending events before we sync up @@ -1423,27 +1373,6 @@ } } -static inline int -evdev_init_accel(struct evdev_device *device, - enum libinput_config_accel_profile which) -{ - struct motion_filter *filter; - - if (which == LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT) - filter = create_pointer_accelerator_filter_flat(device->dpi); - else if (device->tags & EVDEV_TAG_TRACKPOINT) - filter = create_pointer_accelerator_filter_trackpoint(device->dpi); - else if (device->dpi < DEFAULT_MOUSE_DPI) - filter = create_pointer_accelerator_filter_linear_low_dpi(device->dpi); - else - filter = create_pointer_accelerator_filter_linear(device->dpi); - - if (!filter) - return -1; - - return evdev_device_init_pointer_acceleration(device, filter); -} - static int evdev_accel_config_available(struct libinput_device *device) { @@ -1477,83 +1406,23 @@ return 0.0; } -static uint32_t -evdev_accel_config_get_profiles(struct libinput_device *libinput_device) -{ - struct evdev_device *device = (struct evdev_device*)libinput_device; - - if (!device->pointer.filter) - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; - - return LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE | - LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT; -} - -static enum libinput_config_status -evdev_accel_config_set_profile(struct libinput_device *libinput_device, - enum libinput_config_accel_profile profile) -{ - struct evdev_device *device = (struct evdev_device*)libinput_device; - struct motion_filter *filter; - double speed; - - filter = device->pointer.filter; - if (filter_get_type(filter) == profile) - return LIBINPUT_CONFIG_STATUS_SUCCESS; - - speed = filter_get_speed(filter); - device->pointer.filter = NULL; - - if (evdev_init_accel(device, profile) == 0) { - evdev_accel_config_set_speed(libinput_device, speed); - filter_destroy(filter); - } else { - device->pointer.filter = filter; - } - - return LIBINPUT_CONFIG_STATUS_SUCCESS; -} - -static enum libinput_config_accel_profile -evdev_accel_config_get_profile(struct libinput_device *libinput_device) -{ - struct evdev_device *device = (struct evdev_device*)libinput_device; - - return filter_get_type(device->pointer.filter); -} - -static enum libinput_config_accel_profile -evdev_accel_config_get_default_profile(struct libinput_device *libinput_device) -{ - struct evdev_device *device = (struct evdev_device*)libinput_device; - - if (!device->pointer.filter) - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; - - /* No device has a flat profile as default */ - return LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE; -} - int evdev_device_init_pointer_acceleration(struct evdev_device *device, - struct motion_filter *filter) + accel_profile_func_t profile) { - device->pointer.filter = filter; + device->pointer.filter = create_pointer_accelerator_filter(profile, + device->dpi); + if (!device->pointer.filter) + return -1; - if (device->base.config.accel == NULL) { - device->pointer.config.available = evdev_accel_config_available; - device->pointer.config.set_speed = evdev_accel_config_set_speed; - device->pointer.config.get_speed = evdev_accel_config_get_speed; - device->pointer.config.get_default_speed = evdev_accel_config_get_default_speed; - device->pointer.config.get_profiles = evdev_accel_config_get_profiles; - device->pointer.config.set_profile = evdev_accel_config_set_profile; - device->pointer.config.get_profile = evdev_accel_config_get_profile; - device->pointer.config.get_default_profile = evdev_accel_config_get_default_profile; - device->base.config.accel = &device->pointer.config; + device->pointer.config.available = evdev_accel_config_available; + device->pointer.config.set_speed = evdev_accel_config_set_speed; + device->pointer.config.get_speed = evdev_accel_config_get_speed; + device->pointer.config.get_default_speed = evdev_accel_config_get_default_speed; + device->base.config.accel = &device->pointer.config; - evdev_accel_config_set_speed(&device->base, - evdev_accel_config_get_default_speed(&device->base)); - } + evdev_accel_config_set_speed(&device->base, + evdev_accel_config_get_default_speed(&device->base)); return 0; } @@ -1664,7 +1533,6 @@ enum evdev_device_model model; } model_map[] = { { "LIBINPUT_MODEL_LENOVO_X230", EVDEV_MODEL_LENOVO_X230 }, - { "LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81", EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 }, { "LIBINPUT_MODEL_CHROMEBOOK", EVDEV_MODEL_CHROMEBOOK }, { "LIBINPUT_MODEL_SYSTEM76_BONOBO", EVDEV_MODEL_SYSTEM76_BONOBO }, { "LIBINPUT_MODEL_SYSTEM76_GALAGO", EVDEV_MODEL_SYSTEM76_GALAGO }, @@ -1676,11 +1544,6 @@ { "LIBINPUT_MODEL_SYNAPTICS_SERIAL_TOUCHPAD", EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD }, { "LIBINPUT_MODEL_JUMPING_SEMI_MT", EVDEV_MODEL_JUMPING_SEMI_MT }, { "LIBINPUT_MODEL_ELANTECH_TOUCHPAD", EVDEV_MODEL_ELANTECH_TOUCHPAD }, - { "LIBINPUT_MODEL_APPLE_INTERNAL_KEYBOARD", EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD }, - { "LIBINPUT_MODEL_CYBORG_RAT", EVDEV_MODEL_CYBORG_RAT }, - { "LIBINPUT_MODEL_CYAPA", EVDEV_MODEL_CYAPA }, - { "LIBINPUT_MODEL_ALPS_RUSHMORE", EVDEV_MODEL_ALPS_RUSHMORE }, - { "LIBINPUT_MODEL_LENOVO_T450_TOUCHPAD", EVDEV_MODEL_LENOVO_T450_TOUCHPAD }, { NULL, EVDEV_MODEL_DEFAULT }, }; const struct model_map *m = model_map; @@ -1887,8 +1750,7 @@ libevdev_has_event_code(evdev, EV_REL, REL_Y)) return -1; - if (!evdev_is_fake_mt_device(device) && - libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) ^ + if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) ^ libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y)) return -1; @@ -1997,6 +1859,19 @@ return 0; } +static inline int +evdev_init_accel(struct evdev_device *device) +{ + accel_profile_func_t profile; + + if (device->dpi < DEFAULT_MOUSE_DPI) + profile = pointer_accel_profile_linear_low_dpi; + else + profile = pointer_accel_profile_linear; + + return evdev_device_init_pointer_acceleration(device, profile); +} + static int evdev_configure_device(struct evdev_device *device) { @@ -2004,7 +1879,6 @@ struct libevdev *evdev = device->evdev; const char *devnode = udev_device_get_devnode(device->udev_device); enum evdev_device_udev_tags udev_tags; - unsigned int tablet_tags; udev_tags = evdev_device_get_udev_tags(device, device->udev_device); @@ -2029,13 +1903,6 @@ udev_tags & EVDEV_UDEV_TAG_ACCELEROMETER ? " Accelerometer" : "", udev_tags & EVDEV_UDEV_TAG_BUTTONSET ? " Buttonset" : ""); - if (udev_tags & EVDEV_UDEV_TAG_ACCELEROMETER) { - log_info(libinput, - "input device '%s', %s is an accelerometer, ignoring\n", - device->devname, devnode); - return -1; - } - /* libwacom *adds* TABLET, TOUCHPAD but leaves JOYSTICK in place, so make sure we only ignore real joystick devices */ if ((udev_tags & EVDEV_UDEV_TAG_JOYSTICK) == udev_tags) { @@ -2082,21 +1949,6 @@ } } - /* libwacom assigns touchpad (or touchscreen) _and_ tablet to the - tablet touch bits, so make sure we don't initialize the tablet - interface for the touch device */ - tablet_tags = EVDEV_UDEV_TAG_TABLET | - EVDEV_UDEV_TAG_TOUCHPAD | - EVDEV_UDEV_TAG_TOUCHSCREEN; - if ((udev_tags & tablet_tags) == EVDEV_UDEV_TAG_TABLET) { - device->dispatch = evdev_tablet_create(device); - device->seat_caps |= EVDEV_DEVICE_TABLET; - log_info(libinput, - "input device '%s', %s is a tablet\n", - device->devname, devnode); - return device->dispatch == NULL ? -1 : 0; - } - if (udev_tags & EVDEV_UDEV_TAG_TOUCHPAD) { device->dispatch = evdev_mt_touchpad_create(device); log_info(libinput, @@ -2113,6 +1965,11 @@ evdev_tag_trackpoint(device, device->udev_device); device->dpi = evdev_read_dpi_prop(device); + if (libevdev_has_event_code(evdev, EV_REL, REL_X) && + libevdev_has_event_code(evdev, EV_REL, REL_Y) && + evdev_init_accel(device) == -1) + return -1; + device->seat_caps |= EVDEV_DEVICE_POINTER; log_info(libinput, @@ -2150,16 +2007,6 @@ device->devname, devnode); } - if (device->seat_caps & EVDEV_DEVICE_POINTER && - libevdev_has_event_code(evdev, EV_REL, REL_X) && - libevdev_has_event_code(evdev, EV_REL, REL_Y) && - evdev_init_accel(device, LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE) == -1) { - log_error(libinput, - "failed to initialize pointer acceleration for %s\n", - device->devname); - return -1; - } - return 0; } @@ -2187,10 +2034,6 @@ } notify_added_device(&device->base); - - if (device->dispatch->interface->post_added) - device->dispatch->interface->post_added(device, - device->dispatch); } static bool @@ -2220,17 +2063,27 @@ evdev_set_device_group(struct evdev_device *device, struct udev_device *udev_device) { - struct libinput *libinput = device->base.seat->libinput; struct libinput_device_group *group = NULL; const char *udev_group; udev_group = udev_device_get_property_value(udev_device, "LIBINPUT_DEVICE_GROUP"); - if (udev_group) - group = libinput_device_group_find_group(libinput, udev_group); + if (udev_group) { + struct libinput_device *d; + + list_for_each(d, &device->base.seat->devices_list, link) { + const char *identifier = d->group->identifier; + + if (identifier && + strcmp(identifier, udev_group) == 0) { + group = d->group; + break; + } + } + } if (!group) { - group = libinput_device_group_create(libinput, udev_group); + group = libinput_device_group_create(udev_group); if (!group) return 1; libinput_device_set_device_group(&device->base, group); @@ -2242,50 +2095,6 @@ return 0; } -static inline void -evdev_drain_fd(int fd) -{ - struct input_event ev[24]; - size_t sz = sizeof ev; - - while (read(fd, &ev, sz) == (int)sz) { - /* discard all pending events */ - } -} - -static inline void -evdev_pre_configure_model_quirks(struct evdev_device *device) -{ - /* The Cyborg RAT has a mode button that cycles through event codes. - * On press, we get a release for the current mode and a press for the - * next mode: - * E: 0.000001 0004 0004 589833 # EV_MSC / MSC_SCAN 589833 - * E: 0.000001 0001 0118 0000 # EV_KEY / (null) 0 - * E: 0.000001 0004 0004 589834 # EV_MSC / MSC_SCAN 589834 - * E: 0.000001 0001 0119 0001 # EV_KEY / (null) 1 - * E: 0.000001 0000 0000 0000 # ------------ SYN_REPORT (0) ---------- +0ms - * E: 0.705000 0004 0004 589834 # EV_MSC / MSC_SCAN 589834 - * E: 0.705000 0001 0119 0000 # EV_KEY / (null) 0 - * E: 0.705000 0004 0004 589835 # EV_MSC / MSC_SCAN 589835 - * E: 0.705000 0001 011a 0001 # EV_KEY / (null) 1 - * E: 0.705000 0000 0000 0000 # ------------ SYN_REPORT (0) ---------- +705ms - * E: 1.496995 0004 0004 589833 # EV_MSC / MSC_SCAN 589833 - * E: 1.496995 0001 0118 0001 # EV_KEY / (null) 1 - * E: 1.496995 0004 0004 589835 # EV_MSC / MSC_SCAN 589835 - * E: 1.496995 0001 011a 0000 # EV_KEY / (null) 0 - * E: 1.496995 0000 0000 0000 # ------------ SYN_REPORT (0) ---------- +791ms - * - * https://bugs.freedesktop.org/show_bug.cgi?id=92127 - * - * Disable the event codes to avoid stuck buttons. - */ - if(device->model_flags & EVDEV_MODEL_CYBORG_RAT) { - libevdev_disable_event_code(device->evdev, EV_KEY, 0x118); - libevdev_disable_event_code(device->evdev, EV_KEY, 0x119); - libevdev_disable_event_code(device->evdev, EV_KEY, 0x11a); - } -} - struct evdev_device * evdev_device_create(struct libinput_seat *seat, struct udev_device *udev_device) @@ -2319,8 +2128,6 @@ libinput_device_init(&device->base, seat); libinput_seat_ref(seat); - evdev_drain_fd(fd); - rc = libevdev_new_from_fd(fd, &device->evdev); if (rc != 0) goto err; @@ -2339,7 +2146,6 @@ device->pending_event = EVDEV_NONE; device->devname = libevdev_get_name(device->evdev); device->scroll.threshold = 5.0; /* Default may be overridden */ - device->scroll.direction_lock_threshold = 5.0; /* Default may be overridden */ device->scroll.direction = 0; device->scroll.wheel_click_angle = evdev_read_wheel_click_prop(device); @@ -2348,15 +2154,11 @@ /* at most 5 SYN_DROPPED log-messages per 30s */ ratelimit_init(&device->syn_drop_limit, s2us(30), 5); - /* at most 5 log-messages per 5s */ - ratelimit_init(&device->nonpointer_rel_limit, s2us(5), 5); matrix_init_identity(&device->abs.calibration); matrix_init_identity(&device->abs.usermatrix); matrix_init_identity(&device->abs.default_calibration); - evdev_pre_configure_model_quirks(device); - if (evdev_configure_device(device) == -1) goto err; @@ -2515,8 +2317,6 @@ return !!(device->seat_caps & EVDEV_DEVICE_TOUCH); case LIBINPUT_DEVICE_CAP_GESTURE: return !!(device->seat_caps & EVDEV_DEVICE_GESTURE); - case LIBINPUT_DEVICE_CAP_TABLET_TOOL: - return !!(device->seat_caps & EVDEV_DEVICE_TABLET); default: return 0; } @@ -2614,12 +2414,12 @@ trigger speed to start scrolling in the other direction */ } else if (!evdev_is_scrolling(device, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) { - if (fabs(delta->y) >= device->scroll.direction_lock_threshold) + if (fabs(delta->y) >= device->scroll.threshold) evdev_start_scrolling(device, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); } else if (!evdev_is_scrolling(device, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) { - if (fabs(delta->x) >= device->scroll.direction_lock_threshold) + if (fabs(delta->x) >= device->scroll.threshold) evdev_start_scrolling(device, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL); } @@ -2639,16 +2439,9 @@ if (!normalized_is_zero(event)) { const struct discrete_coords zero_discrete = { 0.0, 0.0 }; - uint32_t axes = device->scroll.direction; - - if (event.y == 0.0) - axes &= ~AS_MASK(LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); - if (event.x == 0.0) - axes &= ~AS_MASK(LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL); - evdev_notify_axis(device, time, - axes, + device->scroll.direction, source, &event, &zero_discrete); @@ -2772,8 +2565,6 @@ return -ENODEV; } - evdev_drain_fd(fd); - device->fd = fd; if (evdev_need_mtdev(device)) { diff -Nru libinput-1.2.2/src/evdev.h libinput-0.21.0/src/evdev.h --- libinput-1.2.2/src/evdev.h 2016-03-15 00:22:40.000000000 +0000 +++ libinput-0.21.0/src/evdev.h 2015-08-03 04:55:20.000000000 +0000 @@ -60,7 +60,6 @@ EVDEV_DEVICE_POINTER = (1 << 0), EVDEV_DEVICE_KEYBOARD = (1 << 1), EVDEV_DEVICE_TOUCH = (1 << 2), - EVDEV_DEVICE_TABLET = (1 << 3), EVDEV_DEVICE_GESTURE = (1 << 5), }; @@ -108,12 +107,6 @@ EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD = (1 << 9), EVDEV_MODEL_JUMPING_SEMI_MT = (1 << 10), EVDEV_MODEL_ELANTECH_TOUCHPAD = (1 << 11), - EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), - EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD = (1 << 13), - EVDEV_MODEL_CYBORG_RAT = (1 << 14), - EVDEV_MODEL_CYAPA = (1 << 15), - EVDEV_MODEL_ALPS_RUSHMORE = (1 << 16), - EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17), }; struct mt_slot { @@ -173,7 +166,6 @@ void (*change_scroll_method)(struct evdev_device *device); bool button_scroll_active; double threshold; - double direction_lock_threshold; uint32_t direction; struct normalized_coords buildup; @@ -230,7 +222,6 @@ int dpi; /* HW resolution */ struct ratelimit syn_drop_limit; /* ratelimit for SYN_DROPPED logging */ - struct ratelimit nonpointer_rel_limit; /* ratelimit for REL_* events from non-pointer devices */ uint32_t model_flags; }; @@ -271,11 +262,6 @@ /* A device was resumed */ void (*device_resumed)(struct evdev_device *device, struct evdev_device *resumed_device); - - /* Called immediately after the LIBINPUT_EVENT_DEVICE_ADDED event - * was sent */ - void (*post_added)(struct evdev_device *device, - struct evdev_dispatch *dispatch); }; struct evdev_dispatch { @@ -292,21 +278,9 @@ evdev_device_create(struct libinput_seat *seat, struct udev_device *device); -void -evdev_transform_absolute(struct evdev_device *device, - struct device_coords *point); - -void -evdev_transform_relative(struct evdev_device *device, - struct device_coords *point); - -void -evdev_init_calibration(struct evdev_device *device, - struct evdev_dispatch *dispatch); - int evdev_device_init_pointer_acceleration(struct evdev_device *device, - struct motion_filter *filter); + accel_profile_func_t profile); struct evdev_dispatch * evdev_touchpad_create(struct evdev_device *device); @@ -314,9 +288,6 @@ struct evdev_dispatch * evdev_mt_touchpad_create(struct evdev_device *device); -struct evdev_dispatch * -evdev_tablet_create(struct evdev_device *device); - void evdev_tag_touchpad(struct evdev_device *device, struct udev_device *udev_device); @@ -409,13 +380,6 @@ evdev_init_natural_scroll(struct evdev_device *device); void -evdev_notify_axis(struct evdev_device *device, - uint64_t time, - uint32_t axes, - enum libinput_pointer_axis_source source, - const struct normalized_coords *delta_in, - const struct discrete_coords *discrete_in); -void evdev_post_scroll(struct evdev_device *device, uint64_t time, enum libinput_pointer_axis_source source, diff -Nru libinput-1.2.2/src/evdev-middle-button.c libinput-0.21.0/src/evdev-middle-button.c --- libinput-1.2.2/src/evdev-middle-button.c 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/src/evdev-middle-button.c 2015-08-03 05:08:55.000000000 +0000 @@ -640,7 +640,9 @@ { struct evdev_device *device = (struct evdev_device*)data; - evdev_middlebutton_handle_event(device, now, MIDDLEBUTTON_EVENT_TIMEOUT); + evdev_middlebutton_handle_event(device, + libinput_now(device->base.seat->libinput), + MIDDLEBUTTON_EVENT_TIMEOUT); } static int diff -Nru libinput-1.2.2/src/evdev-mt-touchpad-buttons.c libinput-0.21.0/src/evdev-mt-touchpad-buttons.c --- libinput-1.2.2/src/evdev-mt-touchpad-buttons.c 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/src/evdev-mt-touchpad-buttons.c 2015-08-03 04:55:20.000000000 +0000 @@ -78,54 +78,47 @@ } static inline bool -is_inside_bottom_button_area(const struct tp_dispatch *tp, - const struct tp_touch *t) +is_inside_bottom_button_area(struct tp_dispatch *tp, struct tp_touch *t) { return t->point.y >= tp->buttons.bottom_area.top_edge; } static inline bool -is_inside_bottom_right_area(const struct tp_dispatch *tp, - const struct tp_touch *t) +is_inside_bottom_right_area(struct tp_dispatch *tp, struct tp_touch *t) { return is_inside_bottom_button_area(tp, t) && t->point.x > tp->buttons.bottom_area.rightbutton_left_edge; } static inline bool -is_inside_bottom_left_area(const struct tp_dispatch *tp, - const struct tp_touch *t) +is_inside_bottom_left_area(struct tp_dispatch *tp, struct tp_touch *t) { return is_inside_bottom_button_area(tp, t) && !is_inside_bottom_right_area(tp, t); } static inline bool -is_inside_top_button_area(const struct tp_dispatch *tp, - const struct tp_touch *t) +is_inside_top_button_area(struct tp_dispatch *tp, struct tp_touch *t) { return t->point.y <= tp->buttons.top_area.bottom_edge; } static inline bool -is_inside_top_right_area(const struct tp_dispatch *tp, - const struct tp_touch *t) +is_inside_top_right_area(struct tp_dispatch *tp, struct tp_touch *t) { return is_inside_top_button_area(tp, t) && t->point.x > tp->buttons.top_area.rightbutton_left_edge; } static inline bool -is_inside_top_left_area(const struct tp_dispatch *tp, - const struct tp_touch *t) +is_inside_top_left_area(struct tp_dispatch *tp, struct tp_touch *t) { return is_inside_top_button_area(tp, t) && t->point.x < tp->buttons.top_area.leftbutton_right_edge; } static inline bool -is_inside_top_middle_area(const struct tp_dispatch *tp, - const struct tp_touch *t) +is_inside_top_middle_area(struct tp_dispatch *tp, struct tp_touch *t) { return is_inside_top_button_area(tp, t) && t->point.x >= tp->buttons.top_area.leftbutton_right_edge && @@ -1049,15 +1042,13 @@ } int -tp_button_touch_active(const struct tp_dispatch *tp, - const struct tp_touch *t) +tp_button_touch_active(struct tp_dispatch *tp, struct tp_touch *t) { return t->button.state == BUTTON_STATE_AREA; } bool -tp_button_is_inside_softbutton_area(const struct tp_dispatch *tp, - const struct tp_touch *t) +tp_button_is_inside_softbutton_area(struct tp_dispatch *tp, struct tp_touch *t) { return is_inside_top_button_area(tp, t) || is_inside_bottom_button_area(tp, t); diff -Nru libinput-1.2.2/src/evdev-mt-touchpad.c libinput-0.21.0/src/evdev-mt-touchpad.c --- libinput-1.2.2/src/evdev-mt-touchpad.c 2016-03-15 00:22:40.000000000 +0000 +++ libinput-0.21.0/src/evdev-mt-touchpad.c 2015-08-04 00:01:51.000000000 +0000 @@ -71,18 +71,6 @@ unaccelerated, tp, time); } -struct normalized_coords -tp_filter_motion_unaccelerated(struct tp_dispatch *tp, - const struct normalized_coords *unaccelerated, - uint64_t time) -{ - if (normalized_is_zero(*unaccelerated)) - return *unaccelerated; - - return filter_dispatch_constant(tp->device->pointer.filter, - unaccelerated, tp, time); -} - static inline void tp_motion_history_push(struct tp_touch *t) { @@ -140,14 +128,6 @@ static inline unsigned int tp_fake_finger_count(struct tp_dispatch *tp) { - /* Only one of BTN_TOOL_DOUBLETAP/TRIPLETAP/... may be set at any - * time */ - if (__builtin_popcount( - tp->fake_touches & ~(FAKE_FINGER_OVERFLOW|0x1)) > 1) - log_bug_kernel(tp->device->base.seat->libinput, - "Invalid fake finger state %#x\n", - tp->fake_touches); - if (tp->fake_touches & FAKE_FINGER_OVERFLOW) return FAKE_FINGER_OVERFLOW; else /* don't count BTN_TOUCH */ @@ -337,7 +317,7 @@ case ABS_MT_PRESSURE: t->pressure = e->value; t->dirty = true; - tp->queued |= TOUCHPAD_EVENT_OTHERAXIS; + tp->queued |= TOUCHPAD_EVENT_MOTION; break; } } @@ -518,7 +498,7 @@ } int -tp_touch_active(const struct tp_dispatch *tp, const struct tp_touch *t) +tp_touch_active(struct tp_dispatch *tp, struct tp_touch *t) { return (t->state == TOUCH_BEGIN || t->state == TOUCH_UPDATE) && t->palm.state == PALM_NONE && @@ -529,7 +509,7 @@ } bool -tp_palm_tap_is_palm(const struct tp_dispatch *tp, const struct tp_touch *t) +tp_palm_tap_is_palm(struct tp_dispatch *tp, struct tp_touch *t) { if (t->state != TOUCH_BEGIN) return false; @@ -538,9 +518,9 @@ t->point.x < tp->palm.right_edge) return false; - /* We're inside the left/right palm edge and not in one of the - * software button areas */ - if (t->point.y < tp->buttons.bottom_area.top_edge) { + /* We're inside the left/right palm edge and in the northern half of + * the touchpad - this tap is a palm */ + if (t->point.y < tp->palm.vert_center) { log_debug(tp_libinput_context(tp), "palm: palm-tap detected\n"); return true; @@ -751,9 +731,6 @@ for (i = 0; i < tp->ntouches; i++) { t = tp_get_touch(tp, i); - if (!t->dirty) - continue; - if (t->state == TOUCH_HOVERING) { if (t->distance == 0) { /* avoid jumps when landing a finger */ @@ -843,8 +820,7 @@ struct tp_touch *topmost = NULL; unsigned int start, i; - if (tp_fake_finger_count(tp) <= tp->num_slots || - tp->nfingers_down == 0) + if (tp_fake_finger_count(tp) <= tp->num_slots) return; /* We have at least one fake touch down. Find the top-most real @@ -880,10 +856,8 @@ } static inline bool -tp_need_motion_history_reset(struct tp_dispatch *tp, uint64_t time) +tp_need_motion_history_reset(struct tp_dispatch *tp) { - bool rc = false; - /* semi-mt finger postions may "jump" when nfingers changes */ if (tp->semi_mt && tp->nfingers_down != tp->old_nfingers_down) return true; @@ -896,29 +870,7 @@ tp->old_nfingers_down > tp->num_slots)) return true; - /* Quirk: if we had multiple events without x/y axis - information, the next x/y event is going to be a jump. So we - reset that touch to non-dirty effectively swallowing that event - and restarting with the next event again. - */ - if (tp->device->model_flags & EVDEV_MODEL_LENOVO_T450_TOUCHPAD) { - if (tp->queued & TOUCHPAD_EVENT_MOTION) { - if (tp->quirks.nonmotion_event_count > 10) { - struct tp_touch *t; - - tp_for_each_touch(tp, t) - t->dirty = false; - rc = true; - } - tp->quirks.nonmotion_event_count = 0; - } - - if ((tp->queued & (TOUCHPAD_EVENT_OTHERAXIS|TOUCHPAD_EVENT_MOTION)) == - TOUCHPAD_EVENT_OTHERAXIS) - tp->quirks.nonmotion_event_count++; - } - - return rc; + return false; } static void @@ -933,7 +885,7 @@ tp_unhover_touches(tp, time); tp_position_fake_touches(tp); - want_motion_reset = tp_need_motion_history_reset(tp, time); + want_motion_reset = tp_need_motion_history_reset(tp); for (i = 0; i < tp->ntouches; i++) { t = tp_get_touch(tp, i); @@ -1220,16 +1172,6 @@ { struct tp_dispatch *tp = data; - if (tp->dwt.dwt_enabled && - long_any_bit_set(tp->dwt.key_mask, - ARRAY_LENGTH(tp->dwt.key_mask))) { - libinput_timer_set(&tp->dwt.keyboard_timer, - now + DEFAULT_KEYBOARD_ACTIVITY_TIMEOUT_2); - tp->dwt.keyboard_last_press_time = now; - log_debug(tp_libinput_context(tp), "palm: keyboard timeout refresh\n"); - return; - } - tp_tap_resume(tp, now); tp->dwt.keyboard_active = false; @@ -1274,27 +1216,23 @@ struct tp_dispatch *tp = data; struct libinput_event_keyboard *kbdev; unsigned int timeout; - unsigned int key; + + if (!tp->dwt.dwt_enabled) + return; if (event->type != LIBINPUT_EVENT_KEYBOARD_KEY) return; kbdev = libinput_event_get_keyboard_event(event); - key = libinput_event_keyboard_get_key(kbdev); /* Only trigger the timer on key down. */ if (libinput_event_keyboard_get_key_state(kbdev) != - LIBINPUT_KEY_STATE_PRESSED) { - long_clear_bit(tp->dwt.key_mask, key); - return; - } - - if (!tp->dwt.dwt_enabled) + LIBINPUT_KEY_STATE_PRESSED) return; /* modifier keys don't trigger disable-while-typing so things like * ctrl+zoom or ctrl+click are possible */ - if (tp_key_ignore_for_dwt(key)) + if (tp_key_ignore_for_dwt(libinput_event_keyboard_get_key(kbdev))) return; if (!tp->dwt.keyboard_active) { @@ -1308,7 +1246,6 @@ } tp->dwt.keyboard_last_press_time = time; - long_set_bit(tp->dwt.key_mask, key); libinput_timer_set(&tp->dwt.keyboard_timer, time + timeout); } @@ -1323,7 +1260,7 @@ return true; /* Wacom makes touchpads, but not internal ones */ - if (device->model_flags & EVDEV_MODEL_WACOM_TOUCHPAD) + if (libevdev_get_id_vendor(device->evdev) == VENDOR_ID_WACOM) return true; return false; @@ -1335,8 +1272,6 @@ { unsigned int bus_tp = libevdev_get_id_bustype(touchpad->evdev), bus_kbd = libevdev_get_id_bustype(keyboard->evdev); - unsigned int vendor_tp = evdev_device_get_id_vendor(touchpad); - unsigned int vendor_kbd = evdev_device_get_id_vendor(keyboard); if (tp_dwt_device_is_blacklisted(touchpad) || tp_dwt_device_is_blacklisted(keyboard)) @@ -1347,13 +1282,6 @@ if (bus_tp == BUS_I8042 && bus_kbd != bus_tp) return false; - /* For Apple touchpads, always use its internal keyboard */ - if (vendor_tp == VENDOR_ID_APPLE) { - return vendor_kbd == vendor_tp && - keyboard->model_flags & - EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD; - } - /* everything else we don't really know, so we have to assume they go together */ @@ -1361,38 +1289,6 @@ } static void -tp_dwt_pair_keyboard(struct evdev_device *touchpad, - struct evdev_device *keyboard) -{ - struct tp_dispatch *tp = (struct tp_dispatch*)touchpad->dispatch; - unsigned int bus_kbd = libevdev_get_id_bustype(keyboard->evdev); - - if (!tp_want_dwt(touchpad, keyboard)) - return; - - /* If we already have a keyboard paired, override it if the new one - * is a serio device. Otherwise keep the current one */ - if (tp->dwt.keyboard) { - if (bus_kbd != BUS_I8042) - return; - - memset(tp->dwt.key_mask, 0, sizeof(tp->dwt.key_mask)); - libinput_device_remove_event_listener(&tp->dwt.keyboard_listener); - } - - libinput_device_add_event_listener(&keyboard->base, - &tp->dwt.keyboard_listener, - tp_keyboard_event, tp); - tp->dwt.keyboard = keyboard; - tp->dwt.keyboard_active = false; - - log_debug(touchpad->base.seat->libinput, - "palm: dwt activated with %s<->%s\n", - touchpad->devname, - keyboard->devname); -} - -static void tp_interface_device_added(struct evdev_device *device, struct evdev_device *added_device) { @@ -1416,8 +1312,20 @@ tp_trackpoint_event, tp); } - if (added_device->tags & EVDEV_TAG_KEYBOARD) - tp_dwt_pair_keyboard(device, added_device); + if (added_device->tags & EVDEV_TAG_KEYBOARD && + tp->dwt.keyboard == NULL && + tp_want_dwt(device, added_device)) { + log_debug(tp_libinput_context(tp), + "palm: dwt activated with %s<->%s\n", + device->devname, + added_device->devname); + + libinput_device_add_event_listener(&added_device->base, + &tp->dwt.keyboard_listener, + tp_keyboard_event, tp); + tp->dwt.keyboard = added_device; + tp->dwt.keyboard_active = false; + } if (tp->sendevents.current_mode != LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE) @@ -1495,7 +1403,6 @@ tp_interface_device_removed, tp_interface_device_removed, /* device_suspended, treat as remove */ tp_interface_device_added, /* device_resumed, treat as add */ - NULL, /* post_added */ }; static void @@ -1558,22 +1465,16 @@ tp->semi_mt = libevdev_has_property(device->evdev, INPUT_PROP_SEMI_MT); - /* Semi-mt devices are not reliable for true multitouch data, so we - * simply pretend they're single touch touchpads with BTN_TOOL bits. - * Synaptics: - * Terrible resolution when two fingers are down, + /* This device has a terrible resolution when two fingers are down, * causing scroll jumps. The single-touch emulation ABS_X/Y is * accurate but the ABS_MT_POSITION touchpoints report the bounding - * box and that causes jumps. See https://bugzilla.redhat.com/1235175 - * Elantech: - * On three-finger taps/clicks, one slot doesn't get a coordinate - * assigned. See https://bugs.freedesktop.org/show_bug.cgi?id=93583 - * Alps: - * If three fingers are set down in the same frame, one slot has the - * coordinates 0/0 and may not get updated for several frames. - * See https://bugzilla.redhat.com/show_bug.cgi?id=1295073 + * box and that causes jumps. So we simply pretend it's a single + * touch touchpad with the BTN_TOOL bits. + * See https://bugzilla.redhat.com/show_bug.cgi?id=1235175 for an + * explanation. */ - if (tp->semi_mt) { + if (tp->semi_mt && + (device->model_flags & EVDEV_MODEL_JUMPING_SEMI_MT)) { tp->num_slots = 1; tp->slot = 0; tp->has_mt = false; @@ -1605,38 +1506,11 @@ return 0; } -static uint32_t -tp_accel_config_get_profiles(struct libinput_device *libinput_device) -{ - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; -} - -static enum libinput_config_status -tp_accel_config_set_profile(struct libinput_device *libinput_device, - enum libinput_config_accel_profile profile) -{ - return LIBINPUT_CONFIG_STATUS_UNSUPPORTED; -} - -static enum libinput_config_accel_profile -tp_accel_config_get_profile(struct libinput_device *libinput_device) -{ - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; -} - -static enum libinput_config_accel_profile -tp_accel_config_get_default_profile(struct libinput_device *libinput_device) -{ - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; -} - static int tp_init_accel(struct tp_dispatch *tp, double diagonal) { - struct evdev_device *device = tp->device; int res_x, res_y; - struct motion_filter *filter; - int rc; + accel_profile_func_t profile; res_x = tp->device->abs.absinfo_x->resolution; res_y = tp->device->abs.absinfo_y->resolution; @@ -1651,26 +1525,14 @@ tp->accel.x_scale_coeff = (DEFAULT_MOUSE_DPI/25.4) / res_x; tp->accel.y_scale_coeff = (DEFAULT_MOUSE_DPI/25.4) / res_y; - if (tp->device->model_flags & EVDEV_MODEL_LENOVO_X230 || - tp->device->model_flags & EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81) - filter = create_pointer_accelerator_filter_lenovo_x230(tp->device->dpi); + if (tp->device->model_flags & EVDEV_MODEL_LENOVO_X230) + profile = touchpad_lenovo_x230_accel_profile; else - filter = create_pointer_accelerator_filter_touchpad(tp->device->dpi); + profile = touchpad_accel_profile_linear; - if (!filter) + if (evdev_device_init_pointer_acceleration(tp->device, profile) == -1) return -1; - rc = evdev_device_init_pointer_acceleration(tp->device, filter); - if (rc != 0) - return rc; - - /* we override the profile hooks for accel configuration with hooks - * that don't allow selection of profiles */ - device->pointer.config.get_profiles = tp_accel_config_get_profiles; - device->pointer.config.set_profile = tp_accel_config_set_profile; - device->pointer.config.get_profile = tp_accel_config_get_profile; - device->pointer.config.get_default_profile = tp_accel_config_get_default_profile; - return 0; } @@ -1766,9 +1628,8 @@ tp->scroll.method = tp_scroll_get_default_method(tp); tp->device->base.config.scroll_method = &tp->scroll.config_method; - /* In mm for touchpads with valid resolution, see tp_init_accel() */ - tp->device->scroll.threshold = 0.0; - tp->device->scroll.direction_lock_threshold = 5.0; + /* In mm for touchpads with valid resolution, see tp_init_accel() */ + tp->device->scroll.threshold = 5.0; return 0; } @@ -1848,14 +1709,17 @@ tp_init_palmdetect(struct tp_dispatch *tp, struct evdev_device *device) { - int width; + int width, height; tp->palm.right_edge = INT_MAX; tp->palm.left_edge = INT_MIN; + tp->palm.vert_center = INT_MIN; width = device->abs.dimensions.x; + height = device->abs.dimensions.y; - /* Wacom doesn't have internal touchpads */ + /* Wacom doesn't have internal touchpads, + * Apple touchpads are always big enough to warrant palm detection */ if (device->model_flags & EVDEV_MODEL_WACOM_TOUCHPAD) return 0; @@ -1867,6 +1731,7 @@ /* palm edges are 5% of the width on each side */ tp->palm.right_edge = device->abs.absinfo_x->maximum - width * 0.05; tp->palm.left_edge = device->abs.absinfo_x->minimum + width * 0.05; + tp->palm.vert_center = device->abs.absinfo_y->minimum + height/2; tp->palm.monitor_trackpoint = true; @@ -2007,41 +1872,13 @@ return 0; } -static inline void -tp_init_hysteresis(struct tp_dispatch *tp) -{ - int res_x, res_y; - - if (tp->device->model_flags & EVDEV_MODEL_CYAPA) - goto want_hysteresis; - - if (tp->device->model_flags & EVDEV_MODEL_ALPS_RUSHMORE) - goto want_hysteresis; - - if (tp->semi_mt && - (tp->device->model_flags & EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD)) - goto want_hysteresis; - - tp->hysteresis_margin.x = 0; - tp->hysteresis_margin.y = 0; - - return; - -want_hysteresis: - res_x = tp->device->abs.absinfo_x->resolution; - res_y = tp->device->abs.absinfo_y->resolution; - - tp->hysteresis_margin.x = res_x/2; - tp->hysteresis_margin.y = res_y/2; - return; -} - static int tp_init(struct tp_dispatch *tp, struct evdev_device *device) { int width, height; double diagonal; + int res_x, res_y; tp->base.interface = &tp_interface; tp->device = device; @@ -2055,6 +1892,8 @@ if (tp_init_slots(tp, device) != 0) return -1; + res_x = tp->device->abs.absinfo_x->resolution; + res_y = tp->device->abs.absinfo_y->resolution; width = device->abs.dimensions.x; height = device->abs.dimensions.y; diagonal = sqrt(width*width + height*height); @@ -2063,7 +1902,8 @@ EV_ABS, ABS_MT_DISTANCE); - tp_init_hysteresis(tp); + tp->hysteresis_margin.x = res_x/2; + tp->hysteresis_margin.y = res_y/2; if (tp_init_accel(tp, diagonal) != 0) return -1; @@ -2192,6 +2032,40 @@ device->left_handed.enabled = device->left_handed.want_enabled; } +struct model_lookup_t { + uint16_t vendor; + uint16_t product_start; + uint16_t product_end; + enum touchpad_model model; +}; + +static struct model_lookup_t model_lookup_table[] = { + { 0x0002, 0x0007, 0x0007, MODEL_SYNAPTICS }, + { 0x0002, 0x0008, 0x0008, MODEL_ALPS }, + { 0x0002, 0x000e, 0x000e, MODEL_ELANTECH }, + { 0x05ac, 0, 0x0222, MODEL_APPLETOUCH }, + { 0x05ac, 0x0223, 0x0228, MODEL_UNIBODY_MACBOOK }, + { 0x05ac, 0x0229, 0x022b, MODEL_APPLETOUCH }, + { 0x05ac, 0x022c, 0xffff, MODEL_UNIBODY_MACBOOK }, + { 0, 0, 0, 0 } +}; + +static enum touchpad_model +tp_get_model(struct evdev_device *device) +{ + struct model_lookup_t *lookup; + uint16_t vendor = libevdev_get_id_vendor(device->evdev); + uint16_t product = libevdev_get_id_product(device->evdev); + + for (lookup = model_lookup_table; lookup->vendor; lookup++) { + if (lookup->vendor == vendor && + lookup->product_start <= product && + product <= lookup->product_end) + return lookup->model; + } + return MODEL_UNKNOWN; +} + struct evdev_dispatch * evdev_mt_touchpad_create(struct evdev_device *device) { @@ -2201,6 +2075,8 @@ if (!tp) return NULL; + tp->model = tp_get_model(device); + if (tp_init(tp, device) != 0) { tp_interface_destroy(&tp->base); return NULL; diff -Nru libinput-1.2.2/src/evdev-mt-touchpad-edge-scroll.c libinput-0.21.0/src/evdev-mt-touchpad-edge-scroll.c --- libinput-1.2.2/src/evdev-mt-touchpad-edge-scroll.c 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/src/evdev-mt-touchpad-edge-scroll.c 2015-08-03 04:55:20.000000000 +0000 @@ -73,7 +73,7 @@ } uint32_t -tp_touch_get_edge(const struct tp_dispatch *tp, const struct tp_touch *t) +tp_touch_get_edge(struct tp_dispatch *tp, struct tp_touch *t) { uint32_t edge = EDGE_NONE; @@ -342,7 +342,7 @@ int tp_edge_scroll_post_events(struct tp_dispatch *tp, uint64_t time) { - struct evdev_device *device = tp->device; + struct libinput_device *device = &tp->device->base; struct tp_touch *t; enum libinput_pointer_axis axis; double *delta; @@ -369,7 +369,7 @@ case EDGE_NONE: if (t->scroll.direction != -1) { /* Send stop scroll event */ - evdev_notify_axis(device, time, + pointer_notify_axis(device, time, AS_MASK(t->scroll.direction), LIBINPUT_POINTER_AXIS_SOURCE_FINGER, &zero, @@ -390,13 +390,12 @@ } normalized = tp_get_delta(t); - /* scroll is not accelerated */ - normalized = tp_filter_motion_unaccelerated(tp, &normalized, time); + normalized = tp_filter_motion(tp, &normalized, time); switch (t->scroll.edge_state) { case EDGE_SCROLL_TOUCH_STATE_NONE: case EDGE_SCROLL_TOUCH_STATE_AREA: - log_bug_libinput(tp_libinput_context(tp), + log_bug_libinput(device->seat->libinput, "unexpected scroll state %d\n", t->scroll.edge_state); break; @@ -417,11 +416,11 @@ if (*delta == 0.0) continue; - evdev_notify_axis(device, time, - AS_MASK(axis), - LIBINPUT_POINTER_AXIS_SOURCE_FINGER, - &normalized, - &zero_discrete); + pointer_notify_axis(device, time, + AS_MASK(axis), + LIBINPUT_POINTER_AXIS_SOURCE_FINGER, + &normalized, + &zero_discrete); t->scroll.direction = axis; tp_edge_scroll_handle_event(tp, t, SCROLL_EVENT_POSTED); @@ -433,14 +432,14 @@ void tp_edge_scroll_stop_events(struct tp_dispatch *tp, uint64_t time) { - struct evdev_device *device = tp->device; + struct libinput_device *device = &tp->device->base; struct tp_touch *t; const struct normalized_coords zero = { 0.0, 0.0 }; const struct discrete_coords zero_discrete = { 0.0, 0.0 }; tp_for_each_touch(tp, t) { if (t->scroll.direction != -1) { - evdev_notify_axis(device, time, + pointer_notify_axis(device, time, AS_MASK(t->scroll.direction), LIBINPUT_POINTER_AXIS_SOURCE_FINGER, &zero, @@ -455,8 +454,7 @@ } int -tp_edge_scroll_touch_active(const struct tp_dispatch *tp, - const struct tp_touch *t) +tp_edge_scroll_touch_active(struct tp_dispatch *tp, struct tp_touch *t) { return t->scroll.edge_state == EDGE_SCROLL_TOUCH_STATE_AREA; } diff -Nru libinput-1.2.2/src/evdev-mt-touchpad-gestures.c libinput-0.21.0/src/evdev-mt-touchpad-gestures.c --- libinput-1.2.2/src/evdev-mt-touchpad-gestures.c 2016-03-07 06:24:16.000000000 +0000 +++ libinput-0.21.0/src/evdev-mt-touchpad-gestures.c 2015-08-03 21:42:14.000000000 +0000 @@ -33,14 +33,13 @@ #define DEFAULT_GESTURE_2FG_SCROLL_TIMEOUT ms2us(500) static inline const char* -gesture_state_to_str(enum tp_gesture_state state) +gesture_state_to_str(enum tp_gesture_2fg_state state) { switch (state) { - CASE_RETURN_STRING(GESTURE_STATE_NONE); - CASE_RETURN_STRING(GESTURE_STATE_UNKNOWN); - CASE_RETURN_STRING(GESTURE_STATE_SCROLL); - CASE_RETURN_STRING(GESTURE_STATE_PINCH); - CASE_RETURN_STRING(GESTURE_STATE_SWIPE); + CASE_RETURN_STRING(GESTURE_2FG_STATE_NONE); + CASE_RETURN_STRING(GESTURE_2FG_STATE_UNKNOWN); + CASE_RETURN_STRING(GESTURE_2FG_STATE_SCROLL); + CASE_RETURN_STRING(GESTURE_2FG_STATE_PINCH); } return NULL; } @@ -49,19 +48,15 @@ tp_get_touches_delta(struct tp_dispatch *tp, bool average) { struct tp_touch *t; - unsigned int i, nactive = 0; + unsigned int i, nchanged = 0; struct normalized_coords normalized; struct normalized_coords delta = {0.0, 0.0}; for (i = 0; i < tp->num_slots; i++) { t = &tp->touches[i]; - if (!tp_touch_active(tp, t)) - continue; - - nactive++; - - if (t->dirty) { + if (tp_touch_active(tp, t) && t->dirty) { + nchanged++; normalized = tp_get_delta(t); delta.x += normalized.x; @@ -69,11 +64,11 @@ } } - if (!average || nactive == 0) + if (!average || nchanged == 0) return delta; - delta.x /= nactive; - delta.y /= nactive; + delta.x /= nchanged; + delta.y /= nchanged; return delta; } @@ -99,30 +94,33 @@ if (tp->gesture.started) return; - switch (tp->gesture.state) { - case GESTURE_STATE_NONE: - case GESTURE_STATE_UNKNOWN: - log_bug_libinput(libinput, - "%s in unknown gesture mode\n", - __func__); - break; - case GESTURE_STATE_SCROLL: - /* NOP */ - break; - case GESTURE_STATE_PINCH: - gesture_notify_pinch(&tp->device->base, time, - LIBINPUT_EVENT_GESTURE_PINCH_BEGIN, - tp->gesture.finger_count, - &zero, &zero, 1.0, 0.0); + switch (tp->gesture.finger_count) { + case 2: + switch (tp->gesture.twofinger_state) { + case GESTURE_2FG_STATE_NONE: + case GESTURE_2FG_STATE_UNKNOWN: + log_bug_libinput(libinput, + "%s in unknown gesture mode\n", + __func__); + break; + case GESTURE_2FG_STATE_SCROLL: + /* NOP */ + break; + case GESTURE_2FG_STATE_PINCH: + gesture_notify_pinch(&tp->device->base, time, + LIBINPUT_EVENT_GESTURE_PINCH_BEGIN, + &zero, &zero, 1.0, 0.0); + break; + } break; - case GESTURE_STATE_SWIPE: + case 3: + case 4: gesture_notify_swipe(&tp->device->base, time, LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN, tp->gesture.finger_count, &zero, &zero); break; } - tp->gesture.started = true; } @@ -150,7 +148,7 @@ } static unsigned int -tp_gesture_get_active_touches(const struct tp_dispatch *tp, +tp_gesture_get_active_touches(struct tp_dispatch *tp, struct tp_touch **touches, unsigned int count) { @@ -186,7 +184,18 @@ { struct normalized_coords normalized; struct device_float_coords delta; - double move_threshold = TP_MM_TO_DPI_NORMALIZED(1); + double move_threshold; + + /* + * Semi-mt touchpads have somewhat inaccurate coordinates when + * 2 fingers are down, so use a slightly larger threshold. + * Elantech semi-mt touchpads are accurate enough though. + */ + if (tp->semi_mt && + (tp->device->model_flags & EVDEV_MODEL_ELANTECH_TOUCHPAD) == 0) + move_threshold = TP_MM_TO_DPI_NORMALIZED(4); + else + move_threshold = TP_MM_TO_DPI_NORMALIZED(2); delta = device_delta(touch->point, touch->gesture.initial); @@ -212,7 +221,11 @@ delta = device_delta(first->point, second->point); normalized = tp_normalize_delta(tp, delta); *distance = normalized_length(normalized); - *angle = atan2(normalized.y, normalized.x) * 180.0 / M_PI; + + if (!tp->semi_mt) + *angle = atan2(normalized.y, normalized.x) * 180.0 / M_PI; + else + *angle = 0.0; *center = device_average(first->point, second->point); } @@ -232,157 +245,93 @@ tp->device->scroll.buildup = tp_normalize_delta(tp, average); } -static enum tp_gesture_state -tp_gesture_handle_state_none(struct tp_dispatch *tp, uint64_t time) +static enum tp_gesture_2fg_state +tp_gesture_twofinger_handle_state_none(struct tp_dispatch *tp, uint64_t time) { struct tp_touch *first, *second; - struct tp_touch *touches[4]; - unsigned int ntouches; - unsigned int i; - - ntouches = tp_gesture_get_active_touches(tp, touches, 4); - if (ntouches < 2) - return GESTURE_STATE_NONE; - - if (!tp->gesture.enabled) { - if (ntouches == 2) - return GESTURE_STATE_SCROLL; - else - return GESTURE_STATE_SWIPE; - } - - first = touches[0]; - second = touches[1]; - - /* For 3+ finger gestures we cheat. A human hand's finger - * arrangement means that for a 3 or 4 finger swipe gesture, the - * fingers are roughly arranged in a horizontal line. - * They will all move in the same direction, so we can simply look - * at the left and right-most ones only. If we have fake touches, we - * just take the left/right-most real touch position, since the fake - * touch has the same location as one of those. - * - * For a 3 or 4 finger pinch gesture, 2 or 3 fingers are roughly in - * a horizontal line, with the thumb below and left (right-handed - * users) or right (left-handed users). Again, the row of non-thumb - * fingers moves identically so we can look at the left and - * right-most only and then treat it like a two-finger - * gesture. - */ - if (ntouches > 2) { - second = touches[0]; - for (i = 1; i < ntouches && i < tp->num_slots; i++) { - if (touches[i]->point.x < first->point.x) - first = touches[i]; - else if (touches[i]->point.x > second->point.x) - second = touches[i]; - } - - if (first == second) - return GESTURE_STATE_NONE; + if (tp_gesture_get_active_touches(tp, tp->gesture.touches, 2) != 2) + return GESTURE_2FG_STATE_NONE; - } + first = tp->gesture.touches[0]; + second = tp->gesture.touches[1]; tp->gesture.initial_time = time; first->gesture.initial = first->point; second->gesture.initial = second->point; - tp->gesture.touches[0] = first; - tp->gesture.touches[1] = second; - return GESTURE_STATE_UNKNOWN; + return GESTURE_2FG_STATE_UNKNOWN; } -static inline int -tp_gesture_same_directions(int dir1, int dir2) -{ - /* - * In some cases (semi-mt touchpads) we may seen one finger move - * e.g. N/NE and the other W/NW so we not only check for overlapping - * directions, but also for neighboring bits being set. - * The ((dira & 0x80) && (dirb & 0x01)) checks are to check for bit 0 - * and 7 being set as they also represent neighboring directions. - */ - return ((dir1 | (dir1 >> 1)) & dir2) || - ((dir2 | (dir2 >> 1)) & dir1) || - ((dir1 & 0x80) && (dir2 & 0x01)) || - ((dir2 & 0x80) && (dir1 & 0x01)); -} - -static inline void -tp_gesture_init_pinch( struct tp_dispatch *tp) -{ - tp_gesture_get_pinch_info(tp, - &tp->gesture.initial_distance, - &tp->gesture.angle, - &tp->gesture.center); - tp->gesture.prev_scale = 1.0; -} - -static enum tp_gesture_state -tp_gesture_handle_state_unknown(struct tp_dispatch *tp, uint64_t time) +static enum tp_gesture_2fg_state +tp_gesture_twofinger_handle_state_unknown(struct tp_dispatch *tp, uint64_t time) { struct tp_touch *first = tp->gesture.touches[0], *second = tp->gesture.touches[1]; int dir1, dir2; - int yres = tp->device->abs.absinfo_y->resolution; - int vert_distance; - /* for two-finger gestures, if the fingers stay unmoving for a - * while, assume (slow) scroll */ - if (tp->gesture.finger_count == 2 && - time > (tp->gesture.initial_time + DEFAULT_GESTURE_2FG_SCROLL_TIMEOUT)) { + /* if fingers stay unmoving for a while, assume (slow) scroll */ + if (time > (tp->gesture.initial_time + DEFAULT_GESTURE_2FG_SCROLL_TIMEOUT)) { tp_gesture_set_scroll_buildup(tp); - return GESTURE_STATE_SCROLL; - } - - /* Else check if one finger is > 20mm below the others */ - vert_distance = abs(first->point.y - second->point.y); - if (vert_distance > 20 * yres && - tp->gesture.finger_count > 2 && - tp->gesture.enabled) { - tp_gesture_init_pinch(tp); - return GESTURE_STATE_PINCH; + return GESTURE_2FG_STATE_SCROLL; } /* Else wait for both fingers to have moved */ dir1 = tp_gesture_get_direction(tp, first); dir2 = tp_gesture_get_direction(tp, second); if (dir1 == UNDEFINED_DIRECTION || dir2 == UNDEFINED_DIRECTION) - return GESTURE_STATE_UNKNOWN; + return GESTURE_2FG_STATE_UNKNOWN; - /* If both touches are moving in the same direction assume - * scroll or swipe */ - if (tp_gesture_same_directions(dir1, dir2)) { - if (tp->gesture.finger_count == 2) { - tp_gesture_set_scroll_buildup(tp); - return GESTURE_STATE_SCROLL; - } else if (tp->gesture.enabled) { - return GESTURE_STATE_SWIPE; - } - } else { - tp_gesture_init_pinch(tp); - return GESTURE_STATE_PINCH; + /* + * If both touches are moving in the same direction assume scroll. + * + * In some cases (semi-mt touchpads) We may seen one finger move + * e.g. N/NE and the other W/NW so we not only check for overlapping + * directions, but also for neighboring bits being set. + * The ((dira & 0x80) && (dirb & 0x01)) checks are to check for bit 0 + * and 7 being set as they also represent neighboring directions. + */ + if (((dir1 | (dir1 >> 1)) & dir2) || + ((dir2 | (dir2 >> 1)) & dir1) || + ((dir1 & 0x80) && (dir2 & 0x01)) || + ((dir2 & 0x80) && (dir1 & 0x01))) { + tp_gesture_set_scroll_buildup(tp); + return GESTURE_2FG_STATE_SCROLL; + } else if (tp->gesture.enabled) { + tp_gesture_get_pinch_info(tp, + &tp->gesture.initial_distance, + &tp->gesture.angle, + &tp->gesture.center); + tp->gesture.prev_scale = 1.0; + return GESTURE_2FG_STATE_PINCH; } - return GESTURE_STATE_UNKNOWN; + return GESTURE_2FG_STATE_UNKNOWN; } -static enum tp_gesture_state -tp_gesture_handle_state_scroll(struct tp_dispatch *tp, uint64_t time) +static enum tp_gesture_2fg_state +tp_gesture_twofinger_handle_state_scroll(struct tp_dispatch *tp, uint64_t time) { struct normalized_coords delta; if (tp->scroll.method != LIBINPUT_CONFIG_SCROLL_2FG) - return GESTURE_STATE_SCROLL; + return GESTURE_2FG_STATE_SCROLL; - delta = tp_get_average_touches_delta(tp); + /* On some semi-mt models slot 0 is more accurate, so for semi-mt + * we only use slot 0. */ + if (tp->semi_mt) { + if (!tp->touches[0].dirty) + return GESTURE_2FG_STATE_SCROLL; - /* scroll is not accelerated */ - delta = tp_filter_motion_unaccelerated(tp, &delta, time); + delta = tp_get_delta(&tp->touches[0]); + } else { + delta = tp_get_average_touches_delta(tp); + } + + delta = tp_filter_motion(tp, &delta, time); if (normalized_is_zero(delta)) - return GESTURE_STATE_SCROLL; + return GESTURE_2FG_STATE_SCROLL; tp_gesture_start(tp, time); evdev_post_scroll(tp->device, @@ -390,30 +339,11 @@ LIBINPUT_POINTER_AXIS_SOURCE_FINGER, &delta); - return GESTURE_STATE_SCROLL; + return GESTURE_2FG_STATE_SCROLL; } -static enum tp_gesture_state -tp_gesture_handle_state_swipe(struct tp_dispatch *tp, uint64_t time) -{ - struct normalized_coords delta, unaccel; - - unaccel = tp_get_average_touches_delta(tp); - delta = tp_filter_motion(tp, &unaccel, time); - - if (!normalized_is_zero(delta) || !normalized_is_zero(unaccel)) { - tp_gesture_start(tp, time); - gesture_notify_swipe(&tp->device->base, time, - LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE, - tp->gesture.finger_count, - &delta, &unaccel); - } - - return GESTURE_STATE_SWIPE; -} - -static enum tp_gesture_state -tp_gesture_handle_state_pinch(struct tp_dispatch *tp, uint64_t time) +static enum tp_gesture_2fg_state +tp_gesture_twofinger_handle_state_pinch(struct tp_dispatch *tp, uint64_t time) { double angle, angle_delta, distance, scale; struct device_float_coords center, fdelta; @@ -437,48 +367,60 @@ if (normalized_is_zero(delta) && normalized_is_zero(unaccel) && scale == tp->gesture.prev_scale && angle_delta == 0.0) - return GESTURE_STATE_PINCH; + return GESTURE_2FG_STATE_PINCH; tp_gesture_start(tp, time); gesture_notify_pinch(&tp->device->base, time, LIBINPUT_EVENT_GESTURE_PINCH_UPDATE, - tp->gesture.finger_count, &delta, &unaccel, scale, angle_delta); tp->gesture.prev_scale = scale; - return GESTURE_STATE_PINCH; + return GESTURE_2FG_STATE_PINCH; } static void -tp_gesture_post_gesture(struct tp_dispatch *tp, uint64_t time) +tp_gesture_post_twofinger(struct tp_dispatch *tp, uint64_t time) { - enum tp_gesture_state oldstate = tp->gesture.state; - - if (tp->gesture.state == GESTURE_STATE_NONE) - tp->gesture.state = - tp_gesture_handle_state_none(tp, time); + enum tp_gesture_2fg_state oldstate = tp->gesture.twofinger_state; - if (tp->gesture.state == GESTURE_STATE_UNKNOWN) - tp->gesture.state = - tp_gesture_handle_state_unknown(tp, time); + if (tp->gesture.twofinger_state == GESTURE_2FG_STATE_NONE) + tp->gesture.twofinger_state = + tp_gesture_twofinger_handle_state_none(tp, time); - if (tp->gesture.state == GESTURE_STATE_SCROLL) - tp->gesture.state = - tp_gesture_handle_state_scroll(tp, time); + if (tp->gesture.twofinger_state == GESTURE_2FG_STATE_UNKNOWN) + tp->gesture.twofinger_state = + tp_gesture_twofinger_handle_state_unknown(tp, time); - if (tp->gesture.state == GESTURE_STATE_SWIPE) - tp->gesture.state = - tp_gesture_handle_state_swipe(tp, time); + if (tp->gesture.twofinger_state == GESTURE_2FG_STATE_SCROLL) + tp->gesture.twofinger_state = + tp_gesture_twofinger_handle_state_scroll(tp, time); - if (tp->gesture.state == GESTURE_STATE_PINCH) - tp->gesture.state = - tp_gesture_handle_state_pinch(tp, time); + if (tp->gesture.twofinger_state == GESTURE_2FG_STATE_PINCH) + tp->gesture.twofinger_state = + tp_gesture_twofinger_handle_state_pinch(tp, time); log_debug(tp_libinput_context(tp), "gesture state: %s → %s\n", gesture_state_to_str(oldstate), - gesture_state_to_str(tp->gesture.state)); + gesture_state_to_str(tp->gesture.twofinger_state)); +} + +static void +tp_gesture_post_swipe(struct tp_dispatch *tp, uint64_t time) +{ + struct normalized_coords delta, unaccel; + + unaccel = tp_get_average_touches_delta(tp); + delta = tp_filter_motion(tp, &unaccel, time); + + if (!normalized_is_zero(delta) || !normalized_is_zero(unaccel)) { + tp_gesture_start(tp, time); + gesture_notify_swipe(&tp->device->base, time, + LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE, + tp->gesture.finger_count, + &delta, &unaccel); + } } void @@ -503,9 +445,11 @@ tp_gesture_post_pointer_motion(tp, time); break; case 2: + tp_gesture_post_twofinger(tp, time); + break; case 3: case 4: - tp_gesture_post_gesture(tp, time); + tp_gesture_post_swipe(tp, time); break; } } @@ -525,37 +469,38 @@ tp_gesture_end(struct tp_dispatch *tp, uint64_t time, bool cancelled) { struct libinput *libinput = tp->device->base.seat->libinput; - enum tp_gesture_state state = tp->gesture.state; + enum tp_gesture_2fg_state twofinger_state = tp->gesture.twofinger_state; - tp->gesture.state = GESTURE_STATE_NONE; + tp->gesture.twofinger_state = GESTURE_2FG_STATE_NONE; if (!tp->gesture.started) return; - switch (state) { - case GESTURE_STATE_NONE: - case GESTURE_STATE_UNKNOWN: - log_bug_libinput(libinput, - "%s in unknown gesture mode\n", - __func__); - break; - case GESTURE_STATE_SCROLL: - tp_gesture_stop_twofinger_scroll(tp, time); - break; - case GESTURE_STATE_PINCH: - gesture_notify_pinch_end(&tp->device->base, time, - tp->gesture.finger_count, - tp->gesture.prev_scale, - cancelled); + switch (tp->gesture.finger_count) { + case 2: + switch (twofinger_state) { + case GESTURE_2FG_STATE_NONE: + case GESTURE_2FG_STATE_UNKNOWN: + log_bug_libinput(libinput, + "%s in unknown gesture mode\n", + __func__); + break; + case GESTURE_2FG_STATE_SCROLL: + tp_gesture_stop_twofinger_scroll(tp, time); + break; + case GESTURE_2FG_STATE_PINCH: + gesture_notify_pinch_end(&tp->device->base, time, + tp->gesture.prev_scale, + cancelled); + break; + } break; - case GESTURE_STATE_SWIPE: - gesture_notify_swipe_end(&tp->device->base, - time, - tp->gesture.finger_count, - cancelled); + case 3: + case 4: + gesture_notify_swipe_end(&tp->device->base, time, + tp->gesture.finger_count, cancelled); break; } - tp->gesture.started = false; } @@ -589,10 +534,13 @@ { unsigned int active_touches = 0; struct tp_touch *t; + int i = 0; tp_for_each_touch(tp, t) { if (tp_touch_active(tp, t)) active_touches++; + + i++; } if (active_touches != tp->gesture.finger_count) { @@ -619,12 +567,12 @@ int tp_init_gesture(struct tp_dispatch *tp) { - /* two-finger scrolling is always enabled, this flag just - * decides whether we detect pinch. semi-mt devices are too - * unreliable to do pinch gestures. */ - tp->gesture.enabled = !tp->semi_mt && tp->num_slots > 1; + if (tp->device->model_flags & EVDEV_MODEL_JUMPING_SEMI_MT) + tp->gesture.enabled = false; + else + tp->gesture.enabled = true; - tp->gesture.state = GESTURE_STATE_NONE; + tp->gesture.twofinger_state = GESTURE_2FG_STATE_NONE; libinput_timer_init(&tp->gesture.finger_count_switch_timer, tp->device->base.seat->libinput, diff -Nru libinput-1.2.2/src/evdev-mt-touchpad.h libinput-0.21.0/src/evdev-mt-touchpad.h --- libinput-1.2.2/src/evdev-mt-touchpad.h 2016-03-15 00:22:40.000000000 +0000 +++ libinput-0.21.0/src/evdev-mt-touchpad.h 2015-08-03 04:55:20.000000000 +0000 @@ -41,7 +41,6 @@ TOUCHPAD_EVENT_MOTION = (1 << 0), TOUCHPAD_EVENT_BUTTON_PRESS = (1 << 1), TOUCHPAD_EVENT_BUTTON_RELEASE = (1 << 2), - TOUCHPAD_EVENT_OTHERAXIS = (1 << 3), }; enum touchpad_model { @@ -98,7 +97,6 @@ TAP_STATE_TAPPED, TAP_STATE_TOUCH_2, TAP_STATE_TOUCH_2_HOLD, - TAP_STATE_TOUCH_2_RELEASE, TAP_STATE_TOUCH_3, TAP_STATE_TOUCH_3_HOLD, TAP_STATE_DRAGGING_OR_DOUBLETAP, @@ -131,12 +129,11 @@ EDGE_SCROLL_TOUCH_STATE_AREA, }; -enum tp_gesture_state { - GESTURE_STATE_NONE, - GESTURE_STATE_UNKNOWN, - GESTURE_STATE_SCROLL, - GESTURE_STATE_PINCH, - GESTURE_STATE_SWIPE, +enum tp_gesture_2fg_state { + GESTURE_2FG_STATE_NONE, + GESTURE_2FG_STATE_UNKNOWN, + GESTURE_2FG_STATE_SCROLL, + GESTURE_2FG_STATE_PINCH, }; enum tp_thumb_state { @@ -229,6 +226,7 @@ bool has_mt; bool semi_mt; bool reports_distance; /* does the device support true hovering */ + enum touchpad_model model; unsigned int num_slots; /* number of slots */ unsigned int ntouches; /* no slots inc. fakes */ @@ -253,7 +251,7 @@ unsigned int finger_count; unsigned int finger_count_pending; struct libinput_timer finger_count_switch_timer; - enum tp_gesture_state state; + enum tp_gesture_2fg_state twofinger_state; struct tp_touch *touches[2]; uint64_t initial_time; double initial_distance; @@ -313,15 +311,15 @@ struct libinput_timer timer; enum tp_tap_state state; uint32_t buttons_pressed; - uint64_t first_press_time; + uint64_t multitap_last_time; - bool drag_enabled; bool drag_lock_enabled; } tap; struct { int32_t right_edge; /* in device coordinates */ int32_t left_edge; /* in device coordinates */ + int32_t vert_center; /* in device coordinates */ bool trackpoint_active; struct libinput_event_listener trackpoint_listener; @@ -343,7 +341,6 @@ struct libinput_event_listener keyboard_listener; struct libinput_timer keyboard_timer; struct evdev_device *keyboard; - unsigned long key_mask[NLONGS(KEY_CNT)]; uint64_t keyboard_last_press_time; } dwt; @@ -354,24 +351,13 @@ int upper_thumb_line; int lower_thumb_line; } thumb; - - struct { - /* A quirk used on the T450 series Synaptics hardware. - * Slowly moving the finger causes multiple events with only - * ABS_MT_PRESSURE but no x/y information. When the x/y - * event comes, it will be a jump of ~20 units. We use the - * below to count non-motion events to discard that first - * event with the jump. - */ - unsigned int nonmotion_event_count; - } quirks; }; #define tp_for_each_touch(_tp, _t) \ for (unsigned int _i = 0; _i < (_tp)->ntouches && (_t = &(_tp)->touches[_i]); _i++) static inline struct libinput* -tp_libinput_context(const struct tp_dispatch *tp) +tp_libinput_context(struct tp_dispatch *tp) { return tp->device->base.seat->libinput; } @@ -410,13 +396,8 @@ const struct normalized_coords *unaccelerated, uint64_t time); -struct normalized_coords -tp_filter_motion_unaccelerated(struct tp_dispatch *tp, - const struct normalized_coords *unaccelerated, - uint64_t time); - int -tp_touch_active(const struct tp_dispatch *tp, const struct tp_touch *t); +tp_touch_active(struct tp_dispatch *tp, struct tp_touch *t); int tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time); @@ -454,12 +435,10 @@ tp_button_handle_state(struct tp_dispatch *tp, uint64_t time); int -tp_button_touch_active(const struct tp_dispatch *tp, - const struct tp_touch *t); +tp_button_touch_active(struct tp_dispatch *tp, struct tp_touch *t); bool -tp_button_is_inside_softbutton_area(const struct tp_dispatch *tp, - const struct tp_touch *t); +tp_button_is_inside_softbutton_area(struct tp_dispatch *tp, struct tp_touch *t); void tp_release_all_taps(struct tp_dispatch *tp, @@ -472,7 +451,7 @@ tp_tap_resume(struct tp_dispatch *tp, uint64_t time); bool -tp_tap_dragging(const struct tp_dispatch *tp); +tp_tap_dragging(struct tp_dispatch *tp); int tp_edge_scroll_init(struct tp_dispatch *tp, struct evdev_device *device); @@ -490,11 +469,10 @@ tp_edge_scroll_stop_events(struct tp_dispatch *tp, uint64_t time); int -tp_edge_scroll_touch_active(const struct tp_dispatch *tp, - const struct tp_touch *t); +tp_edge_scroll_touch_active(struct tp_dispatch *tp, struct tp_touch *t); uint32_t -tp_touch_get_edge(const struct tp_dispatch *tp, const struct tp_touch *t); +tp_touch_get_edge(struct tp_dispatch *tp, struct tp_touch *t); int tp_init_gesture(struct tp_dispatch *tp); @@ -518,6 +496,6 @@ tp_gesture_stop_twofinger_scroll(struct tp_dispatch *tp, uint64_t time); bool -tp_palm_tap_is_palm(const struct tp_dispatch *tp, const struct tp_touch *t); +tp_palm_tap_is_palm(struct tp_dispatch *tp, struct tp_touch *t); #endif diff -Nru libinput-1.2.2/src/evdev-mt-touchpad-tap.c libinput-0.21.0/src/evdev-mt-touchpad-tap.c --- libinput-1.2.2/src/evdev-mt-touchpad-tap.c 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/src/evdev-mt-touchpad-tap.c 2015-08-03 04:55:20.000000000 +0000 @@ -69,7 +69,6 @@ CASE_RETURN_STRING(TAP_STATE_TAPPED); CASE_RETURN_STRING(TAP_STATE_TOUCH_2); CASE_RETURN_STRING(TAP_STATE_TOUCH_2_HOLD); - CASE_RETURN_STRING(TAP_STATE_TOUCH_2_RELEASE); CASE_RETURN_STRING(TAP_STATE_TOUCH_3); CASE_RETURN_STRING(TAP_STATE_TOUCH_3_HOLD); CASE_RETURN_STRING(TAP_STATE_DRAGGING); @@ -153,7 +152,6 @@ switch (event) { case TAP_EVENT_TOUCH: tp->tap.state = TAP_STATE_TOUCH; - tp->tap.first_press_time = time; tp_tap_set_timer(tp, time); break; case TAP_EVENT_RELEASE: @@ -186,14 +184,9 @@ tp_tap_set_timer(tp, time); break; case TAP_EVENT_RELEASE: - tp_tap_notify(tp, tp->tap.first_press_time, 1, LIBINPUT_BUTTON_STATE_PRESSED); - if (tp->tap.drag_enabled) { - tp->tap.state = TAP_STATE_TAPPED; - tp_tap_set_timer(tp, time); - } else { - tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED); - tp->tap.state = TAP_STATE_IDLE; - } + tp->tap.state = TAP_STATE_TAPPED; + tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_PRESSED); + tp_tap_set_timer(tp, time); break; case TAP_EVENT_TIMEOUT: case TAP_EVENT_MOTION: @@ -282,8 +275,12 @@ tp_tap_set_timer(tp, time); break; case TAP_EVENT_RELEASE: - tp->tap.state = TAP_STATE_TOUCH_2_RELEASE; - tp_tap_set_timer(tp, time); + tp->tap.state = TAP_STATE_HOLD; + if (t->tap.state == TAP_TOUCH_STATE_TOUCH) { + tp_tap_notify(tp, time, 2, LIBINPUT_BUTTON_STATE_PRESSED); + tp_tap_notify(tp, time, 2, LIBINPUT_BUTTON_STATE_RELEASED); + } + tp_tap_clear_timer(tp); break; case TAP_EVENT_MOTION: tp_tap_clear_timer(tp); @@ -326,35 +323,6 @@ } static void -tp_tap_touch2_release_handle_event(struct tp_dispatch *tp, - struct tp_touch *t, - enum tap_event event, uint64_t time) -{ - - switch (event) { - case TAP_EVENT_TOUCH: - tp->tap.state = TAP_STATE_TOUCH_2_HOLD; - t->tap.state = TAP_TOUCH_STATE_DEAD; - tp_tap_clear_timer(tp); - break; - case TAP_EVENT_RELEASE: - tp_tap_notify(tp, time, 2, LIBINPUT_BUTTON_STATE_PRESSED); - tp_tap_notify(tp, time, 2, LIBINPUT_BUTTON_STATE_RELEASED); - tp->tap.state = TAP_STATE_IDLE; - break; - case TAP_EVENT_MOTION: - case TAP_EVENT_TIMEOUT: - tp->tap.state = TAP_STATE_HOLD; - break; - case TAP_EVENT_BUTTON: - tp->tap.state = TAP_STATE_DEAD; - break; - case TAP_EVENT_THUMB: - break; - } -} - -static void tp_tap_touch3_handle_event(struct tp_dispatch *tp, struct tp_touch *t, enum tap_event event, uint64_t time) @@ -567,6 +535,7 @@ break; case TAP_EVENT_TOUCH: tp->tap.state = TAP_STATE_MULTITAP_DOWN; + tp->tap.multitap_last_time = time; tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_PRESSED); tp_tap_set_timer(tp, time); break; @@ -601,11 +570,21 @@ break; case TAP_EVENT_TOUCH: tp->tap.state = TAP_STATE_DRAGGING_2; + tp_tap_notify(tp, + tp->tap.multitap_last_time, + 1, + LIBINPUT_BUTTON_STATE_RELEASED); + tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_PRESSED); tp_tap_clear_timer(tp); break; case TAP_EVENT_MOTION: case TAP_EVENT_TIMEOUT: tp->tap.state = TAP_STATE_DRAGGING; + tp_tap_notify(tp, + tp->tap.multitap_last_time, + 1, + LIBINPUT_BUTTON_STATE_RELEASED); + tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_PRESSED); tp_tap_clear_timer(tp); break; case TAP_EVENT_BUTTON: @@ -670,9 +649,6 @@ case TAP_STATE_TOUCH_2_HOLD: tp_tap_touch2_hold_handle_event(tp, t, event, time); break; - case TAP_STATE_TOUCH_2_RELEASE: - tp_tap_touch2_release_handle_event(tp, t, event, time); - break; case TAP_STATE_TOUCH_3: tp_tap_touch3_handle_event(tp, t, event, time); break; @@ -935,44 +911,6 @@ } static enum libinput_config_status -tp_tap_config_set_drag_enabled(struct libinput_device *device, - enum libinput_config_drag_state enabled) -{ - struct evdev_dispatch *dispatch = ((struct evdev_device *) device)->dispatch; - struct tp_dispatch *tp = NULL; - - tp = container_of(dispatch, tp, base); - tp->tap.drag_enabled = enabled; - - return LIBINPUT_CONFIG_STATUS_SUCCESS; -} - -static enum libinput_config_drag_state -tp_tap_config_get_drag_enabled(struct libinput_device *device) -{ - struct evdev_device *evdev = (struct evdev_device *)device; - struct tp_dispatch *tp = NULL; - - tp = container_of(evdev->dispatch, tp, base); - - return tp->tap.drag_enabled; -} - -static inline enum libinput_config_drag_state -tp_drag_default(struct evdev_device *device) -{ - return LIBINPUT_CONFIG_DRAG_ENABLED; -} - -static enum libinput_config_drag_state -tp_tap_config_get_default_drag_enabled(struct libinput_device *device) -{ - struct evdev_device *evdev = (struct evdev_device *)device; - - return tp_drag_default(evdev); -} - -static enum libinput_config_status tp_tap_config_set_draglock_enabled(struct libinput_device *device, enum libinput_config_drag_lock_state enabled) { @@ -1017,9 +955,6 @@ tp->tap.config.set_enabled = tp_tap_config_set_enabled; tp->tap.config.get_enabled = tp_tap_config_is_enabled; tp->tap.config.get_default = tp_tap_config_get_default; - tp->tap.config.set_drag_enabled = tp_tap_config_set_drag_enabled; - tp->tap.config.get_drag_enabled = tp_tap_config_get_drag_enabled; - tp->tap.config.get_default_drag_enabled = tp_tap_config_get_default_drag_enabled; tp->tap.config.set_draglock_enabled = tp_tap_config_set_draglock_enabled; tp->tap.config.get_draglock_enabled = tp_tap_config_get_draglock_enabled; tp->tap.config.get_default_draglock_enabled = tp_tap_config_get_default_draglock_enabled; @@ -1027,7 +962,6 @@ tp->tap.state = TAP_STATE_IDLE; tp->tap.enabled = tp_tap_default(tp->device); - tp->tap.drag_enabled = tp_drag_default(tp->device); tp->tap.drag_lock_enabled = tp_drag_lock_default(tp->device); libinput_timer_init(&tp->tap.timer, @@ -1069,7 +1003,7 @@ } bool -tp_tap_dragging(const struct tp_dispatch *tp) +tp_tap_dragging(struct tp_dispatch *tp) { switch (tp->tap.state) { case TAP_STATE_DRAGGING: diff -Nru libinput-1.2.2/src/evdev-tablet.c libinput-0.21.0/src/evdev-tablet.c --- libinput-1.2.2/src/evdev-tablet.c 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/src/evdev-tablet.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1691 +0,0 @@ -/* - * Copyright © 2014 Red Hat, Inc. - * Copyright © 2014 Stephen Chandler "Lyude" Paul - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, provided - * that the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of the copyright holders not be used in - * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The copyright holders make - * no representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY - * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#include "config.h" -#include "libinput-version.h" -#include "evdev-tablet.h" - -#include -#include -#include - -#if HAVE_LIBWACOM -#include -#endif - -#define tablet_set_status(tablet_,s_) (tablet_)->status |= (s_) -#define tablet_unset_status(tablet_,s_) (tablet_)->status &= ~(s_) -#define tablet_has_status(tablet_,s_) (!!((tablet_)->status & (s_))) - -static inline void -tablet_get_pressed_buttons(struct tablet_dispatch *tablet, - struct button_state *buttons) -{ - size_t i; - const struct button_state *state = &tablet->button_state, - *prev_state = &tablet->prev_button_state; - - for (i = 0; i < sizeof(buttons->bits); i++) - buttons->bits[i] = state->bits[i] & ~(prev_state->bits[i]); -} - -static inline void -tablet_get_released_buttons(struct tablet_dispatch *tablet, - struct button_state *buttons) -{ - size_t i; - const struct button_state *state = &tablet->button_state, - *prev_state = &tablet->prev_button_state; - - for (i = 0; i < sizeof(buttons->bits); i++) - buttons->bits[i] = prev_state->bits[i] & - ~(state->bits[i]); -} - -/* Merge the previous state with the current one so all buttons look like - * they just got pressed in this frame */ -static inline void -tablet_force_button_presses(struct tablet_dispatch *tablet) -{ - struct button_state *state = &tablet->button_state, - *prev_state = &tablet->prev_button_state; - size_t i; - - for (i = 0; i < sizeof(state->bits); i++) { - state->bits[i] = state->bits[i] | prev_state->bits[i]; - prev_state->bits[i] = 0; - } -} - -static int -tablet_device_has_axis(struct tablet_dispatch *tablet, - enum libinput_tablet_tool_axis axis) -{ - struct libevdev *evdev = tablet->device->evdev; - bool has_axis = false; - unsigned int code; - - if (axis == LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z) { - has_axis = (libevdev_has_event_code(evdev, - EV_KEY, - BTN_TOOL_MOUSE) && - libevdev_has_event_code(evdev, - EV_ABS, - ABS_TILT_X) && - libevdev_has_event_code(evdev, - EV_ABS, - ABS_TILT_Y)); - code = axis_to_evcode(axis); - has_axis |= libevdev_has_event_code(evdev, - EV_ABS, - code); - } else if (axis == LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL) { - has_axis = libevdev_has_event_code(evdev, - EV_REL, - REL_WHEEL); - } else { - code = axis_to_evcode(axis); - has_axis = libevdev_has_event_code(evdev, - EV_ABS, - code); - } - - return has_axis; -} - -static void -tablet_process_absolute(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct input_event *e, - uint64_t time) -{ - enum libinput_tablet_tool_axis axis; - - switch (e->code) { - case ABS_X: - case ABS_Y: - case ABS_Z: - case ABS_PRESSURE: - case ABS_TILT_X: - case ABS_TILT_Y: - case ABS_DISTANCE: - case ABS_WHEEL: - axis = evcode_to_axis(e->code); - if (axis == LIBINPUT_TABLET_TOOL_AXIS_NONE) { - log_bug_libinput(device->base.seat->libinput, - "Invalid ABS event code %#x\n", - e->code); - break; - } - - set_bit(tablet->changed_axes, axis); - tablet_set_status(tablet, TABLET_AXES_UPDATED); - break; - /* tool_id is the identifier for the tool we can use in libwacom - * to identify it (if we have one anyway) */ - case ABS_MISC: - tablet->current_tool_id = e->value; - break; - /* Intuos 3 strip data. Should only happen on the Pad device, not on - the Pen device. */ - case ABS_RX: - case ABS_RY: - /* Only on the 4D mouse (Intuos2), obsolete */ - case ABS_RZ: - /* Only on the 4D mouse (Intuos2), obsolete. - The 24HD sends ABS_THROTTLE on the Pad device for the second - wheel but we shouldn't get here on kernel >= 3.17. - */ - case ABS_THROTTLE: - default: - log_info(device->base.seat->libinput, - "Unhandled ABS event code %#x\n", e->code); - break; - } -} - -static void -tablet_change_to_left_handed(struct evdev_device *device) -{ - struct tablet_dispatch *tablet = - (struct tablet_dispatch*)device->dispatch; - - if (device->left_handed.enabled == device->left_handed.want_enabled) - return; - - if (!tablet_has_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY)) - return; - - device->left_handed.enabled = device->left_handed.want_enabled; -} - -static void -tablet_update_tool(struct tablet_dispatch *tablet, - struct evdev_device *device, - enum libinput_tablet_tool_type tool, - bool enabled) -{ - assert(tool != LIBINPUT_TOOL_NONE); - - if (enabled) { - tablet->current_tool_type = tool; - tablet_set_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY); - tablet_unset_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY); - } - else if (!tablet_has_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY)) - tablet_set_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY); -} - -static inline double -normalize_dist_slider(const struct input_absinfo *absinfo) -{ - double range = absinfo->maximum - absinfo->minimum; - double value = (absinfo->value - absinfo->minimum) / range; - - return value; -} - -static inline double -normalize_pressure(const struct input_absinfo *absinfo, - struct libinput_tablet_tool *tool) -{ - double range = absinfo->maximum - absinfo->minimum; - int offset = tool->has_pressure_offset ? - tool->pressure_offset : 0; - double value = (absinfo->value - offset - absinfo->minimum) / range; - - return value; -} - -static inline double -adjust_tilt(const struct input_absinfo *absinfo) -{ - double range = absinfo->maximum - absinfo->minimum; - double value = (absinfo->value - absinfo->minimum) / range; - const int WACOM_MAX_DEGREES = 64; - - /* If resolution is nonzero, it's in units/radian. But require - * a min/max less/greater than zero so we can assume 0 is the - * center */ - if (absinfo->resolution != 0 && - absinfo->maximum > 0 && - absinfo->minimum < 0) { - value = 180.0/M_PI * absinfo->value/absinfo->resolution; - } else { - /* Wacom supports physical [-64, 64] degrees, so map to that by - * default. If other tablets have a different physical range or - * nonzero physical offsets, they need extra treatment - * here. - */ - /* Map to the (-1, 1) range */ - value = (value * 2) - 1; - value *= WACOM_MAX_DEGREES; - } - - return value; -} - -static inline int32_t -invert_axis(const struct input_absinfo *absinfo) -{ - return absinfo->maximum - (absinfo->value - absinfo->minimum); -} - -static void -convert_tilt_to_rotation(struct tablet_dispatch *tablet) -{ - const int offset = 5; - double x, y; - double angle = 0.0; - - /* Wacom Intuos 4, 5, Pro mouse calculates rotation from the x/y tilt - values. The device has a 175 degree CCW hardware offset but since we use - atan2 the effective offset is just 5 degrees. - */ - x = tablet->axes.tilt.x; - y = tablet->axes.tilt.y; - - /* atan2 is CCW, we want CW -> negate x */ - if (x || y) - angle = ((180.0 * atan2(-x, y)) / M_PI); - - angle = fmod(360 + angle - offset, 360); - - tablet->axes.rotation = angle; - set_bit(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); -} - -static double -convert_to_degrees(const struct input_absinfo *absinfo, double offset) -{ - /* range is [0, 360[, i.e. range + 1 */ - double range = absinfo->maximum - absinfo->minimum + 1; - double value = (absinfo->value - absinfo->minimum) / range; - - return fmod(value * 360.0 + offset, 360.0); -} - -static inline double -normalize_wheel(struct tablet_dispatch *tablet, - int value) -{ - struct evdev_device *device = tablet->device; - - return value * device->scroll.wheel_click_angle; -} - -static inline void -tablet_handle_xy(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct device_coords *point_out, - struct device_coords *delta_out) -{ - struct device_coords point; - struct device_coords delta = { 0, 0 }; - const struct input_absinfo *absinfo; - int value; - - if (bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_X)) { - absinfo = libevdev_get_abs_info(device->evdev, ABS_X); - - if (device->left_handed.enabled) - value = invert_axis(absinfo); - else - value = absinfo->value; - - if (!tablet_has_status(tablet, - TABLET_TOOL_ENTERING_PROXIMITY)) - delta.x = value - tablet->axes.point.x; - tablet->axes.point.x = value; - } - point.x = tablet->axes.point.x; - - if (bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_Y)) { - absinfo = libevdev_get_abs_info(device->evdev, ABS_Y); - - if (device->left_handed.enabled) - value = invert_axis(absinfo); - else - value = absinfo->value; - - if (!tablet_has_status(tablet, - TABLET_TOOL_ENTERING_PROXIMITY)) - delta.y = value - tablet->axes.point.y; - tablet->axes.point.y = value; - } - point.y = tablet->axes.point.y; - - evdev_transform_absolute(device, &point); - evdev_transform_relative(device, &delta); - - *delta_out = delta; - *point_out = point; -} - -static inline struct normalized_coords -tablet_process_delta(struct tablet_dispatch *tablet, - const struct evdev_device *device, - const struct device_coords *delta, - uint64_t time) -{ - struct normalized_coords accel; - - /* The tablet accel code uses mm as input */ - accel.x = 1.0 * delta->x/device->abs.absinfo_x->resolution; - accel.y = 1.0 * delta->y/device->abs.absinfo_y->resolution; - - if (normalized_is_zero(accel)) - return accel; - - return filter_dispatch(device->pointer.filter, - &accel, tablet, time); -} - -static inline double -tablet_handle_pressure(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct libinput_tablet_tool *tool) -{ - const struct input_absinfo *absinfo; - - if (bit_is_set(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_PRESSURE)) { - absinfo = libevdev_get_abs_info(device->evdev, ABS_PRESSURE); - tablet->axes.pressure = normalize_pressure(absinfo, tool); - } - - return tablet->axes.pressure; -} - -static inline double -tablet_handle_distance(struct tablet_dispatch *tablet, - struct evdev_device *device) -{ - const struct input_absinfo *absinfo; - - if (bit_is_set(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_DISTANCE)) { - absinfo = libevdev_get_abs_info(device->evdev, ABS_DISTANCE); - tablet->axes.distance = normalize_dist_slider(absinfo); - } - - return tablet->axes.distance; -} - -static inline double -tablet_handle_slider(struct tablet_dispatch *tablet, - struct evdev_device *device) -{ - const struct input_absinfo *absinfo; - - if (bit_is_set(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_SLIDER)) { - absinfo = libevdev_get_abs_info(device->evdev, ABS_WHEEL); - tablet->axes.slider = normalize_dist_slider(absinfo); - } - - return tablet->axes.slider; -} - -static inline struct tilt_degrees -tablet_handle_tilt(struct tablet_dispatch *tablet, - struct evdev_device *device) -{ - struct tilt_degrees tilt; - const struct input_absinfo *absinfo; - - if (bit_is_set(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_TILT_X)) { - absinfo = libevdev_get_abs_info(device->evdev, ABS_TILT_X); - tablet->axes.tilt.x = adjust_tilt(absinfo); - if (device->left_handed.enabled) - tablet->axes.tilt.x *= -1; - } - tilt.x = tablet->axes.tilt.x; - - if (bit_is_set(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_TILT_Y)) { - absinfo = libevdev_get_abs_info(device->evdev, ABS_TILT_Y); - tablet->axes.tilt.y = adjust_tilt(absinfo); - if (device->left_handed.enabled) - tablet->axes.tilt.y *= -1; - } - tilt.y = tablet->axes.tilt.y; - - return tilt; -} - -static inline double -tablet_handle_artpen_rotation(struct tablet_dispatch *tablet, - struct evdev_device *device) -{ - const struct input_absinfo *absinfo; - - if (bit_is_set(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z)) { - absinfo = libevdev_get_abs_info(device->evdev, - ABS_Z); - /* artpen has 0 with buttons pointing east */ - tablet->axes.rotation = convert_to_degrees(absinfo, 90); - } - - return tablet->axes.rotation; -} - -static inline double -tablet_handle_mouse_rotation(struct tablet_dispatch *tablet, - struct evdev_device *device) -{ - if (bit_is_set(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_TILT_X) || - bit_is_set(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_TILT_Y)) { - convert_tilt_to_rotation(tablet); - } - - return tablet->axes.rotation; -} - -static inline double -tablet_handle_wheel(struct tablet_dispatch *tablet, - struct evdev_device *device, - int *wheel_discrete) -{ - int a; - - a = LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL; - if (bit_is_set(tablet->changed_axes, a)) { - *wheel_discrete = tablet->axes.wheel_discrete; - tablet->axes.wheel = normalize_wheel(tablet, - tablet->axes.wheel_discrete); - } else { - tablet->axes.wheel = 0; - *wheel_discrete = 0; - } - - return tablet->axes.wheel; -} - -static bool -tablet_check_notify_axes(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct libinput_tablet_tool *tool, - struct tablet_axes *axes_out, - uint64_t time) -{ - struct tablet_axes axes = {0}; - const char tmp[sizeof(tablet->changed_axes)] = {0}; - struct device_coords delta; - - if (memcmp(tmp, tablet->changed_axes, sizeof(tmp)) == 0) - return false; - - tablet_handle_xy(tablet, device, &axes.point, &delta); - axes.pressure = tablet_handle_pressure(tablet, device, tool); - axes.distance = tablet_handle_distance(tablet, device); - axes.slider = tablet_handle_slider(tablet, device); - axes.tilt = tablet_handle_tilt(tablet, device); - axes.delta = tablet_process_delta(tablet, device, &delta, time); - - /* We must check ROTATION_Z after TILT_X/Y so that the tilt axes are - * already normalized and set if we have the mouse/lens tool */ - if (tablet->current_tool_type == LIBINPUT_TABLET_TOOL_TYPE_MOUSE || - tablet->current_tool_type == LIBINPUT_TABLET_TOOL_TYPE_LENS) { - axes.rotation = tablet_handle_mouse_rotation(tablet, device); - clear_bit(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_TILT_X); - clear_bit(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_TILT_Y); - axes.tilt.x = 0; - axes.tilt.y = 0; - - /* tilt is already coverted to left-handed, so mouse - * rotation is converted to left-handed automatically */ - } else { - axes.rotation = tablet_handle_artpen_rotation(tablet, device); - if (device->left_handed.enabled) - axes.rotation = fmod(180 + axes.rotation, 360); - } - - axes.wheel = tablet_handle_wheel(tablet, device, &axes.wheel_discrete); - - *axes_out = axes; - - return true; -} - -static void -tablet_update_button(struct tablet_dispatch *tablet, - uint32_t evcode, - uint32_t enable) -{ - switch (evcode) { - case BTN_TOUCH: - return; - case BTN_LEFT: - case BTN_RIGHT: - case BTN_MIDDLE: - case BTN_SIDE: - case BTN_EXTRA: - case BTN_FORWARD: - case BTN_BACK: - case BTN_TASK: - case BTN_STYLUS: - case BTN_STYLUS2: - break; - default: - log_info(tablet->device->base.seat->libinput, - "Unhandled button %s (%#x)\n", - libevdev_event_code_get_name(EV_KEY, evcode), evcode); - return; - } - - if (enable) { - set_bit(tablet->button_state.bits, evcode); - tablet_set_status(tablet, TABLET_BUTTONS_PRESSED); - } else { - clear_bit(tablet->button_state.bits, evcode); - tablet_set_status(tablet, TABLET_BUTTONS_RELEASED); - } -} - -static inline enum libinput_tablet_tool_type -tablet_evcode_to_tool(int code) -{ - enum libinput_tablet_tool_type type; - - switch (code) { - case BTN_TOOL_PEN: type = LIBINPUT_TABLET_TOOL_TYPE_PEN; break; - case BTN_TOOL_RUBBER: type = LIBINPUT_TABLET_TOOL_TYPE_ERASER; break; - case BTN_TOOL_BRUSH: type = LIBINPUT_TABLET_TOOL_TYPE_BRUSH; break; - case BTN_TOOL_PENCIL: type = LIBINPUT_TABLET_TOOL_TYPE_PENCIL; break; - case BTN_TOOL_AIRBRUSH: type = LIBINPUT_TABLET_TOOL_TYPE_AIRBRUSH; break; - case BTN_TOOL_MOUSE: type = LIBINPUT_TABLET_TOOL_TYPE_MOUSE; break; - case BTN_TOOL_LENS: type = LIBINPUT_TABLET_TOOL_TYPE_LENS; break; - default: - abort(); - } - - return type; -} - -static void -tablet_process_key(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct input_event *e, - uint64_t time) -{ - switch (e->code) { - case BTN_TOOL_FINGER: - log_bug_libinput(device->base.seat->libinput, - "Invalid tool 'finger' on tablet interface\n"); - break; - case BTN_TOOL_PEN: - case BTN_TOOL_RUBBER: - case BTN_TOOL_BRUSH: - case BTN_TOOL_PENCIL: - case BTN_TOOL_AIRBRUSH: - case BTN_TOOL_MOUSE: - case BTN_TOOL_LENS: - tablet_update_tool(tablet, - device, - tablet_evcode_to_tool(e->code), - e->value); - break; - case BTN_TOUCH: - if (!bit_is_set(tablet->axis_caps, - LIBINPUT_TABLET_TOOL_AXIS_PRESSURE)) { - if (e->value) - tablet_set_status(tablet, - TABLET_TOOL_ENTERING_CONTACT); - else - tablet_set_status(tablet, - TABLET_TOOL_LEAVING_CONTACT); - } - break; - case BTN_LEFT: - case BTN_RIGHT: - case BTN_MIDDLE: - case BTN_SIDE: - case BTN_EXTRA: - case BTN_FORWARD: - case BTN_BACK: - case BTN_TASK: - case BTN_STYLUS: - case BTN_STYLUS2: - default: - tablet_update_button(tablet, e->code, e->value); - break; - } -} - -static void -tablet_process_relative(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct input_event *e, - uint64_t time) -{ - enum libinput_tablet_tool_axis axis; - - switch (e->code) { - case REL_WHEEL: - axis = rel_evcode_to_axis(e->code); - if (axis == LIBINPUT_TABLET_TOOL_AXIS_NONE) { - log_bug_libinput(device->base.seat->libinput, - "Invalid ABS event code %#x\n", - e->code); - break; - } - set_bit(tablet->changed_axes, axis); - tablet->axes.wheel_discrete = -1 * e->value; - tablet_set_status(tablet, TABLET_AXES_UPDATED); - break; - default: - log_info(tablet->device->base.seat->libinput, - "Unhandled relative axis %s (%#x)\n", - libevdev_event_code_get_name(EV_REL, e->code), - e->code); - return; - } -} - -static void -tablet_process_misc(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct input_event *e, - uint64_t time) -{ - switch (e->code) { - case MSC_SERIAL: - if (e->value != -1) - tablet->current_tool_serial = e->value; - - break; - default: - log_info(device->base.seat->libinput, - "Unhandled MSC event code %s (%#x)\n", - libevdev_event_code_get_name(EV_MSC, e->code), - e->code); - break; - } -} - -static inline void -copy_axis_cap(const struct tablet_dispatch *tablet, - struct libinput_tablet_tool *tool, - enum libinput_tablet_tool_axis axis) -{ - if (bit_is_set(tablet->axis_caps, axis)) - set_bit(tool->axis_caps, axis); -} - -static inline void -copy_button_cap(const struct tablet_dispatch *tablet, - struct libinput_tablet_tool *tool, - uint32_t button) -{ - struct libevdev *evdev = tablet->device->evdev; - if (libevdev_has_event_code(evdev, EV_KEY, button)) - set_bit(tool->buttons, button); -} - -static inline int -tool_set_bits_from_libwacom(const struct tablet_dispatch *tablet, - struct libinput_tablet_tool *tool) -{ - int rc = 1; - -#if HAVE_LIBWACOM - struct libinput *libinput = tablet->device->base.seat->libinput; - WacomDeviceDatabase *db; - const WacomStylus *s = NULL; - int code; - WacomStylusType type; - WacomAxisTypeFlags axes; - - db = libwacom_database_new(); - if (!db) { - log_info(libinput, - "Failed to initialize libwacom context.\n"); - goto out; - } - s = libwacom_stylus_get_for_id(db, tool->tool_id); - if (!s) - goto out; - - type = libwacom_stylus_get_type(s); - if (type == WSTYLUS_PUCK) { - for (code = BTN_LEFT; - code < BTN_LEFT + libwacom_stylus_get_num_buttons(s); - code++) - copy_button_cap(tablet, tool, code); - } else { - if (libwacom_stylus_get_num_buttons(s) >= 2) - copy_button_cap(tablet, tool, BTN_STYLUS2); - if (libwacom_stylus_get_num_buttons(s) >= 1) - copy_button_cap(tablet, tool, BTN_STYLUS); - } - - if (libwacom_stylus_has_wheel(s)) - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL); - - axes = libwacom_stylus_get_axes(s); - - if (axes & WACOM_AXIS_TYPE_TILT) { - /* tilt on the puck is converted to rotation */ - if (type == WSTYLUS_PUCK) { - set_bit(tool->axis_caps, - LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); - } else { - copy_axis_cap(tablet, - tool, - LIBINPUT_TABLET_TOOL_AXIS_TILT_X); - copy_axis_cap(tablet, - tool, - LIBINPUT_TABLET_TOOL_AXIS_TILT_Y); - } - } - if (axes & WACOM_AXIS_TYPE_ROTATION_Z) - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); - if (axes & WACOM_AXIS_TYPE_DISTANCE) - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_DISTANCE); - if (axes & WACOM_AXIS_TYPE_SLIDER) - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_SLIDER); - if (axes & WACOM_AXIS_TYPE_PRESSURE) - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE); - - rc = 0; -out: - if (db) - libwacom_database_destroy(db); -#endif - return rc; -} - -static void -tool_set_bits(const struct tablet_dispatch *tablet, - struct libinput_tablet_tool *tool) -{ - enum libinput_tablet_tool_type type = tool->type; - - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_X); - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_Y); - -#if HAVE_LIBWACOM - if (tool_set_bits_from_libwacom(tablet, tool) == 0) - return; -#endif - /* If we don't have libwacom, we simply copy any axis we have on the - tablet onto the tool. Except we know that mice only have rotation - anyway. - */ - switch (type) { - case LIBINPUT_TABLET_TOOL_TYPE_PEN: - case LIBINPUT_TABLET_TOOL_TYPE_ERASER: - case LIBINPUT_TABLET_TOOL_TYPE_PENCIL: - case LIBINPUT_TABLET_TOOL_TYPE_BRUSH: - case LIBINPUT_TABLET_TOOL_TYPE_AIRBRUSH: - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE); - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_DISTANCE); - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_TILT_X); - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_TILT_Y); - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_SLIDER); - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); - break; - case LIBINPUT_TABLET_TOOL_TYPE_MOUSE: - case LIBINPUT_TABLET_TOOL_TYPE_LENS: - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL); - break; - default: - break; - } - - /* If we don't have libwacom, copy all pen-related buttons from the - tablet vs all mouse-related buttons */ - switch (type) { - case LIBINPUT_TABLET_TOOL_TYPE_PEN: - case LIBINPUT_TABLET_TOOL_TYPE_BRUSH: - case LIBINPUT_TABLET_TOOL_TYPE_AIRBRUSH: - case LIBINPUT_TABLET_TOOL_TYPE_PENCIL: - case LIBINPUT_TABLET_TOOL_TYPE_ERASER: - copy_button_cap(tablet, tool, BTN_STYLUS); - copy_button_cap(tablet, tool, BTN_STYLUS2); - break; - case LIBINPUT_TABLET_TOOL_TYPE_MOUSE: - case LIBINPUT_TABLET_TOOL_TYPE_LENS: - copy_button_cap(tablet, tool, BTN_LEFT); - copy_button_cap(tablet, tool, BTN_MIDDLE); - copy_button_cap(tablet, tool, BTN_RIGHT); - copy_button_cap(tablet, tool, BTN_SIDE); - copy_button_cap(tablet, tool, BTN_EXTRA); - break; - default: - break; - } -} - -static inline int -axis_range_percentage(const struct input_absinfo *a, double percent) -{ - return (a->maximum - a->minimum) * percent/100.0 + a->minimum; -} - -static struct libinput_tablet_tool * -tablet_get_tool(struct tablet_dispatch *tablet, - enum libinput_tablet_tool_type type, - uint32_t tool_id, - uint32_t serial) -{ - struct libinput_tablet_tool *tool = NULL, *t; - struct list *tool_list; - - if (serial) { - tool_list = &tablet->device->base.seat->libinput->tool_list; - - /* Check if we already have the tool in our list of tools */ - list_for_each(t, tool_list, link) { - if (type == t->type && serial == t->serial) { - tool = t; - break; - } - } - } else { - /* We can't guarantee that tools without serial numbers are - * unique, so we keep them local to the tablet that they come - * into proximity of instead of storing them in the global tool - * list */ - tool_list = &tablet->tool_list; - - /* Same as above, but don't bother checking the serial number */ - list_for_each(t, tool_list, link) { - if (type == t->type) { - tool = t; - break; - } - } - } - - /* If we didn't already have the new_tool in our list of tools, - * add it */ - if (!tool) { - const struct input_absinfo *pressure; - - tool = zalloc(sizeof *tool); - if (!tool) - return NULL; - *tool = (struct libinput_tablet_tool) { - .type = type, - .serial = serial, - .tool_id = tool_id, - .refcount = 1, - }; - - tool->pressure_offset = 0; - tool->has_pressure_offset = false; - tool->pressure_threshold.lower = 0; - tool->pressure_threshold.upper = 1; - - pressure = libevdev_get_abs_info(tablet->device->evdev, - ABS_PRESSURE); - if (pressure) { - tool->pressure_offset = pressure->minimum; - - /* 5% of the pressure range */ - tool->pressure_threshold.upper = - axis_range_percentage(pressure, 5); - tool->pressure_threshold.lower = - pressure->minimum; - } - - tool_set_bits(tablet, tool); - - list_insert(tool_list, &tool->link); - } - - return tool; -} - -static void -tablet_notify_button_mask(struct tablet_dispatch *tablet, - struct evdev_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - const struct button_state *buttons, - enum libinput_button_state state) -{ - struct libinput_device *base = &device->base; - size_t i; - size_t nbits = 8 * sizeof(buttons->bits); - enum libinput_tablet_tool_tip_state tip_state; - - tip_state = tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT) ? - LIBINPUT_TABLET_TOOL_TIP_DOWN : LIBINPUT_TABLET_TOOL_TIP_UP; - - for (i = 0; i < nbits; i++) { - if (!bit_is_set(buttons->bits, i)) - continue; - - tablet_notify_button(base, - time, - tool, - tip_state, - &tablet->axes, - i, - state); - } -} - -static void -tablet_notify_buttons(struct tablet_dispatch *tablet, - struct evdev_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - enum libinput_button_state state) -{ - struct button_state buttons; - - if (state == LIBINPUT_BUTTON_STATE_PRESSED) - tablet_get_pressed_buttons(tablet, &buttons); - else - tablet_get_released_buttons(tablet, &buttons); - - tablet_notify_button_mask(tablet, - device, - time, - tool, - &buttons, - state); -} - -static void -sanitize_pressure_distance(struct tablet_dispatch *tablet, - struct libinput_tablet_tool *tool) -{ - bool tool_in_contact; - const struct input_absinfo *distance, - *pressure; - - distance = libevdev_get_abs_info(tablet->device->evdev, ABS_DISTANCE); - pressure = libevdev_get_abs_info(tablet->device->evdev, ABS_PRESSURE); - - if (!pressure || !distance) - return; - - if (!bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_DISTANCE) && - !bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE)) - return; - - tool_in_contact = (pressure->value > tool->pressure_offset); - - /* Keep distance and pressure mutually exclusive */ - if (distance && - (bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_DISTANCE) || - bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE)) && - distance->value > distance->minimum && - pressure->value > pressure->minimum) { - if (tool_in_contact) { - clear_bit(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_DISTANCE); - tablet->axes.distance = 0; - } else { - clear_bit(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_PRESSURE); - tablet->axes.pressure = 0; - } - } else if (bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE) && - !tool_in_contact) { - /* Make sure that the last axis value sent to the caller is a 0 */ - if (tablet->axes.pressure == 0) - clear_bit(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_PRESSURE); - else - tablet->axes.pressure = 0; - } -} - -static inline void -sanitize_mouse_lens_rotation(struct tablet_dispatch *tablet) -{ - /* If we have a mouse/lens cursor and the tilt changed, the rotation - changed. Mark this, calculate the angle later */ - if ((tablet->current_tool_type == LIBINPUT_TABLET_TOOL_TYPE_MOUSE || - tablet->current_tool_type == LIBINPUT_TABLET_TOOL_TYPE_LENS) && - (bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_TILT_X) || - bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_TILT_Y))) - set_bit(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); -} - -static void -sanitize_tablet_axes(struct tablet_dispatch *tablet, - struct libinput_tablet_tool *tool) -{ - sanitize_pressure_distance(tablet, tool); - sanitize_mouse_lens_rotation(tablet); -} - -static void -detect_pressure_offset(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct libinput_tablet_tool *tool) -{ - const struct input_absinfo *pressure, *distance; - int offset; - - if (!bit_is_set(tablet->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_PRESSURE)) - return; - - pressure = libevdev_get_abs_info(device->evdev, ABS_PRESSURE); - distance = libevdev_get_abs_info(device->evdev, ABS_DISTANCE); - - if (!pressure || !distance) - return; - - offset = pressure->value - pressure->minimum; - - if (tool->has_pressure_offset) { - if (offset < tool->pressure_offset) - tool->pressure_offset = offset; - return; - } - - if (offset == 0) - return; - - /* we only set a pressure offset on proximity in */ - if (!tablet_has_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY)) - return; - - /* If we're closer than 50% of the distance axis, skip pressure - * offset detection, too likely to be wrong */ - if (distance->value < axis_range_percentage(distance, 50)) - return; - - if (offset > axis_range_percentage(pressure, 20)) { - log_error(device->base.seat->libinput, - "Ignoring pressure offset greater than 20%% detected on tool %s (serial %#x). " - "See http://wayland.freedesktop.org/libinput/doc/%s/tablet-support.html\n", - tablet_tool_type_to_string(tool->type), - tool->serial, - LIBINPUT_VERSION); - return; - } - - log_info(device->base.seat->libinput, - "Pressure offset detected on tool %s (serial %#x). " - "See http://wayland.freedesktop.org/libinput/doc/%s/tablet-support.html\n", - tablet_tool_type_to_string(tool->type), - tool->serial, - LIBINPUT_VERSION); - tool->pressure_offset = offset; - tool->has_pressure_offset = true; -} - -static void -detect_tool_contact(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct libinput_tablet_tool *tool) -{ - const struct input_absinfo *p; - int pressure; - - if (!bit_is_set(tool->axis_caps, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE)) - return; - - /* if we have pressure, always use that for contact, not BTN_TOUCH */ - if (tablet_has_status(tablet, TABLET_TOOL_ENTERING_CONTACT)) - log_bug_libinput(device->base.seat->libinput, - "Invalid status: entering contact\n"); - if (tablet_has_status(tablet, TABLET_TOOL_LEAVING_CONTACT) && - !tablet_has_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY)) - log_bug_libinput(device->base.seat->libinput, - "Invalid status: leaving contact\n"); - - p = libevdev_get_abs_info(tablet->device->evdev, ABS_PRESSURE); - if (!p) { - log_bug_libinput(device->base.seat->libinput, - "Missing pressure axis\n"); - return; - } - pressure = p->value; - - if (tool->has_pressure_offset) - pressure -= (tool->pressure_offset - p->minimum); - - if (pressure <= tool->pressure_threshold.lower && - tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT)) { - tablet_set_status(tablet, TABLET_TOOL_LEAVING_CONTACT); - } else if (pressure >= tool->pressure_threshold.upper && - !tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT)) { - tablet_set_status(tablet, TABLET_TOOL_ENTERING_CONTACT); - } -} - -static void -tablet_mark_all_axes_changed(struct tablet_dispatch *tablet, - struct libinput_tablet_tool *tool) -{ - static_assert(sizeof(tablet->changed_axes) == - sizeof(tool->axis_caps), - "Mismatching array sizes"); - - memcpy(tablet->changed_axes, - tool->axis_caps, - sizeof(tablet->changed_axes)); -} - -static void -tablet_update_proximity_state(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct libinput_tablet_tool *tool) -{ - const struct input_absinfo *distance; - int dist_max = tablet->cursor_proximity_threshold; - int dist; - - distance = libevdev_get_abs_info(tablet->device->evdev, ABS_DISTANCE); - if (!distance) - return; - - dist = distance->value; - if (dist == 0) - return; - - /* Tool got into permitted range */ - if (dist < dist_max && - (tablet_has_status(tablet, TABLET_TOOL_OUT_OF_RANGE) || - tablet_has_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY))) { - tablet_unset_status(tablet, - TABLET_TOOL_OUT_OF_RANGE); - tablet_unset_status(tablet, - TABLET_TOOL_OUT_OF_PROXIMITY); - tablet_set_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY); - tablet_mark_all_axes_changed(tablet, tool); - - tablet_set_status(tablet, TABLET_BUTTONS_PRESSED); - tablet_force_button_presses(tablet); - return; - } - - if (dist < dist_max) - return; - - /* Still out of range/proximity */ - if (tablet_has_status(tablet, TABLET_TOOL_OUT_OF_RANGE) || - tablet_has_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY)) - return; - - /* Tool entered prox but is outside of permitted range */ - if (tablet_has_status(tablet, - TABLET_TOOL_ENTERING_PROXIMITY)) { - tablet_set_status(tablet, - TABLET_TOOL_OUT_OF_RANGE); - tablet_unset_status(tablet, - TABLET_TOOL_ENTERING_PROXIMITY); - return; - } - - /* Tool was in prox and is now outside of range. Set leaving - * proximity, on the next event it will be OUT_OF_PROXIMITY and thus - * caught by the above conditions */ - tablet_set_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY); -} - -static void -tablet_send_axis_proximity_tip_down_events(struct tablet_dispatch *tablet, - struct evdev_device *device, - struct libinput_tablet_tool *tool, - uint64_t time) -{ - struct tablet_axes axes = {0}; - - /* We need to make sure that we check that the tool is not out of - * proximity before we send any axis updates. This is because many - * tablets will send axis events with incorrect values if the tablet - * tool is close enough so that the tablet can partially detect that - * it's there, but can't properly receive any data from the tool. */ - if (tablet_has_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY)) - goto out; - else if (tablet_has_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY)) { - /* Tool is leaving proximity, we can't rely on the last axis - * information (it'll be mostly 0), so we just get the - * current state and skip over updating the axes. - */ - axes = tablet->axes; - - /* Dont' send an axis event, but we may have a tip event - * update */ - tablet_unset_status(tablet, TABLET_AXES_UPDATED); - } else if (!tablet_check_notify_axes(tablet, - device, - tool, - &axes, - time)) { - goto out; - } - - if (tablet_has_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY)) { - tablet_notify_proximity(&device->base, - time, - tool, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN, - tablet->changed_axes, - &axes); - tablet_unset_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY); - tablet_unset_status(tablet, TABLET_AXES_UPDATED); - } - - if (tablet_has_status(tablet, TABLET_TOOL_ENTERING_CONTACT)) { - tablet_notify_tip(&device->base, - time, - tool, - LIBINPUT_TABLET_TOOL_TIP_DOWN, - tablet->changed_axes, - &tablet->axes); - tablet_unset_status(tablet, TABLET_AXES_UPDATED); - tablet_unset_status(tablet, TABLET_TOOL_ENTERING_CONTACT); - tablet_set_status(tablet, TABLET_TOOL_IN_CONTACT); - } else if (tablet_has_status(tablet, TABLET_TOOL_LEAVING_CONTACT)) { - tablet_notify_tip(&device->base, - time, - tool, - LIBINPUT_TABLET_TOOL_TIP_UP, - tablet->changed_axes, - &tablet->axes); - tablet_unset_status(tablet, TABLET_AXES_UPDATED); - tablet_unset_status(tablet, TABLET_TOOL_LEAVING_CONTACT); - tablet_unset_status(tablet, TABLET_TOOL_IN_CONTACT); - } else if (tablet_has_status(tablet, TABLET_AXES_UPDATED)) { - enum libinput_tablet_tool_tip_state tip_state; - - if (tablet_has_status(tablet, - TABLET_TOOL_IN_CONTACT)) - tip_state = LIBINPUT_TABLET_TOOL_TIP_DOWN; - else - tip_state = LIBINPUT_TABLET_TOOL_TIP_UP; - - tablet_notify_axis(&device->base, - time, - tool, - tip_state, - tablet->changed_axes, - &axes); - tablet_unset_status(tablet, TABLET_AXES_UPDATED); - } - -out: - memset(tablet->changed_axes, 0, sizeof(tablet->changed_axes)); - tablet_unset_status(tablet, TABLET_TOOL_ENTERING_CONTACT); -} - -static void -tablet_flush(struct tablet_dispatch *tablet, - struct evdev_device *device, - uint64_t time) -{ - struct libinput_tablet_tool *tool = - tablet_get_tool(tablet, - tablet->current_tool_type, - tablet->current_tool_id, - tablet->current_tool_serial); - - if (!tool) - return; /* OOM */ - - if (tool->type == LIBINPUT_TABLET_TOOL_TYPE_MOUSE || - tool->type == LIBINPUT_TABLET_TOOL_TYPE_LENS) - tablet_update_proximity_state(tablet, device, tool); - - if (tablet_has_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY) || - tablet_has_status(tablet, TABLET_TOOL_OUT_OF_RANGE)) - return; - - if (tablet_has_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY)) { - /* Release all stylus buttons */ - memset(tablet->button_state.bits, - 0, - sizeof(tablet->button_state.bits)); - tablet_set_status(tablet, TABLET_BUTTONS_RELEASED); - if (tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT)) - tablet_set_status(tablet, TABLET_TOOL_LEAVING_CONTACT); - } else if (tablet_has_status(tablet, TABLET_AXES_UPDATED) || - tablet_has_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY)) { - if (tablet_has_status(tablet, - TABLET_TOOL_ENTERING_PROXIMITY)) - tablet_mark_all_axes_changed(tablet, tool); - detect_pressure_offset(tablet, device, tool); - detect_tool_contact(tablet, device, tool); - sanitize_tablet_axes(tablet, tool); - } - - tablet_send_axis_proximity_tip_down_events(tablet, - device, - tool, - time); - - if (tablet_has_status(tablet, TABLET_BUTTONS_RELEASED)) { - tablet_notify_buttons(tablet, - device, - time, - tool, - LIBINPUT_BUTTON_STATE_RELEASED); - tablet_unset_status(tablet, TABLET_BUTTONS_RELEASED); - } - - if (tablet_has_status(tablet, TABLET_BUTTONS_PRESSED)) { - tablet_notify_buttons(tablet, - device, - time, - tool, - LIBINPUT_BUTTON_STATE_PRESSED); - tablet_unset_status(tablet, TABLET_BUTTONS_PRESSED); - } - - if (tablet_has_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY)) { - memset(tablet->changed_axes, 0, sizeof(tablet->changed_axes)); - tablet_notify_proximity(&device->base, - time, - tool, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT, - tablet->changed_axes, - &tablet->axes); - - tablet_set_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY); - tablet_unset_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY); - - tablet_change_to_left_handed(device); - } -} - -static inline void -tablet_reset_state(struct tablet_dispatch *tablet) -{ - /* Update state */ - memcpy(&tablet->prev_button_state, - &tablet->button_state, - sizeof(tablet->button_state)); -} - -static void -tablet_process(struct evdev_dispatch *dispatch, - struct evdev_device *device, - struct input_event *e, - uint64_t time) -{ - struct tablet_dispatch *tablet = - (struct tablet_dispatch *)dispatch; - - switch (e->type) { - case EV_ABS: - tablet_process_absolute(tablet, device, e, time); - break; - case EV_REL: - tablet_process_relative(tablet, device, e, time); - break; - case EV_KEY: - tablet_process_key(tablet, device, e, time); - break; - case EV_MSC: - tablet_process_misc(tablet, device, e, time); - break; - case EV_SYN: - tablet_flush(tablet, device, time); - tablet_reset_state(tablet); - break; - default: - log_error(device->base.seat->libinput, - "Unexpected event type %s (%#x)\n", - libevdev_event_type_get_name(e->type), - e->type); - break; - } -} - -static void -tablet_destroy(struct evdev_dispatch *dispatch) -{ - struct tablet_dispatch *tablet = - (struct tablet_dispatch*)dispatch; - struct libinput_tablet_tool *tool, *tmp; - - list_for_each_safe(tool, tmp, &tablet->tool_list, link) { - libinput_tablet_tool_unref(tool); - } - - free(tablet); -} - -static void -tablet_check_initial_proximity(struct evdev_device *device, - struct evdev_dispatch *dispatch) -{ - bool tool_in_prox = false; - int code, state; - enum libinput_tablet_tool_type tool; - struct tablet_dispatch *tablet = (struct tablet_dispatch*)dispatch; - - for (tool = LIBINPUT_TABLET_TOOL_TYPE_PEN; tool <= LIBINPUT_TABLET_TOOL_TYPE_MAX; tool++) { - code = tablet_tool_to_evcode(tool); - - /* we only expect one tool to be in proximity at a time */ - if (libevdev_fetch_event_value(device->evdev, - EV_KEY, - code, - &state) && state) { - tool_in_prox = true; - break; - } - } - - if (!tool_in_prox) - return; - - tablet_update_tool(tablet, device, tool, state); - - tablet->current_tool_id = - libevdev_get_event_value(device->evdev, - EV_ABS, - ABS_MISC); - - /* we can't fetch MSC_SERIAL from the kernel, so we set the serial - * to 0 for now. On the first real event from the device we get the - * serial (if any) and that event will be converted into a proximity - * event */ - tablet->current_tool_serial = 0; -} - -static struct evdev_dispatch_interface tablet_interface = { - tablet_process, - NULL, /* suspend */ - NULL, /* remove */ - tablet_destroy, - NULL, /* device_added */ - NULL, /* device_removed */ - NULL, /* device_suspended */ - NULL, /* device_resumed */ - tablet_check_initial_proximity, -}; - -static void -tablet_init_calibration(struct tablet_dispatch *tablet, - struct evdev_device *device) -{ - if (libevdev_has_property(device->evdev, INPUT_PROP_DIRECT)) - evdev_init_calibration(device, &tablet->base); -} - -static void -tablet_init_proximity_threshold(struct tablet_dispatch *tablet, - struct evdev_device *device) -{ - /* This rules out most of the bamboos and other devices, we're - * pretty much down to - */ - if (!libevdev_has_event_code(device->evdev, EV_KEY, BTN_TOOL_MOUSE) && - !libevdev_has_event_code(device->evdev, EV_KEY, BTN_TOOL_LENS)) - return; - - /* 42 is the default proximity threshold the xf86-input-wacom driver - * uses for Intuos/Cintiq models. Graphire models have a threshold - * of 10 but since they haven't been manufactured in ages and the - * intersection of users having a graphire, running libinput and - * wanting to use the mouse/lens cursor tool is small enough to not - * worry about it for now. If we need to, we can introduce a udev - * property later. - * - * Value is in device coordinates. - */ - tablet->cursor_proximity_threshold = 42; -} - -static uint32_t -tablet_accel_config_get_profiles(struct libinput_device *libinput_device) -{ - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; -} - -static enum libinput_config_status -tablet_accel_config_set_profile(struct libinput_device *libinput_device, - enum libinput_config_accel_profile profile) -{ - return LIBINPUT_CONFIG_STATUS_UNSUPPORTED; -} - -static enum libinput_config_accel_profile -tablet_accel_config_get_profile(struct libinput_device *libinput_device) -{ - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; -} - -static enum libinput_config_accel_profile -tablet_accel_config_get_default_profile(struct libinput_device *libinput_device) -{ - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; -} - -static int -tablet_init_accel(struct tablet_dispatch *tablet, struct evdev_device *device) -{ - const struct input_absinfo *x, *y; - struct motion_filter *filter; - int rc; - - x = device->abs.absinfo_x; - y = device->abs.absinfo_y; - - filter = create_pointer_accelerator_filter_tablet(x->resolution, - y->resolution); - - rc = evdev_device_init_pointer_acceleration(device, filter); - if (rc != 0) - return rc; - - /* we override the profile hooks for accel configuration with hooks - * that don't allow selection of profiles */ - device->pointer.config.get_profiles = tablet_accel_config_get_profiles; - device->pointer.config.set_profile = tablet_accel_config_set_profile; - device->pointer.config.get_profile = tablet_accel_config_get_profile; - device->pointer.config.get_default_profile = tablet_accel_config_get_default_profile; - - return 0; -} - -static void -tablet_init_left_handed(struct evdev_device *device) -{ -#if HAVE_LIBWACOM - struct libinput *libinput = device->base.seat->libinput; - WacomDeviceDatabase *db; - WacomDevice *d = NULL; - WacomError *error; - const char *devnode; - - db = libwacom_database_new(); - if (!db) { - log_info(libinput, - "Failed to initialize libwacom context.\n"); - return; - } - error = libwacom_error_new(); - devnode = udev_device_get_devnode(device->udev_device); - - d = libwacom_new_from_path(db, - devnode, - WFALLBACK_NONE, - error); - - if (d) { - if (libwacom_is_reversible(d)) - evdev_init_left_handed(device, - tablet_change_to_left_handed); - } else if (libwacom_error_get_code(error) == WERROR_UNKNOWN_MODEL) { - log_info(libinput, "Tablet unknown to libwacom\n"); - } else { - log_error(libinput, - "libwacom error: %s\n", - libwacom_error_get_message(error)); - } - - if (error) - libwacom_error_free(&error); - if (d) - libwacom_destroy(d); - libwacom_database_destroy(db); -#endif -} - -static int -tablet_reject_device(struct evdev_device *device) -{ - struct libevdev *evdev = device->evdev; - int rc = -1; - - if (!libevdev_has_event_code(evdev, EV_ABS, ABS_X) || - !libevdev_has_event_code(evdev, EV_ABS, ABS_Y)) - goto out; - - if (!libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_PEN)) - goto out; - - rc = 0; - -out: - if (rc) { - log_bug_libinput(device->base.seat->libinput, - "Device '%s' does not meet tablet criteria. " - "Ignoring this device.\n", - device->devname); - } - return rc; -} - -static int -tablet_init(struct tablet_dispatch *tablet, - struct evdev_device *device) -{ - enum libinput_tablet_tool_axis axis; - int rc; - - tablet->base.interface = &tablet_interface; - tablet->device = device; - tablet->status = TABLET_NONE; - tablet->current_tool_type = LIBINPUT_TOOL_NONE; - list_init(&tablet->tool_list); - - if (tablet_reject_device(device)) - return -1; - - tablet_init_calibration(tablet, device); - tablet_init_proximity_threshold(tablet, device); - rc = tablet_init_accel(tablet, device); - if (rc != 0) - return rc; - - tablet_init_left_handed(device); - - for (axis = LIBINPUT_TABLET_TOOL_AXIS_X; - axis <= LIBINPUT_TABLET_TOOL_AXIS_MAX; - axis++) { - if (tablet_device_has_axis(tablet, axis)) - set_bit(tablet->axis_caps, axis); - } - - tablet_set_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY); - - return 0; -} - -struct evdev_dispatch * -evdev_tablet_create(struct evdev_device *device) -{ - struct tablet_dispatch *tablet; - - tablet = zalloc(sizeof *tablet); - if (!tablet) - return NULL; - - if (tablet_init(tablet, device) != 0) { - tablet_destroy(&tablet->base); - return NULL; - } - - return &tablet->base; -} diff -Nru libinput-1.2.2/src/evdev-tablet.h libinput-0.21.0/src/evdev-tablet.h --- libinput-1.2.2/src/evdev-tablet.h 2016-03-01 06:02:28.000000000 +0000 +++ libinput-0.21.0/src/evdev-tablet.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,204 +0,0 @@ -/* - * Copyright © 2014 Red Hat, Inc. - * Copyright © 2014 Stephen Chandler "Lyude" Paul - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, provided - * that the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of the copyright holders not be used in - * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The copyright holders make - * no representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY - * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef EVDEV_TABLET_H -#define EVDEV_TABLET_H - -#include "evdev.h" - -#define LIBINPUT_TABLET_TOOL_AXIS_NONE 0 -#define LIBINPUT_TOOL_NONE 0 -#define LIBINPUT_TABLET_TOOL_TYPE_MAX LIBINPUT_TABLET_TOOL_TYPE_LENS - -enum tablet_status { - TABLET_NONE = 0, - TABLET_AXES_UPDATED = 1 << 0, - TABLET_BUTTONS_PRESSED = 1 << 1, - TABLET_BUTTONS_RELEASED = 1 << 2, - TABLET_TOOL_IN_CONTACT = 1 << 3, - TABLET_TOOL_LEAVING_PROXIMITY = 1 << 4, - TABLET_TOOL_OUT_OF_PROXIMITY = 1 << 5, - TABLET_TOOL_ENTERING_PROXIMITY = 1 << 6, - TABLET_TOOL_ENTERING_CONTACT = 1 << 7, - TABLET_TOOL_LEAVING_CONTACT = 1 << 8, - TABLET_TOOL_OUT_OF_RANGE = 1 << 9, -}; - -struct button_state { - unsigned char bits[NCHARS(KEY_CNT)]; -}; - -struct tablet_dispatch { - struct evdev_dispatch base; - struct evdev_device *device; - unsigned int status; - unsigned char changed_axes[NCHARS(LIBINPUT_TABLET_TOOL_AXIS_MAX + 1)]; - struct tablet_axes axes; - unsigned char axis_caps[NCHARS(LIBINPUT_TABLET_TOOL_AXIS_MAX + 1)]; - - /* Only used for tablets that don't report serial numbers */ - struct list tool_list; - - struct button_state button_state; - struct button_state prev_button_state; - - enum libinput_tablet_tool_type current_tool_type; - uint32_t current_tool_id; - uint32_t current_tool_serial; - - uint32_t cursor_proximity_threshold; -}; - -static inline enum libinput_tablet_tool_axis -evcode_to_axis(const uint32_t evcode) -{ - enum libinput_tablet_tool_axis axis; - - switch (evcode) { - case ABS_X: - axis = LIBINPUT_TABLET_TOOL_AXIS_X; - break; - case ABS_Y: - axis = LIBINPUT_TABLET_TOOL_AXIS_Y; - break; - case ABS_Z: - axis = LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z; - break; - case ABS_DISTANCE: - axis = LIBINPUT_TABLET_TOOL_AXIS_DISTANCE; - break; - case ABS_PRESSURE: - axis = LIBINPUT_TABLET_TOOL_AXIS_PRESSURE; - break; - case ABS_TILT_X: - axis = LIBINPUT_TABLET_TOOL_AXIS_TILT_X; - break; - case ABS_TILT_Y: - axis = LIBINPUT_TABLET_TOOL_AXIS_TILT_Y; - break; - case ABS_WHEEL: - axis = LIBINPUT_TABLET_TOOL_AXIS_SLIDER; - break; - default: - axis = LIBINPUT_TABLET_TOOL_AXIS_NONE; - break; - } - - return axis; -} - -static inline enum libinput_tablet_tool_axis -rel_evcode_to_axis(const uint32_t evcode) -{ - enum libinput_tablet_tool_axis axis; - - switch (evcode) { - case REL_WHEEL: - axis = LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL; - break; - default: - axis = LIBINPUT_TABLET_TOOL_AXIS_NONE; - break; - } - - return axis; -} - -static inline uint32_t -axis_to_evcode(const enum libinput_tablet_tool_axis axis) -{ - uint32_t evcode; - - switch (axis) { - case LIBINPUT_TABLET_TOOL_AXIS_X: - evcode = ABS_X; - break; - case LIBINPUT_TABLET_TOOL_AXIS_Y: - evcode = ABS_Y; - break; - case LIBINPUT_TABLET_TOOL_AXIS_DISTANCE: - evcode = ABS_DISTANCE; - break; - case LIBINPUT_TABLET_TOOL_AXIS_PRESSURE: - evcode = ABS_PRESSURE; - break; - case LIBINPUT_TABLET_TOOL_AXIS_TILT_X: - evcode = ABS_TILT_X; - break; - case LIBINPUT_TABLET_TOOL_AXIS_TILT_Y: - evcode = ABS_TILT_Y; - break; - case LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z: - evcode = ABS_Z; - break; - case LIBINPUT_TABLET_TOOL_AXIS_SLIDER: - evcode = ABS_WHEEL; - break; - default: - abort(); - } - - return evcode; -} - -static inline int -tablet_tool_to_evcode(enum libinput_tablet_tool_type type) -{ - int code; - - switch (type) { - case LIBINPUT_TABLET_TOOL_TYPE_PEN: code = BTN_TOOL_PEN; break; - case LIBINPUT_TABLET_TOOL_TYPE_ERASER: code = BTN_TOOL_RUBBER; break; - case LIBINPUT_TABLET_TOOL_TYPE_BRUSH: code = BTN_TOOL_BRUSH; break; - case LIBINPUT_TABLET_TOOL_TYPE_PENCIL: code = BTN_TOOL_PENCIL; break; - case LIBINPUT_TABLET_TOOL_TYPE_AIRBRUSH: code = BTN_TOOL_AIRBRUSH; break; - case LIBINPUT_TABLET_TOOL_TYPE_MOUSE: code = BTN_TOOL_MOUSE; break; - case LIBINPUT_TABLET_TOOL_TYPE_LENS: code = BTN_TOOL_LENS; break; - default: - abort(); - } - - return code; -} - -static inline const char * -tablet_tool_type_to_string(enum libinput_tablet_tool_type type) -{ - const char *str; - - switch (type) { - case LIBINPUT_TABLET_TOOL_TYPE_PEN: str = "pen"; break; - case LIBINPUT_TABLET_TOOL_TYPE_ERASER: str = "eraser"; break; - case LIBINPUT_TABLET_TOOL_TYPE_BRUSH: str = "brush"; break; - case LIBINPUT_TABLET_TOOL_TYPE_PENCIL: str = "pencil"; break; - case LIBINPUT_TABLET_TOOL_TYPE_AIRBRUSH: str = "airbrush"; break; - case LIBINPUT_TABLET_TOOL_TYPE_MOUSE: str = "mouse"; break; - case LIBINPUT_TABLET_TOOL_TYPE_LENS: str = "lens"; break; - default: - abort(); - } - - return str; -} - -#endif diff -Nru libinput-1.2.2/src/filter.c libinput-0.21.0/src/filter.c --- libinput-1.2.2/src/filter.c 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/src/filter.c 2015-08-03 05:08:55.000000000 +0000 @@ -36,26 +36,6 @@ #include "libinput-util.h" #include "filter-private.h" -/* Once normalized, touchpads see the same acceleration as mice. that is - * technically correct but subjectively wrong, we expect a touchpad to be a - * lot slower than a mouse. Apply a magic factor to slow down all movements - */ -#define TP_MAGIC_SLOWDOWN 0.4 /* unitless factor */ - -/* Convert speed/velocity from units/us to units/ms */ -static inline double -v_us2ms(double units_per_us) -{ - return units_per_us * 1000.0; -} - -/* Convert speed/velocity from units/ms to units/us */ -static inline double -v_ms2us(double units_per_ms) -{ - return units_per_ms/1000.0; -} - struct normalized_coords filter_dispatch(struct motion_filter *filter, const struct normalized_coords *unaccelerated, @@ -64,26 +44,17 @@ return filter->interface->filter(filter, unaccelerated, data, time); } -struct normalized_coords -filter_dispatch_constant(struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time) -{ - return filter->interface->filter_constant(filter, unaccelerated, data, time); -} - void filter_restart(struct motion_filter *filter, void *data, uint64_t time) { - if (filter->interface->restart) - filter->interface->restart(filter, data, time); + filter->interface->restart(filter, data, time); } void filter_destroy(struct motion_filter *filter) { - if (!filter || !filter->interface->destroy) + if (!filter) return; filter->interface->destroy(filter); @@ -91,44 +62,30 @@ bool filter_set_speed(struct motion_filter *filter, - double speed_adjustment) + double speed) { - return filter->interface->set_speed(filter, speed_adjustment); + return filter->interface->set_speed(filter, speed); } double filter_get_speed(struct motion_filter *filter) { - return filter->speed_adjustment; -} - -enum libinput_config_accel_profile -filter_get_type(struct motion_filter *filter) -{ - return filter->interface->type; + return filter->speed; } /* * Default parameters for pointer acceleration profiles. */ -#define DEFAULT_THRESHOLD v_ms2us(0.4) /* in units/us */ -#define MINIMUM_THRESHOLD v_ms2us(0.2) /* in units/us */ +#define DEFAULT_THRESHOLD 0.4 /* in units/ms */ #define DEFAULT_ACCELERATION 2.0 /* unitless factor */ #define DEFAULT_INCLINE 1.1 /* unitless factor */ -/* for the Lenovo x230 custom accel. do not touch */ -#define X230_THRESHOLD v_ms2us(0.4) /* in units/us */ -#define X230_ACCELERATION 2.0 /* unitless factor */ -#define X230_INCLINE 1.1 /* unitless factor */ -#define X230_MAGIC_SLOWDOWN 0.4 /* unitless */ -#define X230_TP_MAGIC_LOW_RES_FACTOR 4.0 /* unitless */ - /* * Pointer acceleration filter constants */ -#define MAX_VELOCITY_DIFF v_ms2us(1) /* units/us */ +#define MAX_VELOCITY_DIFF 1 /* units/ms */ #define MOTION_TIMEOUT ms2us(1000) #define NUM_POINTER_TRACKERS 16 @@ -138,38 +95,26 @@ int dir; }; +struct pointer_accelerator; struct pointer_accelerator { struct motion_filter base; accel_profile_func_t profile; - double velocity; /* units/us */ - double last_velocity; /* units/us */ + double velocity; /* units/ms */ + double last_velocity; /* units/ms */ + struct normalized_coords last; struct pointer_tracker *trackers; int cur_tracker; - double threshold; /* units/us */ + double threshold; /* units/ms */ double accel; /* unitless factor */ double incline; /* incline of the function */ double dpi_factor; }; -struct pointer_accelerator_flat { - struct motion_filter base; - - double factor; - double dpi_factor; -}; - -struct tablet_accelerator_flat { - struct motion_filter base; - - double factor; - int xres, yres; -}; - static void feed_trackers(struct pointer_accelerator *accel, const struct normalized_coords *delta, @@ -205,7 +150,7 @@ calculate_tracker_velocity(struct pointer_tracker *tracker, uint64_t time) { double tdelta = time - tracker->time + 1; - return normalized_length(tracker->delta) / tdelta; /* units/us */ + return normalized_length(tracker->delta) / tdelta * 1000.0; /* units/ms */ } static inline double @@ -275,7 +220,7 @@ } } - return result; /* units/us */ + return result; /* units/ms */ } static double @@ -308,63 +253,14 @@ return factor; /* unitless factor */ } -static inline double -calculate_acceleration_factor(struct pointer_accelerator *accel, - const struct normalized_coords *unaccelerated, - void *data, - uint64_t time) -{ - double velocity; /* units/us */ - double accel_factor; - - feed_trackers(accel, unaccelerated, time); - velocity = calculate_velocity(accel, time); - accel_factor = calculate_acceleration(accel, - data, - velocity, - accel->last_velocity, - time); - accel->last_velocity = velocity; - - return accel_factor; -} - static struct normalized_coords accelerator_filter(struct motion_filter *filter, const struct normalized_coords *unaccelerated, - void *data, uint64_t time) -{ - struct pointer_accelerator *accel = - (struct pointer_accelerator *) filter; - double accel_value; /* unitless factor */ - struct normalized_coords accelerated; - - accel_value = calculate_acceleration_factor(accel, - unaccelerated, - data, - time); - - accelerated.x = accel_value * unaccelerated->x; - accelerated.y = accel_value * unaccelerated->y; - - return accelerated; -} - -static struct normalized_coords -accelerator_filter_noop(struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time) -{ - return *unaccelerated; -} - -static struct normalized_coords -accelerator_filter_low_dpi(struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time) + void *data, uint64_t time /* in us */) { struct pointer_accelerator *accel = (struct pointer_accelerator *) filter; + double velocity; /* units/ms */ double accel_value; /* unitless factor */ struct normalized_coords accelerated; struct normalized_coords unnormalized; @@ -376,101 +272,24 @@ unnormalized.x = unaccelerated->x * dpi_factor; unnormalized.y = unaccelerated->y * dpi_factor; - accel_value = calculate_acceleration_factor(accel, - &unnormalized, - data, - time); - - accelerated.x = accel_value * unnormalized.x; - accelerated.y = accel_value * unnormalized.y; - - return accelerated; -} - -static struct normalized_coords -accelerator_filter_trackpoint(struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time) -{ - struct pointer_accelerator *accel = - (struct pointer_accelerator *) filter; - double accel_value; /* unitless factor */ - struct normalized_coords accelerated; - struct normalized_coords unnormalized; - double dpi_factor = accel->dpi_factor; - - /* trackpoints with a dpi factor have a const accel set, remove that - * and restore device units. The accel profile takes const accel - * into account */ - dpi_factor = min(1.0, dpi_factor); - unnormalized.x = unaccelerated->x * dpi_factor; - unnormalized.y = unaccelerated->y * dpi_factor; - - accel_value = calculate_acceleration_factor(accel, - &unnormalized, - data, - time); + feed_trackers(accel, &unnormalized, time); + velocity = calculate_velocity(accel, time); + accel_value = calculate_acceleration(accel, + data, + velocity, + accel->last_velocity, + time); accelerated.x = accel_value * unnormalized.x; accelerated.y = accel_value * unnormalized.y; - return accelerated; -} - -static struct normalized_coords -accelerator_filter_x230(struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time) -{ - struct pointer_accelerator *accel = - (struct pointer_accelerator *) filter; - double accel_factor; /* unitless factor */ - struct normalized_coords accelerated; - double velocity; /* units/us */ + accel->last = unnormalized; - feed_trackers(accel, unaccelerated, time); - velocity = calculate_velocity(accel, time); - accel_factor = calculate_acceleration(accel, - data, - velocity, - accel->last_velocity, - time); accel->last_velocity = velocity; - accelerated.x = accel_factor * unaccelerated->x; - accelerated.y = accel_factor * unaccelerated->y; - return accelerated; } -static struct normalized_coords -accelerator_filter_constant_x230(struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time) -{ - struct normalized_coords normalized; - const double factor = - X230_MAGIC_SLOWDOWN/X230_TP_MAGIC_LOW_RES_FACTOR; - - normalized.x = factor * unaccelerated->x; - normalized.y = factor * unaccelerated->y; - - return normalized; -} - -static struct normalized_coords -touchpad_constant_filter(struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time) -{ - struct normalized_coords normalized; - - normalized.x = TP_MAGIC_SLOWDOWN * unaccelerated->x; - normalized.y = TP_MAGIC_SLOWDOWN * unaccelerated->y; - - return normalized; -} - static void accelerator_restart(struct motion_filter *filter, void *data, @@ -506,32 +325,65 @@ static bool accelerator_set_speed(struct motion_filter *filter, - double speed_adjustment) + double speed) { struct pointer_accelerator *accel_filter = (struct pointer_accelerator *)filter; - assert(speed_adjustment >= -1.0 && speed_adjustment <= 1.0); - - /* Note: the numbers below are nothing but trial-and-error magic, - don't read more into them other than "they mostly worked ok" */ + assert(speed >= -1.0 && speed <= 1.0); /* delay when accel kicks in */ - accel_filter->threshold = DEFAULT_THRESHOLD - - v_ms2us(0.25) * speed_adjustment; - if (accel_filter->threshold < MINIMUM_THRESHOLD) - accel_filter->threshold = MINIMUM_THRESHOLD; + accel_filter->threshold = DEFAULT_THRESHOLD - speed / 4000.0; + if (accel_filter->threshold < 0.0002) + accel_filter->threshold = 0.0002; /* adjust max accel factor */ - accel_filter->accel = DEFAULT_ACCELERATION + speed_adjustment * 1.5; + accel_filter->accel = DEFAULT_ACCELERATION + speed * 1.5; /* higher speed -> faster to reach max */ - accel_filter->incline = DEFAULT_INCLINE + speed_adjustment * 0.75; + accel_filter->incline = DEFAULT_INCLINE + speed * 0.75; - filter->speed_adjustment = speed_adjustment; + filter->speed = speed; return true; } +struct motion_filter_interface accelerator_interface = { + accelerator_filter, + accelerator_restart, + accelerator_destroy, + accelerator_set_speed, +}; + +struct motion_filter * +create_pointer_accelerator_filter(accel_profile_func_t profile, + int dpi) +{ + struct pointer_accelerator *filter; + + filter = zalloc(sizeof *filter); + if (filter == NULL) + return NULL; + + filter->base.interface = &accelerator_interface; + + filter->profile = profile; + filter->last_velocity = 0.0; + filter->last.x = 0; + filter->last.y = 0; + + filter->trackers = + calloc(NUM_POINTER_TRACKERS, sizeof *filter->trackers); + filter->cur_tracker = 0; + + filter->threshold = DEFAULT_THRESHOLD; + filter->accel = DEFAULT_ACCELERATION; + filter->incline = DEFAULT_INCLINE; + + filter->dpi_factor = dpi/(double)DEFAULT_MOUSE_DPI; + + return &filter->base; +} + /** * Custom acceleration function for mice < 1000dpi. * At slow motion, a single device unit causes a one-pixel movement. @@ -545,32 +397,25 @@ double pointer_accel_profile_linear_low_dpi(struct motion_filter *filter, void *data, - double speed_in, /* in device units (units/us) */ - uint64_t time) + double speed_in, /* in device units (units/ms) */ + uint64_t time /* in us */) { struct pointer_accelerator *accel_filter = (struct pointer_accelerator *)filter; + double s1, s2; double max_accel = accel_filter->accel; /* unitless factor */ - double threshold = accel_filter->threshold; /* units/us */ + const double threshold = accel_filter->threshold; /* units/ms */ const double incline = accel_filter->incline; - double factor; /* unitless */ + double factor; double dpi_factor = accel_filter->dpi_factor; - /* dpi_factor is always < 1.0, increase max_accel, reduce - the threshold so it kicks in earlier */ max_accel /= dpi_factor; - threshold *= dpi_factor; - /* see pointer_accel_profile_linear for a long description */ - if (v_us2ms(speed_in) < 0.07) - factor = 10 * v_us2ms(speed_in) + 0.3; - else if (speed_in < threshold) - factor = 1; - else - factor = incline * v_us2ms(speed_in - threshold) + 1; + s1 = min(1, 0.3 + speed_in * 10.0); + s2 = 1 + (speed_in - threshold * dpi_factor) * incline; - factor = min(max_accel, factor); + factor = min(max_accel, s2 > 1 ? s2 : s1); return factor; } @@ -579,482 +424,79 @@ pointer_accel_profile_linear(struct motion_filter *filter, void *data, double speed_in, /* 1000-dpi normalized */ - uint64_t time) + uint64_t time /* in us */) { struct pointer_accelerator *accel_filter = (struct pointer_accelerator *)filter; + + double s1, s2; const double max_accel = accel_filter->accel; /* unitless factor */ - const double threshold = accel_filter->threshold; /* units/us */ + const double threshold = accel_filter->threshold; /* units/ms */ const double incline = accel_filter->incline; - double factor; /* unitless */ + double factor; - /* - Our acceleration function calculates a factor to accelerate input - deltas with. The function is a double incline with a plateau, - with a rough shape like this: - - accel - factor - ^ - | / - | _____/ - | / - |/ - +-------------> speed in - - The two inclines are linear functions in the form - y = ax + b - where y is speed_out - x is speed_in - a is the incline of acceleration - b is minimum acceleration factor - - for speeds up to 0.07 u/ms, we decelerate, down to 30% of input - speed. - hence 1 = a * 0.07 + 0.3 - 0.3 = a * 0.00 + 0.3 => a := 10 - deceleration function is thus: - y = 10x + 0.3 - - Note: - * 0.07u/ms as threshold is a result of trial-and-error and - has no other intrinsic meaning. - * 0.3 is chosen simply because it is above the Nyquist frequency - for subpixel motion within a pixel. - */ - if (v_us2ms(speed_in) < 0.07) { - factor = 10 * v_us2ms(speed_in) + 0.3; - /* up to the threshold, we keep factor 1, i.e. 1:1 movement */ - } else if (speed_in < threshold) { - factor = 1; - - } else { - /* Acceleration function above the threshold: - y = ax' + b - where T is threshold - x is speed_in - x' is speed - and - y(T) == 1 - hence 1 = ax' + 1 - => x' := (x - T) - */ - factor = incline * v_us2ms(speed_in - threshold) + 1; - } + s1 = min(1, 0.3 + speed_in * 10); + s2 = 1 + (speed_in - threshold) * incline; - /* Cap at the maximum acceleration factor */ - factor = min(max_accel, factor); + factor = min(max_accel, s2 > 1 ? s2 : s1); return factor; } double touchpad_accel_profile_linear(struct motion_filter *filter, - void *data, - double speed_in, /* units/us */ - uint64_t time) + void *data, + double speed_in, + uint64_t time /* in us */) { - double factor; /* unitless */ + /* Once normalized, touchpads see the same + acceleration as mice. that is technically correct but + subjectively wrong, we expect a touchpad to be a lot + slower than a mouse. Apply a magic factor here and proceed + as normal. */ + const double TP_MAGIC_SLOWDOWN = 0.4; + double speed_out; speed_in *= TP_MAGIC_SLOWDOWN; - factor = pointer_accel_profile_linear(filter, data, speed_in, time); + speed_out = pointer_accel_profile_linear(filter, data, speed_in, time); - return factor * TP_MAGIC_SLOWDOWN; + return speed_out * TP_MAGIC_SLOWDOWN; } double touchpad_lenovo_x230_accel_profile(struct motion_filter *filter, void *data, double speed_in, - uint64_t time) + uint64_t time /* in us */) { + /* Keep the magic factor from touchpad_accel_profile_linear. */ + const double TP_MAGIC_SLOWDOWN = 0.4; + /* Those touchpads presents an actual lower resolution that what is * advertised. We see some jumps from the cursor due to the big steps * in X and Y when we are receiving data. * Apply a factor to minimize those jumps at low speed, and try * keeping the same feeling as regular touchpads at high speed. * It still feels slower but it is usable at least */ - double factor; /* unitless */ + const double TP_MAGIC_LOW_RES_FACTOR = 4.0; + double speed_out; struct pointer_accelerator *accel_filter = (struct pointer_accelerator *)filter; - double f1, f2; /* unitless */ + double s1, s2; const double max_accel = accel_filter->accel * - X230_TP_MAGIC_LOW_RES_FACTOR; /* unitless factor */ + TP_MAGIC_LOW_RES_FACTOR; /* unitless factor */ const double threshold = accel_filter->threshold / - X230_TP_MAGIC_LOW_RES_FACTOR; /* units/us */ - const double incline = accel_filter->incline * X230_TP_MAGIC_LOW_RES_FACTOR; - - /* Note: the magic values in this function are obtained by - * trial-and-error. No other meaning should be interpreted. - * The calculation is a compressed form of - * pointer_accel_profile_linear(), look at the git history of that - * function for an explaination of what the min/max/etc. does. - */ - speed_in *= X230_MAGIC_SLOWDOWN / X230_TP_MAGIC_LOW_RES_FACTOR; - - f1 = min(1, v_us2ms(speed_in) * 5); - f2 = 1 + (v_us2ms(speed_in) - v_us2ms(threshold)) * incline; - - factor = min(max_accel, f2 > 1 ? f2 : f1); - - return factor * X230_MAGIC_SLOWDOWN / X230_TP_MAGIC_LOW_RES_FACTOR; -} - -double -trackpoint_accel_profile(struct motion_filter *filter, - void *data, - double speed_in, /* 1000-dpi normalized */ - uint64_t time) -{ - struct pointer_accelerator *accel_filter = - (struct pointer_accelerator *)filter; - double max_accel = accel_filter->accel; /* unitless factor */ - double threshold = accel_filter->threshold; /* units/ms */ - const double incline = accel_filter->incline; - double factor; - double dpi_factor = accel_filter->dpi_factor; - - /* dpi_factor is always < 1.0, increase max_accel, reduce - the threshold so it kicks in earlier */ - max_accel /= dpi_factor; - threshold *= dpi_factor; - - /* see pointer_accel_profile_linear for a long description */ - if (v_us2ms(speed_in) < 0.07) - factor = 10 * v_us2ms(speed_in) + 0.3; - else if (speed_in < threshold) - factor = 1; - else - factor = incline * v_us2ms(speed_in - threshold) + 1; - - factor = min(max_accel, factor); - - return factor; -} - -struct motion_filter_interface accelerator_interface = { - .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE, - .filter = accelerator_filter, - .filter_constant = accelerator_filter_noop, - .restart = accelerator_restart, - .destroy = accelerator_destroy, - .set_speed = accelerator_set_speed, -}; - -static struct pointer_accelerator * -create_default_filter(int dpi) -{ - struct pointer_accelerator *filter; - - filter = zalloc(sizeof *filter); - if (filter == NULL) - return NULL; - - filter->last_velocity = 0.0; + TP_MAGIC_LOW_RES_FACTOR; /* units/ms */ + const double incline = accel_filter->incline * TP_MAGIC_LOW_RES_FACTOR; - filter->trackers = - calloc(NUM_POINTER_TRACKERS, sizeof *filter->trackers); - filter->cur_tracker = 0; - - filter->threshold = DEFAULT_THRESHOLD; - filter->accel = DEFAULT_ACCELERATION; - filter->incline = DEFAULT_INCLINE; - - filter->dpi_factor = dpi/(double)DEFAULT_MOUSE_DPI; - - return filter; -} - -struct motion_filter * -create_pointer_accelerator_filter_linear(int dpi) -{ - struct pointer_accelerator *filter; - - filter = create_default_filter(dpi); - if (!filter) - return NULL; - - filter->base.interface = &accelerator_interface; - filter->profile = pointer_accel_profile_linear; - - return &filter->base; -} - -struct motion_filter_interface accelerator_interface_low_dpi = { - .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE, - .filter = accelerator_filter_low_dpi, - .filter_constant = accelerator_filter_noop, - .restart = accelerator_restart, - .destroy = accelerator_destroy, - .set_speed = accelerator_set_speed, -}; - -struct motion_filter * -create_pointer_accelerator_filter_linear_low_dpi(int dpi) -{ - struct pointer_accelerator *filter; - - filter = create_default_filter(dpi); - if (!filter) - return NULL; - - filter->base.interface = &accelerator_interface_low_dpi; - filter->profile = pointer_accel_profile_linear_low_dpi; - - return &filter->base; -} - -struct motion_filter_interface accelerator_interface_touchpad = { - .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE, - .filter = accelerator_filter, - .filter_constant = touchpad_constant_filter, - .restart = accelerator_restart, - .destroy = accelerator_destroy, - .set_speed = accelerator_set_speed, -}; - -struct motion_filter * -create_pointer_accelerator_filter_touchpad(int dpi) -{ - struct pointer_accelerator *filter; + speed_in *= TP_MAGIC_SLOWDOWN / TP_MAGIC_LOW_RES_FACTOR; - filter = create_default_filter(dpi); - if (!filter) - return NULL; - - filter->base.interface = &accelerator_interface_touchpad; - filter->profile = touchpad_accel_profile_linear; - - return &filter->base; -} - -struct motion_filter_interface accelerator_interface_x230 = { - .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE, - .filter = accelerator_filter_x230, - .filter_constant = accelerator_filter_constant_x230, - .restart = accelerator_restart, - .destroy = accelerator_destroy, - .set_speed = accelerator_set_speed, -}; - -/* The Lenovo x230 has a bad touchpad. This accel method has been - * trial-and-error'd, any changes to it will require re-testing everything. - * Don't touch this. - */ -struct motion_filter * -create_pointer_accelerator_filter_lenovo_x230(int dpi) -{ - struct pointer_accelerator *filter; - - filter = zalloc(sizeof *filter); - if (filter == NULL) - return NULL; - - filter->base.interface = &accelerator_interface_x230; - filter->profile = touchpad_lenovo_x230_accel_profile; - filter->last_velocity = 0.0; - - filter->trackers = - calloc(NUM_POINTER_TRACKERS, sizeof *filter->trackers); - filter->cur_tracker = 0; - - filter->threshold = X230_THRESHOLD; - filter->accel = X230_ACCELERATION; /* unitless factor */ - filter->incline = X230_INCLINE; /* incline of the acceleration function */ + s1 = min(1, speed_in * 5); + s2 = 1 + (speed_in - threshold) * incline; - filter->dpi_factor = 1; /* unused for this accel method */ - - return &filter->base; -} + speed_out = min(max_accel, s2 > 1 ? s2 : s1); -struct motion_filter_interface accelerator_interface_trackpoint = { - .type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE, - .filter = accelerator_filter_trackpoint, - .filter_constant = accelerator_filter_noop, - .restart = accelerator_restart, - .destroy = accelerator_destroy, - .set_speed = accelerator_set_speed, -}; - -struct motion_filter * -create_pointer_accelerator_filter_trackpoint(int dpi) -{ - struct pointer_accelerator *filter; - - filter = create_default_filter(dpi); - if (!filter) - return NULL; - - filter->base.interface = &accelerator_interface_trackpoint; - filter->profile = trackpoint_accel_profile; - filter->threshold = DEFAULT_THRESHOLD; - filter->accel = DEFAULT_ACCELERATION; - filter->incline = DEFAULT_INCLINE; - - return &filter->base; -} - -static struct normalized_coords -accelerator_filter_flat(struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time) -{ - struct pointer_accelerator_flat *accel_filter = - (struct pointer_accelerator_flat *)filter; - double factor; /* unitless factor */ - struct normalized_coords accelerated; - struct normalized_coords unnormalized; - - /* You want flat acceleration, you get flat acceleration for the - * device */ - unnormalized.x = unaccelerated->x * accel_filter->dpi_factor; - unnormalized.y = unaccelerated->y * accel_filter->dpi_factor; - factor = accel_filter->factor; - - accelerated.x = factor * unnormalized.x; - accelerated.y = factor * unnormalized.y; - - return accelerated; -} - -static bool -accelerator_set_speed_flat(struct motion_filter *filter, - double speed_adjustment) -{ - struct pointer_accelerator_flat *accel_filter = - (struct pointer_accelerator_flat *)filter; - - assert(speed_adjustment >= -1.0 && speed_adjustment <= 1.0); - - /* Speed rage is 0-200% of the nominal speed, with 0 mapping to the - * nominal speed. Anything above 200 is pointless, we're already - * skipping over ever second pixel at 200% speed. - */ - - accel_filter->factor = 1 + speed_adjustment; - filter->speed_adjustment = speed_adjustment; - - return true; -} - -static void -accelerator_destroy_flat(struct motion_filter *filter) -{ - struct pointer_accelerator_flat *accel = - (struct pointer_accelerator_flat *) filter; - - free(accel); -} - -struct motion_filter_interface accelerator_interface_flat = { - .type = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT, - .filter = accelerator_filter_flat, - .filter_constant = accelerator_filter_noop, - .restart = NULL, - .destroy = accelerator_destroy_flat, - .set_speed = accelerator_set_speed_flat, -}; - -struct motion_filter * -create_pointer_accelerator_filter_flat(int dpi) -{ - struct pointer_accelerator_flat *filter; - - filter = zalloc(sizeof *filter); - if (filter == NULL) - return NULL; - - filter->base.interface = &accelerator_interface_flat; - filter->dpi_factor = dpi/(double)DEFAULT_MOUSE_DPI; - - return &filter->base; -} - -/* The tablet accel code uses mm as input */ -static struct normalized_coords -tablet_accelerator_filter_flat(struct motion_filter *filter, - const struct normalized_coords *mm, - void *data, uint64_t time) -{ - struct tablet_accelerator_flat *accel_filter = - (struct tablet_accelerator_flat *)filter; - struct normalized_coords accelerated; - - /* Tablet input is in mm, output is supposed to be in logical - * pixels roughly equivalent to a mouse/touchpad. - * - * This is a magical constant found by trial and error. On a 96dpi - * screen 0.4mm of movement correspond to 1px logical pixel which - * is almost identical to the tablet mapped to screen in absolute - * mode. Tested on a Intuos5, other tablets may vary. - */ - const double DPI_CONVERSION = 96.0/25.4 * 2.5; /* unitless factor */ - - accelerated.x = mm->x * accel_filter->factor * DPI_CONVERSION; - accelerated.y = mm->y * accel_filter->factor * DPI_CONVERSION; - - return accelerated; -} - -static bool -tablet_accelerator_set_speed(struct motion_filter *filter, - double speed_adjustment) -{ - struct tablet_accelerator_flat *accel_filter = - (struct tablet_accelerator_flat *)filter; - - assert(speed_adjustment >= -1.0 && speed_adjustment <= 1.0); - - accel_filter->factor = speed_adjustment + 1.0; - - return true; -} - -static void -tablet_accelerator_destroy(struct motion_filter *filter) -{ - struct tablet_accelerator_flat *accel_filter = - (struct tablet_accelerator_flat *)filter; - - free(accel_filter); -} - -struct motion_filter_interface accelerator_interface_tablet = { - .type = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT, - .filter = tablet_accelerator_filter_flat, - .filter_constant = NULL, - .restart = NULL, - .destroy = tablet_accelerator_destroy, - .set_speed = tablet_accelerator_set_speed, -}; - -static struct tablet_accelerator_flat * -create_tablet_filter_flat(int xres, int yres) -{ - struct tablet_accelerator_flat *filter; - - filter = zalloc(sizeof *filter); - if (filter == NULL) - return NULL; - - filter->xres = xres; - filter->yres = yres; - - return filter; -} - -struct motion_filter * -create_pointer_accelerator_filter_tablet(int xres, int yres) -{ - struct tablet_accelerator_flat *filter; - - filter = create_tablet_filter_flat(xres, yres); - if (!filter) - return NULL; - - filter->base.interface = &accelerator_interface_tablet; - - return &filter->base; + return speed_out * TP_MAGIC_SLOWDOWN / TP_MAGIC_LOW_RES_FACTOR; } diff -Nru libinput-1.2.2/src/filter.h libinput-0.21.0/src/filter.h --- libinput-1.2.2/src/filter.h 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/src/filter.h 2015-08-03 05:08:55.000000000 +0000 @@ -34,33 +34,11 @@ struct motion_filter; -/** - * Accelerate the given coordinates. - * Takes a set of unaccelerated deltas and accelerates them based on the - * current and previous motion. - * - * This is a superset of filter_dispatch_constant() - * - * @see filter_dispatch_constant - */ struct normalized_coords filter_dispatch(struct motion_filter *filter, const struct normalized_coords *unaccelerated, void *data, uint64_t time); -/** - * Apply constant motion filters, but no acceleration. - * - * Takes a set of unaccelerated deltas and applies any constant filters to - * it but does not accelerate the delta in the conventional sense. - * - * @see filter_dispatch - */ -struct normalized_coords -filter_dispatch_constant(struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time); - void filter_restart(struct motion_filter *filter, void *data, uint64_t time); @@ -74,35 +52,14 @@ double filter_get_speed(struct motion_filter *filter); -enum libinput_config_accel_profile -filter_get_type(struct motion_filter *filter); - typedef double (*accel_profile_func_t)(struct motion_filter *filter, void *data, double velocity, uint64_t time); -/* Pointer acceleration types */ -struct motion_filter * -create_pointer_accelerator_filter_flat(int dpi); - -struct motion_filter * -create_pointer_accelerator_filter_linear(int dpi); - struct motion_filter * -create_pointer_accelerator_filter_linear_low_dpi(int dpi); - -struct motion_filter * -create_pointer_accelerator_filter_touchpad(int dpi); - -struct motion_filter * -create_pointer_accelerator_filter_lenovo_x230(int dpi); - -struct motion_filter * -create_pointer_accelerator_filter_trackpoint(int dpi); - -struct motion_filter * -create_pointer_accelerator_filter_tablet(int xres, int yres); +create_pointer_accelerator_filter(accel_profile_func_t filter, + int dpi); /* * Pointer acceleration profiles. @@ -128,9 +85,4 @@ void *data, double speed_in, uint64_t time); -double -trackpoint_accel_profile(struct motion_filter *filter, - void *data, - double speed_in, - uint64_t time); #endif /* FILTER_H */ diff -Nru libinput-1.2.2/src/filter-private.h libinput-0.21.0/src/filter-private.h --- libinput-1.2.2/src/filter-private.h 2016-02-08 01:33:11.000000000 +0000 +++ libinput-0.21.0/src/filter-private.h 2015-08-03 04:55:20.000000000 +0000 @@ -29,25 +29,20 @@ #include "filter.h" struct motion_filter_interface { - enum libinput_config_accel_profile type; struct normalized_coords (*filter)( struct motion_filter *filter, const struct normalized_coords *unaccelerated, void *data, uint64_t time); - struct normalized_coords (*filter_constant)( - struct motion_filter *filter, - const struct normalized_coords *unaccelerated, - void *data, uint64_t time); void (*restart)(struct motion_filter *filter, void *data, uint64_t time); void (*destroy)(struct motion_filter *filter); bool (*set_speed)(struct motion_filter *filter, - double speed_adjustment); + double speed); }; struct motion_filter { - double speed_adjustment; /* normalized [-1, 1] */ + double speed; /* normalized [-1, 1] */ struct motion_filter_interface *interface; }; diff -Nru libinput-1.2.2/src/libinput.c libinput-0.21.0/src/libinput.c --- libinput-1.2.2/src/libinput.c 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/src/libinput.c 2015-08-03 04:55:20.000000000 +0000 @@ -125,19 +125,6 @@ double angle; }; -struct libinput_event_tablet_tool { - struct libinput_event base; - uint32_t button; - enum libinput_button_state state; - uint32_t seat_button_count; - uint64_t time; - struct tablet_axes axes; - unsigned char changed_axes[NCHARS(LIBINPUT_TABLET_TOOL_AXIS_MAX + 1)]; - struct libinput_tablet_tool *tool; - enum libinput_tablet_tool_proximity_state proximity_state; - enum libinput_tablet_tool_tip_state tip_state; -}; - static void libinput_default_log_func(struct libinput *libinput, enum libinput_log_priority priority, @@ -179,31 +166,6 @@ va_end(args); } -void -log_msg_ratelimit(struct libinput *libinput, - struct ratelimit *ratelimit, - enum libinput_log_priority priority, - const char *format, ...) -{ - va_list args; - enum ratelimit_state state; - - state = ratelimit_test(ratelimit); - if (state == RATELIMIT_EXCEEDED) - return; - - va_start(args, format); - log_msg_va(libinput, priority, format, args); - va_end(args); - - if (state == RATELIMIT_THRESHOLD) - log_msg(libinput, - priority, - "WARNING: log rate limit exceeded (%d msgs per %dms). Discarding future messages.\n", - ratelimit->burst, - us2ms(ratelimit->interval)); -} - LIBINPUT_EXPORT void libinput_log_set_priority(struct libinput *libinput, enum libinput_log_priority priority) @@ -225,9 +187,6 @@ } static void -libinput_device_group_destroy(struct libinput_device_group *group); - -static void libinput_post_event(struct libinput *libinput, struct libinput_event *event); @@ -285,6 +244,7 @@ LIBINPUT_EVENT_TOUCH_MOTION, LIBINPUT_EVENT_TOUCH_CANCEL, LIBINPUT_EVENT_TOUCH_FRAME); + return (struct libinput_event_touch *) event; } @@ -304,20 +264,6 @@ return (struct libinput_event_gesture *) event; } -LIBINPUT_EXPORT struct libinput_event_tablet_tool * -libinput_event_get_tablet_tool_event(struct libinput_event *event) -{ - require_event_type(libinput_event_get_context(event), - event->type, - NULL, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - - return (struct libinput_event_tablet_tool *) event; -} - LIBINPUT_EXPORT struct libinput_event_device_notify * libinput_event_get_device_notify_event(struct libinput_event *event) { @@ -910,569 +856,6 @@ return event->angle; } -LIBINPUT_EXPORT int -libinput_event_tablet_tool_x_has_changed( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return bit_is_set(event->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_X); -} - -LIBINPUT_EXPORT int -libinput_event_tablet_tool_y_has_changed( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return bit_is_set(event->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_Y); -} - -LIBINPUT_EXPORT int -libinput_event_tablet_tool_pressure_has_changed( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return bit_is_set(event->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_PRESSURE); -} - -LIBINPUT_EXPORT int -libinput_event_tablet_tool_distance_has_changed( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return bit_is_set(event->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_DISTANCE); -} - -LIBINPUT_EXPORT int -libinput_event_tablet_tool_tilt_x_has_changed( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return bit_is_set(event->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_TILT_X); -} - -LIBINPUT_EXPORT int -libinput_event_tablet_tool_tilt_y_has_changed( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return bit_is_set(event->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_TILT_Y); -} - -LIBINPUT_EXPORT int -libinput_event_tablet_tool_rotation_has_changed( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return bit_is_set(event->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); -} - -LIBINPUT_EXPORT int -libinput_event_tablet_tool_slider_has_changed( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return bit_is_set(event->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_SLIDER); -} - -LIBINPUT_EXPORT int -libinput_event_tablet_tool_wheel_has_changed( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return bit_is_set(event->changed_axes, - LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL); -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_x(struct libinput_event_tablet_tool *event) -{ - struct evdev_device *device = - (struct evdev_device *) event->base.device; - - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return evdev_convert_to_mm(device->abs.absinfo_x, - event->axes.point.x); -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_y(struct libinput_event_tablet_tool *event) -{ - struct evdev_device *device = - (struct evdev_device *) event->base.device; - - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return evdev_convert_to_mm(device->abs.absinfo_y, - event->axes.point.y); -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_dx(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.delta.x; -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_dy(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.delta.y; -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_pressure(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.pressure; -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_distance(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.distance; -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_tilt_x(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.tilt.x; -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_tilt_y(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.tilt.y; -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_rotation(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.rotation; -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_slider_position(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.slider; -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_wheel_delta(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.wheel; -} - -LIBINPUT_EXPORT int -libinput_event_tablet_tool_get_wheel_delta_discrete( - struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->axes.wheel_discrete; -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_x_transformed(struct libinput_event_tablet_tool *event, - uint32_t width) -{ - struct evdev_device *device = - (struct evdev_device *) event->base.device; - - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return evdev_device_transform_x(device, - event->axes.point.x, - width); -} - -LIBINPUT_EXPORT double -libinput_event_tablet_tool_get_y_transformed(struct libinput_event_tablet_tool *event, - uint32_t height) -{ - struct evdev_device *device = - (struct evdev_device *) event->base.device; - - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return evdev_device_transform_y(device, - event->axes.point.y, - height); -} - -LIBINPUT_EXPORT struct libinput_tablet_tool * -libinput_event_tablet_tool_get_tool(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->tool; -} - -LIBINPUT_EXPORT enum libinput_tablet_tool_proximity_state -libinput_event_tablet_tool_get_proximity_state(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->proximity_state; -} - -LIBINPUT_EXPORT enum libinput_tablet_tool_tip_state -libinput_event_tablet_tool_get_tip_state(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->tip_state; -} - -LIBINPUT_EXPORT uint32_t -libinput_event_tablet_tool_get_time(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return us2ms(event->time); -} - -LIBINPUT_EXPORT uint64_t -libinput_event_tablet_tool_get_time_usec(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - return event->time; -} - -LIBINPUT_EXPORT uint32_t -libinput_event_tablet_tool_get_button(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - - return event->button; -} - -LIBINPUT_EXPORT enum libinput_button_state -libinput_event_tablet_tool_get_button_state(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - - return event->state; -} - -LIBINPUT_EXPORT uint32_t -libinput_event_tablet_tool_get_seat_button_count(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - 0, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - - return event->seat_button_count; -} - -LIBINPUT_EXPORT enum libinput_tablet_tool_type -libinput_tablet_tool_get_type(struct libinput_tablet_tool *tool) -{ - return tool->type; -} - -LIBINPUT_EXPORT uint64_t -libinput_tablet_tool_get_tool_id(struct libinput_tablet_tool *tool) -{ - return tool->tool_id; -} - -LIBINPUT_EXPORT int -libinput_tablet_tool_is_unique(struct libinput_tablet_tool *tool) -{ - return tool->serial != 0; -} - -LIBINPUT_EXPORT uint64_t -libinput_tablet_tool_get_serial(struct libinput_tablet_tool *tool) -{ - return tool->serial; -} - -LIBINPUT_EXPORT int -libinput_tablet_tool_has_pressure(struct libinput_tablet_tool *tool) -{ - return bit_is_set(tool->axis_caps, - LIBINPUT_TABLET_TOOL_AXIS_PRESSURE); -} - -LIBINPUT_EXPORT int -libinput_tablet_tool_has_distance(struct libinput_tablet_tool *tool) -{ - return bit_is_set(tool->axis_caps, - LIBINPUT_TABLET_TOOL_AXIS_DISTANCE); -} - -LIBINPUT_EXPORT int -libinput_tablet_tool_has_tilt(struct libinput_tablet_tool *tool) -{ - return bit_is_set(tool->axis_caps, - LIBINPUT_TABLET_TOOL_AXIS_TILT_X); -} - -LIBINPUT_EXPORT int -libinput_tablet_tool_has_rotation(struct libinput_tablet_tool *tool) -{ - return bit_is_set(tool->axis_caps, - LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); -} - -LIBINPUT_EXPORT int -libinput_tablet_tool_has_slider(struct libinput_tablet_tool *tool) -{ - return bit_is_set(tool->axis_caps, - LIBINPUT_TABLET_TOOL_AXIS_SLIDER); -} - -LIBINPUT_EXPORT int -libinput_tablet_tool_has_wheel(struct libinput_tablet_tool *tool) -{ - return bit_is_set(tool->axis_caps, - LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL); -} - -LIBINPUT_EXPORT int -libinput_tablet_tool_has_button(struct libinput_tablet_tool *tool, - uint32_t code) -{ - if (NCHARS(code) > sizeof(tool->buttons)) - return 0; - - return bit_is_set(tool->buttons, code); -} - -LIBINPUT_EXPORT void -libinput_tablet_tool_set_user_data(struct libinput_tablet_tool *tool, - void *user_data) -{ - tool->user_data = user_data; -} - -LIBINPUT_EXPORT void * -libinput_tablet_tool_get_user_data(struct libinput_tablet_tool *tool) -{ - return tool->user_data; -} - -LIBINPUT_EXPORT struct libinput_tablet_tool * -libinput_tablet_tool_ref(struct libinput_tablet_tool *tool) -{ - tool->refcount++; - return tool; -} - -LIBINPUT_EXPORT struct libinput_tablet_tool * -libinput_tablet_tool_unref(struct libinput_tablet_tool *tool) -{ - assert(tool->refcount > 0); - - tool->refcount--; - if (tool->refcount > 0) - return tool; - - list_remove(&tool->link); - free(tool); - return NULL; -} - struct libinput_source * libinput_add_fd(struct libinput *libinput, int fd, @@ -1517,9 +900,6 @@ const struct libinput_interface_backend *interface_backend, void *user_data) { - assert(interface->open_restricted != NULL); - assert(interface->close_restricted != NULL); - libinput->epoll_fd = epoll_create1(EPOLL_CLOEXEC);; if (libinput->epoll_fd < 0) return -1; @@ -1539,8 +919,6 @@ libinput->refcount = 1; list_init(&libinput->source_destroy_list); list_init(&libinput->seat_list); - list_init(&libinput->device_group_list); - list_init(&libinput->tool_list); if (libinput_timer_subsys_init(libinput) != 0) { free(libinput->events); @@ -1580,8 +958,6 @@ struct libinput_event *event; struct libinput_device *device, *next_device; struct libinput_seat *seat, *next_seat; - struct libinput_tablet_tool *tool, *next_tool; - struct libinput_device_group *group, *next_group; if (libinput == NULL) return NULL; @@ -1609,17 +985,6 @@ libinput_seat_destroy(seat); } - list_for_each_safe(group, - next_group, - &libinput->device_group_list, - link) { - libinput_device_group_destroy(group); - } - - list_for_each_safe(tool, next_tool, &libinput->tool_list, link) { - libinput_tablet_tool_unref(tool); - } - libinput_timer_subsys_destroy(libinput); libinput_drop_destroyed_sources(libinput); close(libinput->epoll_fd); @@ -1953,9 +1318,6 @@ case LIBINPUT_DEVICE_CAP_GESTURE: capability = "CAP_GESTURE"; break; - case LIBINPUT_DEVICE_CAP_TABLET_TOOL: - capability = "CAP_TABLET_TOOL"; - break; } log_bug_libinput(device->seat->libinput, @@ -2212,137 +1574,6 @@ &touch_event->base); } -void -tablet_notify_axis(struct libinput_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - enum libinput_tablet_tool_tip_state tip_state, - unsigned char *changed_axes, - const struct tablet_axes *axes) -{ - struct libinput_event_tablet_tool *axis_event; - - axis_event = zalloc(sizeof *axis_event); - if (!axis_event) - return; - - *axis_event = (struct libinput_event_tablet_tool) { - .time = time, - .tool = tool, - .proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN, - .tip_state = tip_state, - .axes = *axes, - }; - - memcpy(axis_event->changed_axes, - changed_axes, - sizeof(axis_event->changed_axes)); - - post_device_event(device, - time, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - &axis_event->base); -} - -void -tablet_notify_proximity(struct libinput_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - enum libinput_tablet_tool_proximity_state proximity_state, - unsigned char *changed_axes, - const struct tablet_axes *axes) -{ - struct libinput_event_tablet_tool *proximity_event; - - proximity_event = zalloc(sizeof *proximity_event); - if (!proximity_event) - return; - - *proximity_event = (struct libinput_event_tablet_tool) { - .time = time, - .tool = tool, - .tip_state = LIBINPUT_TABLET_TOOL_TIP_UP, - .proximity_state = proximity_state, - .axes = *axes, - }; - memcpy(proximity_event->changed_axes, - changed_axes, - sizeof(proximity_event->changed_axes)); - - post_device_event(device, - time, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, - &proximity_event->base); -} - -void -tablet_notify_tip(struct libinput_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - enum libinput_tablet_tool_tip_state tip_state, - unsigned char *changed_axes, - const struct tablet_axes *axes) -{ - struct libinput_event_tablet_tool *tip_event; - - tip_event = zalloc(sizeof *tip_event); - if (!tip_event) - return; - - *tip_event = (struct libinput_event_tablet_tool) { - .time = time, - .tool = tool, - .tip_state = tip_state, - .proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN, - .axes = *axes, - }; - memcpy(tip_event->changed_axes, - changed_axes, - sizeof(tip_event->changed_axes)); - - post_device_event(device, - time, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - &tip_event->base); -} - -void -tablet_notify_button(struct libinput_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - enum libinput_tablet_tool_tip_state tip_state, - const struct tablet_axes *axes, - int32_t button, - enum libinput_button_state state) -{ - struct libinput_event_tablet_tool *button_event; - int32_t seat_button_count; - - button_event = zalloc(sizeof *button_event); - if (!button_event) - return; - - seat_button_count = update_seat_button_count(device->seat, - button, - state); - - *button_event = (struct libinput_event_tablet_tool) { - .time = time, - .tool = tool, - .button = button, - .state = state, - .seat_button_count = seat_button_count, - .proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN, - .tip_state = tip_state, - .axes = *axes, - }; - - post_device_event(device, - time, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - &button_event->base); -} - static void gesture_notify(struct libinput_device *device, uint64_t time, @@ -2405,60 +1636,25 @@ gesture_notify_pinch(struct libinput_device *device, uint64_t time, enum libinput_event_type type, - int finger_count, const struct normalized_coords *delta, const struct normalized_coords *unaccel, double scale, double angle) { - gesture_notify(device, time, type, finger_count, 0, - delta, unaccel, scale, angle); + gesture_notify(device, time, type, 2, 0, delta, unaccel, + scale, angle); } void gesture_notify_pinch_end(struct libinput_device *device, uint64_t time, - int finger_count, double scale, int cancelled) { const struct normalized_coords zero = { 0.0, 0.0 }; gesture_notify(device, time, LIBINPUT_EVENT_GESTURE_PINCH_END, - finger_count, cancelled, &zero, &zero, scale, 0.0); -} - -static inline const char * -event_type_to_str(enum libinput_event_type type) -{ - switch(type) { - CASE_RETURN_STRING(LIBINPUT_EVENT_DEVICE_ADDED); - CASE_RETURN_STRING(LIBINPUT_EVENT_DEVICE_REMOVED); - CASE_RETURN_STRING(LIBINPUT_EVENT_KEYBOARD_KEY); - CASE_RETURN_STRING(LIBINPUT_EVENT_POINTER_MOTION); - CASE_RETURN_STRING(LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE); - CASE_RETURN_STRING(LIBINPUT_EVENT_POINTER_BUTTON); - CASE_RETURN_STRING(LIBINPUT_EVENT_POINTER_AXIS); - CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_DOWN); - CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_UP); - CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_MOTION); - CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_CANCEL); - CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_FRAME); - CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_TOOL_AXIS); - CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_TOOL_TIP); - CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - CASE_RETURN_STRING(LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN); - CASE_RETURN_STRING(LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE); - CASE_RETURN_STRING(LIBINPUT_EVENT_GESTURE_SWIPE_END); - CASE_RETURN_STRING(LIBINPUT_EVENT_GESTURE_PINCH_BEGIN); - CASE_RETURN_STRING(LIBINPUT_EVENT_GESTURE_PINCH_UPDATE); - CASE_RETURN_STRING(LIBINPUT_EVENT_GESTURE_PINCH_END); - case LIBINPUT_EVENT_NONE: - abort(); - } - - return NULL; + 2, cancelled, &zero, &zero, scale, 0.0); } static void @@ -2471,18 +1667,13 @@ size_t move_len; size_t new_out; -#if 0 - log_debug(libinput, "Queuing %s\n", event_type_to_str(event->type)); -#endif - events_count++; if (events_count > events_len) { events_len *= 2; events = realloc(events, events_len * sizeof *events); if (!events) { - log_error(libinput, - "Failed to reallocate event ring buffer. " - "Events may be discarded\n"); + fprintf(stderr, "Failed to reallocate event ring " + "buffer"); return; } @@ -2737,20 +1928,6 @@ return &event->base; } -LIBINPUT_EXPORT struct libinput_event * -libinput_event_tablet_tool_get_base_event(struct libinput_event_tablet_tool *event) -{ - require_event_type(libinput_event_get_context(&event->base), - event->base.type, - NULL, - LIBINPUT_EVENT_TABLET_TOOL_AXIS, - LIBINPUT_EVENT_TABLET_TOOL_TIP, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - - return &event->base; -} - LIBINPUT_EXPORT struct libinput_device_group * libinput_device_group_ref(struct libinput_device_group *group) { @@ -2759,8 +1936,7 @@ } struct libinput_device_group * -libinput_device_group_create(struct libinput *libinput, - const char *identifier) +libinput_device_group_create(const char *identifier) { struct libinput_device_group *group; @@ -2773,32 +1949,13 @@ group->identifier = strdup(identifier); if (!group->identifier) { free(group); - return NULL; + group = NULL; } } - list_init(&group->link); - list_insert(&libinput->device_group_list, &group->link); - return group; } -struct libinput_device_group * -libinput_device_group_find_group(struct libinput *libinput, - const char *identifier) -{ - struct libinput_device_group *g = NULL; - - list_for_each(g, &libinput->device_group_list, link) { - if (identifier && g->identifier && - streq(g->identifier, identifier)) { - return g; - } - } - - return NULL; -} - void libinput_device_set_device_group(struct libinput_device *device, struct libinput_device_group *group) @@ -2810,7 +1967,6 @@ static void libinput_device_group_destroy(struct libinput_device_group *group) { - list_remove(&group->link); free(group->identifier); free(group); } @@ -2902,39 +2058,6 @@ } LIBINPUT_EXPORT enum libinput_config_status -libinput_device_config_tap_set_drag_enabled(struct libinput_device *device, - enum libinput_config_drag_state enable) -{ - if (enable != LIBINPUT_CONFIG_DRAG_ENABLED && - enable != LIBINPUT_CONFIG_DRAG_DISABLED) - return LIBINPUT_CONFIG_STATUS_INVALID; - - if (libinput_device_config_tap_get_finger_count(device) == 0) - return enable ? LIBINPUT_CONFIG_STATUS_UNSUPPORTED : - LIBINPUT_CONFIG_STATUS_SUCCESS; - - return device->config.tap->set_drag_enabled(device, enable); -} - -LIBINPUT_EXPORT enum libinput_config_drag_state -libinput_device_config_tap_get_drag_enabled(struct libinput_device *device) -{ - if (libinput_device_config_tap_get_finger_count(device) == 0) - return LIBINPUT_CONFIG_DRAG_DISABLED; - - return device->config.tap->get_drag_enabled(device); -} - -LIBINPUT_EXPORT enum libinput_config_drag_state -libinput_device_config_tap_get_default_drag_enabled(struct libinput_device *device) -{ - if (libinput_device_config_tap_get_finger_count(device) == 0) - return LIBINPUT_CONFIG_DRAG_DISABLED; - - return device->config.tap->get_default_drag_enabled(device); -} - -LIBINPUT_EXPORT enum libinput_config_status libinput_device_config_tap_set_drag_lock_enabled(struct libinput_device *device, enum libinput_config_drag_lock_state enable) { @@ -3063,6 +2186,7 @@ return device->config.accel->set_speed(device, speed); } + LIBINPUT_EXPORT double libinput_device_config_accel_get_speed(struct libinput_device *device) { @@ -3081,52 +2205,6 @@ return device->config.accel->get_default_speed(device); } -LIBINPUT_EXPORT uint32_t -libinput_device_config_accel_get_profiles(struct libinput_device *device) -{ - if (!libinput_device_config_accel_is_available(device)) - return 0; - - return device->config.accel->get_profiles(device); -} - -LIBINPUT_EXPORT enum libinput_config_accel_profile -libinput_device_config_accel_get_profile(struct libinput_device *device) -{ - if (!libinput_device_config_accel_is_available(device)) - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; - - return device->config.accel->get_profile(device); -} - -LIBINPUT_EXPORT enum libinput_config_accel_profile -libinput_device_config_accel_get_default_profile(struct libinput_device *device) -{ - if (!libinput_device_config_accel_is_available(device)) - return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; - - return device->config.accel->get_profile(device); -} - -LIBINPUT_EXPORT enum libinput_config_status -libinput_device_config_accel_set_profile(struct libinput_device *device, - enum libinput_config_accel_profile profile) -{ - switch (profile) { - case LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT: - case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE: - break; - default: - return LIBINPUT_CONFIG_STATUS_INVALID; - } - - if (!libinput_device_config_accel_is_available(device) || - (libinput_device_config_accel_get_profiles(device) & profile) == 0) - return LIBINPUT_CONFIG_STATUS_UNSUPPORTED; - - return device->config.accel->set_profile(device, profile); -} - LIBINPUT_EXPORT int libinput_device_config_scroll_has_natural_scroll(struct libinput_device *device) { diff -Nru libinput-1.2.2/src/libinput.h libinput-0.21.0/src/libinput.h --- libinput-1.2.2/src/libinput.h 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/src/libinput.h 2015-08-03 03:44:47.000000000 +0000 @@ -58,7 +58,6 @@ LIBINPUT_DEVICE_CAP_KEYBOARD = 0, LIBINPUT_DEVICE_CAP_POINTER = 1, LIBINPUT_DEVICE_CAP_TOUCH = 2, - LIBINPUT_DEVICE_CAP_TABLET_TOOL = 3, LIBINPUT_DEVICE_CAP_GESTURE = 5, }; @@ -135,87 +134,6 @@ }; /** - * @ingroup device - * @struct libinput_tablet_tool - * - * An object representing a tool being used by a device with the @ref - * LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. - * - * Tablet events generated by such a device are bound to a specific tool - * rather than coming from the device directly. Depending on the hardware it - * is possible to track the same physical tool across multiple - * struct libinput_device devices, see @ref tablet-serial-numbers. - * - * This struct is refcounted, use libinput_tablet_tool_ref() and - * libinput_tablet_tool_unref(). - */ -struct libinput_tablet_tool; - -/** - * @ingroup device - * - * Available tool types for a device with the @ref - * LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. The tool type defines the default - * usage of the tool as advertised by the manufacturer. Multiple different - * physical tools may share the same tool type, e.g. a Wacom Classic Pen, - * Wacom Pro Pen and a Wacom Grip Pen are all of type @ref - * LIBINPUT_TABLET_TOOL_TYPE_PEN. - * Use libinput_tablet_tool_get_tool_id() to get a specific model where applicable. - * - * Note that on some device, the eraser tool is on the tail end of a pen - * device. On other devices, e.g. MS Surface 3, the eraser is the pen tip - * while a button is held down. - * - * @note The @ref libinput_tablet_tool_type can only describe the default physical - * type of the device. For devices with adjustible physical properties - * the tool type remains the same, i.e. putting a Wacom stroke nib into a - * classic pen leaves the tool type as @ref LIBINPUT_TABLET_TOOL_TYPE_PEN. - */ -enum libinput_tablet_tool_type { - LIBINPUT_TABLET_TOOL_TYPE_PEN = 1, /**< A generic pen */ - LIBINPUT_TABLET_TOOL_TYPE_ERASER, /**< Eraser */ - LIBINPUT_TABLET_TOOL_TYPE_BRUSH, /**< A paintbrush-like tool */ - LIBINPUT_TABLET_TOOL_TYPE_PENCIL, /**< Physical drawing tool, e.g. - Wacom Inking Pen */ - LIBINPUT_TABLET_TOOL_TYPE_AIRBRUSH, /**< An airbrush-like tool */ - LIBINPUT_TABLET_TOOL_TYPE_MOUSE, /**< A mouse bound to the tablet */ - LIBINPUT_TABLET_TOOL_TYPE_LENS, /**< A mouse tool with a lens */ -}; - -/** - * @ingroup device - * - * The state of proximity for a tool on a device. The device must have the @ref - * LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. - * - * The proximity of a tool is a binary state signalling whether the tool is - * within detectable distance of the tablet device. A tool that is out of - * proximity cannot generate events. - * - * On some hardware a tool goes out of proximity when it ceases to touch the - * surface. On other hardware, the tool is still detectable within a short - * distance (a few cm) off the surface. - */ -enum libinput_tablet_tool_proximity_state { - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT = 0, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN = 1, -}; - -/** - * @ingroup device - * - * The tip contact state for a tool on a device. The device must have - * the @ref LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. - * - * The tip contact state of a tool is a binary state signalling whether the tool is - * touching the surface of the tablet device. - */ -enum libinput_tablet_tool_tip_state { - LIBINPUT_TABLET_TOOL_TIP_UP = 0, - LIBINPUT_TABLET_TOOL_TIP_DOWN = 1, -}; - -/** * @ingroup base * * Event type for events returned by libinput_get_event(). @@ -261,84 +179,6 @@ */ LIBINPUT_EVENT_TOUCH_FRAME, - /** - * One or more axes have changed state on a device with the @ref - * LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. This event is only sent - * when the tool is in proximity, see @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY for details. - * - * The proximity event contains the initial state of the axis as the - * tool comes into proximity. An event of type @ref - * LIBINPUT_EVENT_TABLET_TOOL_AXIS is only sent when an axis value - * changes from this initial state. It is possible for a tool to - * enter and leave proximity without sending an event of type @ref - * LIBINPUT_EVENT_TABLET_TOOL_AXIS. - * - * An event of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS is sent - * when the tip state does not change. See the documentation for - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP for more details. - */ - LIBINPUT_EVENT_TABLET_TOOL_AXIS = 600, - /** - * Signals that a tool has come in or out of proximity of a device with - * the @ref LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. - * - * Proximity events contain each of the current values for each axis, - * and these values may be extracted from them in the same way they are - * with @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS events. - * - * Some tools may always be in proximity. For these tools, events of - * type @ref LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN are sent only once after @ref - * LIBINPUT_EVENT_DEVICE_ADDED, and events of type @ref - * LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT are sent only once before @ref - * LIBINPUT_EVENT_DEVICE_REMOVED. - * - * If the tool that comes into proximity supports x/y coordinates, - * libinput guarantees that both x and y are set in the proximity - * event. - * - * When a tool goes out of proximity, the value of every axis should be - * assumed to have an undefined state and any buttons that are currently held - * down on the stylus are marked as released. Button release events for - * each button that was held down on the stylus are sent before the - * proximity out event. - */ - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, - /** - * Signals that a tool has come in contact with the surface of a - * device with the @ref LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. - * - * On devices without distance proximity detection, the @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP is sent immediately after @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY for the tip down event, and - * immediately before for the tip up event. - * - * The decision when a tip touches the surface is device-dependent - * and may be derived from pressure data or other means. If the tip - * state is changed by axes changing state, the - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP event includes the changed - * axes and no additional axis event is sent for this state change. - * In other words, a caller must look at both @ref - * LIBINPUT_EVENT_TABLET_TOOL_AXIS and @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP events to know the current state - * of the axes. - * - * If a button state change occurs at the same time as a tip state - * change, the order of events is device-dependent. - */ - LIBINPUT_EVENT_TABLET_TOOL_TIP, - /** - * Signals that a tool has changed a logical button state on a - * device with the @ref LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. - * - * Button state changes occur on their own and do not include axis - * state changes. If button and axis state changes occur within the - * same logical hardware event, the order of the @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON and @ref - * LIBINPUT_EVENT_TABLET_TOOL_AXIS event is device-specific. - */ - LIBINPUT_EVENT_TABLET_TOOL_BUTTON, - LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN = 800, LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE, LIBINPUT_EVENT_GESTURE_SWIPE_END, @@ -434,18 +274,6 @@ struct libinput_event_touch; /** - * @ingroup event_tablet - * @struct libinput_event_tablet_tool - * - * Tablet tool event representing an axis update, button press, or tool - * update. Valid event types for this event are @ref - * LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY and @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - */ -struct libinput_event_tablet_tool; - -/** * @defgroup event Accessing and destruction of events */ @@ -541,6 +369,8 @@ libinput_event_get_touch_event(struct libinput_event *event); /** + * @ingroup event + * * Return the gesture event that is this input event. If the event type does * not match the gesture event types, this function returns NULL. * @@ -554,19 +384,6 @@ /** * @ingroup event * - * Return the tablet tool event that is this input event. If the event type - * does not match the tablet tool event types, this function returns NULL. - * - * The inverse of this function is libinput_event_tablet_tool_get_base_event(). - * - * @return A tablet tool event, or NULL for other events - */ -struct libinput_event_tablet_tool * -libinput_event_get_tablet_tool_event(struct libinput_event *event); - -/** - * @ingroup event - * * Return the device event that is this input event. If the event type does * not match the device event types, this function returns NULL. * @@ -1077,8 +894,7 @@ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. * * @note It is an application bug to call this function for events of type - * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref - * LIBINPUT_EVENT_TOUCH_MOTION. + * @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref LIBINPUT_EVENT_TOUCH_MOTION. * * @param event The libinput touch event * @return The current absolute x coordinate @@ -1097,8 +913,7 @@ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. * * @note It is an application bug to call this function for events of type - * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref - * LIBINPUT_EVENT_TOUCH_MOTION. + * @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref LIBINPUT_EVENT_TOUCH_MOTION. * * @param event The libinput touch event * @return The current absolute y coordinate @@ -1116,8 +931,7 @@ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. * * @note It is an application bug to call this function for events of type - * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref - * LIBINPUT_EVENT_TOUCH_MOTION. + * @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref LIBINPUT_EVENT_TOUCH_MOTION. * * @param event The libinput touch event * @param width The current output screen width @@ -1137,8 +951,7 @@ * LIBINPUT_EVENT_TOUCH_MOTION, this function returns 0. * * @note It is an application bug to call this function for events of type - * other than @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref - * LIBINPUT_EVENT_TOUCH_MOTION. + * @ref LIBINPUT_EVENT_TOUCH_DOWN or @ref LIBINPUT_EVENT_TOUCH_MOTION. * * @param event The libinput touch event * @param height The current output screen height @@ -1353,757 +1166,6 @@ libinput_event_gesture_get_angle_delta(struct libinput_event_gesture *event); /** - * @defgroup event_tablet Tablet events - * - * Events that come from tools on tablet devices. - */ - -/** - * @ingroup event_tablet - * - * @return The generic libinput_event of this event - */ -struct libinput_event * -libinput_event_tablet_tool_get_base_event(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Check if the x axis was updated in this event. - * For events that are not of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, or - * @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, this function returns 0. - * - * @note It is an application bug to call this function for events other - * than @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return 1 if the axis was updated or 0 otherwise - */ -int -libinput_event_tablet_tool_x_has_changed( - struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Check if the y axis was updated in this event. - * For events that are not of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, or - * @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, this function returns 0. - * - * @note It is an application bug to call this function for events other - * than @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return 1 if the axis was updated or 0 otherwise - */ -int -libinput_event_tablet_tool_y_has_changed( - struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Check if the pressure axis was updated in this event. - * For events that are not of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, or - * @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, this function returns 0. - * - * @note It is an application bug to call this function for events other - * than @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return 1 if the axis was updated or 0 otherwise - */ -int -libinput_event_tablet_tool_pressure_has_changed( - struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Check if the distance axis was updated in this event. - * For events that are not of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, or - * @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, this function returns 0. - * For tablet tool events of type @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, - * this function always returns 1. - * - * @note It is an application bug to call this function for events other - * than @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return 1 if the axis was updated or 0 otherwise - */ -int -libinput_event_tablet_tool_distance_has_changed( - struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Check if the tilt x axis was updated in this event. - * For events that are not of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, or - * @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, this function returns 0. - * - * @note It is an application bug to call this function for events other - * than @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return 1 if the axis was updated or 0 otherwise - */ -int -libinput_event_tablet_tool_tilt_x_has_changed( - struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Check if the tilt y axis was updated in this event. - * For events that are not of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, or - * @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, this function returns 0. - * - * @note It is an application bug to call this function for events other - * than @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return 1 if the axis was updated or 0 otherwise - */ -int -libinput_event_tablet_tool_tilt_y_has_changed( - struct libinput_event_tablet_tool *event); -/** - * @ingroup event_tablet - * - * Check if the z-rotation axis was updated in this event. - * For events that are not of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, or - * @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, this function returns 0. - * - * @note It is an application bug to call this function for events other - * than @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return 1 if the axis was updated or 0 otherwise - */ -int -libinput_event_tablet_tool_rotation_has_changed( - struct libinput_event_tablet_tool *event); -/** - * @ingroup event_tablet - * - * Check if the slider axis was updated in this event. - * For events that are not of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, or - * @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, this function returns 0. - * - * @note It is an application bug to call this function for events other - * than @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return 1 if the axis was updated or 0 otherwise - */ -int -libinput_event_tablet_tool_slider_has_changed( - struct libinput_event_tablet_tool *event); -/** - * @ingroup event_tablet - * - * Check if the wheel axis was updated in this event. - * For events that are not of type @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, - * @ref LIBINPUT_EVENT_TABLET_TOOL_TIP, or - * @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, this function returns 0. - * - * @note It is an application bug to call this function for events other - * than @ref LIBINPUT_EVENT_TABLET_TOOL_AXIS, @ref - * LIBINPUT_EVENT_TABLET_TOOL_TIP, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, or @ref - * LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return 1 if the axis was updated or 0 otherwise - */ -int -libinput_event_tablet_tool_wheel_has_changed( - struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the X coordinate of the tablet tool, in mm from the top left - * corner of the tablet in its current logical orientation. Use - * libinput_event_tablet_tool_get_x_transformed() for transforming the axis - * value into a different coordinate space. - * - * @note On some devices, returned value may be negative or larger than the - * width of the device. See @ref tablet-bounds for more details. - * - * @param event The libinput tablet tool event - * @return The current value of the the axis - */ -double -libinput_event_tablet_tool_get_x(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the Y coordinate of the tablet tool, in mm from the top left - * corner of the tablet in its current logical orientation. Use - * libinput_event_tablet_tool_get_y_transformed() for transforming the axis - * value into a different coordinate space. - * - * @note On some devices, returned value may be negative or larger than the - * width of the device. See @ref tablet-bounds for more details. - * - * @param event The libinput tablet tool event - * @return The current value of the the axis - */ -double -libinput_event_tablet_tool_get_y(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Return the delta between the last event and the current event. - * If the tool employs pointer acceleration, the delta returned by this - * function is the accelerated delta. - * - * This value is in screen coordinate space, the delta is to be interpreted - * like the return value of libinput_event_pointer_get_dx(). - * See @ref tablet-relative-motion for more details. - * - * @param event The libinput tablet event - * @return The relative x movement since the last event - */ -double -libinput_event_tablet_tool_get_dx(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Return the delta between the last event and the current event. - * If the tool employs pointer acceleration, the delta returned by this - * function is the accelerated delta. - * - * This value is in screen coordinate space, the delta is to be interpreted - * like the return value of libinput_event_pointer_get_dx(). - * See @ref tablet-relative-motion for more details. - * - * @param event The libinput tablet event - * @return The relative y movement since the last event - */ -double -libinput_event_tablet_tool_get_dy(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the current pressure being applied on the tool in use, normalized - * to the range [0, 1]. - * - * If this axis does not exist on the current tool, this function returns 0. - * - * @param event The libinput tablet tool event - * @return The current value of the the axis - */ -double -libinput_event_tablet_tool_get_pressure(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the current distance from the tablet's sensor, normalized to the - * range [0, 1]. - * - * If this axis does not exist on the current tool, this function returns 0. - * - * @param event The libinput tablet tool event - * @return The current value of the the axis - */ -double -libinput_event_tablet_tool_get_distance(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the current tilt along the X axis of the tablet's current logical - * orientation, in degrees off the tablet's z axis. That is, if the tool is - * perfectly orthogonal to the tablet, the tilt angle is 0. When the top - * tilts towards the logical top/left of the tablet, the x/y tilt angles are - * negative, if the top tilts towards the logical bottom/right of the - * tablet, the x/y tilt angles are positive. - * - * If this axis does not exist on the current tool, this function returns 0. - * - * @param event The libinput tablet tool event - * @return The current value of the the axis in degrees - */ -double -libinput_event_tablet_tool_get_tilt_x(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the current tilt along the Y axis of the tablet's current logical - * orientation, in degrees off the tablet's z axis. That is, if the tool is - * perfectly orthogonal to the tablet, the tilt angle is 0. When the top - * tilts towards the logical top/left of the tablet, the x/y tilt angles are - * negative, if the top tilts towards the logical bottom/right of the - * tablet, the x/y tilt angles are positive. - * - * If this axis does not exist on the current tool, this function returns 0. - * - * @param event The libinput tablet tool event - * @return The current value of the the axis in degrees - */ -double -libinput_event_tablet_tool_get_tilt_y(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the current z rotation of the tool in degrees, clockwise from the - * tool's logical neutral position. - * - * For tools of type @ref LIBINPUT_TABLET_TOOL_TYPE_MOUSE and @ref - * LIBINPUT_TABLET_TOOL_TYPE_LENS the logical neutral position is - * pointing to the current logical north of the tablet. For tools of type @ref - * LIBINPUT_TABLET_TOOL_TYPE_BRUSH, the logical neutral position is with the - * buttons pointing up. - * - * If this axis does not exist on the current tool, this function returns 0. - * - * @param event The libinput tablet tool event - * @return The current value of the the axis - */ -double -libinput_event_tablet_tool_get_rotation(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the current position of the slider on the tool, normalized to the - * range [-1, 1]. The logical zero is the neutral position of the slider, or - * the logical center of the axis. This axis is available on e.g. the Wacom - * Airbrush. - * - * If this axis does not exist on the current tool, this function returns 0. - * - * @param event The libinput tablet tool event - * @return The current value of the the axis - */ -double -libinput_event_tablet_tool_get_slider_position(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Return the delta for the wheel in degrees. - * - * @param event The libinput tablet tool event - * @return The delta of the wheel, in degrees, compared to the last event - * - * @see libinput_event_tablet_tool_get_wheel_delta_discrete - */ -double -libinput_event_tablet_tool_get_wheel_delta( - struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Return the delta for the wheel in discrete steps (e.g. wheel clicks). - - * @param event The libinput tablet tool event - * @return The delta of the wheel, in discrete steps, compared to the last event - * - * @see libinput_event_tablet_tool_get_wheel_delta_discrete - */ -int -libinput_event_tablet_tool_get_wheel_delta_discrete( - struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Return the current absolute x coordinate of the tablet tool event, - * transformed to screen coordinates. - * - * @note This function may be called for a specific axis even if - * libinput_event_tablet_tool_*_has_changed() returns 0 for that axis. - * libinput always includes all device axes in the event. - * - * @note On some devices, returned value may be negative or larger than the - * width of the device. See @ref tablet-bounds for more details. - * - * @param event The libinput tablet tool event - * @param width The current output screen width - * @return the current absolute x coordinate transformed to a screen coordinate - */ -double -libinput_event_tablet_tool_get_x_transformed(struct libinput_event_tablet_tool *event, - uint32_t width); - -/** - * @ingroup event_tablet - * - * Return the current absolute y coordinate of the tablet tool event, - * transformed to screen coordinates. - * - * @note This function may be called for a specific axis even if - * libinput_event_tablet_tool_*_has_changed() returns 0 for that axis. - * libinput always includes all device axes in the event. - * - * @note On some devices, returned value may be negative or larger than the - * width of the device. See @ref tablet-bounds for more details. - * - * @param event The libinput tablet tool event - * @param height The current output screen height - * @return the current absolute y coordinate transformed to a screen coordinate - */ -double -libinput_event_tablet_tool_get_y_transformed(struct libinput_event_tablet_tool *event, - uint32_t height); - -/** - * @ingroup event_tablet - * - * Returns the tool that was in use during this event. - * - * If the caller holds at least one reference (see - * libinput_tablet_tool_ref()), this struct is used whenever the - * tools enters proximity. Otherwise, if no references remain when the tool - * leaves proximity, the tool may be destroyed. - * - * @note Physical tool tracking requires hardware support. If unavailable, - * libinput creates one tool per type per tablet. See @ref - * tablet-serial-numbers for more details. - * - * @param event The libinput tablet tool event - * @return The new tool triggering this event - */ -struct libinput_tablet_tool * -libinput_event_tablet_tool_get_tool(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the new proximity state of a tool from a proximity event. - * Used to check whether or not a tool came in or out of proximity during an - * event of type @ref LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY. - * - * See @ref tablet-fake-proximity for recommendations on proximity handling. - * - * @param event The libinput tablet tool event - * @return The new proximity state of the tool from the event. - */ -enum libinput_tablet_tool_proximity_state -libinput_event_tablet_tool_get_proximity_state(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Returns the new tip state of a tool from a tip event. - * Used to check whether or not a tool came in contact with the tablet - * surface or left contact with the tablet surface during an - * event of type @ref LIBINPUT_EVENT_TABLET_TOOL_TIP. - * - * @param event The libinput tablet tool event - * @return The new tip state of the tool from the event. - */ -enum libinput_tablet_tool_tip_state -libinput_event_tablet_tool_get_tip_state(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Return the button that triggered this event. For events that are not of - * type @ref LIBINPUT_EVENT_TABLET_TOOL_BUTTON, this function returns 0. - * - * @note It is an application bug to call this function for events other than - * @ref LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return the button triggering this event - */ -uint32_t -libinput_event_tablet_tool_get_button(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Return the button state of the event. - * - * @note It is an application bug to call this function for events other than - * @ref LIBINPUT_EVENT_TABLET_TOOL_BUTTON. - * - * @param event The libinput tablet tool event - * @return the button state triggering this event - */ -enum libinput_button_state -libinput_event_tablet_tool_get_button_state(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * For the button of a @ref LIBINPUT_EVENT_TABLET_TOOL_BUTTON event, return the total - * number of buttons pressed on all devices on the associated seat after the - * the event was triggered. - * - " @note It is an application bug to call this function for events other than - * @ref LIBINPUT_EVENT_TABLET_TOOL_BUTTON. For other events, this function returns 0. - * - * @param event The libinput tablet tool event - * @return the seat wide pressed button count for the key of this event - */ -uint32_t -libinput_event_tablet_tool_get_seat_button_count(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * @param event The libinput tablet tool event - * @return The event time for this event - */ -uint32_t -libinput_event_tablet_tool_get_time(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * @param event The libinput tablet tool event - * @return The event time for this event in microseconds - */ -uint64_t -libinput_event_tablet_tool_get_time_usec(struct libinput_event_tablet_tool *event); - -/** - * @ingroup event_tablet - * - * Return the type of tool type for a tool object, see @ref - * tablet-tool-types for details. - * - * @param tool The libinput tool - * @return The tool type for this tool object - * - * @see libinput_tablet_tool_get_tool_id - */ -enum libinput_tablet_tool_type -libinput_tablet_tool_get_type(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Return the tool ID for a tool object. If nonzero, this number identifies - * the specific type of the tool with more precision than the type returned in - * libinput_tablet_tool_get_type(), see @ref tablet-tool-types. Not all - * tablets support a tool ID. - * - * Tablets known to support tool IDs include the Wacom Intuos 3, 4, 5, Wacom - * Cintiq and Wacom Intuos Pro series. - * - * @param tool The libinput tool - * @return The tool ID for this tool object or 0 if none is provided - * - * @see libinput_tablet_tool_get_type - */ -uint64_t -libinput_tablet_tool_get_tool_id(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Increment the reference count of the tool by one. A tool is destroyed - * whenever the reference count reaches 0. See libinput_tablet_tool_unref(). - * - * @param tool The tool to increment the ref count of - * @return The passed tool - * - * @see libinput_tablet_tool_unref - */ -struct libinput_tablet_tool * -libinput_tablet_tool_ref(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Decrement the reference count of the tool by one. When the reference - * count of tool reaches 0, the memory allocated for tool will be freed. - * - * @param tool The tool to decrement the ref count of - * @return NULL if the tool was destroyed otherwise the passed tool - * - * @see libinput_tablet_tool_ref - */ -struct libinput_tablet_tool * -libinput_tablet_tool_unref(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Return whether the tablet tool supports pressure. - * - * @param tool The tool to check the axis capabilities of - * @return Nonzero if the axis is available, zero otherwise. - */ -int -libinput_tablet_tool_has_pressure(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Return whether the tablet tool supports distance. - * - * @param tool The tool to check the axis capabilities of - * @return Nonzero if the axis is available, zero otherwise. - */ -int -libinput_tablet_tool_has_distance(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Return whether the tablet tool supports tilt. - * - * @param tool The tool to check the axis capabilities of - * @return Nonzero if the axis is available, zero otherwise. - */ -int -libinput_tablet_tool_has_tilt(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Return whether the tablet tool supports z-rotation. - * - * @param tool The tool to check the axis capabilities of - * @return Nonzero if the axis is available, zero otherwise. - */ -int -libinput_tablet_tool_has_rotation(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Return whether the tablet tool has a slider axis. - * - * @param tool The tool to check the axis capabilities of - * @return Nonzero if the axis is available, zero otherwise. - */ -int -libinput_tablet_tool_has_slider(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Return whether the tablet tool has a relative wheel. - * - * @param tool The tool to check the axis capabilities of - * @return Nonzero if the axis is available, zero otherwise. - */ -int -libinput_tablet_tool_has_wheel(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Check if a tablet tool has a button with the - * passed-in code (see linux/input.h). - * - * @param tool A tablet tool - * @param code button code to check for - * - * @return 1 if the tool supports this button code, 0 if it does not - */ -int -libinput_tablet_tool_has_button(struct libinput_tablet_tool *tool, - uint32_t code); - -/** - * @ingroup event_tablet - * - * Return nonzero if the physical tool can be uniquely identified by - * libinput, or nonzero otherwise. If a tool can be uniquely identified, - * keeping a reference to the tool allows tracking the tool across - * proximity out sequences and across compatible tablets. - * See @ref tablet-serial-numbers for more details. - * - * @param tool A tablet tool - * @return 1 if the tool can be uniquely identified, 0 otherwise. - * - * @see libinput_tablet_tool_get_serial - */ -int -libinput_tablet_tool_is_unique(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Return the serial number of a tool. If the tool does not report a serial - * number, this function returns zero. See @ref tablet-serial-numbers for - * details. - * - * @param tool The libinput tool - * @return The tool serial number - * - * @see libinput_tablet_tool_is_unique - */ -uint64_t -libinput_tablet_tool_get_serial(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Return the user data associated with a tool object. libinput does - * not manage, look at, or modify this data. The caller must ensure the - * data is valid. - * - * @param tool The libinput tool - * @return The user data associated with the tool object - */ -void * -libinput_tablet_tool_get_user_data(struct libinput_tablet_tool *tool); - -/** - * @ingroup event_tablet - * - * Set the user data associated with a tool object, if any. - * - * @param tool The libinput tool - * @param user_data The user data to associate with the tool object - */ -void -libinput_tablet_tool_set_user_data(struct libinput_tablet_tool *tool, - void *user_data); - -/** * @defgroup base Initialization and manipulation of libinput contexts */ @@ -2383,26 +1445,6 @@ * destroyed, if the last reference was dereferenced. If so, the context is * invalid and may not be interacted with. * - * @bug When the refcount reaches zero, libinput_unref() releases resources - * even if a caller still holds refcounted references to related resources - * (e.g. a libinput_device). When libinput_unref() returns - * NULL, the caller must consider any resources related to that context - * invalid. See https://bugs.freedesktop.org/show_bug.cgi?id=91872. - * Example code: - * @code - * li = libinput_path_create_context(&interface, NULL); - * device = libinput_path_add_device(li, "/dev/input/event0"); - * // get extra reference to device - * libinput_device_ref(device); - * - * // refcount reaches 0, so *all* resources are cleaned up, - * // including device - * libinput_unref(li); - * - * // INCORRECT: device has been cleaned up and must not be used - * // li = libinput_device_get_context(device); - * @endcode - * * @param libinput A previously initialized libinput context * @return NULL if context was destroyed otherwise the passed context */ @@ -3116,79 +2158,6 @@ /** * @ingroup config - * - * A config status to distinguish or set dragging on a device. Currently - * implemented for tap-and-drag only, see - * libinput_device_config_tap_set_drag_enabled() - */ -enum libinput_config_drag_state { - /** - * Drag is to be disabled, or is - * currently disabled. - */ - LIBINPUT_CONFIG_DRAG_DISABLED, - /** - * Drag is to be enabled, or is - * currently enabled - */ - LIBINPUT_CONFIG_DRAG_ENABLED, -}; - -/** - * @ingroup config - * - * Enable or disable tap-and-drag on this device. When enabled, a - * single-finger tap immediately followed by a finger down results in a - * button down event, subsequent finger motion thus triggers a drag. The - * button is released on finger up. See @ref tapndrag for more details. - * - * @param device The device to configure - * @param enable @ref LIBINPUT_CONFIG_DRAG_ENABLED to enable, @ref - * LIBINPUT_CONFIG_DRAG_DISABLED to disable tap-and-drag - * - * @see libinput_device_config_tap_drag_get_enabled - * @see libinput_device_config_tap_drag_get_default_enabled - */ -enum libinput_config_status -libinput_device_config_tap_set_drag_enabled(struct libinput_device *device, - enum libinput_config_drag_state enable); - -/** - * @ingroup config - * - * Return whether tap-and-drag is enabled or disabled on this device. - * - * @param device The device to check - * @retval LIBINPUT_CONFIG_DRAG_ENABLED if tap-and-drag is enabled - * @retval LIBINPUT_CONFIG_DRAG_DISABLED if tap-and-drag is - * disabled - * - * @see libinput_device_config_tap_drag_set_enabled - * @see libinput_device_config_tap_drag_get_default_enabled - */ -enum libinput_config_drag_state -libinput_device_config_tap_get_drag_enabled(struct libinput_device *device); - -/** - * @ingroup config - * - * Return whether tap-and-drag is enabled or disabled by default on this - * device. - * - * @param device The device to check - * @retval LIBINPUT_CONFIG_DRAG_ENABLED if tap-and-drag is enabled by - * default - * @retval LIBINPUT_CONFIG_DRAG_DISABLED if tap-and-drag is - * disabled by default - * - * @see libinput_device_config_tap_drag_set_enabled - * @see libinput_device_config_tap_drag_get_enabled - */ -enum libinput_config_drag_state -libinput_device_config_tap_get_default_drag_enabled(struct libinput_device *device); - -/** - * @ingroup config */ enum libinput_config_drag_lock_state { /** Drag lock is to be disabled, or is currently disabled */ @@ -3378,8 +2347,6 @@ float matrix[6]); /** - * @ingroup config - * * The send-event mode of a device defines when a device may generate events * and pass those events to the caller. */ @@ -3558,80 +2525,6 @@ double libinput_device_config_accel_get_default_speed(struct libinput_device *device); -enum libinput_config_accel_profile { - /** - * Placeholder for devices that don't have a configurable pointer - * acceleration profile. - */ - LIBINPUT_CONFIG_ACCEL_PROFILE_NONE = 0, - /** - * A flat acceleration profile. Pointer motion is accelerated by a - * constant (device-specific) factor, depending on the current - * speed. - * - * @see libinput_device_config_accel_set_speed - */ - LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT = (1 << 0), - - /** - * An adaptive acceleration profile. Pointer acceleration depends - * on the input speed. This is the default profile for most devices. - */ - LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE = (1 << 1), -}; - -/** - * @ingroup config - * - * Returns a bitmask of the configurable acceleration modes available on - * this device. - * - * @param device The device to configure - * - * @return A bitmask of all configurable modes availble on this device. - */ -uint32_t -libinput_device_config_accel_get_profiles(struct libinput_device *device); - -/** - * @ingroup config - * - * Set the pointer acceleration profile of this pointer device to the given - * mode. - * - * @param device The device to configure - * @param mode The mode to set the device to. - * - * @return A config status code - */ -enum libinput_config_status -libinput_device_config_accel_set_profile(struct libinput_device *device, - enum libinput_config_accel_profile mode); - -/** - * @ingroup config - * - * Get the current pointer acceleration profile for this pointer device. - * - * @param device The device to configure - * - * @return The currently configured pointer acceleration profile. - */ -enum libinput_config_accel_profile -libinput_device_config_accel_get_profile(struct libinput_device *device); - -/** - * @ingroup config - * - * Return the default pointer acceleration profile for this pointer device. - * - * @param device The device to configure - * - * @return The default acceleration profile for this device. - */ -enum libinput_config_accel_profile -libinput_device_config_accel_get_default_profile(struct libinput_device *device); - /** * @ingroup config * diff -Nru libinput-1.2.2/src/libinput-private.h libinput-0.21.0/src/libinput-private.h --- libinput-1.2.2/src/libinput-private.h 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/src/libinput-private.h 2015-08-03 04:55:20.000000000 +0000 @@ -58,34 +58,6 @@ int x, y; }; -/* A pair of coordinates normalized to a [0,1] or [-1, 1] range */ -struct normalized_range_coords { - double x, y; -}; - -/* A pair of angles in degrees */ -struct tilt_degrees { - double x, y; -}; - -/* A threshold with an upper and lower limit */ -struct threshold { - int upper; - int lower; -}; - -struct tablet_axes { - struct device_coords point; - struct normalized_coords delta; - double distance; - double pressure; - struct tilt_degrees tilt; - double rotation; - double slider; - double wheel; - int wheel_discrete; -}; - struct libinput_interface_backend { int (*resume)(struct libinput *libinput); void (*suspend)(struct libinput *libinput); @@ -112,8 +84,6 @@ size_t events_in; size_t events_out; - struct list tool_list; - const struct libinput_interface *interface; const struct libinput_interface_backend *interface_backend; @@ -121,8 +91,6 @@ enum libinput_log_priority log_priority; void *user_data; int refcount; - - struct list device_group_list; }; typedef void (*libinput_seat_destroy_func) (struct libinput_seat *seat); @@ -150,11 +118,6 @@ enum libinput_config_tap_state (*get_enabled)(struct libinput_device *device); enum libinput_config_tap_state (*get_default)(struct libinput_device *device); - enum libinput_config_status (*set_drag_enabled)(struct libinput_device *device, - enum libinput_config_drag_state); - enum libinput_config_drag_state (*get_drag_enabled)(struct libinput_device *device); - enum libinput_config_drag_state (*get_default_drag_enabled)(struct libinput_device *device); - enum libinput_config_status (*set_draglock_enabled)(struct libinput_device *device, enum libinput_config_drag_lock_state); enum libinput_config_drag_lock_state (*get_draglock_enabled)(struct libinput_device *device); @@ -185,12 +148,6 @@ double speed); double (*get_speed)(struct libinput_device *device); double (*get_default_speed)(struct libinput_device *device); - - uint32_t (*get_profiles)(struct libinput_device *device); - enum libinput_config_status (*set_profile)(struct libinput_device *device, - enum libinput_config_accel_profile); - enum libinput_config_accel_profile (*get_profile)(struct libinput_device *device); - enum libinput_config_accel_profile (*get_default_profile)(struct libinput_device *device); }; struct libinput_device_config_natural_scroll { @@ -267,8 +224,6 @@ int refcount; void *user_data; char *identifier; /* unique identifier or NULL for singletons */ - - struct list link; }; struct libinput_device { @@ -281,36 +236,6 @@ struct libinput_device_config config; }; -enum libinput_tablet_tool_axis { - LIBINPUT_TABLET_TOOL_AXIS_X = 1, - LIBINPUT_TABLET_TOOL_AXIS_Y = 2, - LIBINPUT_TABLET_TOOL_AXIS_DISTANCE = 3, - LIBINPUT_TABLET_TOOL_AXIS_PRESSURE = 4, - LIBINPUT_TABLET_TOOL_AXIS_TILT_X = 5, - LIBINPUT_TABLET_TOOL_AXIS_TILT_Y = 6, - LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z = 7, - LIBINPUT_TABLET_TOOL_AXIS_SLIDER = 8, - LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL = 9, -}; - -#define LIBINPUT_TABLET_TOOL_AXIS_MAX LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL - -struct libinput_tablet_tool { - struct list link; - uint32_t serial; - uint32_t tool_id; - enum libinput_tablet_tool_type type; - unsigned char axis_caps[NCHARS(LIBINPUT_TABLET_TOOL_AXIS_MAX + 1)]; - unsigned char buttons[NCHARS(KEY_MAX) + 1]; - int refcount; - void *user_data; - - /* The pressure threshold assumes a pressure_offset of 0 */ - struct threshold pressure_threshold; - int pressure_offset; /* in device coordinates */ - bool has_pressure_offset; -}; - struct libinput_event { enum libinput_event_type type; struct libinput_device *device; @@ -331,20 +256,6 @@ #define log_bug_libinput(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__) #define log_bug_client(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__) -#define log_debug_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__) -#define log_info_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__) -#define log_error_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__) -#define log_bug_kernel_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__) -#define log_bug_libinput_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__) -#define log_bug_client_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__) - -void -log_msg_ratelimit(struct libinput *libinput, - struct ratelimit *ratelimit, - enum libinput_log_priority priority, - const char *format, ...) - LIBINPUT_ATTRIBUTE_PRINTF(4, 5); - void log_msg(struct libinput *libinput, enum libinput_log_priority priority, @@ -396,12 +307,7 @@ struct libinput_seat *seat); struct libinput_device_group * -libinput_device_group_create(struct libinput *libinput, - const char *identifier); - -struct libinput_device_group * -libinput_device_group_find_group(struct libinput *libinput, - const char *identifier); +libinput_device_group_create(const char *identifier); void libinput_device_set_device_group(struct libinput_device *device, @@ -494,7 +400,6 @@ gesture_notify_pinch(struct libinput_device *device, uint64_t time, enum libinput_event_type type, - int finger_count, const struct normalized_coords *delta, const struct normalized_coords *unaccel, double scale, @@ -503,7 +408,6 @@ void gesture_notify_pinch_end(struct libinput_device *device, uint64_t time, - int finger_count, double scale, int cancelled); @@ -511,39 +415,6 @@ touch_notify_frame(struct libinput_device *device, uint64_t time); -void -tablet_notify_axis(struct libinput_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - enum libinput_tablet_tool_tip_state tip_state, - unsigned char *changed_axes, - const struct tablet_axes *axes); - -void -tablet_notify_proximity(struct libinput_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - enum libinput_tablet_tool_proximity_state state, - unsigned char *changed_axes, - const struct tablet_axes *axes); - -void -tablet_notify_tip(struct libinput_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - enum libinput_tablet_tool_tip_state tip_state, - unsigned char *changed_axes, - const struct tablet_axes *axes); - -void -tablet_notify_button(struct libinput_device *device, - uint64_t time, - struct libinput_tablet_tool *tool, - enum libinput_tablet_tool_tip_state tip_state, - const struct tablet_axes *axes, - int32_t button, - enum libinput_button_state state); - static inline uint64_t libinput_now(struct libinput *libinput) { diff -Nru libinput-1.2.2/src/libinput.sym libinput-0.21.0/src/libinput.sym --- libinput-1.2.2/src/libinput.sym 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/src/libinput.sym 2015-08-04 00:08:52.000000000 +0000 @@ -124,7 +124,6 @@ libinput_udev_assign_seat; libinput_udev_create_context; libinput_unref; - local: *; }; @@ -173,64 +172,3 @@ libinput_event_pointer_get_time_usec; libinput_event_touch_get_time_usec; } LIBINPUT_0.20.0; - -LIBINPUT_1.1 { - libinput_device_config_accel_get_profile; - libinput_device_config_accel_get_profiles; - libinput_device_config_accel_get_default_profile; - libinput_device_config_accel_set_profile; -} LIBINPUT_0.21.0; - -LIBINPUT_1.2 { - libinput_device_config_tap_get_drag_enabled; - libinput_device_config_tap_get_default_drag_enabled; - libinput_device_config_tap_set_drag_enabled; - libinput_event_get_tablet_tool_event; - libinput_event_tablet_tool_x_has_changed; - libinput_event_tablet_tool_y_has_changed; - libinput_event_tablet_tool_pressure_has_changed; - libinput_event_tablet_tool_distance_has_changed; - libinput_event_tablet_tool_rotation_has_changed; - libinput_event_tablet_tool_tilt_x_has_changed; - libinput_event_tablet_tool_tilt_y_has_changed; - libinput_event_tablet_tool_wheel_has_changed; - libinput_event_tablet_tool_slider_has_changed; - libinput_event_tablet_tool_get_dx; - libinput_event_tablet_tool_get_dy; - libinput_event_tablet_tool_get_x; - libinput_event_tablet_tool_get_y; - libinput_event_tablet_tool_get_pressure; - libinput_event_tablet_tool_get_distance; - libinput_event_tablet_tool_get_tilt_x; - libinput_event_tablet_tool_get_tilt_y; - libinput_event_tablet_tool_get_rotation; - libinput_event_tablet_tool_get_slider_position; - libinput_event_tablet_tool_get_wheel_delta; - libinput_event_tablet_tool_get_wheel_delta_discrete; - libinput_event_tablet_tool_get_base_event; - libinput_event_tablet_tool_get_button; - libinput_event_tablet_tool_get_button_state; - libinput_event_tablet_tool_get_proximity_state; - libinput_event_tablet_tool_get_seat_button_count; - libinput_event_tablet_tool_get_time; - libinput_event_tablet_tool_get_tip_state; - libinput_event_tablet_tool_get_tool; - libinput_event_tablet_tool_get_x_transformed; - libinput_event_tablet_tool_get_y_transformed; - libinput_event_tablet_tool_get_time_usec; - libinput_tablet_tool_get_serial; - libinput_tablet_tool_get_tool_id; - libinput_tablet_tool_get_type; - libinput_tablet_tool_get_user_data; - libinput_tablet_tool_has_pressure; - libinput_tablet_tool_has_distance; - libinput_tablet_tool_has_rotation; - libinput_tablet_tool_has_tilt; - libinput_tablet_tool_has_wheel; - libinput_tablet_tool_has_slider; - libinput_tablet_tool_has_button; - libinput_tablet_tool_is_unique; - libinput_tablet_tool_ref; - libinput_tablet_tool_set_user_data; - libinput_tablet_tool_unref; -} LIBINPUT_1.1; diff -Nru libinput-1.2.2/src/libinput-util.h libinput-0.21.0/src/libinput-util.h --- libinput-1.2.2/src/libinput-util.h 2016-02-24 06:33:17.000000000 +0000 +++ libinput-0.21.0/src/libinput-util.h 2015-08-03 04:35:00.000000000 +0000 @@ -25,7 +25,6 @@ #ifndef LIBINPUT_UTIL_H #define LIBINPUT_UTIL_H -#include #include #include #include @@ -39,13 +38,18 @@ #define VENDOR_ID_APPLE 0x5ac #define VENDOR_ID_WACOM 0x56a #define VENDOR_ID_SYNAPTICS_SERIAL 0x002 -#define PRODUCT_ID_APPLE_KBD_TOUCHPAD 0x273 #define PRODUCT_ID_SYNAPTICS_SERIAL 0x007 /* The HW DPI rate we normalize to before calculating pointer acceleration */ #define DEFAULT_MOUSE_DPI 1000 -#define CASE_RETURN_STRING(a) case a: return #a +#define CASE_RETURN_STRING(a) case a: return #a; + +void +set_logging_enabled(int enabled); + +void +log_info(const char *format, ...); /* * This list data structure is a verbatim copy from wayland-util.h from the @@ -97,8 +101,6 @@ #define streq(s1, s2) (strcmp((s1), (s2)) == 0) #define strneq(s1, s2, n) (strncmp((s1), (s2), (n)) == 0) -#define NCHARS(x) ((size_t)(((x) + 7) / 8)) - #ifdef DEBUG_TRACE #define debug_trace(...) \ do { \ @@ -108,7 +110,6 @@ #else #define debug_trace(...) { } #endif - #define LIBINPUT_EXPORT __attribute__ ((visibility("default"))) static inline void * @@ -117,28 +118,6 @@ return calloc(1, size); } -/* This bitfield helper implementation is taken from from libevdev-util.h, - * except that it has been modified to work with arrays of unsigned chars - */ - -static inline int -bit_is_set(const unsigned char *array, int bit) -{ - return !!(array[bit / 8] & (1 << (bit % 8))); -} - -static inline void -set_bit(unsigned char *array, int bit) -{ - array[bit / 8] |= (1 << (bit % 8)); -} - -static inline void -clear_bit(unsigned char *array, int bit) -{ - array[bit / 8] &= ~(1 << (bit % 8)); -} - static inline void msleep(unsigned int ms) { @@ -148,19 +127,19 @@ static inline int long_bit_is_set(const unsigned long *array, int bit) { - return !!(array[bit / LONG_BITS] & (1LL << (bit % LONG_BITS))); + return !!(array[bit / LONG_BITS] & (1LL << (bit % LONG_BITS))); } static inline void long_set_bit(unsigned long *array, int bit) { - array[bit / LONG_BITS] |= (1LL << (bit % LONG_BITS)); + array[bit / LONG_BITS] |= (1LL << (bit % LONG_BITS)); } static inline void long_clear_bit(unsigned long *array, int bit) { - array[bit / LONG_BITS] &= ~(1LL << (bit % LONG_BITS)); + array[bit / LONG_BITS] &= ~(1LL << (bit % LONG_BITS)); } static inline void @@ -172,19 +151,6 @@ long_clear_bit(array, bit); } -static inline int -long_any_bit_set(unsigned long *array, size_t size) -{ - unsigned long i; - - assert(size > 0); - - for (i = 0; i < size; i++) - if (array[i] != 0) - return 1; - return 0; -} - struct matrix { float val[3][3]; /* [row][col] */ }; @@ -284,16 +250,6 @@ out[5] = m->val[1][2]; } -static inline void -matrix_to_relative(struct matrix *dest, const struct matrix *src) -{ - matrix_init_identity(dest); - dest->val[0][0] = src->val[0][0]; - dest->val[0][1] = src->val[0][1]; - dest->val[1][0] = src->val[1][0]; - dest->val[1][1] = src->val[1][1]; -} - /** * Simple wrapper for asprintf that ensures the passed in-pointer is set * to NULL upon error. diff -Nru libinput-1.2.2/src/Makefile.am libinput-0.21.0/src/Makefile.am --- libinput-1.2.2/src/Makefile.am 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/src/Makefile.am 2015-07-24 03:24:43.000000000 +0000 @@ -18,8 +18,6 @@ evdev-mt-touchpad-buttons.c \ evdev-mt-touchpad-edge-scroll.c \ evdev-mt-touchpad-gestures.c \ - evdev-tablet.c \ - evdev-tablet.h \ filter.c \ filter.h \ filter-private.h \ @@ -34,14 +32,12 @@ libinput_la_LIBADD = $(MTDEV_LIBS) \ $(LIBUDEV_LIBS) \ $(LIBEVDEV_LIBS) \ - $(LIBWACOM_LIBS) \ libinput-util.la libinput_la_CFLAGS = -I$(top_srcdir)/include \ $(MTDEV_CFLAGS) \ $(LIBUDEV_CFLAGS) \ $(LIBEVDEV_CFLAGS) \ - $(LIBWACOM_CFLAGS) \ $(GCC_CFLAGS) EXTRA_libinput_la_DEPENDENCIES = $(srcdir)/libinput.sym diff -Nru libinput-1.2.2/src/Makefile.in libinput-0.21.0/src/Makefile.in --- libinput-1.2.2/src/Makefile.in 2016-03-15 00:23:56.000000000 +0000 +++ libinput-0.21.0/src/Makefile.in 2015-08-04 00:58:30.000000000 +0000 @@ -153,7 +153,7 @@ -o $@ am__DEPENDENCIES_1 = libinput_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libinput-util.la + $(am__DEPENDENCIES_1) libinput-util.la am_libinput_la_OBJECTS = libinput_la-libinput.lo libinput_la-evdev.lo \ libinput_la-evdev-middle-button.lo \ libinput_la-evdev-mt-touchpad.lo \ @@ -161,9 +161,8 @@ libinput_la-evdev-mt-touchpad-buttons.lo \ libinput_la-evdev-mt-touchpad-edge-scroll.lo \ libinput_la-evdev-mt-touchpad-gestures.lo \ - libinput_la-evdev-tablet.lo libinput_la-filter.lo \ - libinput_la-path.lo libinput_la-udev-seat.lo \ - libinput_la-timer.lo + libinput_la-filter.lo libinput_la-path.lo \ + libinput_la-udev-seat.lo libinput_la-timer.lo libinput_la_OBJECTS = $(am_libinput_la_OBJECTS) libinput_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libinput_la_CFLAGS) \ @@ -298,12 +297,9 @@ LIBUDEV_LIBS = @LIBUDEV_LIBS@ LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@ LIBUNWIND_LIBS = @LIBUNWIND_LIBS@ -LIBWACOM_CFLAGS = @LIBWACOM_CFLAGS@ -LIBWACOM_LIBS = @LIBWACOM_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -408,8 +404,6 @@ evdev-mt-touchpad-buttons.c \ evdev-mt-touchpad-edge-scroll.c \ evdev-mt-touchpad-gestures.c \ - evdev-tablet.c \ - evdev-tablet.h \ filter.c \ filter.h \ filter-private.h \ @@ -424,14 +418,12 @@ libinput_la_LIBADD = $(MTDEV_LIBS) \ $(LIBUDEV_LIBS) \ $(LIBEVDEV_LIBS) \ - $(LIBWACOM_LIBS) \ libinput-util.la libinput_la_CFLAGS = -I$(top_srcdir)/include \ $(MTDEV_CFLAGS) \ $(LIBUDEV_CFLAGS) \ $(LIBEVDEV_CFLAGS) \ - $(LIBWACOM_CFLAGS) \ $(GCC_CFLAGS) EXTRA_libinput_la_DEPENDENCIES = $(srcdir)/libinput.sym @@ -565,7 +557,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libinput_la-evdev-mt-touchpad-gestures.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libinput_la-evdev-mt-touchpad-tap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libinput_la-evdev-mt-touchpad.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libinput_la-evdev-tablet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libinput_la-evdev.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libinput_la-filter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libinput_la-libinput.Plo@am__quote@ @@ -665,13 +656,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libinput_la_CFLAGS) $(CFLAGS) -c -o libinput_la-evdev-mt-touchpad-gestures.lo `test -f 'evdev-mt-touchpad-gestures.c' || echo '$(srcdir)/'`evdev-mt-touchpad-gestures.c -libinput_la-evdev-tablet.lo: evdev-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libinput_la_CFLAGS) $(CFLAGS) -MT libinput_la-evdev-tablet.lo -MD -MP -MF $(DEPDIR)/libinput_la-evdev-tablet.Tpo -c -o libinput_la-evdev-tablet.lo `test -f 'evdev-tablet.c' || echo '$(srcdir)/'`evdev-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libinput_la-evdev-tablet.Tpo $(DEPDIR)/libinput_la-evdev-tablet.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='evdev-tablet.c' object='libinput_la-evdev-tablet.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libinput_la_CFLAGS) $(CFLAGS) -c -o libinput_la-evdev-tablet.lo `test -f 'evdev-tablet.c' || echo '$(srcdir)/'`evdev-tablet.c - libinput_la-filter.lo: filter.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libinput_la_CFLAGS) $(CFLAGS) -MT libinput_la-filter.lo -MD -MP -MF $(DEPDIR)/libinput_la-filter.Tpo -c -o libinput_la-filter.lo `test -f 'filter.c' || echo '$(srcdir)/'`filter.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libinput_la-filter.Tpo $(DEPDIR)/libinput_la-filter.Plo diff -Nru libinput-1.2.2/test/device.c libinput-0.21.0/test/device.c --- libinput-1.2.2/test/device.c 2016-02-21 21:52:18.000000000 +0000 +++ libinput-0.21.0/test/device.c 2015-07-31 01:50:42.000000000 +0000 @@ -674,22 +674,6 @@ } END_TEST -static int open_restricted(const char *path, int flags, void *data) -{ - int fd; - fd = open(path, flags); - return fd < 0 ? -errno : fd; -} -static void close_restricted(int fd, void *data) -{ - close(fd); -} - -const struct libinput_interface simple_interface = { - .open_restricted = open_restricted, - .close_restricted = close_restricted, -}; - START_TEST(device_group_get) { struct litest_device *dev = litest_current_device(); @@ -738,36 +722,6 @@ } END_TEST -START_TEST(device_group_leak) -{ - struct libinput *li; - struct libinput_device *device; - struct libevdev_uinput *uinput; - struct libinput_device_group *group; - - uinput = litest_create_uinput_device("test device", NULL, - EV_KEY, BTN_LEFT, - EV_KEY, BTN_RIGHT, - EV_REL, REL_X, - EV_REL, REL_Y, - -1); - - li = libinput_path_create_context(&simple_interface, NULL); - device = libinput_path_add_device(li, - libevdev_uinput_get_devnode(uinput)); - - group = libinput_device_get_device_group(device); - libinput_device_group_ref(group); - - libinput_path_remove_device(device); - - libevdev_uinput_destroy(uinput); - libinput_unref(li); - - /* the device group leaks, check valgrind */ -} -END_TEST - START_TEST(abs_device_no_absx) { struct libevdev_uinput *uinput; @@ -995,34 +949,6 @@ } END_TEST -START_TEST(device_accelerometer) -{ - struct libinput *li; - struct libevdev_uinput *uinput; - struct libinput_device *device; - - struct input_absinfo absinfo[] = { - { ABS_X, 0, 10, 0, 0, 10 }, - { ABS_Y, 0, 10, 0, 0, 10 }, - { ABS_Z, 0, 10, 0, 0, 10 }, - { -1, -1, -1, -1, -1, -1 } - }; - - li = litest_create_context(); - litest_disable_log_handler(li); - - uinput = litest_create_uinput_abs_device("test device", NULL, - absinfo, - -1); - device = libinput_path_add_device(li, - libevdev_uinput_get_devnode(uinput)); - litest_assert_ptr_null(device); - libevdev_uinput_destroy(uinput); - litest_restore_log_handler(li); - libinput_unref(li); -} -END_TEST - START_TEST(device_udev_tag_alps) { struct litest_device *dev = litest_current_device(); @@ -1104,249 +1030,22 @@ } END_TEST -START_TEST(device_udev_tag_wacom_tablet) -{ - struct litest_device *dev = litest_current_device(); - struct libinput_device *device = dev->libinput_device; - struct udev_device *d; - const char *prop; - - d = libinput_device_get_udev_device(device); - prop = udev_device_get_property_value(d, - "ID_INPUT_TABLET"); - - ck_assert_notnull(prop); - udev_device_unref(d); -} -END_TEST - -START_TEST(device_nonpointer_rel) -{ - struct libevdev_uinput *uinput; - struct libinput *li; - struct libinput_device *device; - int i; - - uinput = litest_create_uinput_device("test device", - NULL, - EV_KEY, KEY_A, - EV_KEY, KEY_B, - EV_REL, REL_X, - EV_REL, REL_Y, - -1); - li = litest_create_context(); - device = libinput_path_add_device(li, - libevdev_uinput_get_devnode(uinput)); - ck_assert(device != NULL); - - litest_disable_log_handler(li); - for (i = 0; i < 100; i++) { - libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); - libevdev_uinput_write_event(uinput, EV_REL, REL_Y, -1); - libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - } - litest_restore_log_handler(li); - - libinput_unref(li); - libevdev_uinput_destroy(uinput); -} -END_TEST - -START_TEST(device_touchpad_rel) -{ - struct libevdev_uinput *uinput; - struct libinput *li; - struct libinput_device *device; - const struct input_absinfo abs[] = { - { ABS_X, 0, 10, 0, 0, 10 }, - { ABS_Y, 0, 10, 0, 0, 10 }, - { ABS_MT_SLOT, 0, 2, 0, 0, 0 }, - { ABS_MT_TRACKING_ID, 0, 255, 0, 0, 0 }, - { ABS_MT_POSITION_X, 0, 10, 0, 0, 10 }, - { ABS_MT_POSITION_Y, 0, 10, 0, 0, 10 }, - { -1, -1, -1, -1, -1, -1 } - }; - int i; - - uinput = litest_create_uinput_abs_device("test device", - NULL, abs, - EV_KEY, BTN_TOOL_FINGER, - EV_KEY, BTN_TOUCH, - EV_REL, REL_X, - EV_REL, REL_Y, - -1); - li = litest_create_context(); - device = libinput_path_add_device(li, - libevdev_uinput_get_devnode(uinput)); - ck_assert(device != NULL); - - for (i = 0; i < 100; i++) { - libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); - libevdev_uinput_write_event(uinput, EV_REL, REL_Y, -1); - libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - } - - libinput_unref(li); - libevdev_uinput_destroy(uinput); -} -END_TEST - -START_TEST(device_touch_rel) -{ - struct libevdev_uinput *uinput; - struct libinput *li; - struct libinput_device *device; - const struct input_absinfo abs[] = { - { ABS_X, 0, 10, 0, 0, 10 }, - { ABS_Y, 0, 10, 0, 0, 10 }, - { ABS_MT_SLOT, 0, 2, 0, 0, 0 }, - { ABS_MT_TRACKING_ID, 0, 255, 0, 0, 0 }, - { ABS_MT_POSITION_X, 0, 10, 0, 0, 10 }, - { ABS_MT_POSITION_Y, 0, 10, 0, 0, 10 }, - { -1, -1, -1, -1, -1, -1 } - }; - int i; - - uinput = litest_create_uinput_abs_device("test device", - NULL, abs, - EV_KEY, BTN_TOUCH, - EV_REL, REL_X, - EV_REL, REL_Y, - -1); - li = litest_create_context(); - device = libinput_path_add_device(li, - libevdev_uinput_get_devnode(uinput)); - ck_assert(device != NULL); - - litest_disable_log_handler(li); - for (i = 0; i < 100; i++) { - libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); - libevdev_uinput_write_event(uinput, EV_REL, REL_Y, -1); - libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - } - litest_restore_log_handler(li); - - libinput_unref(li); - libevdev_uinput_destroy(uinput); -} -END_TEST - -START_TEST(device_abs_rel) -{ - struct libevdev_uinput *uinput; - struct libinput *li; - struct libinput_device *device; - const struct input_absinfo abs[] = { - { ABS_X, 0, 10, 0, 0, 10 }, - { ABS_Y, 0, 10, 0, 0, 10 }, - { -1, -1, -1, -1, -1, -1 } - }; - int i; - - uinput = litest_create_uinput_abs_device("test device", - NULL, abs, - EV_KEY, BTN_TOUCH, - EV_KEY, BTN_LEFT, - EV_REL, REL_X, - EV_REL, REL_Y, - -1); - li = litest_create_context(); - device = libinput_path_add_device(li, - libevdev_uinput_get_devnode(uinput)); - ck_assert(device != NULL); - - for (i = 0; i < 100; i++) { - libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); - libevdev_uinput_write_event(uinput, EV_REL, REL_Y, -1); - libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - } - - libinput_unref(li); - libevdev_uinput_destroy(uinput); -} -END_TEST - -START_TEST(device_quirks_no_abs_mt_y) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_pointer *pev; - int code; - - litest_drain_events(li); - - litest_event(dev, EV_REL, REL_HWHEEL, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - pev = litest_is_axis_event(event, - LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, - LIBINPUT_POINTER_AXIS_SOURCE_WHEEL); - libinput_event_destroy(libinput_event_pointer_get_base_event(pev)); - - for (code = ABS_MISC + 1; code < ABS_MAX; code++) { - litest_event(dev, EV_ABS, code, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_assert_empty_queue(li); - } - -} -END_TEST - -START_TEST(device_quirks_cyborg_rat_mode_button) -{ - struct litest_device *dev = litest_current_device(); - struct libinput_device *device = dev->libinput_device; - struct libinput *li = dev->libinput; - - ck_assert(!libinput_device_pointer_has_button(device, 0x118)); - ck_assert(!libinput_device_pointer_has_button(device, 0x119)); - ck_assert(!libinput_device_pointer_has_button(device, 0x11a)); - - litest_drain_events(li); - - litest_event(dev, EV_KEY, 0x118, 0); - litest_event(dev, EV_KEY, 0x119, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_assert_empty_queue(li); - - litest_event(dev, EV_KEY, 0x119, 0); - litest_event(dev, EV_KEY, 0x11a, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_assert_empty_queue(li); - - litest_event(dev, EV_KEY, 0x11a, 0); - litest_event(dev, EV_KEY, 0x118, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_assert_empty_queue(li); -} -END_TEST - void litest_setup_tests(void) { struct range abs_range = { 0, ABS_MISC }; struct range abs_mt_range = { ABS_MT_SLOT + 1, ABS_CNT }; - litest_add("device:sendevents", device_sendevents_config, LITEST_ANY, LITEST_TOUCHPAD|LITEST_TABLET); - litest_add("device:sendevents", device_sendevents_config_invalid, LITEST_ANY, LITEST_TABLET); - litest_add("device:sendevents", device_sendevents_config_touchpad, LITEST_TOUCHPAD, LITEST_TABLET); - litest_add("device:sendevents", device_sendevents_config_touchpad_superset, LITEST_TOUCHPAD, LITEST_TABLET); - litest_add("device:sendevents", device_sendevents_config_default, LITEST_ANY, LITEST_TABLET); - litest_add("device:sendevents", device_disable, LITEST_RELATIVE, LITEST_TABLET); - litest_add("device:sendevents", device_disable_touchpad, LITEST_TOUCHPAD, LITEST_TABLET); - litest_add("device:sendevents", device_disable_events_pending, LITEST_RELATIVE, LITEST_TOUCHPAD|LITEST_TABLET); - litest_add("device:sendevents", device_double_disable, LITEST_ANY, LITEST_TABLET); - litest_add("device:sendevents", device_double_enable, LITEST_ANY, LITEST_TABLET); + litest_add("device:sendevents", device_sendevents_config, LITEST_ANY, LITEST_TOUCHPAD); + litest_add("device:sendevents", device_sendevents_config_invalid, LITEST_ANY, LITEST_ANY); + litest_add("device:sendevents", device_sendevents_config_touchpad, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("device:sendevents", device_sendevents_config_touchpad_superset, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("device:sendevents", device_sendevents_config_default, LITEST_ANY, LITEST_ANY); + litest_add("device:sendevents", device_disable, LITEST_RELATIVE, LITEST_ANY); + litest_add("device:sendevents", device_disable_touchpad, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("device:sendevents", device_disable_events_pending, LITEST_RELATIVE, LITEST_TOUCHPAD); + litest_add("device:sendevents", device_double_disable, LITEST_ANY, LITEST_ANY); + litest_add("device:sendevents", device_double_enable, LITEST_ANY, LITEST_ANY); litest_add_no_device("device:sendevents", device_reenable_syspath_changed); litest_add_no_device("device:sendevents", device_reenable_device_removed); litest_add_for_device("device:sendevents", device_disable_release_buttons, LITEST_MOUSE); @@ -1362,7 +1061,6 @@ litest_add("device:group", device_group_get, LITEST_ANY, LITEST_ANY); litest_add_no_device("device:group", device_group_ref); - litest_add_no_device("device:group", device_group_leak); litest_add_no_device("device:invalid devices", abs_device_no_absx); litest_add_no_device("device:invalid devices", abs_device_no_absy); @@ -1373,20 +1071,10 @@ litest_add_no_device("device:invalid devices", abs_device_missing_res); litest_add_no_device("device:invalid devices", abs_mt_device_missing_res); - litest_add("device:wheel", device_wheel_only, LITEST_WHEEL, LITEST_RELATIVE|LITEST_ABSOLUTE|LITEST_TABLET); - litest_add_no_device("device:accelerometer", device_accelerometer); + litest_add("device:wheel", device_wheel_only, LITEST_WHEEL, LITEST_RELATIVE|LITEST_ABSOLUTE); litest_add("device:udev tags", device_udev_tag_alps, LITEST_TOUCHPAD, LITEST_ANY); litest_add("device:udev tags", device_udev_tag_wacom, LITEST_TOUCHPAD, LITEST_ANY); litest_add("device:udev tags", device_udev_tag_apple, LITEST_TOUCHPAD, LITEST_ANY); litest_add("device:udev tags", device_udev_tag_synaptics_serial, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("device:udev tags", device_udev_tag_wacom_tablet, LITEST_TABLET, LITEST_ANY); - - litest_add_no_device("device:invalid rel events", device_nonpointer_rel); - litest_add_no_device("device:invalid rel events", device_touchpad_rel); - litest_add_no_device("device:invalid rel events", device_touch_rel); - litest_add_no_device("device:invalid rel events", device_abs_rel); - - litest_add_for_device("device:quirks", device_quirks_no_abs_mt_y, LITEST_ANKER_MOUSE_KBD); - litest_add_for_device("device:quirks", device_quirks_cyborg_rat_mode_button, LITEST_CYBORG_RAT); } diff -Nru libinput-1.2.2/test/gestures.c libinput-0.21.0/test/gestures.c --- libinput-1.2.2/test/gestures.c 2016-02-28 22:35:34.000000000 +0000 +++ libinput-0.21.0/test/gestures.c 2015-08-03 04:35:00.000000000 +0000 @@ -34,7 +34,7 @@ struct litest_device *dev = litest_current_device(); struct libinput_device *device = dev->libinput_device; - if (libevdev_has_property(dev->evdev, INPUT_PROP_SEMI_MT)) + if (litest_is_synaptics_semi_mt(dev)) ck_assert(!libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_GESTURE)); else @@ -82,13 +82,13 @@ litest_drain_events(li); litest_touch_down(dev, 0, 40, 40); - litest_touch_down(dev, 1, 50, 40); - litest_touch_down(dev, 2, 60, 40); + litest_touch_down(dev, 1, 40, 50); + litest_touch_down(dev, 2, 40, 60); libinput_dispatch(li); litest_touch_move_three_touches(dev, 40, 40, - 50, 40, - 60, 40, + 40, 50, + 40, 60, dir_x, dir_y, 10, 2); libinput_dispatch(li); @@ -110,6 +110,7 @@ dx = libinput_event_gesture_get_dx(gevent); dy = libinput_event_gesture_get_dy(gevent); + debug_trace("delta: %.2f/%.2f\n", dx, dy); if (dir_x == 0.0) ck_assert(dx == 0.0); else if (dir_x < 0.0) @@ -156,768 +157,7 @@ } END_TEST -START_TEST(gestures_swipe_3fg_btntool) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_gesture *gevent; - double dx, dy; - int cardinal = _i; /* ranged test */ - double dir_x, dir_y; - int cardinals[8][2] = { - { 0, 30 }, - { 30, 30 }, - { 30, 0 }, - { 30, -30 }, - { 0, -30 }, - { -30, -30 }, - { -30, 0 }, - { -30, 30 }, - }; - - if (libevdev_get_num_slots(dev->evdev) > 2 || - !libinput_device_has_capability(dev->libinput_device, - LIBINPUT_DEVICE_CAP_GESTURE)) - return; - - dir_x = cardinals[cardinal][0]; - dir_y = cardinals[cardinal][1]; - - litest_drain_events(li); - - litest_touch_down(dev, 0, 40, 40); - litest_touch_down(dev, 1, 50, 40); - litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); - litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - libinput_dispatch(li); - litest_touch_move_two_touches(dev, - 40, 40, - 50, 40, - dir_x, dir_y, - 10, 2); - libinput_dispatch(li); - - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN, - 3); - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - ck_assert(dx == 0.0); - ck_assert(dy == 0.0); - libinput_event_destroy(event); - - while ((event = libinput_get_event(li)) != NULL) { - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE, - 3); - - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - if (dir_x == 0.0) - ck_assert(dx == 0.0); - else if (dir_x < 0.0) - ck_assert(dx < 0.0); - else if (dir_x > 0.0) - ck_assert(dx > 0.0); - - if (dir_y == 0.0) - ck_assert(dy == 0.0); - else if (dir_y < 0.0) - ck_assert(dy < 0.0); - else if (dir_y > 0.0) - ck_assert(dy > 0.0); - - dx = libinput_event_gesture_get_dx_unaccelerated(gevent); - dy = libinput_event_gesture_get_dy_unaccelerated(gevent); - if (dir_x == 0.0) - ck_assert(dx == 0.0); - else if (dir_x < 0.0) - ck_assert(dx < 0.0); - else if (dir_x > 0.0) - ck_assert(dx > 0.0); - - if (dir_y == 0.0) - ck_assert(dy == 0.0); - else if (dir_y < 0.0) - ck_assert(dy < 0.0); - else if (dir_y > 0.0) - ck_assert(dy > 0.0); - - libinput_event_destroy(event); - } - - litest_touch_up(dev, 0); - litest_touch_up(dev, 1); - libinput_dispatch(li); - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_SWIPE_END, - 3); - ck_assert(!libinput_event_gesture_get_cancelled(gevent)); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(gestures_swipe_4fg) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_gesture *gevent; - double dx, dy; - int cardinal = _i; /* ranged test */ - double dir_x, dir_y; - int cardinals[8][2] = { - { 0, 3 }, - { 3, 3 }, - { 3, 0 }, - { 3, -3 }, - { 0, -3 }, - { -3, -3 }, - { -3, 0 }, - { -3, 3 }, - }; - int i; - - if (libevdev_get_num_slots(dev->evdev) < 4) - return; - - dir_x = cardinals[cardinal][0]; - dir_y = cardinals[cardinal][1]; - - litest_drain_events(li); - - litest_touch_down(dev, 0, 40, 40); - litest_touch_down(dev, 1, 50, 40); - litest_touch_down(dev, 2, 60, 40); - litest_touch_down(dev, 3, 70, 40); - libinput_dispatch(li); - - for (i = 0; i < 8; i++) { - litest_push_event_frame(dev); - - dir_x += cardinals[cardinal][0]; - dir_y += cardinals[cardinal][1]; - - litest_touch_move(dev, - 0, - 40 + dir_x, - 40 + dir_y); - litest_touch_move(dev, - 1, - 50 + dir_x, - 40 + dir_y); - litest_touch_move(dev, - 2, - 60 + dir_x, - 40 + dir_y); - litest_touch_move(dev, - 3, - 70 + dir_x, - 40 + dir_y); - litest_pop_event_frame(dev); - libinput_dispatch(li); - } - - libinput_dispatch(li); - - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN, - 4); - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - ck_assert(dx == 0.0); - ck_assert(dy == 0.0); - libinput_event_destroy(event); - - while ((event = libinput_get_event(li)) != NULL) { - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE, - 4); - - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - if (dir_x == 0.0) - ck_assert(dx == 0.0); - else if (dir_x < 0.0) - ck_assert(dx < 0.0); - else if (dir_x > 0.0) - ck_assert(dx > 0.0); - - if (dir_y == 0.0) - ck_assert(dy == 0.0); - else if (dir_y < 0.0) - ck_assert(dy < 0.0); - else if (dir_y > 0.0) - ck_assert(dy > 0.0); - - dx = libinput_event_gesture_get_dx_unaccelerated(gevent); - dy = libinput_event_gesture_get_dy_unaccelerated(gevent); - if (dir_x == 0.0) - ck_assert(dx == 0.0); - else if (dir_x < 0.0) - ck_assert(dx < 0.0); - else if (dir_x > 0.0) - ck_assert(dx > 0.0); - - if (dir_y == 0.0) - ck_assert(dy == 0.0); - else if (dir_y < 0.0) - ck_assert(dy < 0.0); - else if (dir_y > 0.0) - ck_assert(dy > 0.0); - - libinput_event_destroy(event); - } - - litest_touch_up(dev, 0); - litest_touch_up(dev, 1); - litest_touch_up(dev, 2); - litest_touch_up(dev, 3); - libinput_dispatch(li); - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_SWIPE_END, - 4); - ck_assert(!libinput_event_gesture_get_cancelled(gevent)); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(gestures_swipe_4fg_btntool) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_gesture *gevent; - double dx, dy; - int cardinal = _i; /* ranged test */ - double dir_x, dir_y; - int cardinals[8][2] = { - { 0, 30 }, - { 30, 30 }, - { 30, 0 }, - { 30, -30 }, - { 0, -30 }, - { -30, -30 }, - { -30, 0 }, - { -30, 30 }, - }; - - if (libevdev_get_num_slots(dev->evdev) > 2 || - !libevdev_has_event_code(dev->evdev, EV_KEY, BTN_TOOL_QUADTAP) || - !libinput_device_has_capability(dev->libinput_device, - LIBINPUT_DEVICE_CAP_GESTURE)) - return; - - dir_x = cardinals[cardinal][0]; - dir_y = cardinals[cardinal][1]; - - litest_drain_events(li); - - litest_touch_down(dev, 0, 40, 40); - litest_touch_down(dev, 1, 50, 40); - litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); - litest_event(dev, EV_KEY, BTN_TOOL_QUADTAP, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - libinput_dispatch(li); - litest_touch_move_two_touches(dev, - 40, 40, - 50, 40, - dir_x, dir_y, - 10, 2); - libinput_dispatch(li); - - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN, - 4); - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - ck_assert(dx == 0.0); - ck_assert(dy == 0.0); - libinput_event_destroy(event); - - while ((event = libinput_get_event(li)) != NULL) { - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE, - 4); - - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - if (dir_x == 0.0) - ck_assert(dx == 0.0); - else if (dir_x < 0.0) - ck_assert(dx < 0.0); - else if (dir_x > 0.0) - ck_assert(dx > 0.0); - - if (dir_y == 0.0) - ck_assert(dy == 0.0); - else if (dir_y < 0.0) - ck_assert(dy < 0.0); - else if (dir_y > 0.0) - ck_assert(dy > 0.0); - - dx = libinput_event_gesture_get_dx_unaccelerated(gevent); - dy = libinput_event_gesture_get_dy_unaccelerated(gevent); - if (dir_x == 0.0) - ck_assert(dx == 0.0); - else if (dir_x < 0.0) - ck_assert(dx < 0.0); - else if (dir_x > 0.0) - ck_assert(dx > 0.0); - - if (dir_y == 0.0) - ck_assert(dy == 0.0); - else if (dir_y < 0.0) - ck_assert(dy < 0.0); - else if (dir_y > 0.0) - ck_assert(dy > 0.0); - - libinput_event_destroy(event); - } - - litest_touch_up(dev, 0); - litest_touch_up(dev, 1); - libinput_dispatch(li); - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_SWIPE_END, - 4); - ck_assert(!libinput_event_gesture_get_cancelled(gevent)); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(gestures_pinch) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_gesture *gevent; - double dx, dy; - int cardinal = _i; /* ranged test */ - double dir_x, dir_y; - int i; - double scale, oldscale; - double angle; - int cardinals[8][2] = { - { 0, 30 }, - { 30, 30 }, - { 30, 0 }, - { 30, -30 }, - { 0, -30 }, - { -30, -30 }, - { -30, 0 }, - { -30, 30 }, - }; - - if (libevdev_get_num_slots(dev->evdev) < 2 || - !libinput_device_has_capability(dev->libinput_device, - LIBINPUT_DEVICE_CAP_GESTURE)) - return; - - dir_x = cardinals[cardinal][0]; - dir_y = cardinals[cardinal][1]; - - litest_drain_events(li); - - litest_touch_down(dev, 0, 50 + dir_x, 50 + dir_y); - litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y); - libinput_dispatch(li); - - for (i = 0; i < 8; i++) { - litest_push_event_frame(dev); - if (dir_x > 0.0) - dir_x -= 2; - else if (dir_x < 0.0) - dir_x += 2; - if (dir_y > 0.0) - dir_y -= 2; - else if (dir_y < 0.0) - dir_y += 2; - litest_touch_move(dev, - 0, - 50 + dir_x, - 50 + dir_y); - litest_touch_move(dev, - 1, - 50 - dir_x, - 50 - dir_y); - litest_pop_event_frame(dev); - libinput_dispatch(li); - } - - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_BEGIN, - 2); - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - scale = libinput_event_gesture_get_scale(gevent); - ck_assert(dx == 0.0); - ck_assert(dy == 0.0); - ck_assert(scale == 1.0); - - libinput_event_destroy(event); - - while ((event = libinput_get_event(li)) != NULL) { - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_UPDATE, - 2); - - oldscale = scale; - scale = libinput_event_gesture_get_scale(gevent); - - ck_assert(scale < oldscale); - - angle = libinput_event_gesture_get_angle_delta(gevent); - ck_assert_double_le(fabs(angle), 1.0); - - libinput_event_destroy(event); - libinput_dispatch(li); - } - - litest_touch_up(dev, 0); - litest_touch_up(dev, 1); - libinput_dispatch(li); - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_END, - 2); - ck_assert(!libinput_event_gesture_get_cancelled(gevent)); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(gestures_pinch_3fg) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_gesture *gevent; - double dx, dy; - int cardinal = _i; /* ranged test */ - double dir_x, dir_y; - int i; - double scale, oldscale; - double angle; - int cardinals[8][2] = { - { 0, 30 }, - { 30, 30 }, - { 30, 0 }, - { 30, -30 }, - { 0, -30 }, - { -30, -30 }, - { -30, 0 }, - { -30, 30 }, - }; - - if (libevdev_get_num_slots(dev->evdev) < 3) - return; - - dir_x = cardinals[cardinal][0]; - dir_y = cardinals[cardinal][1]; - - litest_drain_events(li); - - litest_touch_down(dev, 0, 50 + dir_x, 50 + dir_y); - litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y); - litest_touch_down(dev, 2, 51 - dir_x, 51 - dir_y); - libinput_dispatch(li); - - for (i = 0; i < 8; i++) { - litest_push_event_frame(dev); - if (dir_x > 0.0) - dir_x -= 2; - else if (dir_x < 0.0) - dir_x += 2; - if (dir_y > 0.0) - dir_y -= 2; - else if (dir_y < 0.0) - dir_y += 2; - litest_touch_move(dev, - 0, - 50 + dir_x, - 50 + dir_y); - litest_touch_move(dev, - 1, - 50 - dir_x, - 50 - dir_y); - litest_touch_move(dev, - 2, - 51 - dir_x, - 51 - dir_y); - litest_pop_event_frame(dev); - libinput_dispatch(li); - } - - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_BEGIN, - 3); - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - scale = libinput_event_gesture_get_scale(gevent); - ck_assert(dx == 0.0); - ck_assert(dy == 0.0); - ck_assert(scale == 1.0); - - libinput_event_destroy(event); - - while ((event = libinput_get_event(li)) != NULL) { - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_UPDATE, - 3); - - oldscale = scale; - scale = libinput_event_gesture_get_scale(gevent); - - ck_assert(scale < oldscale); - - angle = libinput_event_gesture_get_angle_delta(gevent); - ck_assert_double_le(fabs(angle), 1.0); - - libinput_event_destroy(event); - libinput_dispatch(li); - } - - litest_touch_up(dev, 0); - litest_touch_up(dev, 1); - litest_touch_up(dev, 2); - libinput_dispatch(li); - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_END, - 3); - ck_assert(!libinput_event_gesture_get_cancelled(gevent)); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(gestures_pinch_3fg_btntool) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_gesture *gevent; - double dx, dy; - int cardinal = _i; /* ranged test */ - double dir_x, dir_y; - int i; - double scale, oldscale; - double angle; - int cardinals[8][2] = { - { 0, 30 }, - { 30, 30 }, - { 30, 0 }, - { 30, -30 }, - { 0, -30 }, - { -30, -30 }, - { -30, 0 }, - { -30, 30 }, - }; - - if (libevdev_get_num_slots(dev->evdev) > 2 || - !libinput_device_has_capability(dev->libinput_device, - LIBINPUT_DEVICE_CAP_GESTURE)) - return; - - dir_x = cardinals[cardinal][0]; - dir_y = cardinals[cardinal][1]; - - litest_drain_events(li); - - litest_touch_down(dev, 0, 50 + dir_x, 50 + dir_y); - litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y); - litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); - litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - for (i = 0; i < 8; i++) { - litest_push_event_frame(dev); - if (dir_x > 0.0) - dir_x -= 2; - else if (dir_x < 0.0) - dir_x += 2; - if (dir_y > 0.0) - dir_y -= 2; - else if (dir_y < 0.0) - dir_y += 2; - litest_touch_move(dev, - 0, - 50 + dir_x, - 50 + dir_y); - litest_touch_move(dev, - 1, - 50 - dir_x, - 50 - dir_y); - litest_pop_event_frame(dev); - libinput_dispatch(li); - } - - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_BEGIN, - 3); - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - scale = libinput_event_gesture_get_scale(gevent); - ck_assert(dx == 0.0); - ck_assert(dy == 0.0); - ck_assert(scale == 1.0); - - libinput_event_destroy(event); - - while ((event = libinput_get_event(li)) != NULL) { - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_UPDATE, - 3); - - oldscale = scale; - scale = libinput_event_gesture_get_scale(gevent); - - ck_assert(scale < oldscale); - - angle = libinput_event_gesture_get_angle_delta(gevent); - ck_assert_double_le(fabs(angle), 1.0); - - libinput_event_destroy(event); - libinput_dispatch(li); - } - - litest_touch_up(dev, 0); - litest_touch_up(dev, 1); - libinput_dispatch(li); - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_END, - 3); - ck_assert(!libinput_event_gesture_get_cancelled(gevent)); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(gestures_pinch_4fg) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_gesture *gevent; - double dx, dy; - int cardinal = _i; /* ranged test */ - double dir_x, dir_y; - int i; - double scale, oldscale; - double angle; - int cardinals[8][2] = { - { 0, 30 }, - { 30, 30 }, - { 30, 0 }, - { 30, -30 }, - { 0, -30 }, - { -30, -30 }, - { -30, 0 }, - { -30, 30 }, - }; - - if (libevdev_get_num_slots(dev->evdev) < 4) - return; - - dir_x = cardinals[cardinal][0]; - dir_y = cardinals[cardinal][1]; - - litest_drain_events(li); - - litest_touch_down(dev, 0, 50 + dir_x, 50 + dir_y); - litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y); - litest_touch_down(dev, 2, 51 - dir_x, 51 - dir_y); - litest_touch_down(dev, 3, 52 - dir_x, 52 - dir_y); - libinput_dispatch(li); - - for (i = 0; i < 8; i++) { - litest_push_event_frame(dev); - if (dir_x > 0.0) - dir_x -= 2; - else if (dir_x < 0.0) - dir_x += 2; - if (dir_y > 0.0) - dir_y -= 2; - else if (dir_y < 0.0) - dir_y += 2; - litest_touch_move(dev, - 0, - 50 + dir_x, - 50 + dir_y); - litest_touch_move(dev, - 1, - 50 - dir_x, - 50 - dir_y); - litest_touch_move(dev, - 2, - 51 - dir_x, - 51 - dir_y); - litest_touch_move(dev, - 3, - 52 - dir_x, - 52 - dir_y); - litest_pop_event_frame(dev); - libinput_dispatch(li); - } - - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_BEGIN, - 4); - dx = libinput_event_gesture_get_dx(gevent); - dy = libinput_event_gesture_get_dy(gevent); - scale = libinput_event_gesture_get_scale(gevent); - ck_assert(dx == 0.0); - ck_assert(dy == 0.0); - ck_assert(scale == 1.0); - - libinput_event_destroy(event); - - while ((event = libinput_get_event(li)) != NULL) { - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_UPDATE, - 4); - - oldscale = scale; - scale = libinput_event_gesture_get_scale(gevent); - - ck_assert(scale < oldscale); - - angle = libinput_event_gesture_get_angle_delta(gevent); - ck_assert_double_le(fabs(angle), 1.0); - - libinput_event_destroy(event); - libinput_dispatch(li); - } - - litest_touch_up(dev, 0); - litest_touch_up(dev, 1); - litest_touch_up(dev, 2); - litest_touch_up(dev, 3); - libinput_dispatch(li); - event = libinput_get_event(li); - gevent = litest_is_gesture_event(event, - LIBINPUT_EVENT_GESTURE_PINCH_END, - 4); - ck_assert(!libinput_event_gesture_get_cancelled(gevent)); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(gestures_pinch_4fg_btntool) +START_TEST(gestures_pinch) { struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; @@ -940,10 +180,7 @@ { -30, 30 }, }; - if (libevdev_get_num_slots(dev->evdev) > 2 || - !libevdev_has_event_code(dev->evdev, EV_KEY, BTN_TOOL_QUADTAP) || - !libinput_device_has_capability(dev->libinput_device, - LIBINPUT_DEVICE_CAP_GESTURE)) + if (libevdev_get_num_slots(dev->evdev) < 3) return; dir_x = cardinals[cardinal][0]; @@ -953,21 +190,18 @@ litest_touch_down(dev, 0, 50 + dir_x, 50 + dir_y); litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y); - litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); - litest_event(dev, EV_KEY, BTN_TOOL_QUADTAP, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); libinput_dispatch(li); for (i = 0; i < 8; i++) { litest_push_event_frame(dev); if (dir_x > 0.0) - dir_x -= 2; + dir_x -= 3; else if (dir_x < 0.0) - dir_x += 2; + dir_x += 3; if (dir_y > 0.0) - dir_y -= 2; + dir_y -= 3; else if (dir_y < 0.0) - dir_y += 2; + dir_y += 3; litest_touch_move(dev, 0, 50 + dir_x, @@ -983,7 +217,7 @@ event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_PINCH_BEGIN, - 4); + 2); dx = libinput_event_gesture_get_dx(gevent); dy = libinput_event_gesture_get_dy(gevent); scale = libinput_event_gesture_get_scale(gevent); @@ -996,7 +230,7 @@ while ((event = libinput_get_event(li)) != NULL) { gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_PINCH_UPDATE, - 4); + 2); oldscale = scale; scale = libinput_event_gesture_get_scale(gevent); @@ -1016,7 +250,7 @@ event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_PINCH_END, - 4); + 2); ck_assert(!libinput_event_gesture_get_cancelled(gevent)); libinput_event_destroy(event); } @@ -1035,19 +269,17 @@ double scale, oldscale; double angle; int cardinals[8][2] = { - { 0, 30 }, - { 30, 30 }, - { 30, 0 }, - { 30, -30 }, - { 0, -30 }, - { -30, -30 }, - { -30, 0 }, - { -30, 30 }, + { 0, 1 }, + { 1, 1 }, + { 1, 0 }, + { 1, -1 }, + { 0, -1 }, + { -1, -1 }, + { -1, 0 }, + { -1, 1 }, }; - if (libevdev_get_num_slots(dev->evdev) < 2 || - !libinput_device_has_capability(dev->libinput_device, - LIBINPUT_DEVICE_CAP_GESTURE)) + if (libevdev_get_num_slots(dev->evdev) < 3) return; dir_x = cardinals[cardinal][0]; @@ -1062,13 +294,13 @@ for (i = 0; i < 15; i++) { litest_push_event_frame(dev); if (dir_x > 0.0) - dir_x += 1; + dir_x += 2; else if (dir_x < 0.0) - dir_x -= 1; + dir_x -= 2; if (dir_y > 0.0) - dir_y += 1; + dir_y += 2; else if (dir_y < 0.0) - dir_y -= 1; + dir_y -= 2; litest_touch_move(dev, 0, 50 + dir_x, @@ -1134,17 +366,18 @@ litest_drain_events(li); litest_touch_down(dev, 0, 40, 40); - litest_touch_down(dev, 1, 50, 40); - litest_touch_down(dev, 2, 60, 40); + litest_touch_down(dev, 1, 40, 50); + litest_touch_down(dev, 2, 40, 60); libinput_dispatch(li); litest_touch_move_three_touches(dev, 40, 40, - 50, 40, - 60, 40, + 40, 50, + 40, 60, 0, 30, 4, 2); - libinput_dispatch(li); + litest_wait_for_event(li); + event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN, @@ -1155,63 +388,6 @@ } END_TEST -START_TEST(gestures_3fg_buttonarea_scroll) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - - if (libevdev_get_num_slots(dev->evdev) < 3) - return; - - litest_enable_buttonareas(dev); - litest_enable_2fg_scroll(dev); - litest_drain_events(li); - - litest_touch_down(dev, 0, 40, 20); - litest_touch_down(dev, 1, 30, 20); - /* third finger in btnarea */ - litest_touch_down(dev, 2, 50, 99); - libinput_dispatch(li); - litest_touch_move_two_touches(dev, - 40, 20, - 30, 20, - 0, 40, - 4, 2); - - litest_touch_up(dev, 0); - litest_touch_up(dev, 1); - libinput_dispatch(li); - litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 4); -} -END_TEST - -START_TEST(gestures_3fg_buttonarea_scroll_btntool) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - - if (libevdev_get_num_slots(dev->evdev) > 2) - return; - - litest_enable_buttonareas(dev); - litest_enable_2fg_scroll(dev); - litest_drain_events(li); - - /* first finger in btnarea */ - litest_touch_down(dev, 0, 20, 99); - litest_touch_down(dev, 1, 30, 20); - litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); - litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - litest_touch_move_to(dev, 1, 30, 20, 30, 70, 10, 1); - - litest_touch_up(dev, 1); - libinput_dispatch(li); - litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 4); -} -END_TEST - void litest_setup_tests(void) { @@ -1222,18 +398,8 @@ litest_add("gestures:cap", gestures_nocap, LITEST_ANY, LITEST_TOUCHPAD); litest_add_ranged("gestures:swipe", gestures_swipe_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:swipe", gestures_swipe_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:swipe", gestures_swipe_4fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:swipe", gestures_swipe_4fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); litest_add_ranged("gestures:pinch", gestures_pinch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:pinch", gestures_pinch_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:pinch", gestures_pinch_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:pinch", gestures_pinch_4fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:pinch", gestures_pinch_4fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); litest_add_ranged("gestures:pinch", gestures_spread, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add("gestures:swipe", gestures_3fg_buttonarea_scroll, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); - litest_add("gestures:swipe", gestures_3fg_buttonarea_scroll_btntool, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); - litest_add("gesture:time", gestures_time_usec, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); } diff -Nru libinput-1.2.2/test/litest.c libinput-0.21.0/test/litest.c --- libinput-1.2.2/test/litest.c 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/test/litest.c 2015-08-03 03:44:47.000000000 +0000 @@ -44,8 +44,6 @@ #include #include #include -#include -#include #include #include "litest.h" @@ -344,10 +342,6 @@ extern struct litest_test_device litest_bcm5974_device; extern struct litest_test_device litest_mouse_device; extern struct litest_test_device litest_wacom_touch_device; -extern struct litest_test_device litest_wacom_bamboo_tablet_device; -extern struct litest_test_device litest_wacom_cintiq_tablet_device; -extern struct litest_test_device litest_wacom_intuos_tablet_device; -extern struct litest_test_device litest_wacom_isdv4_tablet_device; extern struct litest_test_device litest_alps_device; extern struct litest_test_device litest_generic_singletouch_device; extern struct litest_test_device litest_qemu_tablet_device; @@ -369,16 +363,6 @@ extern struct litest_test_device litest_nexus4_device; extern struct litest_test_device litest_magicpad_device; extern struct litest_test_device litest_elantech_touchpad_device; -extern struct litest_test_device litest_mouse_gladius_device; -extern struct litest_test_device litest_mouse_wheel_click_angle_device; -extern struct litest_test_device litest_apple_keyboard_device; -extern struct litest_test_device litest_anker_mouse_kbd_device; -extern struct litest_test_device litest_waltop_tablet_device; -extern struct litest_test_device litest_huion_tablet_device; -extern struct litest_test_device litest_cyborg_rat_device; -extern struct litest_test_device litest_yubikey_device; -extern struct litest_test_device litest_synaptics_i2c_device; -extern struct litest_test_device litest_wacom_cintiq_24hd_device; struct litest_test_device* devices[] = { &litest_synaptics_clickpad_device, @@ -389,10 +373,6 @@ &litest_bcm5974_device, &litest_mouse_device, &litest_wacom_touch_device, - &litest_wacom_bamboo_tablet_device, - &litest_wacom_cintiq_tablet_device, - &litest_wacom_intuos_tablet_device, - &litest_wacom_isdv4_tablet_device, &litest_alps_device, &litest_generic_singletouch_device, &litest_qemu_tablet_device, @@ -414,16 +394,6 @@ &litest_nexus4_device, &litest_magicpad_device, &litest_elantech_touchpad_device, - &litest_mouse_gladius_device, - &litest_mouse_wheel_click_angle_device, - &litest_apple_keyboard_device, - &litest_anker_mouse_kbd_device, - &litest_waltop_tablet_device, - &litest_huion_tablet_device, - &litest_cyborg_rat_device, - &litest_yubikey_device, - &litest_synaptics_i2c_device, - &litest_wacom_cintiq_24hd_device, NULL, }; @@ -614,7 +584,6 @@ { struct litest_test_device **dev = devices; struct suite *suite; - bool added = false; assert(required >= LITEST_DISABLE_DEVICE); assert(excluded >= LITEST_DISABLE_DEVICE); @@ -632,7 +601,6 @@ if (required == LITEST_DISABLE_DEVICE && excluded == LITEST_DISABLE_DEVICE) { litest_add_tcase_no_device(suite, func, range); - added = true; } else if (required != LITEST_ANY || excluded != LITEST_ANY) { for (; *dev; dev++) { if (filter_device && @@ -647,7 +615,6 @@ func, *dev, range); - added = true; } } else { for (; *dev; dev++) { @@ -660,14 +627,8 @@ func, *dev, range); - added = true; } } - - if (!added) { - fprintf(stderr, "Test '%s' does not match any devices. Aborting.\n", funcname); - abort(); - } } void @@ -967,20 +928,18 @@ static inline void litest_copy_file(const char *dest, const char *src, const char *header) { - int in, out, length; + int in, out; out = open(dest, O_CREAT|O_WRONLY, 0644); litest_assert_int_gt(out, -1); - if (header) { - length = strlen(header); - litest_assert_int_eq(write(out, header, length), length); - } + if (header) + write(out, header, strlen(header)); in = open(src, O_RDONLY); litest_assert_int_gt(in, -1); /* lazy, just check for error and empty file copy */ - litest_assert_int_gt(sendfile(out, in, NULL, 40960), 0); + litest_assert_int_gt(sendfile(out, in, NULL, 4096), 0); close(out); close(in); } @@ -1258,7 +1217,6 @@ libinput_path_remove_device(d->libinput_device); if (d->owns_context) libinput_unref(d->libinput); - close(libevdev_get_fd(d->evdev)); libevdev_free(d->evdev); libevdev_uinput_destroy(d->uinput); free(d->private); @@ -1280,8 +1238,7 @@ } static bool -axis_replacement_value(struct litest_device *d, - struct axis_replacement *axes, +axis_replacement_value(struct axis_replacement *axes, int32_t evcode, int32_t *value) { @@ -1292,7 +1249,7 @@ while (axis->evcode != -1) { if (axis->evcode == evcode) { - *value = litest_scale(d, evcode, axis->value); + *value = axis->value; return true; } axis++; @@ -1333,7 +1290,8 @@ value = touching ? 0 : 1; break; default: - if (!axis_replacement_value(d, axes, ev->code, &value) && + value = -1; + if (!axis_replacement_value(axes, ev->code, &value) && d->interface->get_axis_default) d->interface->get_axis_default(d, ev->code, &value); break; @@ -1343,9 +1301,9 @@ } static void -send_btntool(struct litest_device *d, bool hover) +send_btntool(struct litest_device *d) { - litest_event(d, EV_KEY, BTN_TOUCH, d->ntouches_down != 0 && !hover); + litest_event(d, EV_KEY, BTN_TOUCH, d->ntouches_down != 0); litest_event(d, EV_KEY, BTN_TOOL_FINGER, d->ntouches_down == 1); litest_event(d, EV_KEY, BTN_TOOL_DOUBLETAP, d->ntouches_down == 2); litest_event(d, EV_KEY, BTN_TOOL_TRIPLETAP, d->ntouches_down == 3); @@ -1366,7 +1324,7 @@ assert(d->ntouches_down >= 0); d->ntouches_down++; - send_btntool(d, !touching); + send_btntool(d); if (d->interface->touch_down) { d->interface->touch_down(d, slot, x, y); @@ -1382,8 +1340,8 @@ y, axes, touching); - if (value != LITEST_AUTO_ASSIGN) - litest_event(d, ev->type, ev->code, value); + + litest_event(d, ev->type, ev->code, value); ev++; } } @@ -1421,7 +1379,7 @@ litest_assert_int_gt(d->ntouches_down, 0); d->ntouches_down--; - send_btntool(d, false); + send_btntool(d); if (d->interface->touch_up) { d->interface->touch_up(d, slot); @@ -1468,8 +1426,7 @@ y, axes, touching); - if (value != LITEST_AUTO_ASSIGN) - litest_event(d, ev->type, ev->code, value); + litest_event(d, ev->type, ev->code, value); ev++; } } @@ -1513,82 +1470,6 @@ litest_touch_move(d, slot, x_to, y_to); } -static int -auto_assign_tablet_value(struct litest_device *d, - const struct input_event *ev, - int x, int y, - struct axis_replacement *axes) -{ - int value = ev->value; - - if (value != LITEST_AUTO_ASSIGN || ev->type != EV_ABS) - return value; - - switch (ev->code) { - case ABS_X: - value = litest_scale(d, ABS_X, x); - break; - case ABS_Y: - value = litest_scale(d, ABS_Y, y); - break; - default: - if (!axis_replacement_value(d, axes, ev->code, &value) && - d->interface->get_axis_default) - d->interface->get_axis_default(d, ev->code, &value); - break; - } - - return value; -} - -static int -tablet_ignore_event(const struct input_event *ev, int value) -{ - return value == -1 && (ev->code == ABS_PRESSURE || ev->code == ABS_DISTANCE); -} - -void -litest_tablet_proximity_in(struct litest_device *d, int x, int y, struct axis_replacement *axes) -{ - struct input_event *ev; - - ev = d->interface->tablet_proximity_in_events; - while (ev && (int16_t)ev->type != -1 && (int16_t)ev->code != -1) { - int value = auto_assign_tablet_value(d, ev, x, y, axes); - if (!tablet_ignore_event(ev, value)) - litest_event(d, ev->type, ev->code, value); - ev++; - } -} - -void -litest_tablet_proximity_out(struct litest_device *d) -{ - struct input_event *ev; - - ev = d->interface->tablet_proximity_out_events; - while (ev && (int16_t)ev->type != -1 && (int16_t)ev->code != -1) { - int value = auto_assign_tablet_value(d, ev, -1, -1, NULL); - if (!tablet_ignore_event(ev, value)) - litest_event(d, ev->type, ev->code, value); - ev++; - } -} - -void -litest_tablet_motion(struct litest_device *d, int x, int y, struct axis_replacement *axes) -{ - struct input_event *ev; - - ev = d->interface->tablet_motion_events; - while (ev && (int16_t)ev->type != -1 && (int16_t)ev->code != -1) { - int value = auto_assign_tablet_value(d, ev, x, y, axes); - if (!tablet_ignore_event(ev, value)) - litest_event(d, ev->type, ev->code, value); - ev++; - } -} - void litest_touch_move_two_touches(struct litest_device *d, double x0, double y0, @@ -1597,22 +1478,18 @@ int steps, int sleep_ms) { for (int i = 0; i < steps - 1; i++) { - litest_push_event_frame(d); litest_touch_move(d, 0, x0 + dx / steps * i, y0 + dy / steps * i); litest_touch_move(d, 1, x1 + dx / steps * i, y1 + dy / steps * i); - litest_pop_event_frame(d); if (sleep_ms) { libinput_dispatch(d->libinput); msleep(sleep_ms); + libinput_dispatch(d->libinput); } - libinput_dispatch(d->libinput); } - litest_push_event_frame(d); litest_touch_move(d, 0, x0 + dx, y0 + dy); litest_touch_move(d, 1, x1 + dx, y1 + dy); - litest_pop_event_frame(d); } void @@ -1665,7 +1542,7 @@ litest_assert_int_gt(d->ntouches_down, 0); d->ntouches_down--; - send_btntool(d, true); + send_btntool(d); if (d->interface->touch_up) { d->interface->touch_up(d, slot); @@ -1777,36 +1654,17 @@ litest_button_click(d, key, is_press); } -static int -litest_scale_axis(const struct litest_device *d, - unsigned int axis, - double val) -{ - const struct input_absinfo *abs; - - litest_assert_double_ge(val, 0.0); - litest_assert_double_le(val, 100.0); - - abs = libevdev_get_abs_info(d->evdev, axis); - litest_assert_notnull(abs); - - return (abs->maximum - abs->minimum) * val/100.0 + abs->minimum; -} - int litest_scale(const struct litest_device *d, unsigned int axis, double val) { int min, max; - litest_assert_double_ge(val, 0.0); - litest_assert_double_le(val, 100.0); - - if (axis <= ABS_Y) { - min = d->interface->min[axis]; - max = d->interface->max[axis]; - return (max - min) * val/100.0 + min; - } else { - return litest_scale_axis(d, axis, val); - } + litest_assert_int_ge((int)val, 0); + litest_assert_int_le((int)val, 100); + litest_assert_int_le(axis, (unsigned int)ABS_Y); + + min = d->interface->min[axis]; + max = d->interface->max[axis]; + return (max - min) * val/100.0 + min; } void @@ -1935,18 +1793,6 @@ case LIBINPUT_EVENT_GESTURE_PINCH_END: str = "GESTURE PINCH END"; break; - case LIBINPUT_EVENT_TABLET_TOOL_AXIS: - str = "TABLET TOOL AXIS"; - break; - case LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY: - str = "TABLET TOOL PROX"; - break; - case LIBINPUT_EVENT_TABLET_TOOL_TIP: - str = "TABLET TOOL TIP"; - break; - case LIBINPUT_EVENT_TABLET_TOOL_BUTTON: - str = "TABLET TOOL BUTTON"; - break; } return str; } @@ -1955,7 +1801,6 @@ litest_print_event(struct libinput_event *event) { struct libinput_event_pointer *p; - struct libinput_event_tablet_tool *t; struct libinput_device *dev; enum libinput_event_type type; double x, y; @@ -1989,33 +1834,12 @@ break; case LIBINPUT_EVENT_POINTER_AXIS: p = libinput_event_get_pointer_event(event); - x = 0.0; - y = 0.0; - if (libinput_event_pointer_has_axis(p, - LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) - y = libinput_event_pointer_get_axis_value(p, - LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); - if (libinput_event_pointer_has_axis(p, - LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) - x = libinput_event_pointer_get_axis_value(p, - LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL); - fprintf(stderr, "vert %.f horiz %.2f", y, x); - break; - case LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY: - t = libinput_event_get_tablet_tool_event(event); - fprintf(stderr, "proximity %d\n", - libinput_event_tablet_tool_get_proximity_state(t)); - break; - case LIBINPUT_EVENT_TABLET_TOOL_TIP: - t = libinput_event_get_tablet_tool_event(event); - fprintf(stderr, "tip %d\n", - libinput_event_tablet_tool_get_tip_state(t)); - break; - case LIBINPUT_EVENT_TABLET_TOOL_BUTTON: - t = libinput_event_get_tablet_tool_event(event); - fprintf(stderr, "button %d state %d\n", - libinput_event_tablet_tool_get_button(t), - libinput_event_tablet_tool_get_button_state(t)); + fprintf(stderr, + "vert %.f horiz %.2f", + libinput_event_pointer_get_axis_value(p, + LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL), + libinput_event_pointer_get_axis_value(p, + LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)); break; default: break; @@ -2384,60 +2208,6 @@ return gevent; } -struct libinput_event_tablet_tool * -litest_is_tablet_event(struct libinput_event *event, - enum libinput_event_type type) -{ - struct libinput_event_tablet_tool *tevent; - - litest_assert(event != NULL); - litest_assert_int_eq(libinput_event_get_type(event), type); - - tevent = libinput_event_get_tablet_tool_event(event); - litest_assert(tevent != NULL); - - return tevent; -} - -void -litest_assert_tablet_button_event(struct libinput *li, unsigned int button, - enum libinput_button_state state) -{ - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - enum libinput_event_type type = LIBINPUT_EVENT_TABLET_TOOL_BUTTON; - - litest_wait_for_event(li); - event = libinput_get_event(li); - - litest_assert_notnull(event); - litest_assert_int_eq(libinput_event_get_type(event), type); - tev = libinput_event_get_tablet_tool_event(event); - litest_assert_int_eq(libinput_event_tablet_tool_get_button(tev), - button); - litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(tev), - state); - libinput_event_destroy(event); -} - -void litest_assert_tablet_proximity_event(struct libinput *li, - enum libinput_tablet_tool_proximity_state state) -{ - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - enum libinput_event_type type = LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY; - - litest_wait_for_event(li); - event = libinput_get_event(li); - - litest_assert_notnull(event); - litest_assert_int_eq(libinput_event_get_type(event), type); - tev = libinput_event_get_tablet_tool_event(event); - litest_assert_int_eq(libinput_event_tablet_tool_get_proximity_state(tev), - state); - libinput_event_destroy(event); -} - void litest_assert_scroll(struct libinput *li, enum libinput_pointer_axis axis, diff -Nru libinput-1.2.2/test/litest-device-anker-mouse-kbd.c libinput-0.21.0/test/litest-device-anker-mouse-kbd.c --- libinput-1.2.2/test/litest-device-anker-mouse-kbd.c 2016-02-08 01:33:11.000000000 +0000 +++ libinput-0.21.0/test/litest-device-anker-mouse-kbd.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,225 +0,0 @@ -/* - * Copyright © 2015 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -/* Recording from https://bugs.freedesktop.org/show_bug.cgi?id=93474 - * This is the keyboard device for this mouse. - */ - -static void litest_anker_mouse_kbd_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_ANKER_MOUSE_KBD); - litest_set_current_device(d); -} - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x4d9, - .product = 0xfa50, -}; - -static int events[] = { - EV_REL, REL_HWHEEL, - EV_KEY, KEY_ESC, - EV_KEY, KEY_KPMINUS, - EV_KEY, KEY_KPPLUS, - EV_KEY, KEY_UP, - EV_KEY, KEY_PAGEUP, - EV_KEY, KEY_LEFT, - EV_KEY, KEY_RIGHT, - EV_KEY, KEY_END, - EV_KEY, KEY_DOWN, - EV_KEY, KEY_PAGEDOWN, - EV_KEY, KEY_INSERT, - EV_KEY, KEY_DELETE, - EV_KEY, KEY_MUTE, - EV_KEY, KEY_VOLUMEDOWN, - EV_KEY, KEY_VOLUMEUP, - EV_KEY, KEY_POWER, - EV_KEY, KEY_PAUSE, - EV_KEY, KEY_STOP, - EV_KEY, KEY_PROPS, - EV_KEY, KEY_UNDO, - EV_KEY, KEY_COPY, - EV_KEY, KEY_OPEN, - EV_KEY, KEY_PASTE, - EV_KEY, KEY_FIND, - EV_KEY, KEY_CUT, - EV_KEY, KEY_HELP, - EV_KEY, KEY_MENU, - EV_KEY, KEY_CALC, - EV_KEY, KEY_SLEEP, - EV_KEY, KEY_WAKEUP, - EV_KEY, KEY_FILE, - EV_KEY, KEY_WWW, - EV_KEY, KEY_COFFEE, - EV_KEY, KEY_MAIL, - EV_KEY, KEY_BOOKMARKS, - EV_KEY, KEY_BACK, - EV_KEY, KEY_FORWARD, - EV_KEY, KEY_EJECTCD, - EV_KEY, KEY_NEXTSONG, - EV_KEY, KEY_PLAYPAUSE, - EV_KEY, KEY_PREVIOUSSONG, - EV_KEY, KEY_STOPCD, - EV_KEY, KEY_RECORD, - EV_KEY, KEY_REWIND, - EV_KEY, KEY_PHONE, - EV_KEY, KEY_CONFIG, - EV_KEY, KEY_HOMEPAGE, - EV_KEY, KEY_REFRESH, - EV_KEY, KEY_EXIT, - EV_KEY, KEY_EDIT, - EV_KEY, KEY_SCROLLUP, - EV_KEY, KEY_SCROLLDOWN, - EV_KEY, KEY_NEW, - EV_KEY, KEY_REDO, - EV_KEY, KEY_CLOSE, - EV_KEY, KEY_PLAY, - EV_KEY, KEY_FASTFORWARD, - EV_KEY, KEY_BASSBOOST, - EV_KEY, KEY_PRINT, - EV_KEY, KEY_CAMERA, - EV_KEY, KEY_CHAT, - EV_KEY, KEY_SEARCH, - EV_KEY, KEY_FINANCE, - EV_KEY, KEY_BRIGHTNESSDOWN, - EV_KEY, KEY_BRIGHTNESSUP, - EV_KEY, KEY_KBDILLUMTOGGLE, - EV_KEY, KEY_SAVE, - EV_KEY, KEY_DOCUMENTS, - EV_KEY, KEY_UNKNOWN, - EV_KEY, KEY_VIDEO_NEXT, - EV_KEY, KEY_BRIGHTNESS_AUTO, - EV_KEY, BTN_0, - EV_KEY, KEY_SELECT, - EV_KEY, KEY_GOTO, - EV_KEY, KEY_INFO, - EV_KEY, KEY_PROGRAM, - EV_KEY, KEY_PVR, - EV_KEY, KEY_SUBTITLE, - EV_KEY, KEY_ZOOM, - EV_KEY, KEY_KEYBOARD, - EV_KEY, KEY_PC, - EV_KEY, KEY_TV, - EV_KEY, KEY_TV2, - EV_KEY, KEY_VCR, - EV_KEY, KEY_VCR2, - EV_KEY, KEY_SAT, - EV_KEY, KEY_CD, - EV_KEY, KEY_TAPE, - EV_KEY, KEY_TUNER, - EV_KEY, KEY_PLAYER, - EV_KEY, KEY_DVD, - EV_KEY, KEY_AUDIO, - EV_KEY, KEY_VIDEO, - EV_KEY, KEY_MEMO, - EV_KEY, KEY_CALENDAR, - EV_KEY, KEY_RED, - EV_KEY, KEY_GREEN, - EV_KEY, KEY_YELLOW, - EV_KEY, KEY_BLUE, - EV_KEY, KEY_CHANNELUP, - EV_KEY, KEY_CHANNELDOWN, - EV_KEY, KEY_LAST, - EV_KEY, KEY_NEXT, - EV_KEY, KEY_RESTART, - EV_KEY, KEY_SLOW, - EV_KEY, KEY_SHUFFLE, - EV_KEY, KEY_PREVIOUS, - EV_KEY, KEY_VIDEOPHONE, - EV_KEY, KEY_GAMES, - EV_KEY, KEY_ZOOMIN, - EV_KEY, KEY_ZOOMOUT, - EV_KEY, KEY_ZOOMRESET, - EV_KEY, KEY_WORDPROCESSOR, - EV_KEY, KEY_EDITOR, - EV_KEY, KEY_SPREADSHEET, - EV_KEY, KEY_GRAPHICSEDITOR, - EV_KEY, KEY_PRESENTATION, - EV_KEY, KEY_DATABASE, - EV_KEY, KEY_NEWS, - EV_KEY, KEY_VOICEMAIL, - EV_KEY, KEY_ADDRESSBOOK, - EV_KEY, KEY_MESSENGER, - EV_KEY, KEY_DISPLAYTOGGLE, - EV_KEY, KEY_SPELLCHECK, - EV_KEY, KEY_LOGOFF, - EV_KEY, KEY_MEDIA_REPEAT, - EV_KEY, KEY_IMAGES, - EV_KEY, KEY_BUTTONCONFIG, - EV_KEY, KEY_TASKMANAGER, - EV_KEY, KEY_JOURNAL, - EV_KEY, KEY_CONTROLPANEL, - EV_KEY, KEY_APPSELECT, - EV_KEY, KEY_SCREENSAVER, - EV_KEY, KEY_VOICECOMMAND, - EV_KEY, KEY_BRIGHTNESS_MIN, - EV_KEY, KEY_BRIGHTNESS_MAX, - EV_KEY, KEY_KBDINPUTASSIST_PREV, - EV_KEY, KEY_KBDINPUTASSIST_NEXT, - EV_KEY, KEY_KBDINPUTASSIST_PREVGROUP, - EV_KEY, KEY_KBDINPUTASSIST_NEXTGROUP, - EV_KEY, KEY_KBDINPUTASSIST_ACCEPT, - EV_KEY, KEY_KBDINPUTASSIST_CANCEL, - EV_MSC, MSC_SCAN, - -1 , -1, -}; - -static struct input_absinfo absinfo[] = { - { ABS_VOLUME, 0, 4096, 0, 0, 0 }, - { ABS_MISC, 0, 255, 0, 0, 0 }, - { 0x29, 0, 255, 0, 0, 0 }, - { 0x2a, 0, 255, 0, 0, 0 }, - { 0x2b, 0, 255, 0, 0, 0 }, - { 0x2c, 0, 255, 0, 0, 0 }, - { 0x2d, 0, 255, 0, 0, 0 }, - { 0x2e, 0, 255, 0, 0, 0 }, - { ABS_MT_SLOT, 0, 255, 0, 0, 0 }, - { ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0, 0 }, - { ABS_MT_TOUCH_MINOR, 0, 255, 0, 0, 0 }, - { ABS_MT_WIDTH_MINOR, 0, 255, 0, 0, 0 }, - { ABS_MT_WIDTH_MAJOR, 0, 255, 0, 0, 0 }, - { ABS_MT_ORIENTATION, 0, 255, 0, 0, 0 }, - { ABS_MT_POSITION_X, 0, 255, 0, 0, 0 }, - { .value = -1 }, -}; - -struct litest_test_device litest_anker_mouse_kbd_device = { - .type = LITEST_ANKER_MOUSE_KBD, - .features = LITEST_KEYS | LITEST_WHEEL, - .shortname = "anker_kbd", - .setup = litest_anker_mouse_kbd_setup, - .interface = NULL, - - .name = "USB Laser Game Mouse", - .id = &input_id, - .absinfo = absinfo, - .events = events, -}; diff -Nru libinput-1.2.2/test/litest-device-apple-internal-keyboard.c libinput-0.21.0/test/litest-device-apple-internal-keyboard.c --- libinput-1.2.2/test/litest-device-apple-internal-keyboard.c 2016-02-08 01:33:11.000000000 +0000 +++ libinput-0.21.0/test/litest-device-apple-internal-keyboard.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,239 +0,0 @@ -/* - * Copyright © 2015 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_apple_keyboard_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_APPLE_KEYBOARD); - litest_set_current_device(d); -} - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x5ac, - .product = 0x273, -}; - -static int events[] = { - EV_KEY, KEY_ESC, - EV_KEY, KEY_1, - EV_KEY, KEY_2, - EV_KEY, KEY_3, - EV_KEY, KEY_4, - EV_KEY, KEY_5, - EV_KEY, KEY_6, - EV_KEY, KEY_7, - EV_KEY, KEY_8, - EV_KEY, KEY_9, - EV_KEY, KEY_0, - EV_KEY, KEY_MINUS, - EV_KEY, KEY_EQUAL, - EV_KEY, KEY_BACKSPACE, - EV_KEY, KEY_TAB, - EV_KEY, KEY_Q, - EV_KEY, KEY_W, - EV_KEY, KEY_E, - EV_KEY, KEY_R, - EV_KEY, KEY_T, - EV_KEY, KEY_Y, - EV_KEY, KEY_U, - EV_KEY, KEY_I, - EV_KEY, KEY_O, - EV_KEY, KEY_P, - EV_KEY, KEY_LEFTBRACE, - EV_KEY, KEY_RIGHTBRACE, - EV_KEY, KEY_ENTER, - EV_KEY, KEY_LEFTCTRL, - EV_KEY, KEY_A, - EV_KEY, KEY_S, - EV_KEY, KEY_D, - EV_KEY, KEY_F, - EV_KEY, KEY_G, - EV_KEY, KEY_H, - EV_KEY, KEY_J, - EV_KEY, KEY_K, - EV_KEY, KEY_L, - EV_KEY, KEY_SEMICOLON, - EV_KEY, KEY_APOSTROPHE, - EV_KEY, KEY_GRAVE, - EV_KEY, KEY_LEFTSHIFT, - EV_KEY, KEY_BACKSLASH, - EV_KEY, KEY_Z, - EV_KEY, KEY_X, - EV_KEY, KEY_C, - EV_KEY, KEY_V, - EV_KEY, KEY_B, - EV_KEY, KEY_N, - EV_KEY, KEY_M, - EV_KEY, KEY_COMMA, - EV_KEY, KEY_DOT, - EV_KEY, KEY_SLASH, - EV_KEY, KEY_RIGHTSHIFT, - EV_KEY, KEY_KPASTERISK, - EV_KEY, KEY_LEFTALT, - EV_KEY, KEY_SPACE, - EV_KEY, KEY_CAPSLOCK, - EV_KEY, KEY_F1, - EV_KEY, KEY_F2, - EV_KEY, KEY_F3, - EV_KEY, KEY_F4, - EV_KEY, KEY_F5, - EV_KEY, KEY_F6, - EV_KEY, KEY_F7, - EV_KEY, KEY_F8, - EV_KEY, KEY_F9, - EV_KEY, KEY_F10, - EV_KEY, KEY_NUMLOCK, - EV_KEY, KEY_SCROLLLOCK, - EV_KEY, KEY_KP7, - EV_KEY, KEY_KP8, - EV_KEY, KEY_KP9, - EV_KEY, KEY_KPMINUS, - EV_KEY, KEY_KP4, - EV_KEY, KEY_KP5, - EV_KEY, KEY_KP6, - EV_KEY, KEY_KPPLUS, - EV_KEY, KEY_KP1, - EV_KEY, KEY_KP2, - EV_KEY, KEY_KP3, - EV_KEY, KEY_KP0, - EV_KEY, KEY_KPDOT, - EV_KEY, KEY_ZENKAKUHANKAKU, - EV_KEY, KEY_102ND, - EV_KEY, KEY_F11, - EV_KEY, KEY_F12, - EV_KEY, KEY_RO, - EV_KEY, KEY_KATAKANA, - EV_KEY, KEY_HIRAGANA, - EV_KEY, KEY_HENKAN, - EV_KEY, KEY_KATAKANAHIRAGANA, - EV_KEY, KEY_MUHENKAN, - EV_KEY, KEY_KPJPCOMMA, - EV_KEY, KEY_KPENTER, - EV_KEY, KEY_RIGHTCTRL, - EV_KEY, KEY_KPSLASH, - EV_KEY, KEY_SYSRQ, - EV_KEY, KEY_RIGHTALT, - EV_KEY, KEY_HOME, - EV_KEY, KEY_UP, - EV_KEY, KEY_PAGEUP, - EV_KEY, KEY_LEFT, - EV_KEY, KEY_RIGHT, - EV_KEY, KEY_END, - EV_KEY, KEY_DOWN, - EV_KEY, KEY_PAGEDOWN, - EV_KEY, KEY_INSERT, - EV_KEY, KEY_DELETE, - EV_KEY, KEY_MUTE, - EV_KEY, KEY_VOLUMEDOWN, - EV_KEY, KEY_VOLUMEUP, - EV_KEY, KEY_POWER, - EV_KEY, KEY_KPEQUAL, - EV_KEY, KEY_PAUSE, - EV_KEY, KEY_SCALE, - EV_KEY, KEY_KPCOMMA, - EV_KEY, KEY_HANGEUL, - EV_KEY, KEY_HANJA, - EV_KEY, KEY_YEN, - EV_KEY, KEY_LEFTMETA, - EV_KEY, KEY_RIGHTMETA, - EV_KEY, KEY_COMPOSE, - EV_KEY, KEY_STOP, - EV_KEY, KEY_AGAIN, - EV_KEY, KEY_PROPS, - EV_KEY, KEY_UNDO, - EV_KEY, KEY_FRONT, - EV_KEY, KEY_COPY, - EV_KEY, KEY_OPEN, - EV_KEY, KEY_PASTE, - EV_KEY, KEY_FIND, - EV_KEY, KEY_CUT, - EV_KEY, KEY_HELP, - EV_KEY, KEY_CALC, - EV_KEY, KEY_SLEEP, - EV_KEY, KEY_WWW, - EV_KEY, KEY_COFFEE, - EV_KEY, KEY_BACK, - EV_KEY, KEY_FORWARD, - EV_KEY, KEY_EJECTCD, - EV_KEY, KEY_NEXTSONG, - EV_KEY, KEY_PLAYPAUSE, - EV_KEY, KEY_PREVIOUSSONG, - EV_KEY, KEY_STOPCD, - EV_KEY, KEY_REWIND, - EV_KEY, KEY_REFRESH, - EV_KEY, KEY_EDIT, - EV_KEY, KEY_SCROLLUP, - EV_KEY, KEY_SCROLLDOWN, - EV_KEY, KEY_KPLEFTPAREN, - EV_KEY, KEY_KPRIGHTPAREN, - EV_KEY, KEY_F13, - EV_KEY, KEY_F14, - EV_KEY, KEY_F15, - EV_KEY, KEY_F16, - EV_KEY, KEY_F17, - EV_KEY, KEY_F18, - EV_KEY, KEY_F19, - EV_KEY, KEY_F20, - EV_KEY, KEY_F21, - EV_KEY, KEY_F22, - EV_KEY, KEY_F23, - EV_KEY, KEY_F24, - EV_KEY, KEY_DASHBOARD, - EV_KEY, KEY_FASTFORWARD, - EV_KEY, KEY_BRIGHTNESSDOWN, - EV_KEY, KEY_BRIGHTNESSUP, - EV_KEY, KEY_SWITCHVIDEOMODE, - EV_KEY, KEY_KBDILLUMTOGGLE, - EV_KEY, KEY_KBDILLUMDOWN, - EV_KEY, KEY_KBDILLUMUP, - EV_KEY, KEY_UNKNOWN, - EV_KEY, KEY_FN, - EV_MSC, MSC_SCAN, - - EV_LED, LED_NUML, - EV_LED, LED_CAPSL, - EV_LED, LED_SCROLLL, - EV_LED, LED_COMPOSE, - EV_LED, LED_KANA, - -1, -1 -}; - -struct litest_test_device litest_apple_keyboard_device = { - .type = LITEST_APPLE_KEYBOARD, - .features = LITEST_KEYS, - .shortname = "apple_keyboard", - .setup = litest_apple_keyboard_setup, - .interface = NULL, - - .name = "Apple Inc. Apple Internal Keyboard / Trackpad", - .id = &input_id, - .events = events, - .absinfo = NULL, -}; diff -Nru libinput-1.2.2/test/litest-device-asus-rog-gladius.c libinput-0.21.0/test/litest-device-asus-rog-gladius.c --- libinput-1.2.2/test/litest-device-asus-rog-gladius.c 2016-02-08 01:33:11.000000000 +0000 +++ libinput-0.21.0/test/litest-device-asus-rog-gladius.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,334 +0,0 @@ -/* - * Copyright © 2015 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -/* Note: this is the second event node of this mouse only, the first event - * node is just a normal mouse */ - -static void litest_mouse_gladius_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_MOUSE_GLADIUS); - litest_set_current_device(d); -} - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x0b05, - .product = 0x181a, -}; - -static int events[] = { - EV_REL, REL_X, - EV_REL, REL_Y, - EV_REL, REL_HWHEEL, - EV_KEY, KEY_ESC, - EV_KEY, KEY_1, - EV_KEY, KEY_2, - EV_KEY, KEY_3, - EV_KEY, KEY_4, - EV_KEY, KEY_5, - EV_KEY, KEY_6, - EV_KEY, KEY_7, - EV_KEY, KEY_8, - EV_KEY, KEY_9, - EV_KEY, KEY_0, - EV_KEY, KEY_MINUS, - EV_KEY, KEY_EQUAL, - EV_KEY, KEY_BACKSPACE, - EV_KEY, KEY_TAB, - EV_KEY, KEY_Q, - EV_KEY, KEY_W, - EV_KEY, KEY_E, - EV_KEY, KEY_R, - EV_KEY, KEY_T, - EV_KEY, KEY_Y, - EV_KEY, KEY_U, - EV_KEY, KEY_I, - EV_KEY, KEY_O, - EV_KEY, KEY_P, - EV_KEY, KEY_LEFTBRACE, - EV_KEY, KEY_RIGHTBRACE, - EV_KEY, KEY_ENTER, - EV_KEY, KEY_LEFTCTRL, - EV_KEY, KEY_A, - EV_KEY, KEY_S, - EV_KEY, KEY_D, - EV_KEY, KEY_F, - EV_KEY, KEY_G, - EV_KEY, KEY_H, - EV_KEY, KEY_J, - EV_KEY, KEY_K, - EV_KEY, KEY_L, - EV_KEY, KEY_SEMICOLON, - EV_KEY, KEY_APOSTROPHE, - EV_KEY, KEY_GRAVE, - EV_KEY, KEY_LEFTSHIFT, - EV_KEY, KEY_BACKSLASH, - EV_KEY, KEY_Z, - EV_KEY, KEY_X, - EV_KEY, KEY_C, - EV_KEY, KEY_V, - EV_KEY, KEY_B, - EV_KEY, KEY_N, - EV_KEY, KEY_M, - EV_KEY, KEY_COMMA, - EV_KEY, KEY_DOT, - EV_KEY, KEY_SLASH, - EV_KEY, KEY_RIGHTSHIFT, - EV_KEY, KEY_KPASTERISK, - EV_KEY, KEY_LEFTALT, - EV_KEY, KEY_SPACE, - EV_KEY, KEY_CAPSLOCK, - EV_KEY, KEY_F1, - EV_KEY, KEY_F2, - EV_KEY, KEY_F3, - EV_KEY, KEY_F4, - EV_KEY, KEY_F5, - EV_KEY, KEY_F6, - EV_KEY, KEY_F7, - EV_KEY, KEY_F8, - EV_KEY, KEY_F9, - EV_KEY, KEY_F10, - EV_KEY, KEY_NUMLOCK, - EV_KEY, KEY_SCROLLLOCK, - EV_KEY, KEY_KP7, - EV_KEY, KEY_KP8, - EV_KEY, KEY_KP9, - EV_KEY, KEY_KPMINUS, - EV_KEY, KEY_KP4, - EV_KEY, KEY_KP5, - EV_KEY, KEY_KP6, - EV_KEY, KEY_KPPLUS, - EV_KEY, KEY_KP1, - EV_KEY, KEY_KP2, - EV_KEY, KEY_KP3, - EV_KEY, KEY_KP0, - EV_KEY, KEY_KPDOT, - EV_KEY, KEY_ZENKAKUHANKAKU, - EV_KEY, KEY_102ND, - EV_KEY, KEY_F11, - EV_KEY, KEY_F12, - EV_KEY, KEY_RO, - EV_KEY, KEY_KATAKANA, - EV_KEY, KEY_HIRAGANA, - EV_KEY, KEY_HENKAN, - EV_KEY, KEY_KATAKANAHIRAGANA, - EV_KEY, KEY_MUHENKAN, - EV_KEY, KEY_KPJPCOMMA, - EV_KEY, KEY_KPENTER, - EV_KEY, KEY_RIGHTCTRL, - EV_KEY, KEY_KPSLASH, - EV_KEY, KEY_SYSRQ, - EV_KEY, KEY_RIGHTALT, - EV_KEY, KEY_HOME, - EV_KEY, KEY_UP, - EV_KEY, KEY_PAGEUP, - EV_KEY, KEY_LEFT, - EV_KEY, KEY_RIGHT, - EV_KEY, KEY_END, - EV_KEY, KEY_DOWN, - EV_KEY, KEY_PAGEDOWN, - EV_KEY, KEY_INSERT, - EV_KEY, KEY_DELETE, - EV_KEY, KEY_MUTE, - EV_KEY, KEY_VOLUMEDOWN, - EV_KEY, KEY_VOLUMEUP, - EV_KEY, KEY_POWER, - EV_KEY, KEY_KPEQUAL, - EV_KEY, KEY_PAUSE, - EV_KEY, KEY_KPCOMMA, - EV_KEY, KEY_HANGEUL, - EV_KEY, KEY_HANJA, - EV_KEY, KEY_YEN, - EV_KEY, KEY_LEFTMETA, - EV_KEY, KEY_RIGHTMETA, - EV_KEY, KEY_COMPOSE, - EV_KEY, KEY_STOP, - EV_KEY, KEY_AGAIN, - EV_KEY, KEY_PROPS, - EV_KEY, KEY_UNDO, - EV_KEY, KEY_FRONT, - EV_KEY, KEY_COPY, - EV_KEY, KEY_OPEN, - EV_KEY, KEY_PASTE, - EV_KEY, KEY_FIND, - EV_KEY, KEY_CUT, - EV_KEY, KEY_HELP, - EV_KEY, KEY_MENU, - EV_KEY, KEY_CALC, - EV_KEY, KEY_SLEEP, - EV_KEY, KEY_FILE, - EV_KEY, KEY_WWW, - EV_KEY, KEY_COFFEE, - EV_KEY, KEY_MAIL, - EV_KEY, KEY_BOOKMARKS, - EV_KEY, KEY_BACK, - EV_KEY, KEY_FORWARD, - EV_KEY, KEY_EJECTCD, - EV_KEY, KEY_NEXTSONG, - EV_KEY, KEY_PLAYPAUSE, - EV_KEY, KEY_PREVIOUSSONG, - EV_KEY, KEY_STOPCD, - EV_KEY, KEY_RECORD, - EV_KEY, KEY_REWIND, - EV_KEY, KEY_PHONE, - EV_KEY, KEY_CONFIG, - EV_KEY, KEY_HOMEPAGE, - EV_KEY, KEY_REFRESH, - EV_KEY, KEY_EXIT, - EV_KEY, KEY_EDIT, - EV_KEY, KEY_SCROLLUP, - EV_KEY, KEY_SCROLLDOWN, - EV_KEY, KEY_KPLEFTPAREN, - EV_KEY, KEY_KPRIGHTPAREN, - EV_KEY, KEY_NEW, - EV_KEY, KEY_REDO, - EV_KEY, KEY_F13, - EV_KEY, KEY_F14, - EV_KEY, KEY_F15, - EV_KEY, KEY_F16, - EV_KEY, KEY_F17, - EV_KEY, KEY_F18, - EV_KEY, KEY_F19, - EV_KEY, KEY_F20, - EV_KEY, KEY_F21, - EV_KEY, KEY_F22, - EV_KEY, KEY_F23, - EV_KEY, KEY_F24, - EV_KEY, KEY_CLOSE, - EV_KEY, KEY_PLAY, - EV_KEY, KEY_FASTFORWARD, - EV_KEY, KEY_BASSBOOST, - EV_KEY, KEY_PRINT, - EV_KEY, KEY_CAMERA, - EV_KEY, KEY_CHAT, - EV_KEY, KEY_SEARCH, - EV_KEY, KEY_FINANCE, - EV_KEY, KEY_CANCEL, - EV_KEY, KEY_BRIGHTNESSDOWN, - EV_KEY, KEY_BRIGHTNESSUP, - EV_KEY, KEY_KBDILLUMTOGGLE, - EV_KEY, KEY_SEND, - EV_KEY, KEY_REPLY, - EV_KEY, KEY_FORWARDMAIL, - EV_KEY, KEY_SAVE, - EV_KEY, KEY_DOCUMENTS, - EV_KEY, KEY_UNKNOWN, - EV_KEY, KEY_VIDEO_NEXT, - EV_KEY, KEY_BRIGHTNESS_AUTO, - EV_KEY, BTN_0, - EV_KEY, KEY_SELECT, - EV_KEY, KEY_GOTO, - EV_KEY, KEY_INFO, - EV_KEY, KEY_PROGRAM, - EV_KEY, KEY_PVR, - EV_KEY, KEY_SUBTITLE, - EV_KEY, KEY_ZOOM, - EV_KEY, KEY_KEYBOARD, - EV_KEY, KEY_PC, - EV_KEY, KEY_TV, - EV_KEY, KEY_TV2, - EV_KEY, KEY_VCR, - EV_KEY, KEY_VCR2, - EV_KEY, KEY_SAT, - EV_KEY, KEY_CD, - EV_KEY, KEY_TAPE, - EV_KEY, KEY_TUNER, - EV_KEY, KEY_PLAYER, - EV_KEY, KEY_DVD, - EV_KEY, KEY_AUDIO, - EV_KEY, KEY_VIDEO, - EV_KEY, KEY_MEMO, - EV_KEY, KEY_CALENDAR, - EV_KEY, KEY_RED, - EV_KEY, KEY_GREEN, - EV_KEY, KEY_YELLOW, - EV_KEY, KEY_BLUE, - EV_KEY, KEY_CHANNELUP, - EV_KEY, KEY_CHANNELDOWN, - EV_KEY, KEY_LAST, - EV_KEY, KEY_NEXT, - EV_KEY, KEY_RESTART, - EV_KEY, KEY_SLOW, - EV_KEY, KEY_SHUFFLE, - EV_KEY, KEY_PREVIOUS, - EV_KEY, KEY_VIDEOPHONE, - EV_KEY, KEY_GAMES, - EV_KEY, KEY_ZOOMIN, - EV_KEY, KEY_ZOOMOUT, - EV_KEY, KEY_ZOOMRESET, - EV_KEY, KEY_WORDPROCESSOR, - EV_KEY, KEY_EDITOR, - EV_KEY, KEY_SPREADSHEET, - EV_KEY, KEY_GRAPHICSEDITOR, - EV_KEY, KEY_PRESENTATION, - EV_KEY, KEY_DATABASE, - EV_KEY, KEY_NEWS, - EV_KEY, KEY_VOICEMAIL, - EV_KEY, KEY_ADDRESSBOOK, - EV_KEY, KEY_MESSENGER, - EV_KEY, KEY_DISPLAYTOGGLE, - EV_KEY, KEY_SPELLCHECK, - EV_KEY, KEY_LOGOFF, - EV_KEY, KEY_MEDIA_REPEAT, - EV_KEY, KEY_IMAGES, - EV_KEY, KEY_BUTTONCONFIG, - EV_KEY, KEY_TASKMANAGER, - EV_KEY, KEY_JOURNAL, - EV_KEY, KEY_CONTROLPANEL, - EV_KEY, KEY_APPSELECT, - EV_KEY, KEY_SCREENSAVER, - EV_KEY, KEY_VOICECOMMAND, - EV_KEY, KEY_BRIGHTNESS_MIN, - EV_KEY, KEY_BRIGHTNESS_MAX, - EV_LED, LED_NUML, - EV_LED, LED_CAPSL, - EV_LED, LED_SCROLLL, - EV_LED, LED_COMPOSE, - EV_LED, LED_KANA, - -1 , -1, -}; - -static struct input_absinfo absinfo[] = { - { ABS_VOLUME, 0, 668, 0, 0, 0 }, - { .value = -1 } -}; - -struct litest_test_device litest_mouse_gladius_device = { - .type = LITEST_MOUSE_GLADIUS, - .features = LITEST_RELATIVE | LITEST_WHEEL | LITEST_KEYS, - .shortname = "mouse_gladius", - .setup = litest_mouse_gladius_setup, - .interface = NULL, - - .name = "ASUS ROG GLADIUS", - .id = &input_id, - .absinfo = absinfo, - .events = events, -}; diff -Nru libinput-1.2.2/test/litest-device-cyborg-rat-5.c libinput-0.21.0/test/litest-device-cyborg-rat-5.c --- libinput-1.2.2/test/litest-device-cyborg-rat-5.c 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/test/litest-device-cyborg-rat-5.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/* - * Copyright © 2013 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_cyborg_rat_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_CYBORG_RAT); - litest_set_current_device(d); -} - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x6a3, - .product = 0xcd5, -}; - -static int events[] = { - EV_KEY, BTN_LEFT, - EV_KEY, BTN_RIGHT, - EV_KEY, BTN_MIDDLE, - EV_KEY, BTN_SIDE, - EV_KEY, BTN_EXTRA, - EV_KEY, BTN_FORWARD, - EV_KEY, BTN_TASK, - EV_KEY, 0x118, - EV_KEY, 0x119, - EV_KEY, 0x11a, - EV_REL, REL_X, - EV_REL, REL_Y, - EV_REL, REL_WHEEL, - -1 , -1, -}; - -struct litest_test_device litest_cyborg_rat_device = { - .type = LITEST_CYBORG_RAT, - .features = LITEST_RELATIVE | LITEST_BUTTON | LITEST_WHEEL, - .shortname = "cyborg_rat", - .setup = litest_cyborg_rat_setup, - .interface = NULL, - - .name = "Saitek Cyborg R.A.T.5 Mouse", - .id = &input_id, - .absinfo = NULL, - .events = events, -}; diff -Nru libinput-1.2.2/test/litest-device-huion-pentablet.c libinput-0.21.0/test/litest-device-huion-pentablet.c --- libinput-1.2.2/test/litest-device-huion-pentablet.c 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/test/litest-device-huion-pentablet.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -/* - * Copyright © 2015 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_huion_tablet_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_HUION_TABLET); - litest_set_current_device(d); -} - -static struct input_event proximity_in[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 1 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event proximity_out[] = { - { .type = EV_ABS, .code = ABS_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_Y, .value = 0 }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 0 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event motion[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static int -get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value) -{ - switch (evcode) { - case ABS_PRESSURE: - *value = 100; - return 0; - } - return 1; -} - -static struct litest_device_interface interface = { - .tablet_proximity_in_events = proximity_in, - .tablet_proximity_out_events = proximity_out, - .tablet_motion_events = motion, - - .get_axis_default = get_axis_default, -}; - -static struct input_absinfo absinfo[] = { - { ABS_X, 0, 40000, 0, 0, 157 }, - { ABS_Y, 0, 25000, 0, 0, 157 }, - { ABS_PRESSURE, 0, 2047, 0, 0, 0 }, - { .value = -1 }, -}; - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x256c, - .product = 0x6e, -}; - -static int events[] = { - EV_KEY, BTN_TOOL_PEN, - EV_KEY, BTN_TOUCH, - EV_KEY, BTN_STYLUS, - EV_KEY, BTN_STYLUS2, - EV_MSC, MSC_SCAN, - -1, -1, -}; - -struct litest_test_device litest_huion_tablet_device = { - .type = LITEST_HUION_TABLET, - .features = LITEST_TABLET, - .shortname = "huion-tablet", - .setup = litest_huion_tablet_setup, - .interface = &interface, - - .name = "HUION PenTablet Pen", - .id = &input_id, - .events = events, - .absinfo = absinfo, -}; diff -Nru libinput-1.2.2/test/litest-device-mouse-wheel-click-angle.c libinput-0.21.0/test/litest-device-mouse-wheel-click-angle.c --- libinput-1.2.2/test/litest-device-mouse-wheel-click-angle.c 2016-02-08 01:33:11.000000000 +0000 +++ libinput-0.21.0/test/litest-device-mouse-wheel-click-angle.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/* - * Copyright © 2015 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_mouse_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_MOUSE_WHEEL_CLICK_ANGLE); - litest_set_current_device(d); -} - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x1234, - .product = 0x5678, -}; - -static int events[] = { - EV_KEY, BTN_LEFT, - EV_KEY, BTN_RIGHT, - EV_KEY, BTN_MIDDLE, - EV_REL, REL_X, - EV_REL, REL_Y, - EV_REL, REL_WHEEL, - -1 , -1, -}; - -static const char udev_rule[] = -"ACTION==\"remove\", GOTO=\"wheel_click_angle_end\"\n" -"KERNEL!=\"event*\", GOTO=\"wheel_click_angle_end\"\n" -"\n" -"ATTRS{name}==\"litest Wheel Click Angle Mouse*\",\\\n" -" ENV{MOUSE_WHEEL_CLICK_ANGLE}=\"-7\"\n" -"\n" -"LABEL=\"wheel_click_angle_end\""; - -struct litest_test_device litest_mouse_wheel_click_angle_device = { - .type = LITEST_MOUSE_WHEEL_CLICK_ANGLE, - .features = LITEST_RELATIVE | LITEST_BUTTON | LITEST_WHEEL, - .shortname = "mouse-wheelclickangle", - .setup = litest_mouse_setup, - .interface = NULL, - - .name = "Wheel Click Angle Mouse", - .id = &input_id, - .absinfo = NULL, - .events = events, - .udev_rule = udev_rule, -}; diff -Nru libinput-1.2.2/test/litest-device-synaptics-hover.c libinput-0.21.0/test/litest-device-synaptics-hover.c --- libinput-1.2.2/test/litest-device-synaptics-hover.c 2016-02-24 06:33:17.000000000 +0000 +++ libinput-0.21.0/test/litest-device-synaptics-hover.c 2015-08-03 03:44:04.000000000 +0000 @@ -106,7 +106,7 @@ "ACTION==\"remove\", GOTO=\"synaptics_semi_mt_end\"\n" "KERNEL!=\"event*\", GOTO=\"synaptics_semi_mt_end\"\n" "\n" -"ATTRS{name}==\"SynPS/2 Synaptics TouchPad\",\\\n" +"ATTRS{name}==\"SynPS/2 Synaptics TouchPad\",\n" " ENV{LIBINPUT_MODEL_JUMPING_SEMI_MT}=\"1\"\n" "\n" "LABEL=\"synaptics_semi_mt_end\""; diff -Nru libinput-1.2.2/test/litest-device-synaptics-i2c.c libinput-0.21.0/test/litest-device-synaptics-i2c.c --- libinput-1.2.2/test/litest-device-synaptics-i2c.c 2016-02-24 06:33:17.000000000 +0000 +++ libinput-0.21.0/test/litest-device-synaptics-i2c.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -/* - * Copyright © 2015 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void -litest_synaptics_i2c_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_SYNAPTICS_I2C); - litest_set_current_device(d); -} - -static struct input_event down[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_MT_TRACKING_ID, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event move[] = { - { .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct litest_device_interface interface = { - .touch_down_events = down, - .touch_move_events = move, -}; - -static struct input_id input_id = { - .bustype = 0x18, - .vendor = 0x6cb, - .product = 0x76ad, -}; - -static int events[] = { - EV_KEY, BTN_LEFT, - EV_KEY, BTN_TOOL_FINGER, - EV_KEY, BTN_TOUCH, - EV_KEY, BTN_TOOL_DOUBLETAP, - EV_KEY, BTN_TOOL_TRIPLETAP, - INPUT_PROP_MAX, INPUT_PROP_POINTER, - INPUT_PROP_MAX, INPUT_PROP_BUTTONPAD, - -1, -1, -}; - -static struct input_absinfo absinfo[] = { - { ABS_X, 0, 1216, 0, 0, 12 }, - { ABS_Y, 0, 680, 0, 0, 12 }, - { ABS_MT_SLOT, 0, 1, 0, 0, 0 }, - { ABS_MT_POSITION_X, 0, 1216, 0, 0, 12 }, - { ABS_MT_POSITION_Y, 0, 680, 0, 0, 12 }, - { ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 }, - { .value = -1 } -}; - -struct litest_test_device litest_synaptics_i2c_device = { - .type = LITEST_SYNAPTICS_I2C, - .features = LITEST_TOUCHPAD | LITEST_CLICKPAD | LITEST_BUTTON, - .shortname = "synaptics-i2c", - .setup = litest_synaptics_i2c_setup, - .interface = &interface, - - .name = "DLL0704:01 06CB:76AD Touchpad", - .id = &input_id, - .events = events, - .absinfo = absinfo, -}; diff -Nru libinput-1.2.2/test/litest-device-wacom-bamboo-tablet.c libinput-0.21.0/test/litest-device-wacom-bamboo-tablet.c --- libinput-1.2.2/test/litest-device-wacom-bamboo-tablet.c 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/test/litest-device-wacom-bamboo-tablet.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -/* - * Copyright © 2014 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_wacom_bamboo_tablet_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_WACOM_BAMBOO); - litest_set_current_device(d); -} - -static struct input_event proximity_in[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 1 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event proximity_out[] = { - { .type = EV_ABS, .code = ABS_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_Y, .value = 0 }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = 0 }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 0 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event motion[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static int -get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value) -{ - switch (evcode) { - case ABS_PRESSURE: - *value = 100; - return 0; - } - return 1; -} - -static struct litest_device_interface interface = { - .tablet_proximity_in_events = proximity_in, - .tablet_proximity_out_events = proximity_out, - .tablet_motion_events = motion, - - .get_axis_default = get_axis_default, -}; - -static struct input_absinfo absinfo[] = { - { ABS_X, 0, 14720, 4, 0, 100 }, - { ABS_Y, 0, 9200, 4, 0, 100 }, - { ABS_PRESSURE, 0, 1023, 0, 0, 0 }, - { ABS_DISTANCE, 0, 31, 0, 0, 0 }, - { .value = -1 }, -}; - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x56a, - .product = 0xde, - .version = 0x100, -}; - -static int events[] = { - EV_KEY, BTN_TOOL_PEN, - EV_KEY, BTN_TOOL_RUBBER, - EV_KEY, BTN_TOUCH, - EV_KEY, BTN_STYLUS, - EV_KEY, BTN_STYLUS2, - INPUT_PROP_MAX, INPUT_PROP_POINTER, - -1, -1, -}; - -struct litest_test_device litest_wacom_bamboo_tablet_device = { - .type = LITEST_WACOM_BAMBOO, - .features = LITEST_TABLET | LITEST_DISTANCE, - .shortname = "wacom-bamboo-tablet", - .setup = litest_wacom_bamboo_tablet_setup, - .interface = &interface, - - .name = "Wacom Bamboo 16FG 4x5 Pen", - .id = &input_id, - .events = events, - .absinfo = absinfo, -}; diff -Nru libinput-1.2.2/test/litest-device-wacom-cintiq-24hd.c libinput-0.21.0/test/litest-device-wacom-cintiq-24hd.c --- libinput-1.2.2/test/litest-device-wacom-cintiq-24hd.c 2016-03-01 06:00:47.000000000 +0000 +++ libinput-0.21.0/test/litest-device-wacom-cintiq-24hd.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,147 +0,0 @@ -/* - * Copyright © 2014 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_wacom_cintiq_tablet_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_WACOM_CINTIQ_24HD); - litest_set_current_device(d); -} - -static struct input_event proximity_in[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_MISC, .value = 2083 }, - { .type = EV_MSC, .code = MSC_SERIAL, .value = 297797542 }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 1 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event proximity_out[] = { - { .type = EV_ABS, .code = ABS_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_Y, .value = 0 }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = 0 }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = 0 }, - { .type = EV_ABS, .code = ABS_MISC, .value = 0 }, - { .type = EV_MSC, .code = MSC_SERIAL, .value = 297797542 }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 0 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event motion[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_MSC, .code = MSC_SERIAL, .value = 297797542 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static int -get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value) -{ - switch (evcode) { - case ABS_TILT_X: - case ABS_TILT_Y: - *value = 0; - return 0; - case ABS_PRESSURE: - *value = 100; - return 0; - case ABS_DISTANCE: - *value = 0; - return 0; - } - return 1; -} - -static struct litest_device_interface interface = { - .tablet_proximity_in_events = proximity_in, - .tablet_proximity_out_events = proximity_out, - .tablet_motion_events = motion, - - .get_axis_default = get_axis_default, -}; - -static struct input_absinfo absinfo[] = { - { ABS_X, 400, 104080, 4, 0, 200 }, - { ABS_Y, 400, 65200, 4, 0, 200 }, - { ABS_Z, -900, 899, 0, 0, 0 }, - { ABS_WHEEL, 0, 1023, 0, 0, 0 }, - { ABS_THROTTLE, 0, 71, 0, 0, 0 }, - { ABS_PRESSURE, 0, 2047, 0, 0, 0 }, - { ABS_DISTANCE, 0, 63, 0, 0, 0 }, - { ABS_TILT_X, -64, 63, 0, 0, 57 }, - { ABS_TILT_Y, -64, 63, 0, 0, 57 }, - { ABS_MISC, 0, 0, 0, 0, 0 }, - { .value = -1 }, -}; - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x56a, - .product = 0xf4, - .version = 0x113, -}; - -static int events[] = { - EV_KEY, BTN_TOOL_PEN, - EV_KEY, BTN_TOOL_RUBBER, - EV_KEY, BTN_TOOL_BRUSH, - EV_KEY, BTN_TOOL_PENCIL, - EV_KEY, BTN_TOOL_AIRBRUSH, - EV_KEY, BTN_TOUCH, - EV_KEY, BTN_STYLUS, - EV_KEY, BTN_STYLUS2, - EV_MSC, MSC_SERIAL, - INPUT_PROP_MAX, INPUT_PROP_DIRECT, - -1, -1, -}; - -struct litest_test_device litest_wacom_cintiq_24hd_device = { - .type = LITEST_WACOM_CINTIQ_24HD, - .features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT, - .shortname = "wacom-cintiq-24hd-tablet", - .setup = litest_wacom_cintiq_tablet_setup, - .interface = &interface, - - .name = "Wacom Cintiq 24 HD Pen", - .id = &input_id, - .events = events, - .absinfo = absinfo, -}; diff -Nru libinput-1.2.2/test/litest-device-wacom-cintiq-tablet.c libinput-0.21.0/test/litest-device-wacom-cintiq-tablet.c --- libinput-1.2.2/test/litest-device-wacom-cintiq-tablet.c 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/test/litest-device-wacom-cintiq-tablet.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,158 +0,0 @@ -/* - * Copyright © 2014 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_wacom_cintiq_tablet_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_WACOM_CINTIQ); - litest_set_current_device(d); -} - -static struct input_event proximity_in[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_MISC, .value = 2083 }, - { .type = EV_MSC, .code = MSC_SERIAL, .value = 297797542 }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 1 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event proximity_out[] = { - { .type = EV_ABS, .code = ABS_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_Y, .value = 0 }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = 0 }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = 0 }, - { .type = EV_ABS, .code = ABS_MISC, .value = 0 }, - { .type = EV_MSC, .code = MSC_SERIAL, .value = 297797542 }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 0 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event motion[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_MSC, .code = MSC_SERIAL, .value = 297797542 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static int -get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value) -{ - switch (evcode) { - case ABS_TILT_X: - case ABS_TILT_Y: - *value = 0; - return 0; - case ABS_PRESSURE: - *value = 100; - return 0; - case ABS_DISTANCE: - *value = 0; - return 0; - } - return 1; -} - -static struct litest_device_interface interface = { - .tablet_proximity_in_events = proximity_in, - .tablet_proximity_out_events = proximity_out, - .tablet_motion_events = motion, - - .get_axis_default = get_axis_default, -}; - -static struct input_absinfo absinfo[] = { - { ABS_X, 0, 53020, 4, 0, 200 }, - { ABS_Y, 0, 33440, 4, 0, 200 }, - { ABS_Z, -900, 899, 0, 0, 0 }, - { ABS_RX, 0, 4096, 0, 0, 0 }, - { ABS_RY, 0, 4096, 0, 0, 0 }, - { ABS_WHEEL, 0, 1023, 0, 0, 0 }, - { ABS_PRESSURE, 0, 1023, 0, 0, 0 }, - { ABS_DISTANCE, 0, 63, 0, 0, 0 }, - { ABS_TILT_X, 0, 127, 0, 0, 0 }, - { ABS_TILT_Y, 0, 127, 0, 0, 0 }, - { ABS_MISC, 0, 0, 0, 0, 0 }, - { .value = -1 }, -}; - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x56a, - .product = 0xc6, - .version = 0x113, -}; - -static int events[] = { - EV_KEY, BTN_0, - EV_KEY, BTN_1, - EV_KEY, BTN_2, - EV_KEY, BTN_3, - EV_KEY, BTN_4, - EV_KEY, BTN_5, - EV_KEY, BTN_6, - EV_KEY, BTN_7, - EV_KEY, BTN_8, - EV_KEY, BTN_9, - EV_KEY, BTN_TOOL_PEN, - EV_KEY, BTN_TOOL_RUBBER, - EV_KEY, BTN_TOOL_BRUSH, - EV_KEY, BTN_TOOL_PENCIL, - EV_KEY, BTN_TOOL_AIRBRUSH, - EV_KEY, BTN_TOUCH, - EV_KEY, BTN_STYLUS, - EV_KEY, BTN_STYLUS2, - EV_MSC, MSC_SERIAL, - INPUT_PROP_MAX, INPUT_PROP_DIRECT, - -1, -1, -}; - -struct litest_test_device litest_wacom_cintiq_tablet_device = { - .type = LITEST_WACOM_CINTIQ, - .features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT, - .shortname = "wacom-cintiq-tablet", - .setup = litest_wacom_cintiq_tablet_setup, - .interface = &interface, - - .name = "Wacom Cintiq 12WX", - .id = &input_id, - .events = events, - .absinfo = absinfo, -}; diff -Nru libinput-1.2.2/test/litest-device-wacom-intuos-tablet.c libinput-0.21.0/test/litest-device-wacom-intuos-tablet.c --- libinput-1.2.2/test/litest-device-wacom-intuos-tablet.c 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/test/litest-device-wacom-intuos-tablet.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -/* - * Copyright © 2014 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_wacom_intuos_tablet_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_WACOM_INTUOS); - litest_set_current_device(d); -} - -static struct input_event proximity_in[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_MISC, .value = 1050626 }, - { .type = EV_MSC, .code = MSC_SERIAL, .value = 578837976 }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 1 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event proximity_out[] = { - { .type = EV_ABS, .code = ABS_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_Y, .value = 0 }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = 0 }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = 0 }, - { .type = EV_ABS, .code = ABS_MISC, .value = 0 }, - { .type = EV_MSC, .code = MSC_SERIAL, .value = 578837976 }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 0 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event motion[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_DISTANCE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_MSC, .code = MSC_SERIAL, .value = 578837976 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static int -get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value) -{ - switch (evcode) { - case ABS_TILT_X: - case ABS_TILT_Y: - *value = 0; - return 0; - case ABS_PRESSURE: - *value = 100; - return 0; - case ABS_DISTANCE: - *value = 0; - return 0; - } - return 1; -} - -static struct litest_device_interface interface = { - .tablet_proximity_in_events = proximity_in, - .tablet_proximity_out_events = proximity_out, - .tablet_motion_events = motion, - - .get_axis_default = get_axis_default, -}; - -static struct input_absinfo absinfo[] = { - { ABS_X, 0, 44704, 4, 0, 200 }, - { ABS_Y, 0, 27940, 4, 0, 200 }, - { ABS_Z, -900, 899, 0, 0, 0 }, - { ABS_THROTTLE, -1023, 1023, 0, 0, 0 }, - { ABS_WHEEL, 0, 1023, 0, 0, 0 }, - { ABS_PRESSURE, 0, 2047, 0, 0, 0 }, - { ABS_DISTANCE, 0, 63, 0, 0, 0 }, - { ABS_TILT_X, 0, 127, 0, 0, 0 }, - { ABS_TILT_Y, 0, 127, 0, 0, 0 }, - { ABS_MISC, 0, 0, 0, 0, 0 }, - { .value = -1 }, -}; - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x56a, - .product = 0x27, -}; - -static int events[] = { - EV_KEY, BTN_0, - EV_KEY, BTN_1, - EV_KEY, BTN_2, - EV_KEY, BTN_3, - EV_KEY, BTN_4, - EV_KEY, BTN_5, - EV_KEY, BTN_6, - EV_KEY, BTN_7, - EV_KEY, BTN_8, - EV_KEY, BTN_LEFT, - EV_KEY, BTN_RIGHT, - EV_KEY, BTN_MIDDLE, - EV_KEY, BTN_SIDE, - EV_KEY, BTN_EXTRA, - EV_KEY, BTN_TOOL_PEN, - EV_KEY, BTN_TOOL_RUBBER, - EV_KEY, BTN_TOOL_BRUSH, - EV_KEY, BTN_TOOL_PENCIL, - EV_KEY, BTN_TOOL_AIRBRUSH, - EV_KEY, BTN_TOOL_MOUSE, - EV_KEY, BTN_TOOL_LENS, - EV_KEY, BTN_TOUCH, - EV_KEY, BTN_STYLUS, - EV_KEY, BTN_STYLUS2, - EV_REL, REL_WHEEL, - EV_MSC, MSC_SERIAL, - INPUT_PROP_MAX, INPUT_PROP_POINTER, - -1, -1, -}; - -struct litest_test_device litest_wacom_intuos_tablet_device = { - .type = LITEST_WACOM_INTUOS, - .features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT, - .shortname = "wacom-intuos-tablet", - .setup = litest_wacom_intuos_tablet_setup, - .interface = &interface, - - .name = "Wacom Intuos5 touch M Pen", - .id = &input_id, - .events = events, - .absinfo = absinfo, -}; diff -Nru libinput-1.2.2/test/litest-device-wacom-isdv4-tablet.c libinput-0.21.0/test/litest-device-wacom-isdv4-tablet.c --- libinput-1.2.2/test/litest-device-wacom-isdv4-tablet.c 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/test/litest-device-wacom-isdv4-tablet.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -/* - * Copyright © 2014 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_wacom_isdv4_tablet_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_WACOM_ISDV4); - litest_set_current_device(d); -} - -static struct input_event proximity_in[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 1 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event proximity_out[] = { - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 0 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event motion[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static int -get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value) -{ - switch (evcode) { - case ABS_PRESSURE: - *value = 100; - return 0; - } - return 1; -} - -static struct litest_device_interface interface = { - .tablet_proximity_in_events = proximity_in, - .tablet_proximity_out_events = proximity_out, - .tablet_motion_events = motion, - - .get_axis_default = get_axis_default, -}; - -static struct input_absinfo absinfo[] = { - { ABS_X, 0, 27760, 4, 0, 100 }, - { ABS_Y, 0, 15694, 4, 0, 100 }, - { ABS_PRESSURE, 0, 255, 0, 0, 0 }, - { .value = -1 }, -}; - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x56a, - .product = 0xe6, -}; - -static int events[] = { - EV_KEY, BTN_TOOL_PEN, - EV_KEY, BTN_TOOL_RUBBER, - EV_KEY, BTN_TOUCH, - EV_KEY, BTN_STYLUS, - EV_KEY, BTN_STYLUS2, - INPUT_PROP_MAX, INPUT_PROP_DIRECT, - -1, -1, -}; - -struct litest_test_device litest_wacom_isdv4_tablet_device = { - .type = LITEST_WACOM_ISDV4, - .features = LITEST_TABLET, - .shortname = "wacom-isdv4-tablet", - .setup = litest_wacom_isdv4_tablet_setup, - .interface = &interface, - - .name = "Wacom ISDv4 E6 Pen", - .id = &input_id, - .events = events, - .absinfo = absinfo, -}; diff -Nru libinput-1.2.2/test/litest-device-waltop-tablet.c libinput-0.21.0/test/litest-device-waltop-tablet.c --- libinput-1.2.2/test/litest-device-waltop-tablet.c 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/test/litest-device-waltop-tablet.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,241 +0,0 @@ -/* - * Copyright © 2014 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_waltop_tablet_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_WALTOP); - litest_set_current_device(d); -} - -static struct input_event proximity_in[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 1 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event proximity_out[] = { - { .type = EV_ABS, .code = ABS_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_Y, .value = 0 }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = 0 }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = 0 }, - { .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 0 }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static struct input_event motion[] = { - { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN }, - { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, - { .type = -1, .code = -1 }, -}; - -static int -get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value) -{ - switch (evcode) { - case ABS_TILT_X: - case ABS_TILT_Y: - *value = 0; - return 0; - case ABS_PRESSURE: - *value = 100; - return 0; - } - return 1; -} - -static struct litest_device_interface interface = { - .tablet_proximity_in_events = proximity_in, - .tablet_proximity_out_events = proximity_out, - .tablet_motion_events = motion, - - .get_axis_default = get_axis_default, -}; - -static struct input_absinfo absinfo[] = { - { ABS_X, 0, 32000, 0, 0, 0 }, - { ABS_Y, 0, 32000, 0, 0, 0 }, - { ABS_PRESSURE, 0, 2047, 0, 0, 0 }, - { ABS_TILT_X, -127, 127, 0, 0, 0 }, - { ABS_TILT_Y, -127, 127, 0, 0, 0 }, - { .value = -1 }, -}; - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x172f, - .product = 0x509, -}; - -static int events[] = { - EV_KEY, KEY_ESC, - EV_KEY, KEY_1, - EV_KEY, KEY_2, - EV_KEY, KEY_3, - EV_KEY, KEY_4, - EV_KEY, KEY_5, - EV_KEY, KEY_6, - EV_KEY, KEY_7, - EV_KEY, KEY_8, - EV_KEY, KEY_9, - EV_KEY, KEY_0, - EV_KEY, KEY_MINUS, - EV_KEY, KEY_EQUAL, - EV_KEY, KEY_BACKSPACE, - EV_KEY, KEY_TAB, - EV_KEY, KEY_Q, - EV_KEY, KEY_W, - EV_KEY, KEY_E, - EV_KEY, KEY_R, - EV_KEY, KEY_T, - EV_KEY, KEY_Y, - EV_KEY, KEY_U, - EV_KEY, KEY_I, - EV_KEY, KEY_O, - EV_KEY, KEY_P, - EV_KEY, KEY_LEFTBRACE, - EV_KEY, KEY_RIGHTBRACE, - EV_KEY, KEY_ENTER, - EV_KEY, KEY_LEFTCTRL, - EV_KEY, KEY_A, - EV_KEY, KEY_S, - EV_KEY, KEY_D, - EV_KEY, KEY_F, - EV_KEY, KEY_G, - EV_KEY, KEY_H, - EV_KEY, KEY_J, - EV_KEY, KEY_K, - EV_KEY, KEY_L, - EV_KEY, KEY_SEMICOLON, - EV_KEY, KEY_APOSTROPHE, - EV_KEY, KEY_GRAVE, - EV_KEY, KEY_LEFTSHIFT, - EV_KEY, KEY_BACKSLASH, - EV_KEY, KEY_Z, - EV_KEY, KEY_X, - EV_KEY, KEY_C, - EV_KEY, KEY_V, - EV_KEY, KEY_B, - EV_KEY, KEY_N, - EV_KEY, KEY_M, - EV_KEY, KEY_COMMA, - EV_KEY, KEY_DOT, - EV_KEY, KEY_SLASH, - EV_KEY, KEY_RIGHTSHIFT, - EV_KEY, KEY_KPASTERISK, - EV_KEY, KEY_LEFTALT, - EV_KEY, KEY_SPACE, - EV_KEY, KEY_CAPSLOCK, - EV_KEY, KEY_F1, - EV_KEY, KEY_F2, - EV_KEY, KEY_F3, - EV_KEY, KEY_F4, - EV_KEY, KEY_F5, - EV_KEY, KEY_F6, - EV_KEY, KEY_F7, - EV_KEY, KEY_F8, - EV_KEY, KEY_F9, - EV_KEY, KEY_F10, - EV_KEY, KEY_NUMLOCK, - EV_KEY, KEY_SCROLLLOCK, - EV_KEY, KEY_KP7, - EV_KEY, KEY_KP8, - EV_KEY, KEY_KP9, - EV_KEY, KEY_KPMINUS, - EV_KEY, KEY_KP4, - EV_KEY, KEY_KP5, - EV_KEY, KEY_KP6, - EV_KEY, KEY_KPPLUS, - EV_KEY, KEY_KP1, - EV_KEY, KEY_KP2, - EV_KEY, KEY_KP3, - EV_KEY, KEY_KP0, - EV_KEY, KEY_KPDOT, - EV_KEY, KEY_102ND, - EV_KEY, KEY_F11, - EV_KEY, KEY_F12, - EV_KEY, KEY_KPENTER, - EV_KEY, KEY_RIGHTCTRL, - EV_KEY, KEY_KPSLASH, - EV_KEY, KEY_SYSRQ, - EV_KEY, KEY_RIGHTALT, - EV_KEY, KEY_HOME, - EV_KEY, KEY_UP, - EV_KEY, KEY_PAGEUP, - EV_KEY, KEY_LEFT, - EV_KEY, KEY_RIGHT, - EV_KEY, KEY_END, - EV_KEY, KEY_DOWN, - EV_KEY, KEY_PAGEDOWN, - EV_KEY, KEY_INSERT, - EV_KEY, KEY_DELETE, - EV_KEY, KEY_MUTE, - EV_KEY, KEY_VOLUMEDOWN, - EV_KEY, KEY_VOLUMEUP, - EV_KEY, KEY_PAUSE, - EV_KEY, KEY_LEFTMETA, - EV_KEY, KEY_RIGHTMETA, - EV_KEY, KEY_COMPOSE, - EV_KEY, BTN_0, - EV_KEY, BTN_LEFT, - EV_KEY, BTN_RIGHT, - EV_KEY, BTN_MIDDLE, - EV_KEY, BTN_SIDE, - EV_KEY, BTN_EXTRA, - EV_KEY, BTN_TOOL_PEN, - EV_KEY, BTN_TOOL_RUBBER, - EV_KEY, BTN_TOUCH, - EV_KEY, BTN_STYLUS, - EV_REL, REL_HWHEEL, - EV_REL, REL_WHEEL, - EV_MSC, MSC_SERIAL, - -1, -1, -}; - -struct litest_test_device litest_waltop_tablet_device = { - .type = LITEST_WALTOP, - .features = LITEST_TABLET | LITEST_WHEEL | LITEST_TILT, - .shortname = "waltop-tablet", - .setup = litest_waltop_tablet_setup, - .interface = &interface, - - .name = " WALTOP Batteryless Tablet ", /* sic */ - .id = &input_id, - .events = events, - .absinfo = absinfo, -}; diff -Nru libinput-1.2.2/test/litest-device-yubikey.c libinput-0.21.0/test/litest-device-yubikey.c --- libinput-1.2.2/test/litest-device-yubikey.c 2016-02-24 06:33:17.000000000 +0000 +++ libinput-0.21.0/test/litest-device-yubikey.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,169 +0,0 @@ -/* - * Copyright © 2014 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "litest.h" -#include "litest-int.h" - -static void litest_yubikey_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_YUBIKEY); - litest_set_current_device(d); -} - -static struct input_id input_id = { - .bustype = 0x3, - .vendor = 0x1050, - .product = 0x10, -}; - -static int events[] = { - EV_KEY, KEY_ESC, - EV_KEY, KEY_1, - EV_KEY, KEY_2, - EV_KEY, KEY_3, - EV_KEY, KEY_4, - EV_KEY, KEY_5, - EV_KEY, KEY_6, - EV_KEY, KEY_7, - EV_KEY, KEY_8, - EV_KEY, KEY_9, - EV_KEY, KEY_0, - EV_KEY, KEY_MINUS, - EV_KEY, KEY_EQUAL, - EV_KEY, KEY_BACKSPACE, - EV_KEY, KEY_TAB, - EV_KEY, KEY_Q, - EV_KEY, KEY_W, - EV_KEY, KEY_E, - EV_KEY, KEY_R, - EV_KEY, KEY_T, - EV_KEY, KEY_Y, - EV_KEY, KEY_U, - EV_KEY, KEY_I, - EV_KEY, KEY_O, - EV_KEY, KEY_P, - EV_KEY, KEY_LEFTBRACE, - EV_KEY, KEY_RIGHTBRACE, - EV_KEY, KEY_ENTER, - EV_KEY, KEY_LEFTCTRL, - EV_KEY, KEY_A, - EV_KEY, KEY_S, - EV_KEY, KEY_D, - EV_KEY, KEY_F, - EV_KEY, KEY_G, - EV_KEY, KEY_H, - EV_KEY, KEY_J, - EV_KEY, KEY_K, - EV_KEY, KEY_L, - EV_KEY, KEY_SEMICOLON, - EV_KEY, KEY_APOSTROPHE, - EV_KEY, KEY_GRAVE, - EV_KEY, KEY_LEFTSHIFT, - EV_KEY, KEY_BACKSLASH, - EV_KEY, KEY_Z, - EV_KEY, KEY_X, - EV_KEY, KEY_C, - EV_KEY, KEY_V, - EV_KEY, KEY_B, - EV_KEY, KEY_N, - EV_KEY, KEY_M, - EV_KEY, KEY_COMMA, - EV_KEY, KEY_DOT, - EV_KEY, KEY_SLASH, - EV_KEY, KEY_RIGHTSHIFT, - EV_KEY, KEY_KPASTERISK, - EV_KEY, KEY_LEFTALT, - EV_KEY, KEY_SPACE, - EV_KEY, KEY_CAPSLOCK, - EV_KEY, KEY_F1, - EV_KEY, KEY_F2, - EV_KEY, KEY_F3, - EV_KEY, KEY_F4, - EV_KEY, KEY_F5, - EV_KEY, KEY_F6, - EV_KEY, KEY_F7, - EV_KEY, KEY_F8, - EV_KEY, KEY_F9, - EV_KEY, KEY_F10, - EV_KEY, KEY_NUMLOCK, - EV_KEY, KEY_SCROLLLOCK, - EV_KEY, KEY_KP7, - EV_KEY, KEY_KP8, - EV_KEY, KEY_KP9, - EV_KEY, KEY_KPMINUS, - EV_KEY, KEY_KP4, - EV_KEY, KEY_KP5, - EV_KEY, KEY_KP6, - EV_KEY, KEY_KPPLUS, - EV_KEY, KEY_KP1, - EV_KEY, KEY_KP2, - EV_KEY, KEY_KP3, - EV_KEY, KEY_KP0, - EV_KEY, KEY_KPDOT, - EV_KEY, KEY_102ND, - EV_KEY, KEY_F11, - EV_KEY, KEY_F12, - EV_KEY, KEY_KPENTER, - EV_KEY, KEY_RIGHTCTRL, - EV_KEY, KEY_KPSLASH, - EV_KEY, KEY_SYSRQ, - EV_KEY, KEY_RIGHTALT, - EV_KEY, KEY_HOME, - EV_KEY, KEY_UP, - EV_KEY, KEY_PAGEUP, - EV_KEY, KEY_LEFT, - EV_KEY, KEY_RIGHT, - EV_KEY, KEY_END, - EV_KEY, KEY_DOWN, - EV_KEY, KEY_PAGEDOWN, - EV_KEY, KEY_INSERT, - EV_KEY, KEY_DELETE, - EV_KEY, KEY_PAUSE, - EV_KEY, KEY_LEFTMETA, - EV_KEY, KEY_RIGHTMETA, - EV_KEY, KEY_COMPOSE, - - EV_LED, LED_NUML, - EV_LED, LED_CAPSL, - EV_LED, LED_SCROLLL, - EV_LED, LED_COMPOSE, - EV_LED, LED_KANA, - -1, -1, -}; - -struct litest_test_device litest_yubikey_device = { - .type = LITEST_YUBIKEY, - .features = LITEST_KEYS, - .shortname = "yubikey", - .setup = litest_yubikey_setup, - .interface = NULL, - - .name = "Yubico Yubico Yubikey II", - .id = &input_id, - .events = events, - .absinfo = NULL, -}; diff -Nru libinput-1.2.2/test/litest.h libinput-0.21.0/test/litest.h --- libinput-1.2.2/test/litest.h 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/test/litest.h 2015-08-03 04:35:00.000000000 +0000 @@ -35,28 +35,6 @@ #include #include -void -litest_fail_condition(const char *file, - int line, - const char *func, - const char *condition, - const char *message, - ...); -void -litest_fail_comparison_int(const char *file, - int line, - const char *func, - const char *operator, - int a, - int b, - const char *astr, - const char *bstr); -void -litest_fail_comparison_ptr(const char *file, - int line, - const char *func, - const char *comparison); - #define litest_assert(cond) \ do { \ if (!(cond)) \ @@ -133,24 +111,6 @@ #define litest_assert_ptr_notnull(a_) \ litest_assert_comparison_ptr_(a_, !=, NULL) -#define litest_assert_double_eq(a_, b_)\ - ck_assert_int_eq((int)((a_) * 256), (int)((b_) * 256)) - -#define litest_assert_double_ne(a_, b_)\ - ck_assert_int_ne((int)((a_) * 256), (int)((b_) * 256)) - -#define litest_assert_double_lt(a_, b_)\ - ck_assert_int_lt((int)((a_) * 256), (int)((b_) * 256)) - -#define litest_assert_double_le(a_, b_)\ - ck_assert_int_le((int)((a_) * 256), (int)((b_) * 256)) - -#define litest_assert_double_gt(a_, b_)\ - ck_assert_int_gt((int)((a_) * 256), (int)((b_) * 256)) - -#define litest_assert_double_ge(a_, b_)\ - ck_assert_int_ge((int)((a_) * 256), (int)((b_) * 256)) - enum litest_device_type { LITEST_NO_DEVICE = -1, LITEST_SYNAPTICS_CLICKPAD = -2, @@ -182,20 +142,6 @@ LITEST_NEXUS4_TOUCH_SCREEN = -28, LITEST_MAGIC_TRACKPAD = -29, LITEST_ELANTECH_TOUCHPAD = -30, - LITEST_MOUSE_GLADIUS = -31, - LITEST_MOUSE_WHEEL_CLICK_ANGLE = -32, - LITEST_APPLE_KEYBOARD = -33, - LITEST_ANKER_MOUSE_KBD = -34, - LITEST_WACOM_BAMBOO = -35, - LITEST_WACOM_CINTIQ = -36, - LITEST_WACOM_INTUOS = -37, - LITEST_WACOM_ISDV4 = -38, - LITEST_WALTOP = -39, - LITEST_HUION_TABLET = -40, - LITEST_CYBORG_RAT = -41, - LITEST_YUBIKEY = -42, - LITEST_SYNAPTICS_I2C = -43, - LITEST_WACOM_CINTIQ_24HD = -44, }; enum litest_device_feature { @@ -218,10 +164,6 @@ LITEST_PROTOCOL_A = 1 << 14, LITEST_HOVER = 1 << 15, LITEST_ELLIPSE = 1 << 16, - LITEST_TABLET = 1 << 17, - LITEST_DISTANCE = 1 << 18, - LITEST_TOOL_SERIAL = 1 << 19, - LITEST_TILT = 1 << 20, }; struct litest_device { @@ -242,26 +184,9 @@ struct axis_replacement { int32_t evcode; - double value; + int32_t value; }; -static inline void -litest_axis_set_value(struct axis_replacement *axes, int code, double value) -{ - litest_assert_double_ge(value, 0.0); - litest_assert_double_le(value, 100.0); - - while (axes->evcode != -1) { - if (axes->evcode == code) { - axes->value = value; - return; - } - axes++; - } - - litest_abort_msg("Missing axis code %d\n", code); -} - /* A loop range, resolves to: for (i = lower; i < upper; i++) */ @@ -274,6 +199,28 @@ void litest_disable_log_handler(struct libinput *libinput); void litest_restore_log_handler(struct libinput *libinput); +void +litest_fail_condition(const char *file, + int line, + const char *func, + const char *condition, + const char *message, + ...); +void +litest_fail_comparison_int(const char *file, + int line, + const char *func, + const char *operator, + int a, + int b, + const char *astr, + const char *bstr); +void +litest_fail_comparison_ptr(const char *file, + int line, + const char *func, + const char *comparison); + #define litest_add(name_, func_, ...) \ _litest_add(name_, #func_, func_, __VA_ARGS__) #define litest_add_ranged(name_, func_, ...) \ @@ -286,49 +233,38 @@ _litest_add_no_device(name_, #func_, func_) #define litest_add_ranged_no_device(name_, func_, ...) \ _litest_add_ranged_no_device(name_, #func_, func_, __VA_ARGS__) -void -_litest_add(const char *name, - const char *funcname, - void *func, - enum litest_device_feature required_feature, - enum litest_device_feature excluded_feature); -void -_litest_add_ranged(const char *name, - const char *funcname, - void *func, - enum litest_device_feature required, - enum litest_device_feature excluded, - const struct range *range); -void -_litest_add_for_device(const char *name, - const char *funcname, - void *func, - enum litest_device_type type); -void -_litest_add_ranged_for_device(const char *name, - const char *funcname, - void *func, - enum litest_device_type type, - const struct range *range); -void -_litest_add_no_device(const char *name, - const char *funcname, - void *func); -void -_litest_add_ranged_no_device(const char *name, - const char *funcname, - void *func, - const struct range *range); - -extern void -litest_setup_tests(void); - -struct litest_device * -litest_create_device(enum litest_device_type which); - -struct litest_device * -litest_add_device(struct libinput *libinput, - enum litest_device_type which); +void _litest_add(const char *name, + const char *funcname, + void *func, + enum litest_device_feature required_feature, + enum litest_device_feature excluded_feature); +void _litest_add_ranged(const char *name, + const char *funcname, + void *func, + enum litest_device_feature required, + enum litest_device_feature excluded, + const struct range *range); +void _litest_add_for_device(const char *name, + const char *funcname, + void *func, + enum litest_device_type type); +void _litest_add_ranged_for_device(const char *name, + const char *funcname, + void *func, + enum litest_device_type type, + const struct range *range); +void _litest_add_no_device(const char *name, + const char *funcname, + void *func); +void _litest_add_ranged_no_device(const char *name, + const char *funcname, + void *func, + const struct range *range); + +extern void litest_setup_tests(void); +struct litest_device * litest_create_device(enum litest_device_type which); +struct litest_device * litest_add_device(struct libinput *libinput, + enum litest_device_type which); struct libevdev_uinput * litest_create_uinput_device_from_description(const char *name, const struct input_id *id, @@ -348,245 +284,138 @@ const struct input_absinfo *abs_override, const int *events_override); -struct litest_device * -litest_current_device(void); - -void -litest_delete_device(struct litest_device *d); - -int -litest_handle_events(struct litest_device *d); - -void -litest_event(struct litest_device *t, - unsigned int type, - unsigned int code, - int value); -int -litest_auto_assign_value(struct litest_device *d, - const struct input_event *ev, - int slot, double x, double y, - struct axis_replacement *axes, - bool touching); -void -litest_touch_up(struct litest_device *d, unsigned int slot); - -void -litest_touch_move(struct litest_device *d, - unsigned int slot, - double x, - double y); - -void -litest_touch_move_extended(struct litest_device *d, - unsigned int slot, - double x, - double y, - struct axis_replacement *axes); - -void -litest_touch_down(struct litest_device *d, - unsigned int slot, - double x, - double y); - -void -litest_touch_down_extended(struct litest_device *d, - unsigned int slot, - double x, - double y, - struct axis_replacement *axes); - -void -litest_touch_move_to(struct litest_device *d, - unsigned int slot, - double x_from, double y_from, - double x_to, double y_to, - int steps, int sleep_ms); - -void -litest_touch_move_two_touches(struct litest_device *d, - double x0, double y0, - double x1, double y1, - double dx, double dy, - int steps, int sleep_ms); - -void -litest_touch_move_three_touches(struct litest_device *d, - double x0, double y0, - double x1, double y1, - double x2, double y2, - double dx, double dy, - int steps, int sleep_ms); - -void -litest_tablet_proximity_in(struct litest_device *d, - int x, int y, - struct axis_replacement *axes); - -void -litest_tablet_proximity_out(struct litest_device *d); - -void -litest_tablet_motion(struct litest_device *d, - int x, int y, - struct axis_replacement *axes); - -void -litest_hover_start(struct litest_device *d, - unsigned int slot, - double x, - double y); - -void -litest_hover_end(struct litest_device *d, unsigned int slot); - +struct litest_device *litest_current_device(void); +void litest_delete_device(struct litest_device *d); +int litest_handle_events(struct litest_device *d); + +void litest_event(struct litest_device *t, + unsigned int type, + unsigned int code, + int value); +int litest_auto_assign_value(struct litest_device *d, + const struct input_event *ev, + int slot, double x, double y, + struct axis_replacement *axes, + bool touching); +void litest_touch_up(struct litest_device *d, unsigned int slot); +void litest_touch_move(struct litest_device *d, + unsigned int slot, + double x, + double y); +void litest_touch_move_extended(struct litest_device *d, + unsigned int slot, + double x, + double y, + struct axis_replacement *axes); +void litest_touch_down(struct litest_device *d, + unsigned int slot, + double x, + double y); +void litest_touch_down_extended(struct litest_device *d, + unsigned int slot, + double x, + double y, + struct axis_replacement *axes); +void litest_touch_move_to(struct litest_device *d, + unsigned int slot, + double x_from, double y_from, + double x_to, double y_to, + int steps, int sleep_ms); +void litest_touch_move_two_touches(struct litest_device *d, + double x0, double y0, + double x1, double y1, + double dx, double dy, + int steps, int sleep_ms); +void litest_touch_move_three_touches(struct litest_device *d, + double x0, double y0, + double x1, double y1, + double x2, double y2, + double dx, double dy, + int steps, int sleep_ms); +void litest_hover_start(struct litest_device *d, + unsigned int slot, + double x, + double y); +void litest_hover_end(struct litest_device *d, unsigned int slot); void litest_hover_move(struct litest_device *d, unsigned int slot, double x, double y); - -void -litest_hover_move_to(struct litest_device *d, - unsigned int slot, - double x_from, double y_from, - double x_to, double y_to, - int steps, int sleep_ms); - -void -litest_hover_move_two_touches(struct litest_device *d, - double x0, double y0, - double x1, double y1, - double dx, double dy, - int steps, int sleep_ms); - -void -litest_button_click(struct litest_device *d, - unsigned int button, - bool is_press); - -void -litest_button_scroll(struct litest_device *d, - unsigned int button, - double dx, double dy); - -void -litest_keyboard_key(struct litest_device *d, - unsigned int key, - bool is_press); - -void -litest_wait_for_event(struct libinput *li); - -void -litest_wait_for_event_of_type(struct libinput *li, ...); - -void -litest_drain_events(struct libinput *li); - -void -litest_assert_empty_queue(struct libinput *li); - -struct libinput_event_pointer * -litest_is_button_event(struct libinput_event *event, +void litest_hover_move_to(struct litest_device *d, + unsigned int slot, + double x_from, double y_from, + double x_to, double y_to, + int steps, int sleep_ms); +void litest_hover_move_two_touches(struct litest_device *d, + double x0, double y0, + double x1, double y1, + double dx, double dy, + int steps, int sleep_ms); +void litest_button_click(struct litest_device *d, + unsigned int button, + bool is_press); +void litest_button_scroll(struct litest_device *d, + unsigned int button, + double dx, double dy); +void litest_keyboard_key(struct litest_device *d, + unsigned int key, + bool is_press); +void litest_wait_for_event(struct libinput *li); +void litest_wait_for_event_of_type(struct libinput *li, ...); +void litest_drain_events(struct libinput *li); +void litest_assert_empty_queue(struct libinput *li); +struct libinput_event_pointer * litest_is_button_event( + struct libinput_event *event, unsigned int button, enum libinput_button_state state); - -struct libinput_event_pointer * -litest_is_axis_event(struct libinput_event *event, - enum libinput_pointer_axis axis, - enum libinput_pointer_axis_source source); - -struct libinput_event_pointer * -litest_is_motion_event(struct libinput_event *event); - -struct libinput_event_touch * -litest_is_touch_event(struct libinput_event *event, - enum libinput_event_type type); - -struct libinput_event_keyboard * -litest_is_keyboard_event(struct libinput_event *event, - unsigned int key, - enum libinput_key_state state); - -struct libinput_event_gesture * -litest_is_gesture_event(struct libinput_event *event, - enum libinput_event_type type, - int nfingers); - -struct libinput_event_tablet_tool * -litest_is_tablet_event(struct libinput_event *event, +struct libinput_event_pointer * litest_is_axis_event( + struct libinput_event *event, + enum libinput_pointer_axis axis, + enum libinput_pointer_axis_source source); +struct libinput_event_pointer * litest_is_motion_event( + struct libinput_event *event); +struct libinput_event_touch * litest_is_touch_event( + struct libinput_event *event, enum libinput_event_type type); +struct libinput_event_keyboard * litest_is_keyboard_event( + struct libinput_event *event, + unsigned int key, + enum libinput_key_state state); +struct libinput_event_gesture * litest_is_gesture_event( + struct libinput_event *event, + enum libinput_event_type type, + int nfingers); + +void litest_assert_button_event(struct libinput *li, + unsigned int button, + enum libinput_button_state state); +void litest_assert_scroll(struct libinput *li, + enum libinput_pointer_axis axis, + int minimum_movement); +void litest_assert_only_typed_events(struct libinput *li, + enum libinput_event_type type); + +struct libevdev_uinput * litest_create_uinput_device(const char *name, + struct input_id *id, + ...); +struct libevdev_uinput * litest_create_uinput_abs_device(const char *name, + struct input_id *id, + const struct input_absinfo *abs, + ...); + +void litest_timeout_tap(void); +void litest_timeout_tapndrag(void); +void litest_timeout_softbuttons(void); +void litest_timeout_buttonscroll(void); +void litest_timeout_edgescroll(void); +void litest_timeout_finger_switch(void); +void litest_timeout_middlebutton(void); +void litest_timeout_dwt_short(void); +void litest_timeout_dwt_long(void); +void litest_timeout_gesture(void); -void -litest_assert_button_event(struct libinput *li, - unsigned int button, - enum libinput_button_state state); - -void -litest_assert_scroll(struct libinput *li, - enum libinput_pointer_axis axis, - int minimum_movement); - -void -litest_assert_only_typed_events(struct libinput *li, - enum libinput_event_type type); - -void -litest_assert_tablet_button_event(struct libinput *li, - unsigned int button, - enum libinput_button_state state); - -void -litest_assert_tablet_proximity_event(struct libinput *li, - enum libinput_tablet_tool_proximity_state state); - -struct libevdev_uinput * -litest_create_uinput_device(const char *name, - struct input_id *id, - ...); - -struct libevdev_uinput * -litest_create_uinput_abs_device(const char *name, - struct input_id *id, - const struct input_absinfo *abs, - ...); - -void -litest_timeout_tap(void); - -void -litest_timeout_tapndrag(void); - -void -litest_timeout_softbuttons(void); - -void -litest_timeout_buttonscroll(void); - -void -litest_timeout_edgescroll(void); - -void -litest_timeout_finger_switch(void); - -void -litest_timeout_middlebutton(void); - -void -litest_timeout_dwt_short(void); - -void -litest_timeout_dwt_long(void); - -void -litest_timeout_gesture(void); - -void -litest_push_event_frame(struct litest_device *dev); - -void -litest_pop_event_frame(struct litest_device *dev); +void litest_push_event_frame(struct litest_device *dev); +void litest_pop_event_frame(struct litest_device *dev); /* this is a semi-mt device, so we keep track of the touches that the tests * send and modify them so that the first touch is always slot 0 and sends @@ -603,22 +432,17 @@ } touches[2]; }; -void -litest_semi_mt_touch_down(struct litest_device *d, - struct litest_semi_mt *semi_mt, - unsigned int slot, - double x, double y); - -void -litest_semi_mt_touch_move(struct litest_device *d, - struct litest_semi_mt *semi_mt, - unsigned int slot, - double x, double y); - -void -litest_semi_mt_touch_up(struct litest_device *d, - struct litest_semi_mt *semi_mt, - unsigned int slot); +void litest_semi_mt_touch_down(struct litest_device *d, + struct litest_semi_mt *semi_mt, + unsigned int slot, + double x, double y); +void litest_semi_mt_touch_move(struct litest_device *d, + struct litest_semi_mt *semi_mt, + unsigned int slot, + double x, double y); +void litest_semi_mt_touch_up(struct litest_device *d, + struct litest_semi_mt *semi_mt, + unsigned int slot); #ifndef ck_assert_notnull #define ck_assert_notnull(ptr) ck_assert_ptr_ne(ptr, NULL) @@ -648,30 +472,6 @@ litest_assert_int_eq(status, expected); } -static inline void -litest_enable_tap_drag(struct libinput_device *device) -{ - enum libinput_config_status status, expected; - - expected = LIBINPUT_CONFIG_STATUS_SUCCESS; - status = libinput_device_config_tap_set_drag_enabled(device, - LIBINPUT_CONFIG_DRAG_ENABLED); - - litest_assert_int_eq(status, expected); -} - -static inline void -litest_disable_tap_drag(struct libinput_device *device) -{ - enum libinput_config_status status, expected; - - expected = LIBINPUT_CONFIG_STATUS_SUCCESS; - status = libinput_device_config_tap_set_drag_enabled(device, - LIBINPUT_CONFIG_DRAG_DISABLED); - - litest_assert_int_eq(status, expected); -} - static inline bool litest_has_2fg_scroll(struct litest_device *dev) { @@ -731,6 +531,16 @@ litest_assert_int_eq(status, expected); } +static inline int +litest_is_synaptics_semi_mt(struct litest_device *dev) +{ + struct libevdev *evdev = dev->evdev; + + return libevdev_has_property(evdev, INPUT_PROP_SEMI_MT) && + libevdev_get_id_vendor(evdev) == 0x2 && + libevdev_get_id_product(evdev) == 0x7; +} + static inline void litest_enable_drag_lock(struct libinput_device *device) { diff -Nru libinput-1.2.2/test/litest-int.h libinput-0.21.0/test/litest-int.h --- libinput-1.2.2/test/litest-int.h 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/test/litest-int.h 2015-07-28 22:12:38.000000000 +0000 @@ -97,16 +97,8 @@ struct input_event *touch_move_events; struct input_event *touch_up_events; - /** - * Tablet events, LITEST_AUTO_ASSIGN is allowed on event values for - * ABS_X, ABS_Y, ABS_DISTANCE and ABS_PRESSURE. - */ - struct input_event *tablet_proximity_in_events; - struct input_event *tablet_proximity_out_events; - struct input_event *tablet_motion_events; - - int min[2]; /* x/y axis minimum */ - int max[2]; /* x/y axis maximum */ + int min[2]; + int max[2]; }; void litest_set_current_device(struct litest_device *device); diff -Nru libinput-1.2.2/test/litest-selftest.c libinput-0.21.0/test/litest-selftest.c --- libinput-1.2.2/test/litest-selftest.c 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/test/litest-selftest.c 2015-07-28 22:12:38.000000000 +0000 @@ -169,8 +169,8 @@ int v = 10; int *a = &v; int *b = &v; - int *c = NULL; - int *d = NULL; + int c = NULL; + int d = NULL; litest_assert_ptr_eq(a, b); litest_assert_ptr_eq(c, d); diff -Nru libinput-1.2.2/test/Makefile.am libinput-0.21.0/test/Makefile.am --- libinput-1.2.2/test/Makefile.am 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/test/Makefile.am 2015-08-03 03:44:47.000000000 +0000 @@ -15,15 +15,10 @@ litest-int.h \ litest-device-alps-semi-mt.c \ litest-device-alps-dualpoint.c \ - litest-device-anker-mouse-kbd.c \ - litest-device-apple-internal-keyboard.c \ - litest-device-asus-rog-gladius.c \ litest-device-atmel-hover.c \ litest-device-bcm5974.c \ - litest-device-cyborg-rat-5.c \ litest-device-elantech-touchpad.c \ litest-device-generic-singletouch.c \ - litest-device-huion-pentablet.c \ litest-device-keyboard.c \ litest-device-keyboard-razer-blackwidow.c \ litest-device-logitech-trackball.c \ @@ -32,30 +27,21 @@ litest-device-mouse.c \ litest-device-mouse-roccat.c \ litest-device-mouse-low-dpi.c \ - litest-device-mouse-wheel-click-angle.c \ litest-device-ms-surface-cover.c \ litest-device-protocol-a-touch-screen.c \ litest-device-qemu-usb-tablet.c \ litest-device-synaptics.c \ litest-device-synaptics-hover.c \ - litest-device-synaptics-i2c.c \ litest-device-synaptics-st.c \ litest-device-synaptics-t440.c \ litest-device-synaptics-x1-carbon-3rd.c \ litest-device-trackpoint.c \ litest-device-touch-screen.c \ - litest-device-wacom-bamboo-tablet.c \ - litest-device-wacom-cintiq-tablet.c \ - litest-device-wacom-cintiq-24hd.c \ - litest-device-wacom-intuos-tablet.c \ - litest-device-wacom-isdv4-tablet.c \ litest-device-wacom-touch.c \ litest-device-wacom-intuos-finger.c \ - litest-device-waltop-tablet.c \ litest-device-wheel-only.c \ litest-device-xen-virtual-pointer.c \ litest-device-vmware-virtual-usb-mouse.c \ - litest-device-yubikey.c \ litest.c liblitest_la_LIBADD = $(top_builddir)/src/libinput-util.la liblitest_la_CFLAGS = $(AM_CFLAGS) \ @@ -71,7 +57,6 @@ test-touchpad \ test-touchpad-tap \ test-touchpad-buttons \ - test-tablet \ test-device \ test-gestures \ test-pointer \ @@ -116,10 +101,6 @@ test_log_LDADD = $(TEST_LIBS) test_log_LDFLAGS = -no-install -test_tablet_SOURCES = tablet.c -test_tablet_LDADD = $(TEST_LIBS) -test_tablet_LDFLAGS = -static - test_touchpad_SOURCES = touchpad.c test_touchpad_LDADD = $(TEST_LIBS) test_touchpad_LDFLAGS = -no-install @@ -137,7 +118,6 @@ test_trackpoint_LDFLAGS = -no-install test_misc_SOURCES = misc.c -test_misc_CFLAGS= $(AM_CFLAGS) -DLIBINPUT_LT_VERSION="\"$(LIBINPUT_LT_VERSION)\"" test_misc_LDADD = $(TEST_LIBS) test_misc_LDFLAGS = -no-install diff -Nru libinput-1.2.2/test/Makefile.in libinput-0.21.0/test/Makefile.in --- libinput-1.2.2/test/Makefile.in 2016-03-15 00:23:56.000000000 +0000 +++ libinput-0.21.0/test/Makefile.in 2015-08-04 00:58:31.000000000 +0000 @@ -118,48 +118,32 @@ @BUILD_TESTS_TRUE@ $(am__DEPENDENCIES_2) am__liblitest_la_SOURCES_DIST = litest.h litest-int.h \ litest-device-alps-semi-mt.c litest-device-alps-dualpoint.c \ - litest-device-anker-mouse-kbd.c \ - litest-device-apple-internal-keyboard.c \ - litest-device-asus-rog-gladius.c litest-device-atmel-hover.c \ - litest-device-bcm5974.c litest-device-cyborg-rat-5.c \ + litest-device-atmel-hover.c litest-device-bcm5974.c \ litest-device-elantech-touchpad.c \ - litest-device-generic-singletouch.c \ - litest-device-huion-pentablet.c litest-device-keyboard.c \ + litest-device-generic-singletouch.c litest-device-keyboard.c \ litest-device-keyboard-razer-blackwidow.c \ litest-device-logitech-trackball.c \ litest-device-nexus4-touch-screen.c \ litest-device-magic-trackpad.c litest-device-mouse.c \ litest-device-mouse-roccat.c litest-device-mouse-low-dpi.c \ - litest-device-mouse-wheel-click-angle.c \ litest-device-ms-surface-cover.c \ litest-device-protocol-a-touch-screen.c \ litest-device-qemu-usb-tablet.c litest-device-synaptics.c \ - litest-device-synaptics-hover.c litest-device-synaptics-i2c.c \ - litest-device-synaptics-st.c litest-device-synaptics-t440.c \ + litest-device-synaptics-hover.c litest-device-synaptics-st.c \ + litest-device-synaptics-t440.c \ litest-device-synaptics-x1-carbon-3rd.c \ litest-device-trackpoint.c litest-device-touch-screen.c \ - litest-device-wacom-bamboo-tablet.c \ - litest-device-wacom-cintiq-tablet.c \ - litest-device-wacom-cintiq-24hd.c \ - litest-device-wacom-intuos-tablet.c \ - litest-device-wacom-isdv4-tablet.c litest-device-wacom-touch.c \ - litest-device-wacom-intuos-finger.c \ - litest-device-waltop-tablet.c litest-device-wheel-only.c \ + litest-device-wacom-touch.c \ + litest-device-wacom-intuos-finger.c litest-device-wheel-only.c \ litest-device-xen-virtual-pointer.c \ - litest-device-vmware-virtual-usb-mouse.c \ - litest-device-yubikey.c litest.c + litest-device-vmware-virtual-usb-mouse.c litest.c @BUILD_TESTS_TRUE@am_liblitest_la_OBJECTS = \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-alps-semi-mt.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-alps-dualpoint.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-anker-mouse-kbd.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-apple-internal-keyboard.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-asus-rog-gladius.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-atmel-hover.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-bcm5974.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-cyborg-rat-5.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-elantech-touchpad.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-generic-singletouch.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-huion-pentablet.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-keyboard.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-keyboard-razer-blackwidow.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-logitech-trackball.lo \ @@ -168,30 +152,21 @@ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-mouse.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-mouse-roccat.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-mouse-low-dpi.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-mouse-wheel-click-angle.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-ms-surface-cover.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-protocol-a-touch-screen.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-qemu-usb-tablet.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-synaptics.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-synaptics-hover.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-synaptics-i2c.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-synaptics-st.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-synaptics-t440.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-synaptics-x1-carbon-3rd.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-trackpoint.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-touch-screen.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-wacom-bamboo-tablet.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-wacom-cintiq-tablet.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-wacom-cintiq-24hd.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-wacom-intuos-tablet.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-wacom-isdv4-tablet.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-wacom-touch.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-wacom-intuos-finger.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-waltop-tablet.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-wheel-only.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-xen-virtual-pointer.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest-device-vmware-virtual-usb-mouse.lo \ -@BUILD_TESTS_TRUE@ liblitest_la-litest-device-yubikey.lo \ @BUILD_TESTS_TRUE@ liblitest_la-litest.lo liblitest_la_OBJECTS = $(am_liblitest_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -209,12 +184,11 @@ @BUILD_TESTS_TRUE@am__EXEEXT_2 = test-touchpad$(EXEEXT) \ @BUILD_TESTS_TRUE@ test-touchpad-tap$(EXEEXT) \ @BUILD_TESTS_TRUE@ test-touchpad-buttons$(EXEEXT) \ -@BUILD_TESTS_TRUE@ test-tablet$(EXEEXT) test-device$(EXEEXT) \ -@BUILD_TESTS_TRUE@ test-gestures$(EXEEXT) test-pointer$(EXEEXT) \ -@BUILD_TESTS_TRUE@ test-touch$(EXEEXT) test-trackpoint$(EXEEXT) \ -@BUILD_TESTS_TRUE@ test-udev$(EXEEXT) test-path$(EXEEXT) \ -@BUILD_TESTS_TRUE@ test-log$(EXEEXT) test-misc$(EXEEXT) \ -@BUILD_TESTS_TRUE@ test-keyboard$(EXEEXT) \ +@BUILD_TESTS_TRUE@ test-device$(EXEEXT) test-gestures$(EXEEXT) \ +@BUILD_TESTS_TRUE@ test-pointer$(EXEEXT) test-touch$(EXEEXT) \ +@BUILD_TESTS_TRUE@ test-trackpoint$(EXEEXT) test-udev$(EXEEXT) \ +@BUILD_TESTS_TRUE@ test-path$(EXEEXT) test-log$(EXEEXT) \ +@BUILD_TESTS_TRUE@ test-misc$(EXEEXT) test-keyboard$(EXEEXT) \ @BUILD_TESTS_TRUE@ test-litest-selftest$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am__test_build_cxx_SOURCES_DIST = build-cxx.cc @@ -298,12 +272,12 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(test_log_LDFLAGS) $(LDFLAGS) -o $@ am__test_misc_SOURCES_DIST = misc.c -@BUILD_TESTS_TRUE@am_test_misc_OBJECTS = test_misc-misc.$(OBJEXT) +@BUILD_TESTS_TRUE@am_test_misc_OBJECTS = misc.$(OBJEXT) test_misc_OBJECTS = $(am_test_misc_OBJECTS) @BUILD_TESTS_TRUE@test_misc_DEPENDENCIES = $(am__DEPENDENCIES_3) test_misc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_misc_CFLAGS) \ - $(CFLAGS) $(test_misc_LDFLAGS) $(LDFLAGS) -o $@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(test_misc_LDFLAGS) $(LDFLAGS) -o $@ am__test_path_SOURCES_DIST = path.c @BUILD_TESTS_TRUE@am_test_path_OBJECTS = path.$(OBJEXT) test_path_OBJECTS = $(am_test_path_OBJECTS) @@ -318,13 +292,6 @@ test_pointer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(test_pointer_LDFLAGS) $(LDFLAGS) -o $@ -am__test_tablet_SOURCES_DIST = tablet.c -@BUILD_TESTS_TRUE@am_test_tablet_OBJECTS = tablet.$(OBJEXT) -test_tablet_OBJECTS = $(am_test_tablet_OBJECTS) -@BUILD_TESTS_TRUE@test_tablet_DEPENDENCIES = $(am__DEPENDENCIES_3) -test_tablet_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(test_tablet_LDFLAGS) $(LDFLAGS) -o $@ am__test_touch_SOURCES_DIST = touch.c @BUILD_TESTS_TRUE@am_test_touch_OBJECTS = touch.$(OBJEXT) test_touch_OBJECTS = $(am_test_touch_OBJECTS) @@ -435,10 +402,10 @@ $(test_gestures_SOURCES) $(test_keyboard_SOURCES) \ $(test_litest_selftest_SOURCES) $(test_log_SOURCES) \ $(test_misc_SOURCES) $(test_path_SOURCES) \ - $(test_pointer_SOURCES) $(test_tablet_SOURCES) \ - $(test_touch_SOURCES) $(test_touchpad_SOURCES) \ - $(test_touchpad_buttons_SOURCES) $(test_touchpad_tap_SOURCES) \ - $(test_trackpoint_SOURCES) $(test_udev_SOURCES) + $(test_pointer_SOURCES) $(test_touch_SOURCES) \ + $(test_touchpad_SOURCES) $(test_touchpad_buttons_SOURCES) \ + $(test_touchpad_tap_SOURCES) $(test_trackpoint_SOURCES) \ + $(test_udev_SOURCES) DIST_SOURCES = $(am__liblitest_la_SOURCES_DIST) \ $(am__test_build_cxx_SOURCES_DIST) \ $(am__test_build_linker_SOURCES_DIST) \ @@ -450,7 +417,7 @@ $(am__test_litest_selftest_SOURCES_DIST) \ $(am__test_log_SOURCES_DIST) $(am__test_misc_SOURCES_DIST) \ $(am__test_path_SOURCES_DIST) $(am__test_pointer_SOURCES_DIST) \ - $(am__test_tablet_SOURCES_DIST) $(am__test_touch_SOURCES_DIST) \ + $(am__test_touch_SOURCES_DIST) \ $(am__test_touchpad_SOURCES_DIST) \ $(am__test_touchpad_buttons_SOURCES_DIST) \ $(am__test_touchpad_tap_SOURCES_DIST) \ @@ -749,12 +716,9 @@ LIBUDEV_LIBS = @LIBUDEV_LIBS@ LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@ LIBUNWIND_LIBS = @LIBUNWIND_LIBS@ -LIBWACOM_CFLAGS = @LIBWACOM_CFLAGS@ -LIBWACOM_LIBS = @LIBWACOM_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -854,15 +818,10 @@ @BUILD_TESTS_TRUE@ litest-int.h \ @BUILD_TESTS_TRUE@ litest-device-alps-semi-mt.c \ @BUILD_TESTS_TRUE@ litest-device-alps-dualpoint.c \ -@BUILD_TESTS_TRUE@ litest-device-anker-mouse-kbd.c \ -@BUILD_TESTS_TRUE@ litest-device-apple-internal-keyboard.c \ -@BUILD_TESTS_TRUE@ litest-device-asus-rog-gladius.c \ @BUILD_TESTS_TRUE@ litest-device-atmel-hover.c \ @BUILD_TESTS_TRUE@ litest-device-bcm5974.c \ -@BUILD_TESTS_TRUE@ litest-device-cyborg-rat-5.c \ @BUILD_TESTS_TRUE@ litest-device-elantech-touchpad.c \ @BUILD_TESTS_TRUE@ litest-device-generic-singletouch.c \ -@BUILD_TESTS_TRUE@ litest-device-huion-pentablet.c \ @BUILD_TESTS_TRUE@ litest-device-keyboard.c \ @BUILD_TESTS_TRUE@ litest-device-keyboard-razer-blackwidow.c \ @BUILD_TESTS_TRUE@ litest-device-logitech-trackball.c \ @@ -871,30 +830,21 @@ @BUILD_TESTS_TRUE@ litest-device-mouse.c \ @BUILD_TESTS_TRUE@ litest-device-mouse-roccat.c \ @BUILD_TESTS_TRUE@ litest-device-mouse-low-dpi.c \ -@BUILD_TESTS_TRUE@ litest-device-mouse-wheel-click-angle.c \ @BUILD_TESTS_TRUE@ litest-device-ms-surface-cover.c \ @BUILD_TESTS_TRUE@ litest-device-protocol-a-touch-screen.c \ @BUILD_TESTS_TRUE@ litest-device-qemu-usb-tablet.c \ @BUILD_TESTS_TRUE@ litest-device-synaptics.c \ @BUILD_TESTS_TRUE@ litest-device-synaptics-hover.c \ -@BUILD_TESTS_TRUE@ litest-device-synaptics-i2c.c \ @BUILD_TESTS_TRUE@ litest-device-synaptics-st.c \ @BUILD_TESTS_TRUE@ litest-device-synaptics-t440.c \ @BUILD_TESTS_TRUE@ litest-device-synaptics-x1-carbon-3rd.c \ @BUILD_TESTS_TRUE@ litest-device-trackpoint.c \ @BUILD_TESTS_TRUE@ litest-device-touch-screen.c \ -@BUILD_TESTS_TRUE@ litest-device-wacom-bamboo-tablet.c \ -@BUILD_TESTS_TRUE@ litest-device-wacom-cintiq-tablet.c \ -@BUILD_TESTS_TRUE@ litest-device-wacom-cintiq-24hd.c \ -@BUILD_TESTS_TRUE@ litest-device-wacom-intuos-tablet.c \ -@BUILD_TESTS_TRUE@ litest-device-wacom-isdv4-tablet.c \ @BUILD_TESTS_TRUE@ litest-device-wacom-touch.c \ @BUILD_TESTS_TRUE@ litest-device-wacom-intuos-finger.c \ -@BUILD_TESTS_TRUE@ litest-device-waltop-tablet.c \ @BUILD_TESTS_TRUE@ litest-device-wheel-only.c \ @BUILD_TESTS_TRUE@ litest-device-xen-virtual-pointer.c \ @BUILD_TESTS_TRUE@ litest-device-vmware-virtual-usb-mouse.c \ -@BUILD_TESTS_TRUE@ litest-device-yubikey.c \ @BUILD_TESTS_TRUE@ litest.c @BUILD_TESTS_TRUE@liblitest_la_LIBADD = \ @@ -909,7 +859,6 @@ @BUILD_TESTS_TRUE@ test-touchpad \ @BUILD_TESTS_TRUE@ test-touchpad-tap \ @BUILD_TESTS_TRUE@ test-touchpad-buttons \ -@BUILD_TESTS_TRUE@ test-tablet \ @BUILD_TESTS_TRUE@ test-device \ @BUILD_TESTS_TRUE@ test-gestures \ @BUILD_TESTS_TRUE@ test-pointer \ @@ -944,9 +893,6 @@ @BUILD_TESTS_TRUE@test_log_SOURCES = log.c @BUILD_TESTS_TRUE@test_log_LDADD = $(TEST_LIBS) @BUILD_TESTS_TRUE@test_log_LDFLAGS = -no-install -@BUILD_TESTS_TRUE@test_tablet_SOURCES = tablet.c -@BUILD_TESTS_TRUE@test_tablet_LDADD = $(TEST_LIBS) -@BUILD_TESTS_TRUE@test_tablet_LDFLAGS = -static @BUILD_TESTS_TRUE@test_touchpad_SOURCES = touchpad.c @BUILD_TESTS_TRUE@test_touchpad_LDADD = $(TEST_LIBS) @BUILD_TESTS_TRUE@test_touchpad_LDFLAGS = -no-install @@ -960,7 +906,6 @@ @BUILD_TESTS_TRUE@test_trackpoint_LDADD = $(TEST_LIBS) @BUILD_TESTS_TRUE@test_trackpoint_LDFLAGS = -no-install @BUILD_TESTS_TRUE@test_misc_SOURCES = misc.c -@BUILD_TESTS_TRUE@test_misc_CFLAGS = $(AM_CFLAGS) -DLIBINPUT_LT_VERSION="\"$(LIBINPUT_LT_VERSION)\"" @BUILD_TESTS_TRUE@test_misc_LDADD = $(TEST_LIBS) @BUILD_TESTS_TRUE@test_misc_LDFLAGS = -no-install @BUILD_TESTS_TRUE@test_keyboard_SOURCES = keyboard.c @@ -1109,10 +1054,6 @@ @rm -f test-pointer$(EXEEXT) $(AM_V_CCLD)$(test_pointer_LINK) $(test_pointer_OBJECTS) $(test_pointer_LDADD) $(LIBS) -test-tablet$(EXEEXT): $(test_tablet_OBJECTS) $(test_tablet_DEPENDENCIES) $(EXTRA_test_tablet_DEPENDENCIES) - @rm -f test-tablet$(EXEEXT) - $(AM_V_CCLD)$(test_tablet_LINK) $(test_tablet_OBJECTS) $(test_tablet_LDADD) $(LIBS) - test-touch$(EXEEXT): $(test_touch_OBJECTS) $(test_touch_DEPENDENCIES) $(EXTRA_test_touch_DEPENDENCIES) @rm -f test-touch$(EXEEXT) $(AM_V_CCLD)$(test_touch_LINK) $(test_touch_OBJECTS) $(test_touch_LDADD) $(LIBS) @@ -1148,29 +1089,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-alps-dualpoint.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-alps-semi-mt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-anker-mouse-kbd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-apple-internal-keyboard.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-asus-rog-gladius.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-atmel-hover.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-bcm5974.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-cyborg-rat-5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-elantech-touchpad.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-generic-singletouch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-huion-pentablet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-keyboard-razer-blackwidow.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-keyboard.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-logitech-trackball.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-magic-trackpad.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-mouse-low-dpi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-mouse-roccat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-mouse-wheel-click-angle.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-mouse.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-ms-surface-cover.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-nexus4-touch-screen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-protocol-a-touch-screen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-qemu-usb-tablet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-synaptics-hover.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-synaptics-i2c.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-synaptics-st.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-synaptics-t440.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-synaptics-x1-carbon-3rd.Plo@am__quote@ @@ -1178,29 +1112,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-touch-screen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-trackpoint.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-vmware-virtual-usb-mouse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-wacom-bamboo-tablet.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-wacom-cintiq-24hd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-wacom-cintiq-tablet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-wacom-intuos-finger.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-wacom-intuos-tablet.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-wacom-isdv4-tablet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-wacom-touch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-waltop-tablet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-wheel-only.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-xen-virtual-pointer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest-device-yubikey.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblitest_la-litest.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tablet.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_build_cxx-build-cxx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_build_linker-build-pedantic.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_build_pedantic_c99-build-pedantic.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_build_std_gnuc90-build-pedantic.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_litest_selftest-litest-selftest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_litest_selftest-litest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_misc-misc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/touch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/touchpad-buttons.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/touchpad-tap.Po@am__quote@ @@ -1243,27 +1169,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-alps-dualpoint.lo `test -f 'litest-device-alps-dualpoint.c' || echo '$(srcdir)/'`litest-device-alps-dualpoint.c -liblitest_la-litest-device-anker-mouse-kbd.lo: litest-device-anker-mouse-kbd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-anker-mouse-kbd.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-anker-mouse-kbd.Tpo -c -o liblitest_la-litest-device-anker-mouse-kbd.lo `test -f 'litest-device-anker-mouse-kbd.c' || echo '$(srcdir)/'`litest-device-anker-mouse-kbd.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-anker-mouse-kbd.Tpo $(DEPDIR)/liblitest_la-litest-device-anker-mouse-kbd.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-anker-mouse-kbd.c' object='liblitest_la-litest-device-anker-mouse-kbd.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-anker-mouse-kbd.lo `test -f 'litest-device-anker-mouse-kbd.c' || echo '$(srcdir)/'`litest-device-anker-mouse-kbd.c - -liblitest_la-litest-device-apple-internal-keyboard.lo: litest-device-apple-internal-keyboard.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-apple-internal-keyboard.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-apple-internal-keyboard.Tpo -c -o liblitest_la-litest-device-apple-internal-keyboard.lo `test -f 'litest-device-apple-internal-keyboard.c' || echo '$(srcdir)/'`litest-device-apple-internal-keyboard.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-apple-internal-keyboard.Tpo $(DEPDIR)/liblitest_la-litest-device-apple-internal-keyboard.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-apple-internal-keyboard.c' object='liblitest_la-litest-device-apple-internal-keyboard.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-apple-internal-keyboard.lo `test -f 'litest-device-apple-internal-keyboard.c' || echo '$(srcdir)/'`litest-device-apple-internal-keyboard.c - -liblitest_la-litest-device-asus-rog-gladius.lo: litest-device-asus-rog-gladius.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-asus-rog-gladius.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-asus-rog-gladius.Tpo -c -o liblitest_la-litest-device-asus-rog-gladius.lo `test -f 'litest-device-asus-rog-gladius.c' || echo '$(srcdir)/'`litest-device-asus-rog-gladius.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-asus-rog-gladius.Tpo $(DEPDIR)/liblitest_la-litest-device-asus-rog-gladius.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-asus-rog-gladius.c' object='liblitest_la-litest-device-asus-rog-gladius.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-asus-rog-gladius.lo `test -f 'litest-device-asus-rog-gladius.c' || echo '$(srcdir)/'`litest-device-asus-rog-gladius.c - liblitest_la-litest-device-atmel-hover.lo: litest-device-atmel-hover.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-atmel-hover.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-atmel-hover.Tpo -c -o liblitest_la-litest-device-atmel-hover.lo `test -f 'litest-device-atmel-hover.c' || echo '$(srcdir)/'`litest-device-atmel-hover.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-atmel-hover.Tpo $(DEPDIR)/liblitest_la-litest-device-atmel-hover.Plo @@ -1278,13 +1183,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-bcm5974.lo `test -f 'litest-device-bcm5974.c' || echo '$(srcdir)/'`litest-device-bcm5974.c -liblitest_la-litest-device-cyborg-rat-5.lo: litest-device-cyborg-rat-5.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-cyborg-rat-5.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-cyborg-rat-5.Tpo -c -o liblitest_la-litest-device-cyborg-rat-5.lo `test -f 'litest-device-cyborg-rat-5.c' || echo '$(srcdir)/'`litest-device-cyborg-rat-5.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-cyborg-rat-5.Tpo $(DEPDIR)/liblitest_la-litest-device-cyborg-rat-5.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-cyborg-rat-5.c' object='liblitest_la-litest-device-cyborg-rat-5.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-cyborg-rat-5.lo `test -f 'litest-device-cyborg-rat-5.c' || echo '$(srcdir)/'`litest-device-cyborg-rat-5.c - liblitest_la-litest-device-elantech-touchpad.lo: litest-device-elantech-touchpad.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-elantech-touchpad.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-elantech-touchpad.Tpo -c -o liblitest_la-litest-device-elantech-touchpad.lo `test -f 'litest-device-elantech-touchpad.c' || echo '$(srcdir)/'`litest-device-elantech-touchpad.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-elantech-touchpad.Tpo $(DEPDIR)/liblitest_la-litest-device-elantech-touchpad.Plo @@ -1299,13 +1197,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-generic-singletouch.lo `test -f 'litest-device-generic-singletouch.c' || echo '$(srcdir)/'`litest-device-generic-singletouch.c -liblitest_la-litest-device-huion-pentablet.lo: litest-device-huion-pentablet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-huion-pentablet.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-huion-pentablet.Tpo -c -o liblitest_la-litest-device-huion-pentablet.lo `test -f 'litest-device-huion-pentablet.c' || echo '$(srcdir)/'`litest-device-huion-pentablet.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-huion-pentablet.Tpo $(DEPDIR)/liblitest_la-litest-device-huion-pentablet.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-huion-pentablet.c' object='liblitest_la-litest-device-huion-pentablet.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-huion-pentablet.lo `test -f 'litest-device-huion-pentablet.c' || echo '$(srcdir)/'`litest-device-huion-pentablet.c - liblitest_la-litest-device-keyboard.lo: litest-device-keyboard.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-keyboard.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-keyboard.Tpo -c -o liblitest_la-litest-device-keyboard.lo `test -f 'litest-device-keyboard.c' || echo '$(srcdir)/'`litest-device-keyboard.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-keyboard.Tpo $(DEPDIR)/liblitest_la-litest-device-keyboard.Plo @@ -1362,13 +1253,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-mouse-low-dpi.lo `test -f 'litest-device-mouse-low-dpi.c' || echo '$(srcdir)/'`litest-device-mouse-low-dpi.c -liblitest_la-litest-device-mouse-wheel-click-angle.lo: litest-device-mouse-wheel-click-angle.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-mouse-wheel-click-angle.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-mouse-wheel-click-angle.Tpo -c -o liblitest_la-litest-device-mouse-wheel-click-angle.lo `test -f 'litest-device-mouse-wheel-click-angle.c' || echo '$(srcdir)/'`litest-device-mouse-wheel-click-angle.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-mouse-wheel-click-angle.Tpo $(DEPDIR)/liblitest_la-litest-device-mouse-wheel-click-angle.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-mouse-wheel-click-angle.c' object='liblitest_la-litest-device-mouse-wheel-click-angle.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-mouse-wheel-click-angle.lo `test -f 'litest-device-mouse-wheel-click-angle.c' || echo '$(srcdir)/'`litest-device-mouse-wheel-click-angle.c - liblitest_la-litest-device-ms-surface-cover.lo: litest-device-ms-surface-cover.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-ms-surface-cover.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-ms-surface-cover.Tpo -c -o liblitest_la-litest-device-ms-surface-cover.lo `test -f 'litest-device-ms-surface-cover.c' || echo '$(srcdir)/'`litest-device-ms-surface-cover.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-ms-surface-cover.Tpo $(DEPDIR)/liblitest_la-litest-device-ms-surface-cover.Plo @@ -1404,13 +1288,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-synaptics-hover.lo `test -f 'litest-device-synaptics-hover.c' || echo '$(srcdir)/'`litest-device-synaptics-hover.c -liblitest_la-litest-device-synaptics-i2c.lo: litest-device-synaptics-i2c.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-synaptics-i2c.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-synaptics-i2c.Tpo -c -o liblitest_la-litest-device-synaptics-i2c.lo `test -f 'litest-device-synaptics-i2c.c' || echo '$(srcdir)/'`litest-device-synaptics-i2c.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-synaptics-i2c.Tpo $(DEPDIR)/liblitest_la-litest-device-synaptics-i2c.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-synaptics-i2c.c' object='liblitest_la-litest-device-synaptics-i2c.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-synaptics-i2c.lo `test -f 'litest-device-synaptics-i2c.c' || echo '$(srcdir)/'`litest-device-synaptics-i2c.c - liblitest_la-litest-device-synaptics-st.lo: litest-device-synaptics-st.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-synaptics-st.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-synaptics-st.Tpo -c -o liblitest_la-litest-device-synaptics-st.lo `test -f 'litest-device-synaptics-st.c' || echo '$(srcdir)/'`litest-device-synaptics-st.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-synaptics-st.Tpo $(DEPDIR)/liblitest_la-litest-device-synaptics-st.Plo @@ -1446,41 +1323,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-touch-screen.lo `test -f 'litest-device-touch-screen.c' || echo '$(srcdir)/'`litest-device-touch-screen.c -liblitest_la-litest-device-wacom-bamboo-tablet.lo: litest-device-wacom-bamboo-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-wacom-bamboo-tablet.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-wacom-bamboo-tablet.Tpo -c -o liblitest_la-litest-device-wacom-bamboo-tablet.lo `test -f 'litest-device-wacom-bamboo-tablet.c' || echo '$(srcdir)/'`litest-device-wacom-bamboo-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-wacom-bamboo-tablet.Tpo $(DEPDIR)/liblitest_la-litest-device-wacom-bamboo-tablet.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-wacom-bamboo-tablet.c' object='liblitest_la-litest-device-wacom-bamboo-tablet.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-wacom-bamboo-tablet.lo `test -f 'litest-device-wacom-bamboo-tablet.c' || echo '$(srcdir)/'`litest-device-wacom-bamboo-tablet.c - -liblitest_la-litest-device-wacom-cintiq-tablet.lo: litest-device-wacom-cintiq-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-wacom-cintiq-tablet.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-wacom-cintiq-tablet.Tpo -c -o liblitest_la-litest-device-wacom-cintiq-tablet.lo `test -f 'litest-device-wacom-cintiq-tablet.c' || echo '$(srcdir)/'`litest-device-wacom-cintiq-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-wacom-cintiq-tablet.Tpo $(DEPDIR)/liblitest_la-litest-device-wacom-cintiq-tablet.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-wacom-cintiq-tablet.c' object='liblitest_la-litest-device-wacom-cintiq-tablet.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-wacom-cintiq-tablet.lo `test -f 'litest-device-wacom-cintiq-tablet.c' || echo '$(srcdir)/'`litest-device-wacom-cintiq-tablet.c - -liblitest_la-litest-device-wacom-cintiq-24hd.lo: litest-device-wacom-cintiq-24hd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-wacom-cintiq-24hd.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-wacom-cintiq-24hd.Tpo -c -o liblitest_la-litest-device-wacom-cintiq-24hd.lo `test -f 'litest-device-wacom-cintiq-24hd.c' || echo '$(srcdir)/'`litest-device-wacom-cintiq-24hd.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-wacom-cintiq-24hd.Tpo $(DEPDIR)/liblitest_la-litest-device-wacom-cintiq-24hd.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-wacom-cintiq-24hd.c' object='liblitest_la-litest-device-wacom-cintiq-24hd.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-wacom-cintiq-24hd.lo `test -f 'litest-device-wacom-cintiq-24hd.c' || echo '$(srcdir)/'`litest-device-wacom-cintiq-24hd.c - -liblitest_la-litest-device-wacom-intuos-tablet.lo: litest-device-wacom-intuos-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-wacom-intuos-tablet.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-wacom-intuos-tablet.Tpo -c -o liblitest_la-litest-device-wacom-intuos-tablet.lo `test -f 'litest-device-wacom-intuos-tablet.c' || echo '$(srcdir)/'`litest-device-wacom-intuos-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-wacom-intuos-tablet.Tpo $(DEPDIR)/liblitest_la-litest-device-wacom-intuos-tablet.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-wacom-intuos-tablet.c' object='liblitest_la-litest-device-wacom-intuos-tablet.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-wacom-intuos-tablet.lo `test -f 'litest-device-wacom-intuos-tablet.c' || echo '$(srcdir)/'`litest-device-wacom-intuos-tablet.c - -liblitest_la-litest-device-wacom-isdv4-tablet.lo: litest-device-wacom-isdv4-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-wacom-isdv4-tablet.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-wacom-isdv4-tablet.Tpo -c -o liblitest_la-litest-device-wacom-isdv4-tablet.lo `test -f 'litest-device-wacom-isdv4-tablet.c' || echo '$(srcdir)/'`litest-device-wacom-isdv4-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-wacom-isdv4-tablet.Tpo $(DEPDIR)/liblitest_la-litest-device-wacom-isdv4-tablet.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-wacom-isdv4-tablet.c' object='liblitest_la-litest-device-wacom-isdv4-tablet.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-wacom-isdv4-tablet.lo `test -f 'litest-device-wacom-isdv4-tablet.c' || echo '$(srcdir)/'`litest-device-wacom-isdv4-tablet.c - liblitest_la-litest-device-wacom-touch.lo: litest-device-wacom-touch.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-wacom-touch.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-wacom-touch.Tpo -c -o liblitest_la-litest-device-wacom-touch.lo `test -f 'litest-device-wacom-touch.c' || echo '$(srcdir)/'`litest-device-wacom-touch.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-wacom-touch.Tpo $(DEPDIR)/liblitest_la-litest-device-wacom-touch.Plo @@ -1495,13 +1337,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-wacom-intuos-finger.lo `test -f 'litest-device-wacom-intuos-finger.c' || echo '$(srcdir)/'`litest-device-wacom-intuos-finger.c -liblitest_la-litest-device-waltop-tablet.lo: litest-device-waltop-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-waltop-tablet.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-waltop-tablet.Tpo -c -o liblitest_la-litest-device-waltop-tablet.lo `test -f 'litest-device-waltop-tablet.c' || echo '$(srcdir)/'`litest-device-waltop-tablet.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-waltop-tablet.Tpo $(DEPDIR)/liblitest_la-litest-device-waltop-tablet.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-waltop-tablet.c' object='liblitest_la-litest-device-waltop-tablet.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-waltop-tablet.lo `test -f 'litest-device-waltop-tablet.c' || echo '$(srcdir)/'`litest-device-waltop-tablet.c - liblitest_la-litest-device-wheel-only.lo: litest-device-wheel-only.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-wheel-only.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-wheel-only.Tpo -c -o liblitest_la-litest-device-wheel-only.lo `test -f 'litest-device-wheel-only.c' || echo '$(srcdir)/'`litest-device-wheel-only.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-wheel-only.Tpo $(DEPDIR)/liblitest_la-litest-device-wheel-only.Plo @@ -1523,13 +1358,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-vmware-virtual-usb-mouse.lo `test -f 'litest-device-vmware-virtual-usb-mouse.c' || echo '$(srcdir)/'`litest-device-vmware-virtual-usb-mouse.c -liblitest_la-litest-device-yubikey.lo: litest-device-yubikey.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest-device-yubikey.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest-device-yubikey.Tpo -c -o liblitest_la-litest-device-yubikey.lo `test -f 'litest-device-yubikey.c' || echo '$(srcdir)/'`litest-device-yubikey.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest-device-yubikey.Tpo $(DEPDIR)/liblitest_la-litest-device-yubikey.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='litest-device-yubikey.c' object='liblitest_la-litest-device-yubikey.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -c -o liblitest_la-litest-device-yubikey.lo `test -f 'litest-device-yubikey.c' || echo '$(srcdir)/'`litest-device-yubikey.c - liblitest_la-litest.lo: litest.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblitest_la_CFLAGS) $(CFLAGS) -MT liblitest_la-litest.lo -MD -MP -MF $(DEPDIR)/liblitest_la-litest.Tpo -c -o liblitest_la-litest.lo `test -f 'litest.c' || echo '$(srcdir)/'`litest.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblitest_la-litest.Tpo $(DEPDIR)/liblitest_la-litest.Plo @@ -1607,20 +1435,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_litest_selftest_CFLAGS) $(CFLAGS) -c -o test_litest_selftest-litest.obj `if test -f 'litest.c'; then $(CYGPATH_W) 'litest.c'; else $(CYGPATH_W) '$(srcdir)/litest.c'; fi` -test_misc-misc.o: misc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_misc_CFLAGS) $(CFLAGS) -MT test_misc-misc.o -MD -MP -MF $(DEPDIR)/test_misc-misc.Tpo -c -o test_misc-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_misc-misc.Tpo $(DEPDIR)/test_misc-misc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='misc.c' object='test_misc-misc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_misc_CFLAGS) $(CFLAGS) -c -o test_misc-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c - -test_misc-misc.obj: misc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_misc_CFLAGS) $(CFLAGS) -MT test_misc-misc.obj -MD -MP -MF $(DEPDIR)/test_misc-misc.Tpo -c -o test_misc-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_misc-misc.Tpo $(DEPDIR)/test_misc-misc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='misc.c' object='test_misc-misc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_misc_CFLAGS) $(CFLAGS) -c -o test_misc-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi` - .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @@ -1875,13 +1689,6 @@ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test-tablet.log: test-tablet$(EXEEXT) - @p='test-tablet$(EXEEXT)'; \ - b='test-tablet'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) test-device.log: test-device$(EXEEXT) @p='test-device$(EXEEXT)'; \ diff -Nru libinput-1.2.2/test/misc.c libinput-0.21.0/test/misc.c --- libinput-1.2.2/test/misc.c 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/test/misc.c 2015-08-03 03:44:47.000000000 +0000 @@ -31,7 +31,6 @@ #include #include "litest.h" -#include "libinput-util.h" static int open_restricted(const char *path, int flags, void *data) { @@ -133,7 +132,6 @@ ck_assert(libinput_event_get_keyboard_event(event) == NULL); ck_assert(libinput_event_get_touch_event(event) == NULL); ck_assert(libinput_event_get_gesture_event(event) == NULL); - ck_assert(libinput_event_get_tablet_tool_event(event) == NULL); litest_restore_log_handler(li); } @@ -189,7 +187,6 @@ ck_assert(libinput_event_get_keyboard_event(event) == NULL); ck_assert(libinput_event_get_touch_event(event) == NULL); ck_assert(libinput_event_get_gesture_event(event) == NULL); - ck_assert(libinput_event_get_tablet_tool_event(event) == NULL); litest_restore_log_handler(li); } libinput_event_destroy(event); @@ -239,7 +236,6 @@ ck_assert(libinput_event_get_keyboard_event(event) == NULL); ck_assert(libinput_event_get_touch_event(event) == NULL); ck_assert(libinput_event_get_gesture_event(event) == NULL); - ck_assert(libinput_event_get_tablet_tool_event(event) == NULL); litest_restore_log_handler(li); } libinput_event_destroy(event); @@ -282,7 +278,6 @@ ck_assert(libinput_event_get_pointer_event(event) == NULL); ck_assert(libinput_event_get_touch_event(event) == NULL); ck_assert(libinput_event_get_gesture_event(event) == NULL); - ck_assert(libinput_event_get_tablet_tool_event(event) == NULL); litest_restore_log_handler(li); } libinput_event_destroy(event); @@ -332,7 +327,6 @@ ck_assert(libinput_event_get_pointer_event(event) == NULL); ck_assert(libinput_event_get_keyboard_event(event) == NULL); ck_assert(libinput_event_get_gesture_event(event) == NULL); - ck_assert(libinput_event_get_tablet_tool_event(event) == NULL); litest_restore_log_handler(li); } libinput_event_destroy(event); @@ -390,89 +384,6 @@ } END_TEST -START_TEST(event_conversion_tablet) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - int events = 0; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { -1, -1 } - }; - - litest_tablet_proximity_in(dev, 50, 50, axes); - litest_tablet_motion(dev, 60, 50, axes); - litest_button_click(dev, BTN_STYLUS, true); - litest_button_click(dev, BTN_STYLUS, false); - - libinput_dispatch(li); - - while ((event = libinput_get_event(li))) { - enum libinput_event_type type; - type = libinput_event_get_type(event); - - if (type >= LIBINPUT_EVENT_TABLET_TOOL_AXIS && - type <= LIBINPUT_EVENT_TABLET_TOOL_BUTTON) { - struct libinput_event_tablet_tool *t; - struct libinput_event *base; - t = libinput_event_get_tablet_tool_event(event); - base = libinput_event_tablet_tool_get_base_event(t); - ck_assert(event == base); - - events++; - - litest_disable_log_handler(li); - ck_assert(libinput_event_get_device_notify_event(event) == NULL); - ck_assert(libinput_event_get_pointer_event(event) == NULL); - ck_assert(libinput_event_get_keyboard_event(event) == NULL); - ck_assert(libinput_event_get_touch_event(event) == NULL); - litest_restore_log_handler(li); - } - libinput_event_destroy(event); - } - - ck_assert_int_gt(events, 0); -} -END_TEST - -START_TEST(bitfield_helpers) -{ - /* This value has a bit set on all of the word boundaries we want to - * test: 0, 1, 7, 8, 31, 32, and 33 - */ - unsigned char read_bitfield[] = { 0x83, 0x1, 0x0, 0x80, 0x3 }; - unsigned char write_bitfield[ARRAY_LENGTH(read_bitfield)] = {0}; - size_t i; - - /* Now check that the bitfield we wrote to came out to be the same as - * the bitfield we were writing from */ - for (i = 0; i < ARRAY_LENGTH(read_bitfield) * 8; i++) { - switch (i) { - case 0: - case 1: - case 7: - case 8: - case 31: - case 32: - case 33: - ck_assert(bit_is_set(read_bitfield, i)); - set_bit(write_bitfield, i); - break; - default: - ck_assert(!bit_is_set(read_bitfield, i)); - clear_bit(write_bitfield, i); - break; - } - } - - ck_assert_int_eq(memcmp(read_bitfield, - write_bitfield, - sizeof(read_bitfield)), - 0); -} -END_TEST - START_TEST(context_ref_counting) { struct libinput *li; @@ -782,108 +693,6 @@ } END_TEST -static int open_restricted_leak(const char *path, int flags, void *data) -{ - return *(int*)data; -} - -static void close_restricted_leak(int fd, void *data) -{ - /* noop */ -} - -const struct libinput_interface leak_interface = { - .open_restricted = open_restricted_leak, - .close_restricted = close_restricted_leak, -}; - -static void -simple_log_handler(struct libinput *libinput, - enum libinput_log_priority priority, - const char *format, - va_list args) -{ - vfprintf(stderr, format, args); -} - -START_TEST(fd_no_event_leak) -{ - struct libevdev_uinput *uinput; - struct libinput *li; - struct libinput_device *device; - int fd = -1; - const char *path; - struct libinput_event *event; - - uinput = create_simple_test_device("litest test device", - EV_REL, REL_X, - EV_REL, REL_Y, - EV_KEY, BTN_LEFT, - EV_KEY, BTN_MIDDLE, - EV_KEY, BTN_LEFT, - -1, -1); - path = libevdev_uinput_get_devnode(uinput); - - fd = open(path, O_RDWR | O_NONBLOCK | O_CLOEXEC); - ck_assert_int_gt(fd, -1); - - li = libinput_path_create_context(&leak_interface, &fd); - libinput_log_set_priority(li, LIBINPUT_LOG_PRIORITY_DEBUG); - libinput_log_set_handler(li, simple_log_handler); - - /* Add the device, trigger an event, then remove it again. - * Without it, we get a SYN_DROPPED immediately and no events. - */ - device = libinput_path_add_device(li, path); - libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); - libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_path_remove_device(device); - libinput_dispatch(li); - litest_drain_events(li); - - /* Device is removed, but fd is still open. Queue an event, add a - * new device with the same fd, the queued event must be discarded - * by libinput */ - libevdev_uinput_write_event(uinput, EV_REL, REL_Y, 1); - libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - libinput_path_add_device(li, path); - libinput_dispatch(li); - event = libinput_get_event(li); - ck_assert_int_eq(libinput_event_get_type(event), - LIBINPUT_EVENT_DEVICE_ADDED); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); - - close(fd); - libinput_unref(li); - libevdev_uinput_destroy(uinput); -} -END_TEST - -START_TEST(library_version) -{ - const char *version = LIBINPUT_LT_VERSION; - int C, R, A; - int rc; - - rc = sscanf(version, "%d:%d:%d", &C, &R, &A); - ck_assert_int_eq(rc, 3); - - ck_assert_int_ge(C, 17); - ck_assert_int_ge(R, 0); - ck_assert_int_ge(A, 7); - - /* Binary compatibility broken? */ - ck_assert(R != 0 || A != 0); - - /* The first stable API in 0.12 had 10:0:0 */ - ck_assert_int_eq(C - A, 10); -} -END_TEST - void litest_setup_tests(void) { @@ -894,8 +703,6 @@ litest_add_for_device("events:conversion", event_conversion_key, LITEST_KEYBOARD); litest_add_for_device("events:conversion", event_conversion_touch, LITEST_WACOM_TOUCH); litest_add_for_device("events:conversion", event_conversion_gesture, LITEST_BCM5974); - litest_add_for_device("events:conversion", event_conversion_tablet, LITEST_WACOM_CINTIQ); - litest_add_no_device("bitfield_helpers", bitfield_helpers); litest_add_no_device("context:refcount", context_ref_counting); litest_add_no_device("config:status string", config_status_string); @@ -907,8 +714,4 @@ litest_add_no_device("misc:parser", trackpoint_accel_parser); litest_add_no_device("misc:parser", dimension_prop_parser); litest_add_no_device("misc:time", time_conversion); - - litest_add_no_device("misc:fd", fd_no_event_leak); - - litest_add_no_device("misc:library_version", library_version); } diff -Nru libinput-1.2.2/test/path.c libinput-0.21.0/test/path.c --- libinput-1.2.2/test/path.c 2016-03-08 03:52:28.000000000 +0000 +++ libinput-0.21.0/test/path.c 2015-08-03 03:44:47.000000000 +0000 @@ -27,7 +27,6 @@ #include #include #include -#include #include #include "litest.h" @@ -99,63 +98,6 @@ } END_TEST -START_TEST(path_create_invalid_kerneldev) -{ - struct libinput *li; - struct libinput_device *device; - const char *path = "/dev/uinput"; - - open_func_count = 0; - close_func_count = 0; - - li = libinput_path_create_context(&simple_interface, NULL); - ck_assert(li != NULL); - device = libinput_path_add_device(li, path); - ck_assert(device == NULL); - - ck_assert_int_eq(open_func_count, 1); - ck_assert_int_eq(close_func_count, 1); - - libinput_unref(li); - ck_assert_int_eq(close_func_count, 1); - - open_func_count = 0; - close_func_count = 0; -} -END_TEST - -START_TEST(path_create_invalid_file) -{ - struct libinput *li; - struct libinput_device *device; - char path[] = "/tmp/litest_path_XXXXXX"; - int fd; - - fd = mkstemp(path); - ck_assert_int_ge(fd, 0); - close(fd); - - open_func_count = 0; - close_func_count = 0; - - li = libinput_path_create_context(&simple_interface, NULL); - unlink(path); - - ck_assert(li != NULL); - device = libinput_path_add_device(li, path); - ck_assert(device == NULL); - - ck_assert_int_eq(open_func_count, 0); - ck_assert_int_eq(close_func_count, 0); - - libinput_unref(li); - ck_assert_int_eq(close_func_count, 0); - - open_func_count = 0; - close_func_count = 0; -} -END_TEST - START_TEST(path_create_destroy) { struct libinput *li; @@ -940,8 +882,6 @@ { litest_add_no_device("path:create", path_create_NULL); litest_add_no_device("path:create", path_create_invalid); - litest_add_no_device("path:create", path_create_invalid_file); - litest_add_no_device("path:create", path_create_invalid_kerneldev); litest_add_no_device("path:create", path_create_destroy); litest_add_no_device("path:create", path_set_user_data); litest_add_no_device("path:suspend", path_suspend); diff -Nru libinput-1.2.2/test/pointer.c libinput-0.21.0/test/pointer.c --- libinput-1.2.2/test/pointer.c 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/test/pointer.c 2015-08-03 03:44:47.000000000 +0000 @@ -473,30 +473,6 @@ } END_TEST -static inline int -wheel_click_angle(struct litest_device *dev) -{ - struct udev_device *d; - const char *prop; - const int default_angle = 15; - int angle = default_angle; - - d = libinput_device_get_udev_device(dev->libinput_device); - litest_assert_ptr_notnull(d); - - prop = udev_device_get_property_value(d, "MOUSE_WHEEL_CLICK_ANGLE"); - if (!prop) - goto out; - - angle = parse_mouse_wheel_click_angle_property(prop); - if (angle == 0) - angle = default_angle; - -out: - udev_device_unref(d); - return angle; -} - static void test_wheel_event(struct litest_device *dev, int which, int amount) { @@ -505,11 +481,11 @@ struct libinput_event_pointer *ptrev; enum libinput_pointer_axis axis; - int scroll_step, expected, discrete;; - - scroll_step = wheel_click_angle(dev); - expected = amount * scroll_step; - discrete = amount; + /* the current evdev implementation scales the scroll wheel events + up by a factor 15 */ + const int scroll_step = 15; + int expected = amount * scroll_step; + int discrete = amount; if (libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device)) { expected *= -1; @@ -1053,116 +1029,6 @@ } END_TEST -START_TEST(pointer_accel_profile_defaults) -{ - struct litest_device *dev = litest_current_device(); - struct libinput_device *device = dev->libinput_device; - enum libinput_config_status status; - enum libinput_config_accel_profile profile; - uint32_t profiles; - - ck_assert(libinput_device_config_accel_is_available(device)); - - profile = libinput_device_config_accel_get_default_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE); - - profile = libinput_device_config_accel_get_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE); - - profiles = libinput_device_config_accel_get_profiles(device); - ck_assert(profiles & LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE); - ck_assert(profiles & LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT); - - status = libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - profile = libinput_device_config_accel_get_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT); - - status = libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - profile = libinput_device_config_accel_get_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE); -} -END_TEST - -START_TEST(pointer_accel_profile_defaults_noprofile) -{ - struct litest_device *dev = litest_current_device(); - struct libinput_device *device = dev->libinput_device; - enum libinput_config_status status; - enum libinput_config_accel_profile profile; - uint32_t profiles; - - ck_assert(libinput_device_config_accel_is_available(device)); - - profile = libinput_device_config_accel_get_default_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); - - profile = libinput_device_config_accel_get_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); - - profiles = libinput_device_config_accel_get_profiles(device); - ck_assert_int_eq(profiles, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); - - status = libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_UNSUPPORTED); - profile = libinput_device_config_accel_get_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); - - status = libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_UNSUPPORTED); - profile = libinput_device_config_accel_get_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); -} -END_TEST - -START_TEST(pointer_accel_profile_invalid) -{ - struct litest_device *dev = litest_current_device(); - struct libinput_device *device = dev->libinput_device; - enum libinput_config_status status; - - ck_assert(libinput_device_config_accel_is_available(device)); - - status = libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_INVALID); - - status = libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE + 1); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_INVALID); - - status = libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE |LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_INVALID); -} -END_TEST - -START_TEST(pointer_accel_profile_flat_motion_relative) -{ - struct litest_device *dev = litest_current_device(); - struct libinput_device *device = dev->libinput_device; - - libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT); - litest_drain_events(dev->libinput); - - test_relative_event(dev, 1, 0); - test_relative_event(dev, 1, 1); - test_relative_event(dev, 1, -1); - test_relative_event(dev, 0, 1); - - test_relative_event(dev, -1, 0); - test_relative_event(dev, -1, 1); - test_relative_event(dev, -1, -1); - test_relative_event(dev, 0, -1); -} -END_TEST - START_TEST(middlebutton) { struct litest_device *device = litest_current_device(); @@ -1593,14 +1459,14 @@ litest_add("pointer:button", pointer_button, LITEST_BUTTON, LITEST_CLICKPAD); litest_add_no_device("pointer:button", pointer_button_auto_release); litest_add_no_device("pointer:button", pointer_seat_button_count); - litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_TABLET); + litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY); litest_add("pointer:scroll", pointer_scroll_button, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); litest_add("pointer:scroll", pointer_scroll_nowheel_defaults, LITEST_RELATIVE|LITEST_BUTTON, LITEST_WHEEL); - litest_add("pointer:scroll", pointer_scroll_natural_defaults, LITEST_WHEEL, LITEST_TABLET); - litest_add("pointer:scroll", pointer_scroll_natural_enable_config, LITEST_WHEEL, LITEST_TABLET); - litest_add("pointer:scroll", pointer_scroll_natural_wheel, LITEST_WHEEL, LITEST_TABLET); + litest_add("pointer:scroll", pointer_scroll_natural_defaults, LITEST_WHEEL, LITEST_ANY); + litest_add("pointer:scroll", pointer_scroll_natural_enable_config, LITEST_WHEEL, LITEST_ANY); + litest_add("pointer:scroll", pointer_scroll_natural_wheel, LITEST_WHEEL, LITEST_ANY); - litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_ABSOLUTE|LITEST_PROTOCOL_A|LITEST_TABLET); + litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_ABSOLUTE|LITEST_PROTOCOL_A); /* tests touchpads too */ litest_add("pointer:left-handed", pointer_left_handed_defaults, LITEST_BUTTON, LITEST_ANY); @@ -1613,10 +1479,6 @@ litest_add("pointer:accel", pointer_accel_defaults_absolute, LITEST_ABSOLUTE, LITEST_RELATIVE); litest_add("pointer:accel", pointer_accel_defaults_absolute_relative, LITEST_ABSOLUTE|LITEST_RELATIVE, LITEST_ANY); litest_add("pointer:accel", pointer_accel_direction_change, LITEST_RELATIVE, LITEST_ANY); - litest_add("pointer:accel", pointer_accel_profile_defaults, LITEST_RELATIVE, LITEST_TOUCHPAD); - litest_add("pointer:accel", pointer_accel_profile_defaults_noprofile, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("pointer:accel", pointer_accel_profile_invalid, LITEST_RELATIVE, LITEST_ANY); - litest_add("pointer:accel", pointer_accel_profile_flat_motion_relative, LITEST_RELATIVE, LITEST_TOUCHPAD); litest_add("pointer:middlebutton", middlebutton, LITEST_BUTTON, LITEST_ANY); litest_add("pointer:middlebutton", middlebutton_timeout, LITEST_BUTTON, LITEST_ANY); diff -Nru libinput-1.2.2/test/tablet.c libinput-0.21.0/test/tablet.c --- libinput-1.2.2/test/tablet.c 2016-03-01 06:00:47.000000000 +0000 +++ libinput-0.21.0/test/tablet.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,3680 +0,0 @@ -/* - * Copyright © 2014-2015 Red Hat, Inc. - * Copyright © 2014 Stephen Chandler "Lyude" Paul - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, provided - * that the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of the copyright holders not be used in - * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The copyright holders make - * no representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY - * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include - -#include -#include -#include -#include -#include -#include - -#include "libinput-util.h" -#include "evdev-tablet.h" -#include "litest.h" - -START_TEST(tip_down_up) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 30); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_DOWN); - libinput_event_destroy(event); - litest_assert_empty_queue(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 10); - litest_axis_set_value(axes, ABS_PRESSURE, 0); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - litest_assert_empty_queue(li); - - litest_assert_empty_queue(li); - -} -END_TEST - -START_TEST(tip_down_prox_in) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 0 }, - { ABS_PRESSURE, 30 }, - { -1, -1 } - }; - - litest_drain_events(li); - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_tablet_motion(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - ck_assert_int_eq(libinput_event_tablet_tool_get_proximity_state(tablet_event), - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); - libinput_event_destroy(event); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_DOWN); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); - -} -END_TEST - -START_TEST(tip_up_prox_out) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 0 }, - { ABS_PRESSURE, 30 }, - { -1, -1 } - }; - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 30); - litest_axis_set_value(axes, ABS_PRESSURE, 0); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_tablet_proximity_out(dev); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - ck_assert_int_eq(libinput_event_tablet_tool_get_proximity_state(tablet_event), - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); - -} -END_TEST - -START_TEST(tip_up_btn_change) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 0 }, - { ABS_PRESSURE, 30 }, - { -1, -1 } - }; - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_tablet_motion(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 30); - litest_axis_set_value(axes, ABS_PRESSURE, 0); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 20, axes); - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - ck_assert_int_eq(libinput_event_tablet_tool_get_button(tablet_event), - BTN_STYLUS); - ck_assert_int_eq(libinput_event_tablet_tool_get_button_state(tablet_event), - LIBINPUT_BUTTON_STATE_PRESSED); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 30); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - litest_drain_events(li); - - /* same thing with a release at tip-up */ - litest_axis_set_value(axes, ABS_DISTANCE, 30); - litest_axis_set_value(axes, ABS_PRESSURE, 0); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_event(dev, EV_KEY, BTN_STYLUS, 0); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - ck_assert_int_eq(libinput_event_tablet_tool_get_button(tablet_event), - BTN_STYLUS); - ck_assert_int_eq(libinput_event_tablet_tool_get_button_state(tablet_event), - LIBINPUT_BUTTON_STATE_RELEASED); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(tip_down_btn_change) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 30); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 20, axes); - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_DOWN); - libinput_event_destroy(event); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - ck_assert_int_eq(libinput_event_tablet_tool_get_button(tablet_event), - BTN_STYLUS); - ck_assert_int_eq(libinput_event_tablet_tool_get_button_state(tablet_event), - LIBINPUT_BUTTON_STATE_PRESSED); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 30); - litest_axis_set_value(axes, ABS_PRESSURE, 0); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 20, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_pop_event_frame(dev); - litest_drain_events(li); - - /* same thing with a release at tip-down */ - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 30); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 20, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_event(dev, EV_KEY, BTN_STYLUS, 0); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_DOWN); - libinput_event_destroy(event); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - ck_assert_int_eq(libinput_event_tablet_tool_get_button(tablet_event), - BTN_STYLUS); - ck_assert_int_eq(libinput_event_tablet_tool_get_button_state(tablet_event), - LIBINPUT_BUTTON_STATE_RELEASED); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(tip_down_motion) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - double x, y, last_x, last_y; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - last_x = libinput_event_tablet_tool_get_x(tablet_event); - last_y = libinput_event_tablet_tool_get_y(tablet_event); - libinput_event_destroy(event); - - /* move x/y on tip down, make sure x/y changed */ - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 20); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 70, 70, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_DOWN); - ck_assert(libinput_event_tablet_tool_x_has_changed(tablet_event)); - ck_assert(libinput_event_tablet_tool_y_has_changed(tablet_event)); - x = libinput_event_tablet_tool_get_x(tablet_event); - y = libinput_event_tablet_tool_get_y(tablet_event); - ck_assert_double_lt(last_x, x); - ck_assert_double_lt(last_y, y); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(tip_up_motion) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 0 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - double x, y, last_x, last_y; - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_PRESSURE, 20); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 70, 70, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - last_x = libinput_event_tablet_tool_get_x(tablet_event); - last_y = libinput_event_tablet_tool_get_y(tablet_event); - libinput_event_destroy(event); - - /* move x/y on tip up, make sure x/y changed */ - litest_axis_set_value(axes, ABS_PRESSURE, 0); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 40, 40, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_pop_event_frame(dev); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - ck_assert(libinput_event_tablet_tool_x_has_changed(tablet_event)); - ck_assert(libinput_event_tablet_tool_y_has_changed(tablet_event)); - x = libinput_event_tablet_tool_get_x(tablet_event); - y = libinput_event_tablet_tool_get_y(tablet_event); - ck_assert_double_ne(last_x, x); - ck_assert_double_ne(last_y, y); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(tip_state_proximity) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - - litest_axis_set_value(axes, ABS_PRESSURE, 30); - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - - litest_axis_set_value(axes, ABS_PRESSURE, 0); - litest_axis_set_value(axes, ABS_DISTANCE, 10); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_pop_event_frame(dev); - - litest_drain_events(li); - - litest_tablet_proximity_out(dev); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tip_state_axis) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_drain_events(li); - - litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - - litest_axis_set_value(axes, ABS_PRESSURE, 30); - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 40, 40, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - litest_drain_events(li); - - litest_tablet_motion(dev, 30, 30, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_DOWN); - libinput_event_destroy(event); - - litest_axis_set_value(axes, ABS_PRESSURE, 0); - litest_axis_set_value(axes, ABS_DISTANCE, 10); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 40, 40, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_pop_event_frame(dev); - litest_drain_events(li); - - litest_tablet_motion(dev, 40, 80, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(tip_state_button) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - - litest_axis_set_value(axes, ABS_PRESSURE, 30); - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 40, 40, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_STYLUS, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_DOWN); - libinput_event_destroy(event); - - litest_axis_set_value(axes, ABS_PRESSURE, 0); - litest_axis_set_value(axes, ABS_DISTANCE, 10); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 40, 40, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_pop_event_frame(dev); - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - - litest_event(dev, EV_KEY, BTN_STYLUS, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - ck_assert_int_eq(libinput_event_tablet_tool_get_tip_state(tablet_event), - LIBINPUT_TABLET_TOOL_TIP_UP); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(proximity_in_out) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_event *event; - bool have_tool_update = false, - have_proximity_out = false; - - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - - while ((event = libinput_get_event(li))) { - if (libinput_event_get_type(event) == - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY) { - struct libinput_tablet_tool * tool; - - have_tool_update++; - tablet_event = libinput_event_get_tablet_tool_event(event); - tool = libinput_event_tablet_tool_get_tool(tablet_event); - ck_assert_int_eq(libinput_tablet_tool_get_type(tool), - LIBINPUT_TABLET_TOOL_TYPE_PEN); - } - libinput_event_destroy(event); - } - ck_assert(have_tool_update); - - litest_tablet_proximity_out(dev); - libinput_dispatch(li); - - while ((event = libinput_get_event(li))) { - if (libinput_event_get_type(event) == - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY) { - struct libinput_event_tablet_tool *t = - libinput_event_get_tablet_tool_event(event); - - if (libinput_event_tablet_tool_get_proximity_state(t) == - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT) - have_proximity_out = true; - } - - libinput_event_destroy(event); - } - ck_assert(have_proximity_out); - - /* Proximity out must not emit axis events */ - litest_tablet_proximity_out(dev); - libinput_dispatch(li); - - while ((event = libinput_get_event(li))) { - enum libinput_event_type type = libinput_event_get_type(event); - - ck_assert(type != LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - libinput_event_destroy(event); - } -} -END_TEST - -START_TEST(proximity_in_button_down) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_drain_events(li); - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_pop_event_frame(dev); - libinput_dispatch(li); - - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); - litest_assert_tablet_button_event(li, - BTN_STYLUS, - LIBINPUT_BUTTON_STATE_PRESSED); - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(proximity_out_button_up) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_tablet_proximity_in(dev, 10, 10, axes); - - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_drain_events(li); - - litest_push_event_frame(dev); - litest_tablet_proximity_out(dev); - litest_event(dev, EV_KEY, BTN_STYLUS, 0); - litest_pop_event_frame(dev); - libinput_dispatch(li); - - litest_assert_tablet_button_event(li, - BTN_STYLUS, - LIBINPUT_BUTTON_STATE_RELEASED); - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(proximity_out_clear_buttons) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_event *event; - uint32_t button; - - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_drain_events(li); - - /* Test that proximity out events send button releases for any currently - * pressed stylus buttons - */ - for (button = BTN_TOUCH + 1; button <= BTN_STYLUS2; button++) { - bool button_released = false; - uint32_t event_button; - enum libinput_button_state state; - - if (!libevdev_has_event_code(dev->evdev, EV_KEY, button)) - continue; - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, button, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_tablet_proximity_out(dev); - - libinput_dispatch(li); - - while ((event = libinput_get_event(li))) { - tablet_event = libinput_event_get_tablet_tool_event(event); - - if (libinput_event_get_type(event) == - LIBINPUT_EVENT_TABLET_TOOL_BUTTON) { - - event_button = libinput_event_tablet_tool_get_button(tablet_event); - state = libinput_event_tablet_tool_get_button_state(tablet_event); - - if (event_button == button && - state == LIBINPUT_BUTTON_STATE_RELEASED) - button_released = true; - } - - libinput_event_destroy(event); - } - - ck_assert_msg(button_released, - "Button %s (%d) was not released.", - libevdev_event_code_get_name(EV_KEY, button), - event_button); - } - - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(proximity_has_axes) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_event *event; - struct libinput_tablet_tool *tool; - double x, y, - distance; - double last_x, last_y, - last_distance = 0.0, - last_tx = 0.0, last_ty = 0.0; - - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { ABS_TILT_X, 10 }, - { ABS_TILT_Y, 10 }, - { -1, -1} - }; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tablet_event); - - ck_assert(libinput_event_tablet_tool_x_has_changed(tablet_event)); - ck_assert(libinput_event_tablet_tool_y_has_changed(tablet_event)); - - x = libinput_event_tablet_tool_get_x(tablet_event); - y = libinput_event_tablet_tool_get_y(tablet_event); - - litest_assert_double_ne(x, 0); - litest_assert_double_ne(y, 0); - - if (libinput_tablet_tool_has_distance(tool)) { - ck_assert(libinput_event_tablet_tool_distance_has_changed( - tablet_event)); - - distance = libinput_event_tablet_tool_get_distance(tablet_event); - litest_assert_double_ne(distance, 0); - } - - if (libinput_tablet_tool_has_tilt(tool)) { - ck_assert(libinput_event_tablet_tool_tilt_x_has_changed( - tablet_event)); - ck_assert(libinput_event_tablet_tool_tilt_y_has_changed( - tablet_event)); - - x = libinput_event_tablet_tool_get_tilt_x(tablet_event); - y = libinput_event_tablet_tool_get_tilt_y(tablet_event); - - litest_assert_double_ne(x, 0); - litest_assert_double_ne(y, 0); - } - - litest_assert_empty_queue(li); - libinput_event_destroy(event); - - litest_axis_set_value(axes, ABS_DISTANCE, 20); - litest_axis_set_value(axes, ABS_TILT_X, 15); - litest_axis_set_value(axes, ABS_TILT_Y, 25); - litest_tablet_motion(dev, 20, 30, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - last_x = libinput_event_tablet_tool_get_x(tablet_event); - last_y = libinput_event_tablet_tool_get_y(tablet_event); - if (libinput_tablet_tool_has_distance(tool)) - last_distance = libinput_event_tablet_tool_get_distance( - tablet_event); - if (libinput_tablet_tool_has_tilt(tool)) { - last_tx = libinput_event_tablet_tool_get_tilt_x(tablet_event); - last_ty = libinput_event_tablet_tool_get_tilt_y(tablet_event); - } - - libinput_event_destroy(event); - - /* Make sure that the axes are still present on proximity out */ - litest_tablet_proximity_out(dev); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tablet_event); - - ck_assert(!libinput_event_tablet_tool_x_has_changed(tablet_event)); - ck_assert(!libinput_event_tablet_tool_y_has_changed(tablet_event)); - - x = libinput_event_tablet_tool_get_x(tablet_event); - y = libinput_event_tablet_tool_get_y(tablet_event); - litest_assert_double_eq(x, last_x); - litest_assert_double_eq(y, last_y); - - if (libinput_tablet_tool_has_distance(tool)) { - ck_assert(!libinput_event_tablet_tool_distance_has_changed( - tablet_event)); - - distance = libinput_event_tablet_tool_get_distance( - tablet_event); - litest_assert_double_eq(distance, last_distance); - } - - if (libinput_tablet_tool_has_tilt(tool)) { - ck_assert(!libinput_event_tablet_tool_tilt_x_has_changed( - tablet_event)); - ck_assert(!libinput_event_tablet_tool_tilt_y_has_changed( - tablet_event)); - - x = libinput_event_tablet_tool_get_tilt_x(tablet_event); - y = libinput_event_tablet_tool_get_tilt_y(tablet_event); - - litest_assert_double_eq(x, last_tx); - litest_assert_double_eq(y, last_ty); - } - - litest_assert_empty_queue(li); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(proximity_range_enter) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 90 }, - { -1, -1 } - }; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_MOUSE)) - return; - - litest_drain_events(li); - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_pop_event_frame(dev); - litest_assert_empty_queue(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 20); - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); - - litest_axis_set_value(axes, ABS_DISTANCE, 90); - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - - litest_tablet_proximity_out(dev); - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(proximity_range_in_out) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 20 }, - { -1, -1 } - }; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_MOUSE)) - return; - - litest_drain_events(li); - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_pop_event_frame(dev); - libinput_dispatch(li); - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); - - litest_axis_set_value(axes, ABS_DISTANCE, 90); - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - - litest_tablet_motion(dev, 30, 30, axes); - litest_assert_empty_queue(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 20); - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); - - litest_tablet_proximity_out(dev); - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(proximity_range_button_click) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 90 }, - { -1, -1 } - }; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_MOUSE)) - return; - - litest_drain_events(li); - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_pop_event_frame(dev); - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - litest_event(dev, EV_KEY, BTN_STYLUS, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - litest_tablet_proximity_out(dev); - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(proximity_range_button_press) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 20 }, - { -1, -1 } - }; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_MOUSE)) - return; - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_pop_event_frame(dev); - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - litest_assert_tablet_button_event(li, - BTN_STYLUS, - LIBINPUT_BUTTON_STATE_PRESSED); - - litest_axis_set_value(axes, ABS_DISTANCE, 90); - litest_tablet_motion(dev, 15, 15, axes); - libinput_dispatch(li); - - /* expect fake button release */ - litest_assert_tablet_button_event(li, - BTN_STYLUS, - LIBINPUT_BUTTON_STATE_RELEASED); - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - - litest_event(dev, EV_KEY, BTN_STYLUS, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - litest_tablet_proximity_out(dev); - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(proximity_range_button_release) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 90 }, - { -1, -1 } - }; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_MOUSE)) - return; - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_pop_event_frame(dev); - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_assert_empty_queue(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 20); - litest_tablet_motion(dev, 15, 15, axes); - libinput_dispatch(li); - - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); - /* expect fake button press */ - litest_assert_tablet_button_event(li, - BTN_STYLUS, - LIBINPUT_BUTTON_STATE_PRESSED); - litest_assert_empty_queue(li); - - litest_event(dev, EV_KEY, BTN_STYLUS, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - litest_assert_tablet_button_event(li, - BTN_STYLUS, - LIBINPUT_BUTTON_STATE_RELEASED); - - litest_tablet_proximity_out(dev); - litest_assert_tablet_proximity_event(li, - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); -} -END_TEST - -START_TEST(motion) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_event *event; - int test_x, test_y; - double last_reported_x = 0, last_reported_y = 0; - enum libinput_event_type type; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 5, 100, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - - do { - bool x_changed, y_changed; - double reported_x, reported_y; - - tablet_event = libinput_event_get_tablet_tool_event(event); - ck_assert_int_eq(libinput_event_get_type(event), - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - x_changed = libinput_event_tablet_tool_x_has_changed( - tablet_event); - y_changed = libinput_event_tablet_tool_y_has_changed( - tablet_event); - - ck_assert(x_changed); - ck_assert(y_changed); - - reported_x = libinput_event_tablet_tool_get_x(tablet_event); - reported_y = libinput_event_tablet_tool_get_y(tablet_event); - - litest_assert_double_lt(reported_x, reported_y); - - last_reported_x = reported_x; - last_reported_y = reported_y; - - libinput_event_destroy(event); - event = libinput_get_event(li); - } while (event != NULL); - - for (test_x = 10, test_y = 90; - test_x <= 100; - test_x += 10, test_y -= 10) { - bool x_changed, y_changed; - double reported_x, reported_y; - - litest_tablet_motion(dev, test_x, test_y, axes); - libinput_dispatch(li); - - while ((event = libinput_get_event(li))) { - tablet_event = libinput_event_get_tablet_tool_event(event); - type = libinput_event_get_type(event); - - if (type == LIBINPUT_EVENT_TABLET_TOOL_AXIS) { - x_changed = libinput_event_tablet_tool_x_has_changed( - tablet_event); - y_changed = libinput_event_tablet_tool_y_has_changed( - tablet_event); - - ck_assert(x_changed); - ck_assert(y_changed); - - reported_x = libinput_event_tablet_tool_get_x( - tablet_event); - reported_y = libinput_event_tablet_tool_get_y( - tablet_event); - - litest_assert_double_gt(reported_x, - last_reported_x); - litest_assert_double_lt(reported_y, - last_reported_y); - - last_reported_x = reported_x; - last_reported_y = reported_y; - } - - libinput_event_destroy(event); - } - } -} -END_TEST - -START_TEST(left_handed) -{ -#if HAVE_LIBWACOM - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - double libinput_max_x, libinput_max_y; - double last_x = -1.0, last_y = -1.0; - double x, y; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_drain_events(li); - - ck_assert(libinput_device_config_left_handed_is_available(dev->libinput_device)); - - libinput_device_get_size (dev->libinput_device, - &libinput_max_x, - &libinput_max_y); - - /* Test that left-handed mode doesn't go into effect until the tool has - * left proximity of the tablet. In order to test this, we have to bring - * the tool into proximity and make sure libinput processes the - * proximity events so that it updates it's internal tablet state, and - * then try setting it to left-handed mode. */ - litest_tablet_proximity_in(dev, 0, 100, axes); - libinput_dispatch(li); - libinput_device_config_left_handed_set(dev->libinput_device, 1); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - last_x = libinput_event_tablet_tool_get_x(tablet_event); - last_y = libinput_event_tablet_tool_get_y(tablet_event); - - litest_assert_double_eq(last_x, 0); - litest_assert_double_eq(last_y, libinput_max_y); - - libinput_event_destroy(event); - - litest_tablet_motion(dev, 100, 0, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - x = libinput_event_tablet_tool_get_x(tablet_event); - y = libinput_event_tablet_tool_get_y(tablet_event); - - litest_assert_double_eq(x, libinput_max_x); - litest_assert_double_eq(y, 0); - - litest_assert_double_gt(x, last_x); - litest_assert_double_lt(y, last_y); - - libinput_event_destroy(event); - - litest_tablet_proximity_out(dev); - litest_drain_events(li); - - /* Since we've drained the events and libinput's aware the tool is out - * of proximity, it should have finally transitioned into left-handed - * mode, so the axes should be inverted once we bring it back into - * proximity */ - litest_tablet_proximity_in(dev, 0, 100, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - last_x = libinput_event_tablet_tool_get_x(tablet_event); - last_y = libinput_event_tablet_tool_get_y(tablet_event); - - litest_assert_double_eq(last_x, libinput_max_x); - litest_assert_double_eq(last_y, 0); - - libinput_event_destroy(event); - - litest_tablet_motion(dev, 100, 0, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - tablet_event = libinput_event_get_tablet_tool_event(event); - - x = libinput_event_tablet_tool_get_x(tablet_event); - y = libinput_event_tablet_tool_get_y(tablet_event); - - litest_assert_double_eq(x, 0); - litest_assert_double_eq(y, libinput_max_y); - - litest_assert_double_lt(x, last_x); - litest_assert_double_gt(y, last_y); - - libinput_event_destroy(event); -#endif -} -END_TEST - -START_TEST(no_left_handed) -{ - struct litest_device *dev = litest_current_device(); - - ck_assert(!libinput_device_config_left_handed_is_available(dev->libinput_device)); -} -END_TEST - -START_TEST(left_handed_tilt) -{ -#if HAVE_LIBWACOM - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - enum libinput_config_status status; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { ABS_TILT_X, 90 }, - { ABS_TILT_Y, 10 }, - { -1, -1 } - }; - double tx, ty; - - status = libinput_device_config_left_handed_set(dev->libinput_device, 1); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tx = libinput_event_tablet_tool_get_tilt_x(tev); - ty = libinput_event_tablet_tool_get_tilt_y(tev); - - ck_assert_double_lt(tx, 0); - ck_assert_double_gt(ty, 0); - - libinput_event_destroy(event); -#endif -} -END_TEST - -static inline double -rotate_event(struct litest_device *dev, int angle_degrees) -{ - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - const struct input_absinfo *abs; - double a = (angle_degrees - 90 - 175)/180.0 * M_PI; - double val; - int x, y; - int tilt_center_x, tilt_center_y; - - abs = libevdev_get_abs_info(dev->evdev, ABS_TILT_X); - ck_assert_notnull(abs); - tilt_center_x = (abs->maximum - abs->minimum + 1) / 2; - - abs = libevdev_get_abs_info(dev->evdev, ABS_TILT_Y); - ck_assert_notnull(abs); - tilt_center_y = (abs->maximum - abs->minimum + 1) / 2; - - x = cos(a) * 20 + tilt_center_x; - y = sin(a) * 20 + tilt_center_y; - - litest_event(dev, EV_ABS, ABS_TILT_X, x); - litest_event(dev, EV_ABS, ABS_TILT_Y, y); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - ck_assert(libinput_event_tablet_tool_rotation_has_changed(tev)); - val = libinput_event_tablet_tool_get_rotation(tev); - - libinput_event_destroy(event); - litest_assert_empty_queue(li); - - return val; -} - -START_TEST(left_handed_mouse_rotation) -{ -#if HAVE_LIBWACOM - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - enum libinput_config_status status; - int angle; - double val, old_val = 0; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { ABS_TILT_X, 0 }, - { ABS_TILT_Y, 0 }, - { -1, -1 } - }; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_MOUSE)) - return; - - status = libinput_device_config_left_handed_set(dev->libinput_device, 1); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - - litest_drain_events(li); - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_pop_event_frame(dev); - - litest_drain_events(li); - - /* cos/sin are 90 degrees offset from the north-is-zero that - libinput uses. 175 is the CCW offset in the mouse HW */ - for (angle = 185; angle < 540; angle += 5) { - int expected_angle = angle - 180; - - val = rotate_event(dev, angle % 360); - - /* rounding error galore, we can't test for anything more - precise than these */ - litest_assert_double_lt(val, 360.0); - litest_assert_double_gt(val, old_val); - litest_assert_double_lt(val, expected_angle + 5); - - old_val = val; - } -#endif -} -END_TEST - -START_TEST(left_handed_artpen_rotation) -{ -#if HAVE_LIBWACOM - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - const struct input_absinfo *abs; - enum libinput_config_status status; - double val; - double scale; - int angle; - - if (!libevdev_has_event_code(dev->evdev, - EV_ABS, - ABS_Z)) - return; - - status = libinput_device_config_left_handed_set(dev->libinput_device, 1); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - - litest_drain_events(li); - - abs = libevdev_get_abs_info(dev->evdev, ABS_Z); - ck_assert_notnull(abs); - scale = (abs->maximum - abs->minimum + 1)/360.0; - - litest_event(dev, EV_KEY, BTN_TOOL_BRUSH, 1); - litest_event(dev, EV_ABS, ABS_MISC, 0x804); /* Art Pen */ - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_event(dev, EV_ABS, ABS_Z, abs->minimum); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_drain_events(li); - - for (angle = 188; angle < 540; angle += 8) { - int a = angle * scale + abs->minimum; - int expected_angle = angle - 180; - - litest_event(dev, EV_ABS, ABS_Z, a); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - ck_assert(libinput_event_tablet_tool_rotation_has_changed(tev)); - val = libinput_event_tablet_tool_get_rotation(tev); - - /* artpen has a 90 deg offset cw */ - ck_assert_int_eq(round(val), (expected_angle + 90) % 360); - - libinput_event_destroy(event); - litest_assert_empty_queue(li); - - } -#endif -} -END_TEST - -START_TEST(motion_event_state) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - int test_x, test_y; - double last_x, last_y; - - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_drain_events(li); - litest_tablet_proximity_in(dev, 5, 100, axes); - litest_drain_events(li); - - /* couple of events that go left/bottom to right/top */ - for (test_x = 0, test_y = 100; test_x < 100; test_x += 10, test_y -= 10) - litest_tablet_motion(dev, test_x, test_y, axes); - - libinput_dispatch(li); - - while ((event = libinput_get_event(li))) { - if (libinput_event_get_type(event) == LIBINPUT_EVENT_TABLET_TOOL_AXIS) - break; - libinput_event_destroy(event); - } - - /* pop the first event off */ - ck_assert_notnull(event); - tablet_event = libinput_event_get_tablet_tool_event(event); - ck_assert_notnull(tablet_event); - - last_x = libinput_event_tablet_tool_get_x(tablet_event); - last_y = libinput_event_tablet_tool_get_y(tablet_event); - - /* mark with a button event, then go back to bottom/left */ - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - for (test_x = 100, test_y = 0; test_x > 0; test_x -= 10, test_y += 10) - litest_tablet_motion(dev, test_x, test_y, axes); - - libinput_event_destroy(event); - libinput_dispatch(li); - ck_assert_int_eq(libinput_next_event_type(li), - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - /* we expect all events up to the button event to go from - bottom/left to top/right */ - while ((event = libinput_get_event(li))) { - double x, y; - - if (libinput_event_get_type(event) != LIBINPUT_EVENT_TABLET_TOOL_AXIS) - break; - - tablet_event = libinput_event_get_tablet_tool_event(event); - ck_assert_notnull(tablet_event); - - x = libinput_event_tablet_tool_get_x(tablet_event); - y = libinput_event_tablet_tool_get_y(tablet_event); - - ck_assert(x > last_x); - ck_assert(y < last_y); - - last_x = x; - last_y = y; - libinput_event_destroy(event); - } - - ck_assert_int_eq(libinput_event_get_type(event), - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(motion_outside_bounds) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - double val; - - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_tablet_proximity_in(dev, 50, 50, axes); - litest_drain_events(li); - - /* On the 24HD x/y of 0 is outside the limit */ - litest_event(dev, EV_ABS, ABS_X, 0); - litest_event(dev, EV_ABS, ABS_Y, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - val = libinput_event_tablet_tool_get_x(tablet_event); - ck_assert_double_lt(val, 0.0); - val = libinput_event_tablet_tool_get_y(tablet_event); - ck_assert_double_gt(val, 0.0); - - val = libinput_event_tablet_tool_get_x_transformed(tablet_event, 100); - ck_assert_double_lt(val, 0.0); - - libinput_event_destroy(event); - - /* On the 24HD x/y of 0 is outside the limit */ - litest_event(dev, EV_ABS, ABS_X, 1000); - litest_event(dev, EV_ABS, ABS_Y, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - val = libinput_event_tablet_tool_get_x(tablet_event); - ck_assert_double_gt(val, 0.0); - val = libinput_event_tablet_tool_get_y(tablet_event); - ck_assert_double_lt(val, 0.0); - - val = libinput_event_tablet_tool_get_y_transformed(tablet_event, 100); - ck_assert_double_lt(val, 0.0); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(bad_distance_events) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - const struct input_absinfo *absinfo; - struct axis_replacement axes[] = { - { -1, -1 }, - }; - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_tablet_proximity_out(dev); - litest_drain_events(li); - - absinfo = libevdev_get_abs_info(dev->evdev, ABS_DISTANCE); - ck_assert(absinfo != NULL); - - litest_event(dev, EV_ABS, ABS_DISTANCE, absinfo->maximum); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_event(dev, EV_ABS, ABS_DISTANCE, absinfo->minimum); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(normalization) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_event *event; - double pressure, - tilt_vertical, - tilt_horizontal; - const struct input_absinfo *pressure_absinfo, - *tilt_vertical_absinfo, - *tilt_horizontal_absinfo; - - litest_drain_events(li); - - pressure_absinfo = libevdev_get_abs_info(dev->evdev, ABS_PRESSURE); - tilt_vertical_absinfo = libevdev_get_abs_info(dev->evdev, ABS_TILT_X); - tilt_horizontal_absinfo = libevdev_get_abs_info(dev->evdev, ABS_TILT_Y); - - /* Test minimum */ - if (pressure_absinfo != NULL) - litest_event(dev, - EV_ABS, - ABS_PRESSURE, - pressure_absinfo->minimum); - - if (tilt_vertical_absinfo != NULL) - litest_event(dev, - EV_ABS, - ABS_TILT_X, - tilt_vertical_absinfo->minimum); - - if (tilt_horizontal_absinfo != NULL) - litest_event(dev, - EV_ABS, - ABS_TILT_Y, - tilt_horizontal_absinfo->minimum); - - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - libinput_dispatch(li); - - while ((event = libinput_get_event(li))) { - if (libinput_event_get_type(event) == LIBINPUT_EVENT_TABLET_TOOL_AXIS) { - tablet_event = libinput_event_get_tablet_tool_event(event); - - if (libinput_event_tablet_tool_pressure_has_changed( - tablet_event)) { - pressure = libinput_event_tablet_tool_get_pressure( - tablet_event); - - litest_assert_double_eq(pressure, 0); - } - - if (libinput_event_tablet_tool_tilt_x_has_changed( - tablet_event)) { - tilt_vertical = - libinput_event_tablet_tool_get_tilt_x( - tablet_event); - - litest_assert_double_eq(tilt_vertical, -1); - } - - if (libinput_event_tablet_tool_tilt_y_has_changed( - tablet_event)) { - tilt_horizontal = - libinput_event_tablet_tool_get_tilt_y( - tablet_event); - - litest_assert_double_eq(tilt_horizontal, -1); - } - } - - libinput_event_destroy(event); - } - - /* Test maximum */ - if (pressure_absinfo != NULL) - litest_event(dev, - EV_ABS, - ABS_PRESSURE, - pressure_absinfo->maximum); - - if (tilt_vertical_absinfo != NULL) - litest_event(dev, - EV_ABS, - ABS_TILT_X, - tilt_vertical_absinfo->maximum); - - if (tilt_horizontal_absinfo != NULL) - litest_event(dev, - EV_ABS, - ABS_TILT_Y, - tilt_horizontal_absinfo->maximum); - - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - libinput_dispatch(li); - - while ((event = libinput_get_event(li))) { - if (libinput_event_get_type(event) == LIBINPUT_EVENT_TABLET_TOOL_AXIS) { - tablet_event = libinput_event_get_tablet_tool_event(event); - - if (libinput_event_tablet_tool_pressure_has_changed( - tablet_event)) { - pressure = libinput_event_tablet_tool_get_pressure( - tablet_event); - - litest_assert_double_eq(pressure, 1); - } - - if (libinput_event_tablet_tool_tilt_x_has_changed( - tablet_event)) { - tilt_vertical = - libinput_event_tablet_tool_get_tilt_x( - tablet_event); - - litest_assert_double_eq(tilt_vertical, 1); - } - - if (libinput_event_tablet_tool_tilt_y_has_changed( - tablet_event)) { - tilt_horizontal = - libinput_event_tablet_tool_get_tilt_y( - tablet_event); - - litest_assert_double_eq(tilt_horizontal, 1); - } - } - - libinput_event_destroy(event); - } - -} -END_TEST - -START_TEST(tool_unique) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_event *event; - struct libinput_tablet_tool *tool; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tablet_event); - ck_assert(libinput_tablet_tool_is_unique(tool)); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tool_serial) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_event *event; - struct libinput_tablet_tool *tool; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tablet_event); - ck_assert_uint_eq(libinput_tablet_tool_get_serial(tool), 1000); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(serial_changes_tool) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_event *event; - struct libinput_tablet_tool *tool; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, 2000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tablet_event); - - ck_assert_uint_eq(libinput_tablet_tool_get_serial(tool), 2000); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(invalid_serials) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_tablet_tool *tool; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, -1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - libinput_dispatch(li); - while ((event = libinput_get_event(li))) { - if (libinput_event_get_type(event) == - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY) { - tablet_event = libinput_event_get_tablet_tool_event(event); - tool = libinput_event_tablet_tool_get_tool(tablet_event); - - ck_assert_uint_eq(libinput_tablet_tool_get_serial(tool), 1000); - } - - libinput_event_destroy(event); - } -} -END_TEST - -START_TEST(tool_ref) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event_tablet_tool *tablet_event; - struct libinput_event *event; - struct libinput_tablet_tool *tool; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tablet_event); - - ck_assert_notnull(tool); - ck_assert(tool == libinput_tablet_tool_ref(tool)); - ck_assert(tool == libinput_tablet_tool_unref(tool)); - ck_assert(libinput_tablet_tool_unref(tool) == NULL); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(pad_buttons_ignored) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - int button; - - litest_drain_events(li); - - for (button = BTN_0; button < BTN_MOUSE; button++) { - litest_event(dev, EV_KEY, button, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_event(dev, EV_KEY, button, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - } - - while ((event = libinput_get_event(li))) { - ck_assert_int_ne(libinput_event_get_type(event), - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - libinput_event_destroy(event); - libinput_dispatch(li); - } - - /* same thing while in prox */ - litest_tablet_proximity_in(dev, 10, 10, axes); - for (button = BTN_0; button < BTN_MOUSE; button++) { - litest_event(dev, EV_KEY, button, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_event(dev, EV_KEY, button, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - } - litest_tablet_proximity_out(dev); - - libinput_dispatch(li); - while ((event = libinput_get_event(li))) { - ck_assert_int_ne(libinput_event_get_type(event), - LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - libinput_event_destroy(event); - libinput_dispatch(li); - } -} -END_TEST - -START_TEST(tools_with_serials) -{ - struct libinput *li = litest_create_context(); - struct litest_device *dev[2]; - struct libinput_tablet_tool *tool[2] = {0}; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - int i; - - for (i = 0; i < 2; i++) { - dev[i] = litest_add_device_with_overrides(li, - LITEST_WACOM_INTUOS, - NULL, - NULL, - NULL, - NULL); - litest_drain_events(li); - - /* WARNING: this test fails if UI_GET_SYSNAME isn't - * available or isn't used by libevdev (1.3, commit 2ff45c73). - * Put a sleep(1) here and that usually fixes it. - */ - - litest_push_event_frame(dev[i]); - litest_tablet_proximity_in(dev[i], 10, 10, NULL); - litest_event(dev[i], EV_MSC, MSC_SERIAL, 100); - litest_pop_event_frame(dev[i]); - - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool[i] = libinput_event_tablet_tool_get_tool(tev); - libinput_event_destroy(event); - } - - /* We should get the same object for both devices */ - ck_assert_notnull(tool[0]); - ck_assert_notnull(tool[1]); - ck_assert_ptr_eq(tool[0], tool[1]); - - litest_delete_device(dev[0]); - litest_delete_device(dev[1]); - libinput_unref(li); -} -END_TEST - -START_TEST(tools_without_serials) -{ - struct libinput *li = litest_create_context(); - struct litest_device *dev[2]; - struct libinput_tablet_tool *tool[2] = {0}; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - int i; - - for (i = 0; i < 2; i++) { - dev[i] = litest_add_device_with_overrides(li, - LITEST_WACOM_ISDV4, - NULL, - NULL, - NULL, - NULL); - - litest_drain_events(li); - - /* WARNING: this test fails if UI_GET_SYSNAME isn't - * available or isn't used by libevdev (1.3, commit 2ff45c73). - * Put a sleep(1) here and that usually fixes it. - */ - - litest_tablet_proximity_in(dev[i], 10, 10, NULL); - - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool[i] = libinput_event_tablet_tool_get_tool(tev); - libinput_event_destroy(event); - } - - /* We should get different tool objects for each device */ - ck_assert_notnull(tool[0]); - ck_assert_notnull(tool[1]); - ck_assert_ptr_ne(tool[0], tool[1]); - - litest_delete_device(dev[0]); - litest_delete_device(dev[1]); - libinput_unref(li); -} -END_TEST - -START_TEST(tool_capabilities) -{ - struct libinput *li = litest_create_context(); - struct litest_device *intuos; - struct litest_device *bamboo; - struct libinput_event *event; - struct libinput_event_tablet_tool *t; - struct libinput_tablet_tool *tool; - - /* The axis capabilities of a tool can differ depending on the type of - * tablet the tool is being used with */ - bamboo = litest_add_device(li, LITEST_WACOM_BAMBOO); - intuos = litest_add_device(li, LITEST_WACOM_INTUOS); - litest_drain_events(li); - - litest_event(bamboo, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(bamboo, EV_SYN, SYN_REPORT, 0); - - libinput_dispatch(li); - - event = libinput_get_event(li); - t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(t); - - ck_assert(libinput_tablet_tool_has_pressure(tool)); - ck_assert(libinput_tablet_tool_has_distance(tool)); - ck_assert(!libinput_tablet_tool_has_tilt(tool)); - - libinput_event_destroy(event); - litest_assert_empty_queue(li); - - litest_event(intuos, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(intuos, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(t); - tool = libinput_event_tablet_tool_get_tool(t); - - ck_assert(libinput_tablet_tool_has_pressure(tool)); - ck_assert(libinput_tablet_tool_has_distance(tool)); - ck_assert(libinput_tablet_tool_has_tilt(tool)); - - libinput_event_destroy(event); - litest_assert_empty_queue(li); - - litest_delete_device(bamboo); - litest_delete_device(intuos); - libinput_unref(li); -} -END_TEST - -START_TEST(tool_in_prox_before_start) -{ - struct libinput *li; - struct litest_device *dev = litest_current_device(); - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct libinput_tablet_tool *tool; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { ABS_TILT_X, 0 }, - { ABS_TILT_Y, 0 }, - { -1, -1 } - }; - const char *devnode; - unsigned int serial; - - litest_tablet_proximity_in(dev, 10, 10, axes); - - /* for simplicity, we create a new litest context */ - devnode = libevdev_uinput_get_devnode(dev->uinput); - li = litest_create_context(); - libinput_path_add_device(li, devnode); - - litest_wait_for_event_of_type(li, - LIBINPUT_EVENT_DEVICE_ADDED, - -1); - event = libinput_get_event(li); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); - - litest_tablet_motion(dev, 10, 20, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tev); - serial = libinput_tablet_tool_get_serial(tool); - libinput_event_destroy(event); - - litest_tablet_motion(dev, 30, 40, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - tool = libinput_event_tablet_tool_get_tool(tev); - ck_assert_int_eq(serial, - libinput_tablet_tool_get_serial(tool)); - libinput_event_destroy(event); - - litest_assert_empty_queue(li); - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_event(dev, EV_KEY, BTN_STYLUS, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - litest_tablet_proximity_out(dev); - - litest_wait_for_event_of_type(li, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, - -1); - libinput_unref(li); -} -END_TEST - -START_TEST(mouse_tool) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct libinput_tablet_tool *tool; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_MOUSE)) - return; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tev); - ck_assert_notnull(tool); - ck_assert_int_eq(libinput_tablet_tool_get_type(tool), - LIBINPUT_TABLET_TOOL_TYPE_MOUSE); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(mouse_buttons) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct libinput_tablet_tool *tool; - int code; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_MOUSE)) - return; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_event(dev, EV_ABS, ABS_MISC, 0x806); /* 5-button mouse tool_id */ - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tev); - ck_assert_notnull(tool); - libinput_tablet_tool_ref(tool); - - libinput_event_destroy(event); - - for (code = BTN_LEFT; code <= BTN_TASK; code++) { - bool has_button = libevdev_has_event_code(dev->evdev, - EV_KEY, - code); - ck_assert_int_eq(!!has_button, - !!libinput_tablet_tool_has_button(tool, code)); - - if (!has_button) - continue; - - litest_event(dev, EV_KEY, code, 1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - litest_event(dev, EV_KEY, code, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - litest_assert_tablet_button_event(li, - code, - LIBINPUT_BUTTON_STATE_PRESSED); - litest_assert_tablet_button_event(li, - code, - LIBINPUT_BUTTON_STATE_RELEASED); - } - - libinput_tablet_tool_unref(tool); -} -END_TEST - -START_TEST(mouse_rotation) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - int angle; - double val, old_val = 0; - - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { ABS_TILT_X, 0 }, - { ABS_TILT_Y, 0 }, - { -1, -1 } - }; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_MOUSE)) - return; - - litest_drain_events(li); - - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_pop_event_frame(dev); - - litest_drain_events(li); - - /* cos/sin are 90 degrees offset from the north-is-zero that - libinput uses. 175 is the CCW offset in the mouse HW */ - for (angle = 5; angle < 360; angle += 5) { - val = rotate_event(dev, angle); - - /* rounding error galore, we can't test for anything more - precise than these */ - litest_assert_double_lt(val, 360.0); - litest_assert_double_gt(val, old_val); - litest_assert_double_lt(val, angle + 5); - - old_val = val; - } -} -END_TEST - -START_TEST(mouse_wheel) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct libinput_tablet_tool *tool; - const struct input_absinfo *abs; - double val; - int i; - - if (!libevdev_has_event_code(dev->evdev, - EV_REL, - REL_WHEEL)) - return; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); - litest_event(dev, EV_ABS, ABS_MISC, 0x806); /* 5-button mouse tool_id */ - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tev); - ck_assert_notnull(tool); - libinput_tablet_tool_ref(tool); - - libinput_event_destroy(event); - - ck_assert(libinput_tablet_tool_has_wheel(tool)); - - for (i = 0; i < 3; i++) { - litest_event(dev, EV_REL, REL_WHEEL, -1); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - ck_assert(libinput_event_tablet_tool_wheel_has_changed(tev)); - - val = libinput_event_tablet_tool_get_wheel_delta(tev); - ck_assert_int_eq(val, 15); - - val = libinput_event_tablet_tool_get_wheel_delta_discrete(tev); - ck_assert_int_eq(val, 1); - - libinput_event_destroy(event); - - litest_assert_empty_queue(li); - } - - for (i = 2; i < 5; i++) { - /* send x/y events to make sure we reset the wheel */ - abs = libevdev_get_abs_info(dev->evdev, ABS_X); - litest_event(dev, EV_ABS, ABS_X, (abs->maximum - abs->minimum)/i); - abs = libevdev_get_abs_info(dev->evdev, ABS_Y); - litest_event(dev, EV_ABS, ABS_Y, (abs->maximum - abs->minimum)/i); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - ck_assert(!libinput_event_tablet_tool_wheel_has_changed(tev)); - - val = libinput_event_tablet_tool_get_wheel_delta(tev); - ck_assert_int_eq(val, 0); - - val = libinput_event_tablet_tool_get_wheel_delta_discrete(tev); - ck_assert_int_eq(val, 0); - - libinput_event_destroy(event); - - litest_assert_empty_queue(li); - } - - libinput_tablet_tool_unref(tool); -} -END_TEST - -START_TEST(airbrush_tool) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct libinput_tablet_tool *tool; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_AIRBRUSH)) - return; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_AIRBRUSH, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tev); - - ck_assert_notnull(tool); - ck_assert_int_eq(libinput_tablet_tool_get_type(tool), - LIBINPUT_TABLET_TOOL_TYPE_AIRBRUSH); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(airbrush_wheel) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - const struct input_absinfo *abs; - double val; - double scale; - int v; - - if (!libevdev_has_event_code(dev->evdev, - EV_KEY, - BTN_TOOL_AIRBRUSH)) - return; - - litest_drain_events(li); - - abs = libevdev_get_abs_info(dev->evdev, ABS_WHEEL); - ck_assert_notnull(abs); - - litest_event(dev, EV_KEY, BTN_TOOL_AIRBRUSH, 1); - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - /* start with non-zero */ - litest_event(dev, EV_ABS, ABS_WHEEL, 10); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_drain_events(li); - - scale = abs->maximum - abs->minimum; - for (v = abs->minimum; v < abs->maximum; v += 8) { - litest_event(dev, EV_ABS, ABS_WHEEL, v); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - ck_assert(libinput_event_tablet_tool_slider_has_changed(tev)); - val = libinput_event_tablet_tool_get_slider_position(tev); - - ck_assert_int_eq(val, (v - abs->minimum)/scale); - libinput_event_destroy(event); - litest_assert_empty_queue(li); - } -} -END_TEST - -START_TEST(artpen_tool) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct libinput_tablet_tool *tool; - - if (!libevdev_has_event_code(dev->evdev, - EV_ABS, - ABS_Z)) - return; - - litest_drain_events(li); - - litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); - litest_event(dev, EV_ABS, ABS_MISC, 0x804); /* Art Pen */ - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - tool = libinput_event_tablet_tool_get_tool(tev); - ck_assert_notnull(tool); - ck_assert_int_eq(libinput_tablet_tool_get_type(tool), - LIBINPUT_TABLET_TOOL_TYPE_PEN); - ck_assert(libinput_tablet_tool_has_rotation(tool)); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(artpen_rotation) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - const struct input_absinfo *abs; - double val; - double scale; - int angle; - - if (!libevdev_has_event_code(dev->evdev, - EV_ABS, - ABS_Z)) - return; - - litest_drain_events(li); - - abs = libevdev_get_abs_info(dev->evdev, ABS_Z); - ck_assert_notnull(abs); - scale = (abs->maximum - abs->minimum + 1)/360.0; - - litest_event(dev, EV_KEY, BTN_TOOL_BRUSH, 1); - litest_event(dev, EV_ABS, ABS_MISC, 0x804); /* Art Pen */ - litest_event(dev, EV_MSC, MSC_SERIAL, 1000); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_event(dev, EV_ABS, ABS_Z, abs->minimum); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_drain_events(li); - - for (angle = 8; angle < 360; angle += 8) { - int a = angle * scale + abs->minimum; - - litest_event(dev, EV_ABS, ABS_Z, a); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - ck_assert(libinput_event_tablet_tool_rotation_has_changed(tev)); - val = libinput_event_tablet_tool_get_rotation(tev); - - /* artpen has a 90 deg offset cw */ - ck_assert_int_eq(round(val), (angle + 90) % 360); - - libinput_event_destroy(event); - litest_assert_empty_queue(li); - - } -} -END_TEST - -START_TEST(tablet_time_usec) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 5, 100, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - ck_assert_int_eq(libinput_event_tablet_tool_get_time(tev), - libinput_event_tablet_tool_get_time_usec(tev) / 1000); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tablet_pressure_distance_exclusive) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 }, - }; - double pressure, distance; - - litest_tablet_proximity_in(dev, 5, 100, axes); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_PRESSURE, 2); - litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - pressure = libinput_event_tablet_tool_get_pressure(tev); - distance = libinput_event_tablet_tool_get_distance(tev); - - ck_assert_double_ne(pressure, 0.0); - ck_assert_double_eq(distance, 0.0); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tablet_calibration_has_matrix) -{ - struct litest_device *dev = litest_current_device(); - struct libinput_device *d = dev->libinput_device; - enum libinput_config_status status; - int rc; - float calibration[6] = {1, 0, 0, 0, 1, 0}; - int has_calibration; - - has_calibration = libevdev_has_property(dev->evdev, INPUT_PROP_DIRECT); - - rc = libinput_device_config_calibration_has_matrix(d); - ck_assert_int_eq(rc, has_calibration); - rc = libinput_device_config_calibration_get_matrix(d, calibration); - ck_assert_int_eq(rc, 0); - rc = libinput_device_config_calibration_get_default_matrix(d, - calibration); - ck_assert_int_eq(rc, 0); - - status = libinput_device_config_calibration_set_matrix(d, - calibration); - if (has_calibration) - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - else - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_UNSUPPORTED); -} -END_TEST - -START_TEST(tablet_calibration_set_matrix_delta) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_device *d = dev->libinput_device; - enum libinput_config_status status; - float calibration[6] = {0.5, 0, 0, 0, 0.5, 0}; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - int has_calibration; - double x, y, dx, dy, mdx, mdy; - - has_calibration = libevdev_has_property(dev->evdev, INPUT_PROP_DIRECT); - if (!has_calibration) - return; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 100, 100, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - x = libinput_event_tablet_tool_get_x(tablet_event); - y = libinput_event_tablet_tool_get_y(tablet_event); - libinput_event_destroy(event); - - litest_tablet_motion(dev, 80, 80, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - dx = libinput_event_tablet_tool_get_x(tablet_event) - x; - dy = libinput_event_tablet_tool_get_y(tablet_event) - y; - libinput_event_destroy(event); - litest_tablet_proximity_out(dev); - litest_drain_events(li); - - status = libinput_device_config_calibration_set_matrix(d, - calibration); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - - litest_tablet_proximity_in(dev, 100, 100, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - x = libinput_event_tablet_tool_get_x(tablet_event); - y = libinput_event_tablet_tool_get_y(tablet_event); - libinput_event_destroy(event); - - litest_tablet_motion(dev, 80, 80, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - mdx = libinput_event_tablet_tool_get_x(tablet_event) - x; - mdy = libinput_event_tablet_tool_get_y(tablet_event) - y; - libinput_event_destroy(event); - litest_drain_events(li); - - ck_assert_double_gt(dx, mdx * 2 - 1); - ck_assert_double_lt(dx, mdx * 2 + 1); - ck_assert_double_gt(dy, mdy * 2 - 1); - ck_assert_double_lt(dy, mdy * 2 + 1); -} -END_TEST - -START_TEST(tablet_calibration_set_matrix) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_device *d = dev->libinput_device; - enum libinput_config_status status; - float calibration[6] = {0.5, 0, 0, 0, 1, 0}; - struct libinput_event *event; - struct libinput_event_tablet_tool *tablet_event; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - int has_calibration; - double x, y; - - has_calibration = libevdev_has_property(dev->evdev, INPUT_PROP_DIRECT); - if (!has_calibration) - return; - - litest_drain_events(li); - - status = libinput_device_config_calibration_set_matrix(d, - calibration); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - - litest_tablet_proximity_in(dev, 100, 100, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - x = libinput_event_tablet_tool_get_x_transformed(tablet_event, 100); - y = libinput_event_tablet_tool_get_y_transformed(tablet_event, 100); - libinput_event_destroy(event); - - ck_assert_double_gt(x, 49.0); - ck_assert_double_lt(x, 51.0); - ck_assert_double_gt(y, 99.0); - ck_assert_double_lt(y, 100.0); - - litest_tablet_proximity_out(dev); - libinput_dispatch(li); - litest_tablet_proximity_in(dev, 50, 50, axes); - litest_tablet_proximity_out(dev); - litest_drain_events(li); - - calibration[0] = 1; - calibration[4] = 0.5; - status = libinput_device_config_calibration_set_matrix(d, - calibration); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - - litest_tablet_proximity_in(dev, 100, 100, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tablet_event = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - x = libinput_event_tablet_tool_get_x_transformed(tablet_event, 100); - y = libinput_event_tablet_tool_get_y_transformed(tablet_event, 100); - libinput_event_destroy(event); - - ck_assert(x > 99.0); - ck_assert(x < 100.0); - ck_assert(y > 49.0); - ck_assert(y < 51.0); - - litest_tablet_proximity_out(dev); -} -END_TEST - -START_TEST(tablet_pressure_offset) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 70 }, - { ABS_PRESSURE, 20 }, - { -1, -1 }, - }; - double pressure; - - litest_tablet_proximity_in(dev, 5, 100, axes); - litest_drain_events(li); - - /* Put the pen down, with a pressure high enough to meet the - * threshold */ - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 25); - - litest_push_event_frame(dev); - litest_tablet_motion(dev, 70, 70, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - libinput_dispatch(li); - litest_drain_events(li); - - /* Reduce pressure to just a tick over the offset, otherwise we get - * the tip up event again */ - litest_axis_set_value(axes, ABS_PRESSURE, 20.1); - litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - pressure = libinput_event_tablet_tool_get_pressure(tev); - - /* we can't actually get a real 0.0 because that would trigger a tip - * up. but it's close enough to zero that ck_assert_double_eq won't - * notice */ - ck_assert_double_eq(pressure, 0.0); - - libinput_event_destroy(event); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_PRESSURE, 21); - litest_tablet_motion(dev, 70, 70, axes); - - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - pressure = libinput_event_tablet_tool_get_pressure(tev); - - /* can't use the double_eq here, the pressure value is too tiny */ - ck_assert(pressure > 0.0); - ck_assert(pressure < 1.0); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tablet_pressure_offset_decrease) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 70 }, - { ABS_PRESSURE, 20 }, - { -1, -1 }, - }; - double pressure; - - /* offset 20 on prox in */ - litest_tablet_proximity_in(dev, 5, 100, axes); - litest_tablet_proximity_out(dev); - litest_drain_events(li); - - /* a reduced pressure value must reduce the offset */ - litest_axis_set_value(axes, ABS_PRESSURE, 10); - litest_tablet_proximity_in(dev, 5, 100, axes); - litest_tablet_proximity_out(dev); - litest_drain_events(li); - - /* a reduced pressure value must reduce the offset */ - litest_tablet_proximity_in(dev, 5, 100, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - pressure = libinput_event_tablet_tool_get_pressure(tev); - ck_assert_double_eq(pressure, 0.0); - - libinput_event_destroy(event); - litest_drain_events(li); - - /* trigger the pressure threshold */ - litest_axis_set_value(axes, ABS_PRESSURE, 15); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 70, 70, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - - pressure = libinput_event_tablet_tool_get_pressure(tev); - - /* can't use the double_eq here, the pressure value is too tiny */ - ck_assert(pressure > 0.0); - ck_assert(pressure < 1.0); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tablet_pressure_offset_increase) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 70 }, - { ABS_PRESSURE, 20 }, - { -1, -1 }, - }; - double pressure; - - /* offset 20 on first prox in */ - litest_tablet_proximity_in(dev, 5, 100, axes); - litest_tablet_proximity_out(dev); - litest_drain_events(li); - - /* offset 30 on second prox in - must not change the offset */ - litest_axis_set_value(axes, ABS_PRESSURE, 30); - litest_tablet_proximity_in(dev, 5, 100, axes); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 31); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 70, 70, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - libinput_dispatch(li); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_PRESSURE, 30); - litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - pressure = libinput_event_tablet_tool_get_pressure(tev); - /* can't use the double_eq here, the pressure value is too tiny */ - ck_assert(pressure > 0.0); - ck_assert(pressure < 1.0); - libinput_event_destroy(event); - - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_PRESSURE, 20); - litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_TIP); - - pressure = libinput_event_tablet_tool_get_pressure(tev); - - ck_assert_double_eq(pressure, 0.0); - libinput_event_destroy(event); -} -END_TEST - -static void pressure_threshold_warning(struct libinput *libinput, - enum libinput_log_priority priority, - const char *format, - va_list args) -{ - int *warning_triggered = (int*)libinput_get_user_data(libinput); - - if (priority == LIBINPUT_LOG_PRIORITY_ERROR && - strstr(format, "pressure offset greater")) - (*warning_triggered)++; -} - -START_TEST(tablet_pressure_offset_exceed_threshold) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 70 }, - { ABS_PRESSURE, 30 }, - { -1, -1 }, - }; - double pressure; - int warning_triggered = 0; - - litest_drain_events(li); - - libinput_set_user_data(li, &warning_triggered); - - libinput_log_set_handler(li, pressure_threshold_warning); - litest_tablet_proximity_in(dev, 5, 100, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - pressure = libinput_event_tablet_tool_get_pressure(tev); - ck_assert_double_gt(pressure, 0.0); - libinput_event_destroy(event); - - ck_assert_int_eq(warning_triggered, 1); - litest_restore_log_handler(li); -} -END_TEST - -START_TEST(tablet_pressure_offset_none_for_zero_distance) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 0 }, - { ABS_PRESSURE, 20 }, - { -1, -1 }, - }; - double pressure; - - litest_drain_events(li); - - /* we're going straight to touch on proximity, make sure we don't - * offset the pressure here */ - litest_push_event_frame(dev); - litest_tablet_proximity_in(dev, 5, 100, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - pressure = libinput_event_tablet_tool_get_pressure(tev); - ck_assert_double_gt(pressure, 0.0); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tablet_pressure_offset_none_for_small_distance) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 20 }, - { ABS_PRESSURE, 20 }, - { -1, -1 }, - }; - double pressure; - - /* stylus too close to the tablet on the proximity in, ignore any - * pressure offset */ - litest_tablet_proximity_in(dev, 5, 100, axes); - litest_drain_events(li); - libinput_dispatch(li); - - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 21); - litest_push_event_frame(dev); - litest_tablet_motion(dev, 70, 70, axes); - litest_event(dev, EV_KEY, BTN_TOUCH, 1); - litest_pop_event_frame(dev); - litest_drain_events(li); - - litest_axis_set_value(axes, ABS_PRESSURE, 20); - litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); - pressure = libinput_event_tablet_tool_get_pressure(tev); - ck_assert_double_gt(pressure, 0.0); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tilt_available) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct libinput_tablet_tool *tool; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { ABS_TILT_X, 80 }, - { ABS_TILT_Y, 20 }, - { -1, -1 } - }; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - tool = libinput_event_tablet_tool_get_tool(tev); - ck_assert(libinput_tablet_tool_has_tilt(tool)); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tilt_not_available) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct libinput_tablet_tool *tool; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { ABS_TILT_X, 80 }, - { ABS_TILT_Y, 20 }, - { -1, -1 } - }; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - tool = libinput_event_tablet_tool_get_tool(tev); - ck_assert(!libinput_tablet_tool_has_tilt(tool)); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(tilt_x) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { ABS_TILT_X, 10 }, - { ABS_TILT_Y, 0 }, - { -1, -1 } - }; - double tx, ty; - int tilt; - double expected_tx; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - /* 90% of the actual axis but mapped into a [-64, 64] tilt range, so - * we expect 51 degrees ± rounding errors */ - tx = libinput_event_tablet_tool_get_tilt_x(tev); - ck_assert_double_le(tx, -50); - ck_assert_double_ge(tx, -52); - - ty = libinput_event_tablet_tool_get_tilt_y(tev); - ck_assert_double_ge(ty, -65); - ck_assert_double_lt(ty, -63); - - libinput_event_destroy(event); - - expected_tx = -64.0; - - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 1); - - for (tilt = 0; tilt <= 100; tilt += 5) { - litest_axis_set_value(axes, ABS_TILT_X, tilt); - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - tx = libinput_event_tablet_tool_get_tilt_x(tev); - ck_assert_double_ge(tx, expected_tx - 2); - ck_assert_double_le(tx, expected_tx + 2); - - ty = libinput_event_tablet_tool_get_tilt_y(tev); - ck_assert_double_ge(ty, -65); - ck_assert_double_lt(ty, -63); - - libinput_event_destroy(event); - - expected_tx = tx + 6.04; - } - - /* the last event must reach the max */ - ck_assert_double_ge(tx, 63.0); - ck_assert_double_le(tx, 64.0); -} -END_TEST - -START_TEST(tilt_y) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { ABS_TILT_X, 0 }, - { ABS_TILT_Y, 10 }, - { -1, -1 } - }; - double tx, ty; - int tilt; - double expected_ty; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - - /* 90% of the actual axis but mapped into a [-64, 64] tilt range, so - * we expect 50 degrees ± rounding errors */ - ty = libinput_event_tablet_tool_get_tilt_y(tev); - ck_assert_double_le(ty, -50); - ck_assert_double_ge(ty, -52); - - tx = libinput_event_tablet_tool_get_tilt_x(tev); - ck_assert_double_ge(tx, -65); - ck_assert_double_lt(tx, -63); - - libinput_event_destroy(event); - - expected_ty = -64; - - litest_axis_set_value(axes, ABS_DISTANCE, 0); - litest_axis_set_value(axes, ABS_PRESSURE, 1); - - for (tilt = 0; tilt <= 100; tilt += 5) { - litest_axis_set_value(axes, ABS_TILT_Y, tilt); - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - - ty = libinput_event_tablet_tool_get_tilt_y(tev); - ck_assert_double_ge(ty, expected_ty - 2); - ck_assert_double_le(ty, expected_ty + 2); - - tx = libinput_event_tablet_tool_get_tilt_x(tev); - ck_assert_double_ge(tx, -65); - ck_assert_double_lt(tx, -63); - - libinput_event_destroy(event); - - expected_ty = ty + 6; - } - - /* the last event must reach the max */ - ck_assert_double_ge(ty, 63.0); - ck_assert_double_le(tx, 64.0); -} -END_TEST - -START_TEST(relative_no_profile) -{ - struct litest_device *dev = litest_current_device(); - struct libinput_device *device = dev->libinput_device; - enum libinput_config_accel_profile profile; - enum libinput_config_status status; - uint32_t profiles; - - ck_assert(libinput_device_config_accel_is_available(device)); - - profile = libinput_device_config_accel_get_default_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); - - profile = libinput_device_config_accel_get_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); - - profiles = libinput_device_config_accel_get_profiles(device); - ck_assert_int_eq(profiles & LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE, 0); - ck_assert_int_eq(profiles & LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT, 0); - - status = libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_UNSUPPORTED); - profile = libinput_device_config_accel_get_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); - - status = libinput_device_config_accel_set_profile(device, - LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_UNSUPPORTED); - profile = libinput_device_config_accel_get_profile(device); - ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE); -} -END_TEST - -START_TEST(relative_no_delta_prox_in) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - double dx, dy; - - litest_drain_events(li); - - litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); - dx = libinput_event_tablet_tool_get_dx(tev); - dy = libinput_event_tablet_tool_get_dy(tev); - ck_assert(dx == 0.0); - ck_assert(dy == 0.0); - - libinput_event_destroy(event); -} -END_TEST - -START_TEST(relative_delta) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - double dx, dy; - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_drain_events(li); - - litest_tablet_motion(dev, 20, 10, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - dx = libinput_event_tablet_tool_get_dx(tev); - dy = libinput_event_tablet_tool_get_dy(tev); - ck_assert(dx > 0.0); - ck_assert(dy == 0.0); - libinput_event_destroy(event); - - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - dx = libinput_event_tablet_tool_get_dx(tev); - dy = libinput_event_tablet_tool_get_dy(tev); - ck_assert(dx < 0.0); - ck_assert(dy == 0.0); - libinput_event_destroy(event); - - litest_tablet_motion(dev, 10, 20, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - dx = libinput_event_tablet_tool_get_dx(tev); - dy = libinput_event_tablet_tool_get_dy(tev); - ck_assert(dx == 0.0); - ck_assert(dy > 0.0); - libinput_event_destroy(event); - - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - dx = libinput_event_tablet_tool_get_dx(tev); - dy = libinput_event_tablet_tool_get_dy(tev); - ck_assert(dx == 0.0); - ck_assert(dy < 0.0); - libinput_event_destroy(event); -} -END_TEST - -START_TEST(relative_calibration) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_tablet_tool *tev; - struct axis_replacement axes[] = { - { ABS_DISTANCE, 10 }, - { ABS_PRESSURE, 0 }, - { -1, -1 } - }; - double dx, dy; - float calibration[] = { -1, 0, 1, 0, -1, 1 }; - enum libinput_config_status status; - - if (!libinput_device_config_calibration_has_matrix(dev->libinput_device)) - return; - - status = libinput_device_config_calibration_set_matrix( - dev->libinput_device, - calibration); - ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - - litest_tablet_proximity_in(dev, 10, 10, axes); - litest_drain_events(li); - - litest_tablet_motion(dev, 20, 10, axes); - libinput_dispatch(li); - - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - dx = libinput_event_tablet_tool_get_dx(tev); - dy = libinput_event_tablet_tool_get_dy(tev); - ck_assert(dx < 0.0); - ck_assert(dy == 0.0); - libinput_event_destroy(event); - - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - dx = libinput_event_tablet_tool_get_dx(tev); - dy = libinput_event_tablet_tool_get_dy(tev); - ck_assert(dx > 0.0); - ck_assert(dy == 0.0); - libinput_event_destroy(event); - - litest_tablet_motion(dev, 10, 20, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - dx = libinput_event_tablet_tool_get_dx(tev); - dy = libinput_event_tablet_tool_get_dy(tev); - ck_assert(dx == 0.0); - ck_assert(dy < 0.0); - libinput_event_destroy(event); - - litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); - event = libinput_get_event(li); - tev = litest_is_tablet_event(event, - LIBINPUT_EVENT_TABLET_TOOL_AXIS); - dx = libinput_event_tablet_tool_get_dx(tev); - dy = libinput_event_tablet_tool_get_dy(tev); - ck_assert(dx == 0.0); - ck_assert(dy > 0.0); - libinput_event_destroy(event); -} -END_TEST - -void -litest_setup_tests(void) -{ - litest_add("tablet:tool", tool_ref, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add_no_device("tablet:tool", tool_capabilities); - litest_add("tablet:tool", tool_in_prox_before_start, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tool_serial", tool_unique, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add("tablet:tool_serial", tool_serial, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add("tablet:tool_serial", serial_changes_tool, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add("tablet:tool_serial", invalid_serials, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add_no_device("tablet:tool_serial", tools_with_serials); - litest_add_no_device("tablet:tool_serial", tools_without_serials); - litest_add("tablet:proximity", proximity_out_clear_buttons, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:proximity", proximity_in_out, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:proximity", proximity_in_button_down, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:proximity", proximity_out_button_up, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:proximity", proximity_has_axes, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:proximity", bad_distance_events, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_enter, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_in_out, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_button_click, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_button_press, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_button_release, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:tip", tip_down_up, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_down_prox_in, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_up_prox_out, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_down_btn_change, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_up_btn_change, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_down_motion, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_up_motion, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_state_proximity, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_state_axis, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_state_button, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:motion", motion, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:motion", motion_event_state, LITEST_TABLET, LITEST_ANY); - litest_add_for_device("tablet:motion", motion_outside_bounds, LITEST_WACOM_CINTIQ_24HD); - litest_add("tablet:tilt", tilt_available, LITEST_TABLET|LITEST_TILT, LITEST_ANY); - litest_add("tablet:tilt", tilt_not_available, LITEST_TABLET, LITEST_TILT); - litest_add("tablet:tilt", tilt_x, LITEST_TABLET|LITEST_TILT, LITEST_ANY); - litest_add("tablet:tilt", tilt_y, LITEST_TABLET|LITEST_TILT, LITEST_ANY); - litest_add_for_device("tablet:left_handed", left_handed, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:left_handed", left_handed_tilt, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:left_handed", left_handed_mouse_rotation, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:left_handed", left_handed_artpen_rotation, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:left_handed", no_left_handed, LITEST_WACOM_CINTIQ); - litest_add("tablet:normalization", normalization, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:pad", pad_buttons_ignored, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:mouse", mouse_tool, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:mouse", mouse_buttons, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:mouse", mouse_rotation, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:mouse", mouse_wheel, LITEST_TABLET, LITEST_WHEEL); - litest_add("tablet:airbrush", airbrush_tool, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:airbrush", airbrush_wheel, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:artpen", artpen_tool, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:artpen", artpen_rotation, LITEST_TABLET, LITEST_ANY); - - litest_add("tablet:time", tablet_time_usec, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:pressure", tablet_pressure_distance_exclusive, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - - litest_add("tablet:calibration", tablet_calibration_has_matrix, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:calibration", tablet_calibration_set_matrix, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:calibration", tablet_calibration_set_matrix_delta, LITEST_TABLET, LITEST_ANY); - - litest_add_for_device("tablet:pressure", tablet_pressure_offset, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_decrease, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_increase, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_exceed_threshold, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_none_for_zero_distance, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_none_for_small_distance, LITEST_WACOM_INTUOS); - - litest_add("tablet:relative", relative_no_profile, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:relative", relative_no_delta_prox_in, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:relative", relative_delta, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:relative", relative_calibration, LITEST_TABLET, LITEST_ANY); -} diff -Nru libinput-1.2.2/test/touchpad.c libinput-0.21.0/test/touchpad.c --- libinput-1.2.2/test/touchpad.c 2016-03-01 06:00:47.000000000 +0000 +++ libinput-0.21.0/test/touchpad.c 2015-08-03 04:55:04.000000000 +0000 @@ -139,76 +139,31 @@ litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, -10); /* 2fg scroll smaller than the threshold should not generate events */ - test_2fg_scroll(dev, 0.1, 0.1, 1); + test_2fg_scroll(dev, 0.1, 0.1, 200); litest_assert_empty_queue(li); } END_TEST -START_TEST(touchpad_2fg_scroll_diagonal) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_pointer *ptrev; - int i; - - if (!litest_has_2fg_scroll(dev)) - return; - - litest_enable_2fg_scroll(dev); - litest_drain_events(li); - - litest_touch_down(dev, 0, 45, 30); - litest_touch_down(dev, 1, 55, 30); - - litest_touch_move_two_touches(dev, 45, 30, 55, 30, 10, 10, 10, 0); - libinput_dispatch(li); - litest_wait_for_event_of_type(li, - LIBINPUT_EVENT_POINTER_AXIS, - -1); - litest_drain_events(li); - - /* get rid of any touch history still adding x deltas sideways */ - for (i = 0; i < 5; i++) - litest_touch_move(dev, 0, 55, 41 + i); - litest_drain_events(li); - - for (i = 6; i < 10; i++) { - litest_touch_move(dev, 0, 55, 41 + i); - libinput_dispatch(li); - - event = libinput_get_event(li); - ptrev = litest_is_axis_event(event, - LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, - LIBINPUT_POINTER_AXIS_SOURCE_FINGER); - ck_assert(!libinput_event_pointer_has_axis(ptrev, - LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)); - libinput_event_destroy(event); - } - - litest_touch_up(dev, 1); - litest_touch_up(dev, 0); - libinput_dispatch(li); -} -END_TEST - START_TEST(touchpad_2fg_scroll_slow_distance) { struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; struct libinput_event *event; struct libinput_event_pointer *ptrev; - double width, height; - double y_move = 100; + const struct input_absinfo *y; + double y_move; if (!litest_has_2fg_scroll(dev)) return; /* We want to move > 5 mm. */ - ck_assert_int_eq(libinput_device_get_size(dev->libinput_device, - &width, - &height), 0); - y_move = 100.0/height * 7; + y = libevdev_get_abs_info(dev->evdev, ABS_Y); + if (y->resolution) { + y_move = 7.0 * y->resolution / + (y->maximum - y->minimum) * 100; + } else { + y_move = 20.0; + } litest_enable_2fg_scroll(dev); litest_drain_events(li); @@ -289,11 +244,11 @@ litest_touch_down(dev, 0, 20, 20); litest_touch_down(dev, 1, 30, 20); libinput_dispatch(li); - litest_touch_move_two_touches(dev, - 20, 20, - 30, 20, - 30, 40, - 10, 1); + litest_touch_move_to(dev, 1, 30, 20, 30, 70, 10, 5); + + litest_assert_empty_queue(li); + + litest_touch_move_to(dev, 0, 20, 20, 20, 70, 10, 5); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_AXIS); } @@ -395,35 +350,6 @@ } END_TEST -START_TEST(touchpad_scroll_natural_edge) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - - litest_enable_edge_scroll(dev); - litest_drain_events(li); - - libinput_device_config_scroll_set_natural_scroll_enabled(dev->libinput_device, 1); - - litest_touch_down(dev, 0, 99, 20); - litest_touch_move_to(dev, 0, 99, 20, 99, 80, 10, 0); - litest_touch_up(dev, 0); - - libinput_dispatch(li); - litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, -4); - litest_assert_empty_queue(li); - - litest_touch_down(dev, 0, 99, 80); - litest_touch_move_to(dev, 0, 99, 80, 99, 20, 10, 0); - litest_touch_up(dev, 0); - - libinput_dispatch(li); - litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 4); - litest_assert_empty_queue(li); - -} -END_TEST - START_TEST(touchpad_edge_scroll) { struct litest_device *dev = litest_current_device(); @@ -511,60 +437,54 @@ struct libinput_event *event; struct libinput_event_pointer *ptrev; double width = 0, height = 0; - int nevents = 0; - double mm; /* one mm in percent of the device */ + int y_movement = 30; /* in percent of height */ - ck_assert_int_eq(libinput_device_get_size(dev->libinput_device, - &width, - &height), 0); - mm = 100.0/height; - - /* timeout-based scrolling is disabled when software buttons are - * active, so switch to clickfinger. Not all test devices support - * that, hence the extra check. */ - if (libinput_device_config_click_get_methods(dev->libinput_device) & - LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER) - litest_enable_clickfinger(dev); + /* account for different touchpad heights, let's move 100% on a 15mm + high touchpad, less on anything else. This number is picked at + random, we just want deltas less than 5. + */ + if (libinput_device_get_size(dev->libinput_device, + &width, + &height) != -1) { + y_movement = 100 * 15/height; + } litest_drain_events(li); litest_enable_edge_scroll(dev); - /* move 0.5mm, enough to load up the motion history, but less than - * the scroll threshold of 2mm */ litest_touch_down(dev, 0, 99, 20); - litest_touch_move_to(dev, 0, 99, 20, 99, 20 + mm/2, 8, 0); libinput_dispatch(li); - litest_assert_empty_queue(li); - litest_timeout_edgescroll(); libinput_dispatch(li); - litest_assert_empty_queue(li); - - /* now move slowly up to the 2mm scroll threshold. we expect events */ - litest_touch_move_to(dev, 0, 99, 20 + mm/2, 99, 20 + mm * 2, 20, 0); + litest_touch_move_to(dev, 0, 99, 20, 99, 20 + y_movement, 100, 10); litest_touch_up(dev, 0); libinput_dispatch(li); + event = libinput_get_event(li); + ck_assert_notnull(event); + litest_wait_for_event_of_type(li, LIBINPUT_EVENT_POINTER_AXIS, -1); - while ((event = libinput_get_event(li))) { - double value; + while (libinput_next_event_type(li) != LIBINPUT_EVENT_NONE) { + double axisval; + ck_assert_int_eq(libinput_event_get_type(event), + LIBINPUT_EVENT_POINTER_AXIS); + ptrev = libinput_event_get_pointer_event(event); + + axisval = libinput_event_pointer_get_axis_value(ptrev, + LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); + ck_assert(axisval > 0.0); + + /* this is to verify we test the right thing, if the value + is greater than scroll.threshold we triggered the wrong + condition */ + ck_assert(axisval < 5.0); - ptrev = litest_is_axis_event(event, - LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, - 0); - value = libinput_event_pointer_get_axis_value(ptrev, - LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); - ck_assert_double_lt(value, 5.0); libinput_event_destroy(event); - nevents++; + event = libinput_get_event(li); } - /* we sent 20 events but allow for some to be swallowed by rounding - * errors, the hysteresis, etc. */ - ck_assert_int_ge(nevents, 10); - litest_assert_empty_queue(li); libinput_event_destroy(event); } @@ -1031,7 +951,7 @@ } END_TEST -START_TEST(touchpad_palm_detect_tap_hardbuttons) +START_TEST(touchpad_palm_detect_tap) { struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; @@ -1051,38 +971,7 @@ litest_touch_up(dev, 0); litest_assert_empty_queue(li); - litest_touch_down(dev, 0, 5, 99); - litest_touch_up(dev, 0); - litest_assert_empty_queue(li); - - litest_touch_down(dev, 0, 95, 99); - litest_touch_up(dev, 0); - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(touchpad_palm_detect_tap_softbuttons) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - - if (!touchpad_has_palm_detect_size(dev)) - return; - - litest_enable_tap(dev->libinput_device); - litest_enable_buttonareas(dev); - - litest_drain_events(li); - - litest_touch_down(dev, 0, 95, 5); - litest_touch_up(dev, 0); - litest_assert_empty_queue(li); - - litest_touch_down(dev, 0, 5, 5); - litest_touch_up(dev, 0); - litest_assert_empty_queue(li); - - litest_touch_down(dev, 0, 5, 99); + litest_touch_down(dev, 0, 5, 90); litest_touch_up(dev, 0); litest_assert_button_event(li, BTN_LEFT, @@ -1092,7 +981,7 @@ LIBINPUT_BUTTON_STATE_RELEASED); litest_assert_empty_queue(li); - litest_touch_down(dev, 0, 95, 99); + litest_touch_down(dev, 0, 95, 90); litest_touch_up(dev, 0); litest_assert_button_event(li, BTN_LEFT, @@ -1104,37 +993,6 @@ } END_TEST -START_TEST(touchpad_palm_detect_tap_clickfinger) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - - if (!touchpad_has_palm_detect_size(dev)) - return; - - litest_enable_tap(dev->libinput_device); - litest_enable_clickfinger(dev); - - litest_drain_events(li); - - litest_touch_down(dev, 0, 95, 5); - litest_touch_up(dev, 0); - litest_assert_empty_queue(li); - - litest_touch_down(dev, 0, 5, 5); - litest_touch_up(dev, 0); - litest_assert_empty_queue(li); - - litest_touch_down(dev, 0, 5, 99); - litest_touch_up(dev, 0); - litest_assert_empty_queue(li); - - litest_touch_down(dev, 0, 95, 99); - litest_touch_up(dev, 0); - litest_assert_empty_queue(li); -} -END_TEST - START_TEST(touchpad_left_handed) { struct litest_device *dev = litest_current_device(); @@ -1813,31 +1671,6 @@ } END_TEST -START_TEST(touchpad_semi_mt_hover_2fg_up) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - - litest_touch_down(dev, 0, 70, 50); - litest_touch_down(dev, 1, 50, 50); - - litest_push_event_frame(dev); - litest_touch_move(dev, 0, 72, 50); - litest_touch_move(dev, 1, 52, 50); - litest_event(dev, EV_KEY, BTN_TOUCH, 0); - litest_pop_event_frame(dev); - - litest_event(dev, EV_ABS, ABS_MT_SLOT, 0); - litest_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1); - litest_event(dev, EV_ABS, ABS_MT_SLOT, 1); - litest_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1); - litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); - litest_event(dev, EV_SYN, SYN_REPORT, 0); - - litest_drain_events(li); -} -END_TEST - START_TEST(touchpad_hover_noevent) { struct litest_device *dev = litest_current_device(); @@ -2344,18 +2177,6 @@ return libinput_device_config_dwt_is_available(device->libinput_device); } -static inline struct litest_device * -dwt_init_paired_keyboard(struct libinput *li, - struct litest_device *touchpad) -{ - enum litest_device_type which = LITEST_KEYBOARD; - - if (libevdev_get_id_vendor(touchpad->evdev) == VENDOR_ID_APPLE) - which = LITEST_APPLE_KEYBOARD; - - return litest_add_device(li, which); -} - START_TEST(touchpad_dwt) { struct litest_device *touchpad = litest_current_device(); @@ -2365,55 +2186,8 @@ if (!has_disable_while_typing(touchpad)) return; - keyboard = dwt_init_paired_keyboard(li, touchpad); - litest_disable_tap(touchpad->libinput_device); - litest_drain_events(li); - - litest_keyboard_key(keyboard, KEY_A, true); - litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); - litest_touch_up(touchpad, 0); - - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - - /* within timeout - no events */ - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); - litest_touch_up(touchpad, 0); - litest_assert_empty_queue(li); - - litest_timeout_dwt_short(); - libinput_dispatch(li); - - /* after timeout - motion events*/ - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); - litest_touch_up(touchpad, 0); - - litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - - litest_delete_device(keyboard); -} -END_TEST - -START_TEST(touchpad_dwt_update_keyboard) -{ - struct litest_device *touchpad = litest_current_device(); - struct litest_device *keyboard, *yubikey; - struct libinput *li = touchpad->libinput; - - if (!has_disable_while_typing(touchpad)) - return; - + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); - - /* Yubikey is initialized first */ - yubikey = litest_add_device(li, LITEST_YUBIKEY); - litest_drain_events(li); - - keyboard = dwt_init_paired_keyboard(li, touchpad); litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); @@ -2442,62 +2216,9 @@ litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_delete_device(keyboard); - litest_delete_device(yubikey); } END_TEST -START_TEST(touchpad_dwt_update_keyboard_with_state) -{ - struct litest_device *touchpad = litest_current_device(); - struct litest_device *keyboard, *yubikey; - struct libinput *li = touchpad->libinput; - - if (!has_disable_while_typing(touchpad)) - return; - - litest_disable_tap(touchpad->libinput_device); - - /* Yubikey is initialized first */ - yubikey = litest_add_device(li, LITEST_YUBIKEY); - litest_drain_events(li); - - litest_keyboard_key(yubikey, KEY_A, true); - litest_keyboard_key(yubikey, KEY_A, false); - litest_keyboard_key(yubikey, KEY_A, true); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); - litest_touch_up(touchpad, 0); - litest_assert_empty_queue(li); - - litest_keyboard_key(yubikey, KEY_A, false); - litest_keyboard_key(yubikey, KEY_A, true); - litest_drain_events(li); - - /* yubikey still has A down */ - keyboard = dwt_init_paired_keyboard(li, touchpad); - litest_drain_events(li); - - /* expected repairing, dwt should be disabled */ - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); - litest_touch_up(touchpad, 0); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - - /* release remaining key */ - litest_keyboard_key(yubikey, KEY_A, false); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); - litest_touch_up(touchpad, 0); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - - litest_delete_device(keyboard); - litest_delete_device(yubikey); -} -END_TEST START_TEST(touchpad_dwt_enable_touch) { struct litest_device *touchpad = litest_current_device(); @@ -2507,7 +2228,7 @@ if (!has_disable_while_typing(touchpad)) return; - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -2545,7 +2266,7 @@ if (!has_disable_while_typing(touchpad)) return; - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -2582,158 +2303,19 @@ if (!has_disable_while_typing(touchpad)) return; - keyboard = dwt_init_paired_keyboard(li, touchpad); - litest_disable_tap(touchpad->libinput_device); - litest_drain_events(li); - - litest_keyboard_key(keyboard, KEY_A, true); - libinput_dispatch(li); - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5, 1); - litest_touch_up(touchpad, 0); - - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - litest_keyboard_key(keyboard, KEY_A, false); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - - litest_delete_device(keyboard); -} -END_TEST - -START_TEST(touchpad_dwt_key_hold_timeout) -{ - struct litest_device *touchpad = litest_current_device(); - struct litest_device *keyboard; - struct libinput *li = touchpad->libinput; - - if (!has_disable_while_typing(touchpad)) - return; - - keyboard = dwt_init_paired_keyboard(li, touchpad); - litest_disable_tap(touchpad->libinput_device); - litest_drain_events(li); - - litest_keyboard_key(keyboard, KEY_A, true); - libinput_dispatch(li); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - litest_timeout_dwt_long(); - libinput_dispatch(li); - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5, 1); - litest_touch_up(touchpad, 0); - - litest_assert_empty_queue(li); - - litest_keyboard_key(keyboard, KEY_A, false); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - /* key is up, but still within timeout */ - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5, 1); - litest_touch_up(touchpad, 0); - litest_assert_empty_queue(li); - - /* expire timeout */ - litest_timeout_dwt_long(); - libinput_dispatch(li); - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5, 1); - litest_touch_up(touchpad, 0); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - - litest_delete_device(keyboard); -} -END_TEST - -START_TEST(touchpad_dwt_key_hold_timeout_existing_touch_cornercase) -{ - struct litest_device *touchpad = litest_current_device(); - struct litest_device *keyboard; - struct libinput *li = touchpad->libinput; - - if (!has_disable_while_typing(touchpad)) - return; - - /* Note: this tests for the current behavior of a cornercase, and - * the behaviour is essentially a bug. If this test fails it may be - * because the buggy behavior was fixed. - */ - - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); libinput_dispatch(li); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - litest_timeout_dwt_long(); - libinput_dispatch(li); - - /* Touch starting after re-issuing the dwt timeout */ litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5, 1); - - litest_assert_empty_queue(li); - - litest_keyboard_key(keyboard, KEY_A, false); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - /* key is up, but still within timeout */ - litest_touch_move_to(touchpad, 0, 70, 50, 50, 50, 5, 1); - litest_assert_empty_queue(li); - - /* Expire dwt timeout. Because the touch started after re-issuing - * the last timeout, it looks like the touch started after the last - * key press. Such touches are enabled for pointer motion by - * libinput when dwt expires. - * This is buggy behavior and not what a user would typically - * expect. But it's hard to trigger in real life too. - */ - litest_timeout_dwt_long(); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5, 1); litest_touch_up(touchpad, 0); - /* If the below check for motion event fails because no events are - * in the pipe, the buggy behavior was fixed and this test case - * can be removed */ - litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); -} -END_TEST - -START_TEST(touchpad_dwt_key_hold_timeout_existing_touch) -{ - struct litest_device *touchpad = litest_current_device(); - struct litest_device *keyboard; - struct libinput *li = touchpad->libinput; - - if (!has_disable_while_typing(touchpad)) - return; - - keyboard = dwt_init_paired_keyboard(li, touchpad); - litest_disable_tap(touchpad->libinput_device); - litest_drain_events(li); - - litest_keyboard_key(keyboard, KEY_A, true); - libinput_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5, 1); - libinput_dispatch(li); - litest_timeout_dwt_long(); - libinput_dispatch(li); - - litest_assert_empty_queue(li); - litest_keyboard_key(keyboard, KEY_A, false); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - /* key is up, but still within timeout */ - litest_touch_move_to(touchpad, 0, 70, 50, 50, 50, 5, 1); - litest_assert_empty_queue(li); - - /* expire timeout, but touch started before release */ - litest_timeout_dwt_long(); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5, 1); - litest_touch_up(touchpad, 0); - litest_assert_empty_queue(li); litest_delete_device(keyboard); } @@ -2749,7 +2331,7 @@ if (!has_disable_while_typing(touchpad)) return; - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -2787,7 +2369,7 @@ if (!has_disable_while_typing(touchpad)) return; - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -2824,7 +2406,7 @@ if (!has_disable_while_typing(touchpad)) return; - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_enable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -2854,7 +2436,7 @@ if (!has_disable_while_typing(touchpad)) return; - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_enable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -2888,7 +2470,7 @@ if (!has_disable_while_typing(touchpad)) return; - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -2921,7 +2503,7 @@ litest_enable_edge_scroll(touchpad); - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); @@ -2968,7 +2550,7 @@ litest_enable_edge_scroll(touchpad); - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_drain_events(li); litest_touch_down(touchpad, 0, 99, 20); @@ -3092,7 +2674,7 @@ disable_dwt(touchpad); - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -3121,7 +2703,7 @@ enable_dwt(touchpad); - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -3156,7 +2738,7 @@ enable_dwt(touchpad); - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -3176,72 +2758,6 @@ } END_TEST -START_TEST(touchpad_dwt_disable_during_key_release) -{ - struct litest_device *touchpad = litest_current_device(); - struct litest_device *keyboard; - struct libinput *li = touchpad->libinput; - - if (!has_disable_while_typing(touchpad)) - return; - - enable_dwt(touchpad); - - keyboard = dwt_init_paired_keyboard(li, touchpad); - litest_disable_tap(touchpad->libinput_device); - litest_drain_events(li); - - litest_keyboard_key(keyboard, KEY_A, true); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - - disable_dwt(touchpad); - libinput_dispatch(li); - litest_keyboard_key(keyboard, KEY_A, false); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - - /* touch down during timeout, wait, should generate events */ - litest_touch_down(touchpad, 0, 50, 50); - libinput_dispatch(li); - litest_timeout_dwt_long(); - litest_touch_move_to(touchpad, 0, 70, 50, 50, 50, 10, 1); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - - litest_delete_device(keyboard); -} -END_TEST - -START_TEST(touchpad_dwt_disable_during_key_hold) -{ - struct litest_device *touchpad = litest_current_device(); - struct litest_device *keyboard; - struct libinput *li = touchpad->libinput; - - if (!has_disable_while_typing(touchpad)) - return; - - enable_dwt(touchpad); - - keyboard = dwt_init_paired_keyboard(li, touchpad); - litest_disable_tap(touchpad->libinput_device); - litest_drain_events(li); - - litest_keyboard_key(keyboard, KEY_A, true); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - - disable_dwt(touchpad); - libinput_dispatch(li); - - /* touch down during timeout, wait, should generate events */ - litest_touch_down(touchpad, 0, 50, 50); - libinput_dispatch(li); - litest_timeout_dwt_long(); - litest_touch_move_to(touchpad, 0, 70, 50, 50, 50, 10, 1); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - - litest_delete_device(keyboard); -} -END_TEST - START_TEST(touchpad_dwt_enable_during_touch) { struct litest_device *touchpad = litest_current_device(); @@ -3253,7 +2769,7 @@ disable_dwt(touchpad); - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -3287,7 +2803,7 @@ disable_dwt(touchpad); - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_disable_tap(touchpad->libinput_device); litest_drain_events(li); @@ -3318,7 +2834,7 @@ litest_enable_tap(touchpad->libinput_device); disable_dwt(touchpad); - keyboard = dwt_init_paired_keyboard(li, touchpad); + keyboard = litest_add_device(li, LITEST_KEYBOARD); litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); @@ -3343,46 +2859,6 @@ litest_delete_device(keyboard); } END_TEST - -START_TEST(touchpad_dwt_apple) -{ - struct litest_device *touchpad = litest_current_device(); - struct litest_device *keyboard, *apple_keyboard; - struct libinput *li = touchpad->libinput; - - ck_assert(has_disable_while_typing(touchpad)); - - /* Only the apple keyboard can trigger DWT */ - keyboard = litest_add_device(li, LITEST_KEYBOARD); - litest_drain_events(li); - - litest_keyboard_key(keyboard, KEY_A, true); - litest_keyboard_key(keyboard, KEY_A, false); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); - litest_touch_up(touchpad, 0); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - - apple_keyboard = litest_add_device(li, LITEST_APPLE_KEYBOARD); - litest_drain_events(li); - - litest_keyboard_key(apple_keyboard, KEY_A, true); - litest_keyboard_key(apple_keyboard, KEY_A, false); - litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - - litest_touch_down(touchpad, 0, 50, 50); - litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); - litest_touch_up(touchpad, 0); - libinput_dispatch(li); - litest_assert_empty_queue(li); - - litest_delete_device(keyboard); - litest_delete_device(apple_keyboard); -} -END_TEST - static int has_thumb_detect(struct litest_device *dev) { @@ -3402,7 +2878,7 @@ struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3426,7 +2902,7 @@ struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3452,7 +2928,7 @@ struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3481,7 +2957,7 @@ struct libinput_event *event; struct libinput_event_pointer *ptrev; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3538,7 +3014,7 @@ struct libinput_event *event; struct libinput_event_pointer *ptrev; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3574,7 +3050,7 @@ struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3605,7 +3081,7 @@ struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3638,7 +3114,7 @@ struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3671,7 +3147,7 @@ struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3705,7 +3181,7 @@ struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3756,7 +3232,7 @@ struct libinput_event *event; struct libinput_event_pointer *ptrev; struct axis_replacement axes[] = { - { ABS_MT_PRESSURE, 75 }, + { ABS_MT_PRESSURE, 190 }, { -1, 0 } }; @@ -3966,8 +3442,7 @@ litest_add("touchpad:motion", touchpad_1fg_motion, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:motion", touchpad_2fg_no_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_2fg_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("touchpad:scroll", touchpad_2fg_scroll_diagonal, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add("touchpad:scroll", touchpad_2fg_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); litest_add("touchpad:scroll", touchpad_2fg_scroll_slow_distance, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); litest_add("touchpad:scroll", touchpad_2fg_scroll_return_to_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); litest_add("touchpad:scroll", touchpad_2fg_scroll_source, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); @@ -3975,7 +3450,6 @@ litest_add("touchpad:scroll", touchpad_scroll_natural_defaults, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:scroll", touchpad_scroll_natural_enable_config, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:scroll", touchpad_scroll_natural_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_scroll_natural_edge, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); litest_add("touchpad:scroll", touchpad_scroll_defaults, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:scroll", touchpad_edge_scroll, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:scroll", touchpad_edge_scroll_no_motion, LITEST_TOUCHPAD, LITEST_ANY); @@ -3995,9 +3469,7 @@ litest_add("touchpad:palm", touchpad_palm_detect_palm_becomes_pointer, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:palm", touchpad_palm_detect_palm_stays_palm, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:palm", touchpad_palm_detect_no_palm_moving_into_edges, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_tap_hardbuttons, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:palm", touchpad_palm_detect_tap_softbuttons, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_tap_clickfinger, LITEST_CLICKPAD, LITEST_ANY); + litest_add("touchpad:palm", touchpad_palm_detect_tap, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:palm", touchpad_no_palm_detect_at_edge_for_edge_scrolling, LITEST_TOUCHPAD, LITEST_CLICKPAD); litest_add("touchpad:left-handed", touchpad_left_handed, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); @@ -4009,14 +3481,13 @@ litest_add("touchpad:left-handed", touchpad_left_handed_clickpad_delayed, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); /* Semi-MT hover tests aren't generic, they only work on this device and - * ignore the semi-mt capability (it doesn't matter for the tests) */ + * ignore the semi-mt capability (it doesn't matter for the tests */ litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT); litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT); litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_down_up, LITEST_SYNAPTICS_HOVER_SEMI_MT); litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_down_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT); litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_2fg_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT); litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_2fg_1fg_down, LITEST_SYNAPTICS_HOVER_SEMI_MT); - litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_2fg_up, LITEST_SYNAPTICS_HOVER_SEMI_MT); litest_add("touchpad:hover", touchpad_hover_noevent, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); litest_add("touchpad:hover", touchpad_hover_down, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); @@ -4035,14 +3506,9 @@ litest_add_ranged("touchpad:state", touchpad_initial_state, LITEST_TOUCHPAD, LITEST_ANY, &axis_range); litest_add("touchpad:dwt", touchpad_dwt, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_for_device("touchpad:dwt", touchpad_dwt_update_keyboard, LITEST_SYNAPTICS_I2C); - litest_add_for_device("touchpad:dwt", touchpad_dwt_update_keyboard_with_state, LITEST_SYNAPTICS_I2C); litest_add("touchpad:dwt", touchpad_dwt_enable_touch, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_touch_hold, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_key_hold, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_key_hold_timeout, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_key_hold_timeout_existing_touch, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_key_hold_timeout_existing_touch_cornercase, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_type, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_type_short_timeout, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_tap, LITEST_TOUCHPAD, LITEST_ANY); @@ -4055,12 +3521,9 @@ litest_add("touchpad:dwt", touchpad_dwt_disabled, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_disable_during_touch, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_disable_before_touch, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_disable_during_key_release, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_disable_during_key_hold, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_enable_during_touch, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_enable_before_touch, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:dwt", touchpad_dwt_enable_during_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_for_device("touchpad:dwt", touchpad_dwt_apple, LITEST_BCM5974); litest_add("touchpad:thumb", touchpad_thumb_begin_no_motion, LITEST_CLICKPAD, LITEST_ANY); litest_add("touchpad:thumb", touchpad_thumb_update_no_motion, LITEST_CLICKPAD, LITEST_ANY); diff -Nru libinput-1.2.2/test/touchpad-tap.c libinput-0.21.0/test/touchpad-tap.c --- libinput-1.2.2/test/touchpad-tap.c 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/test/touchpad-tap.c 2015-08-03 04:35:00.000000000 +0000 @@ -191,7 +191,7 @@ litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10, 4); libinput_dispatch(li); - for (ntaps = 0; ntaps < range; ntaps++) { + for (ntaps = 0; ntaps <= range; ntaps++) { event = libinput_get_event(li); ptrev = litest_is_button_event(event, BTN_LEFT, @@ -241,7 +241,7 @@ int range = _i, ntaps; - if (libevdev_has_property(dev->evdev, INPUT_PROP_SEMI_MT)) + if (litest_is_synaptics_semi_mt(dev)) return; litest_enable_tap(dev->libinput_device); @@ -261,7 +261,7 @@ litest_touch_down(dev, 1, 70, 50); libinput_dispatch(li); - for (ntaps = 0; ntaps < range; ntaps++) { + for (ntaps = 0; ntaps <= range; ntaps++) { event = libinput_get_event(li); ptrev = litest_is_button_event(event, BTN_LEFT, @@ -393,7 +393,7 @@ litest_timeout_tap(); libinput_dispatch(li); - for (ntaps = 0; ntaps < range; ntaps++) { + for (ntaps = 0; ntaps <= range; ntaps++) { event = libinput_get_event(li); ptrev = litest_is_button_event(event, BTN_LEFT, @@ -464,7 +464,7 @@ litest_timeout_tap(); libinput_dispatch(li); - for (ntaps = 0; ntaps < range; ntaps++) { + for (ntaps = 0; ntaps <= range; ntaps++) { event = libinput_get_event(li); ptrev = litest_is_button_event(event, BTN_LEFT, @@ -537,7 +537,7 @@ litest_timeout_tap(); libinput_dispatch(li); - for (ntaps = 0; ntaps < range; ntaps++) { + for (ntaps = 0; ntaps <= range; ntaps++) { event = libinput_get_event(li); ptrev = litest_is_button_event(event, BTN_LEFT, @@ -966,50 +966,6 @@ } END_TEST -START_TEST(touchpad_2fg_tap_n_hold_first) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - - litest_enable_tap(dev->libinput_device); - - litest_drain_events(dev->libinput); - - litest_touch_down(dev, 0, 50, 50); - litest_touch_down(dev, 1, 70, 70); - litest_touch_up(dev, 1); - - libinput_dispatch(li); - - litest_assert_empty_queue(li); - litest_timeout_tap(); - - litest_assert_empty_queue(li); -} -END_TEST - -START_TEST(touchpad_2fg_tap_n_hold_second) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - - litest_enable_tap(dev->libinput_device); - - litest_drain_events(dev->libinput); - - litest_touch_down(dev, 0, 50, 50); - litest_touch_down(dev, 1, 70, 70); - litest_touch_up(dev, 0); - - libinput_dispatch(li); - - litest_assert_empty_queue(li); - litest_timeout_tap(); - - litest_assert_empty_queue(li); -} -END_TEST - START_TEST(touchpad_2fg_tap_quickrelease) { struct litest_device *dev = litest_current_device(); @@ -1723,187 +1679,6 @@ } END_TEST -START_TEST(touchpad_drag_default_disabled) -{ - struct litest_device *dev = litest_current_device(); - - /* this test is only run on specific devices */ - - ck_assert_int_eq(libinput_device_config_tap_get_default_drag_enabled(dev->libinput_device), - LIBINPUT_CONFIG_DRAG_DISABLED); -} -END_TEST - -START_TEST(touchpad_drag_default_enabled) -{ - struct litest_device *dev = litest_current_device(); - - /* this test is only run on specific devices */ - - ck_assert_int_eq(libinput_device_config_tap_get_default_drag_enabled(dev->libinput_device), - LIBINPUT_CONFIG_DRAG_ENABLED); -} -END_TEST - -START_TEST(touchpad_drag_config_invalid) -{ - struct litest_device *dev = litest_current_device(); - - ck_assert_int_eq(libinput_device_config_tap_set_drag_enabled(dev->libinput_device, 2), - LIBINPUT_CONFIG_STATUS_INVALID); - ck_assert_int_eq(libinput_device_config_tap_set_drag_enabled(dev->libinput_device, -1), - LIBINPUT_CONFIG_STATUS_INVALID); -} -END_TEST - -START_TEST(touchpad_drag_config_enabledisable) -{ - struct litest_device *dev = litest_current_device(); - enum libinput_config_drag_state state; - - litest_enable_tap(dev->libinput_device); - - litest_disable_tap_drag(dev->libinput_device); - state = libinput_device_config_tap_get_drag_enabled(dev->libinput_device); - ck_assert_int_eq(state, LIBINPUT_CONFIG_DRAG_DISABLED); - - litest_enable_tap_drag(dev->libinput_device); - state = libinput_device_config_tap_get_drag_enabled(dev->libinput_device); - ck_assert_int_eq(state, LIBINPUT_CONFIG_DRAG_ENABLED); - - /* same thing with tapping disabled */ - litest_enable_tap(dev->libinput_device); - - litest_disable_tap_drag(dev->libinput_device); - state = libinput_device_config_tap_get_drag_enabled(dev->libinput_device); - ck_assert_int_eq(state, LIBINPUT_CONFIG_DRAG_DISABLED); - - litest_enable_tap_drag(dev->libinput_device); - state = libinput_device_config_tap_get_drag_enabled(dev->libinput_device); - ck_assert_int_eq(state, LIBINPUT_CONFIG_DRAG_ENABLED); -} -END_TEST - -START_TEST(touchpad_drag_disabled) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - - litest_enable_tap(dev->libinput_device); - litest_disable_tap_drag(dev->libinput_device); - - litest_drain_events(li); - - litest_touch_down(dev, 0, 50, 50); - litest_touch_up(dev, 0); - libinput_dispatch(li); - litest_touch_down(dev, 0, 50, 50); - litest_touch_move_to(dev, 0, 50, 50, 90, 90, 10, 0); - litest_touch_up(dev, 0); - libinput_dispatch(li); - - litest_assert_button_event(li, - BTN_LEFT, - LIBINPUT_BUTTON_STATE_PRESSED); - litest_assert_button_event(li, - BTN_LEFT, - LIBINPUT_BUTTON_STATE_RELEASED); - litest_assert_only_typed_events(li, - LIBINPUT_EVENT_POINTER_MOTION); - -} -END_TEST - -START_TEST(touchpad_drag_disabled_immediate) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *ev; - struct libinput_event_pointer *ptrev; - uint64_t press_time, release_time; - - litest_enable_tap(dev->libinput_device); - litest_disable_tap_drag(dev->libinput_device); - - litest_drain_events(li); - - litest_touch_down(dev, 0, 50, 50); - msleep(10); /* to force a time difference */ - libinput_dispatch(li); - litest_touch_up(dev, 0); - libinput_dispatch(li); - - ev = libinput_get_event(li); - ptrev = litest_is_button_event(ev, - BTN_LEFT, - LIBINPUT_BUTTON_STATE_PRESSED); - press_time = libinput_event_pointer_get_time(ptrev); - libinput_event_destroy(ev); - - ev = libinput_get_event(li); - ptrev = litest_is_button_event(ev, - BTN_LEFT, - LIBINPUT_BUTTON_STATE_RELEASED); - release_time = libinput_event_pointer_get_time(ptrev); - libinput_event_destroy(ev); - - ck_assert_int_gt(release_time, press_time); -} -END_TEST - -START_TEST(touchpad_drag_disabled_multitap_no_drag) -{ - struct litest_device *dev = litest_current_device(); - struct libinput *li = dev->libinput; - struct libinput_event *event; - struct libinput_event_pointer *ptrev; - uint32_t oldtime = 0, - curtime; - int range = _i, /* looped test */ - ntaps; - - litest_enable_tap(dev->libinput_device); - litest_disable_tap_drag(dev->libinput_device); - - litest_drain_events(li); - - for (ntaps = 0; ntaps <= range; ntaps++) { - litest_touch_down(dev, 0, 50, 50); - litest_touch_up(dev, 0); - libinput_dispatch(li); - msleep(10); - } - - libinput_dispatch(li); - litest_touch_down(dev, 0, 50, 50); - litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10, 4); - libinput_dispatch(li); - - for (ntaps = 0; ntaps <= range; ntaps++) { - event = libinput_get_event(li); - ptrev = litest_is_button_event(event, - BTN_LEFT, - LIBINPUT_BUTTON_STATE_PRESSED); - curtime = libinput_event_pointer_get_time(ptrev); - libinput_event_destroy(event); - ck_assert_int_gt(curtime, oldtime); - - event = libinput_get_event(li); - ptrev = litest_is_button_event(event, - BTN_LEFT, - LIBINPUT_BUTTON_STATE_RELEASED); - curtime = libinput_event_pointer_get_time(ptrev); - libinput_event_destroy(event); - ck_assert_int_ge(curtime, oldtime); - oldtime = curtime; - } - - litest_assert_only_typed_events(li, - LIBINPUT_EVENT_POINTER_MOTION); - litest_assert_empty_queue(li); -} -END_TEST - START_TEST(touchpad_drag_lock_default_disabled) { struct litest_device *dev = litest_current_device(); @@ -1963,67 +1738,58 @@ { struct range multitap_range = {3, 8}; - litest_add("tap:1fg", touchpad_1fg_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:1fg", touchpad_1fg_doubletap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_ranged("tap:1fg", touchpad_1fg_multitap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:1fg", touchpad_1fg_multitap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:1fg", touchpad_1fg_multitap_n_drag_tap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:1fg", touchpad_1fg_multitap_n_drag_move, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:1fg", touchpad_1fg_multitap_n_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &multitap_range); - litest_add_ranged("tap:1fg", touchpad_1fg_multitap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); - litest_add("tap:1fg", touchpad_1fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:1fg", touchpad_1fg_tap_n_drag_draglock, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:1fg", touchpad_1fg_tap_n_drag_draglock_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:1fg", touchpad_1fg_tap_n_drag_draglock_timeout, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:2fg", touchpad_2fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:2fg", touchpad_2fg_tap_n_drag_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_APPLE_CLICKPAD); - litest_add("tap:2fg", touchpad_2fg_tap_n_drag_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:2fg", touchpad_2fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:2fg", touchpad_2fg_tap_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:2fg", touchpad_2fg_tap_n_hold_first, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:2fg", touchpad_2fg_tap_n_hold_second, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:2fg", touchpad_2fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:2fg", touchpad_1fg_tap_click, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("tap:2fg", touchpad_2fg_tap_click, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_SINGLE_TOUCH|LITEST_CLICKPAD); - - litest_add("tap:2fg", touchpad_2fg_tap_click_apple, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("tap:2fg", touchpad_no_2fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:2fg", touchpad_no_2fg_tap_after_timeout, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:2fg", touchpad_no_first_fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:2fg", touchpad_no_first_fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:3fg", touchpad_3fg_tap_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:3fg", touchpad_3fg_tap_btntool_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:3fg", touchpad_3fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:3fg", touchpad_3fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:4fg", touchpad_4fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:4fg", touchpad_4fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:5fg", touchpad_5fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:5fg", touchpad_5fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add("touchpad:tap", touchpad_1fg_tap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_1fg_doubletap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add_ranged("touchpad:tap", touchpad_1fg_multitap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_tap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_move, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &multitap_range); + litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); + litest_add("touchpad:tap", touchpad_1fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_1fg_tap_n_drag_draglock, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_1fg_tap_n_drag_draglock_tap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_1fg_tap_n_drag_draglock_timeout, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_2fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add("touchpad:tap", touchpad_2fg_tap_n_drag_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_APPLE_CLICKPAD); + litest_add("touchpad:tap", touchpad_2fg_tap_n_drag_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add("touchpad:tap", touchpad_2fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add("touchpad:tap", touchpad_2fg_tap_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add("touchpad:tap", touchpad_2fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add("touchpad:tap", touchpad_1fg_tap_click, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); + litest_add("touchpad:tap", touchpad_2fg_tap_click, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_SINGLE_TOUCH|LITEST_CLICKPAD); + + litest_add("touchpad:tap", touchpad_2fg_tap_click_apple, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_no_2fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add("touchpad:tap", touchpad_no_2fg_tap_after_timeout, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add("touchpad:tap", touchpad_no_first_fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add("touchpad:tap", touchpad_no_first_fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add("touchpad:tap", touchpad_3fg_tap_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add("touchpad:tap", touchpad_3fg_tap_btntool_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add("touchpad:tap", touchpad_3fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add("touchpad:tap", touchpad_3fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add("touchpad:tap", touchpad_4fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add("touchpad:tap", touchpad_4fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add("touchpad:tap", touchpad_5fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add("touchpad:tap", touchpad_5fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); /* Real buttons don't interfere with tapping, so don't run those for pads with buttons */ - litest_add("tap:1fg", touchpad_1fg_double_tap_click, LITEST_CLICKPAD, LITEST_ANY); - litest_add("tap:1fg", touchpad_1fg_tap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY); - litest_add_ranged("tap:1fg", touchpad_1fg_multitap_n_drag_tap_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); - litest_add("tap:1fg", touchpad_1fg_tap_n_drag_draglock_tap_click, LITEST_CLICKPAD, LITEST_ANY); - - litest_add("tap:config", touchpad_tap_default_disabled, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_ANY); - litest_add("tap:config", touchpad_tap_default_enabled, LITEST_TOUCHPAD, LITEST_BUTTON); - litest_add("tap:config", touchpad_tap_invalid, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:config", touchpad_tap_is_available, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:config", touchpad_tap_is_not_available, LITEST_ANY, LITEST_TOUCHPAD); - - litest_add("tap:1fg", clickpad_1fg_tap_click, LITEST_CLICKPAD, LITEST_ANY); - litest_add("tap:2fg", clickpad_2fg_tap_click, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_APPLE_CLICKPAD); - - litest_add("tap:draglock", touchpad_drag_lock_default_disabled, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:draglock", touchpad_drag_lock_default_unavailable, LITEST_ANY, LITEST_TOUCHPAD); - - litest_add("tap:drag", touchpad_drag_default_disabled, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("tap:drag", touchpad_drag_default_enabled, LITEST_TOUCHPAD, LITEST_BUTTON); - litest_add("tap:drag", touchpad_drag_config_invalid, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:drag", touchpad_drag_config_enabledisable, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:drag", touchpad_drag_disabled, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:drag", touchpad_drag_disabled_immediate, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_ranged("tap:drag", touchpad_drag_disabled_multitap_no_drag, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add("touchpad:tap", touchpad_1fg_double_tap_click, LITEST_CLICKPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_1fg_tap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY); + litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_tap_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); + litest_add("touchpad:tap", touchpad_1fg_tap_n_drag_draglock_tap_click, LITEST_CLICKPAD, LITEST_ANY); + + litest_add("touchpad:tap", touchpad_tap_default_disabled, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_ANY); + litest_add("touchpad:tap", touchpad_tap_default_enabled, LITEST_TOUCHPAD, LITEST_BUTTON); + litest_add("touchpad:tap", touchpad_tap_invalid, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_tap_is_available, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_tap_is_not_available, LITEST_ANY, LITEST_TOUCHPAD); + + litest_add("touchpad:tap", clickpad_1fg_tap_click, LITEST_CLICKPAD, LITEST_ANY); + litest_add("touchpad:tap", clickpad_2fg_tap_click, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_APPLE_CLICKPAD); + + litest_add("touchpad:tap", touchpad_drag_lock_default_disabled, LITEST_TOUCHPAD, LITEST_ANY); + litest_add("touchpad:tap", touchpad_drag_lock_default_unavailable, LITEST_ANY, LITEST_TOUCHPAD); + } diff -Nru libinput-1.2.2/test/udev.c libinput-0.21.0/test/udev.c --- libinput-1.2.2/test/udev.c 2016-03-08 03:52:12.000000000 +0000 +++ libinput-0.21.0/test/udev.c 2015-07-28 22:12:38.000000000 +0000 @@ -52,6 +52,7 @@ START_TEST(udev_create_NULL) { struct libinput *li; + const struct libinput_interface interface; struct udev *udev; udev = udev_new(); @@ -59,13 +60,13 @@ li = libinput_udev_create_context(NULL, NULL, NULL); ck_assert(li == NULL); - li = libinput_udev_create_context(&simple_interface, NULL, NULL); + li = libinput_udev_create_context(&interface, NULL, NULL); ck_assert(li == NULL); li = libinput_udev_create_context(NULL, NULL, udev); ck_assert(li == NULL); - li = libinput_udev_create_context(&simple_interface, NULL, udev); + li = libinput_udev_create_context(&interface, NULL, udev); ck_assert(li != NULL); ck_assert_int_eq(libinput_udev_assign_seat(li, NULL), -1); diff -Nru libinput-1.2.2/test/valgrind.suppressions libinput-0.21.0/test/valgrind.suppressions --- libinput-1.2.2/test/valgrind.suppressions 2016-02-19 02:39:43.000000000 +0000 +++ libinput-0.21.0/test/valgrind.suppressions 2015-07-24 03:24:43.000000000 +0000 @@ -14,24 +14,6 @@ fun:mtdev_put_event } { - - Memcheck:Leak - ... - fun:g_type_register_static -} -{ - - Memcheck:Leak - ... - fun:g_type_register_fundamental -} -{ - - Memcheck:Leak - ... - fun:g_malloc0 -} -{ libunwind:msync_uninitialized_bytes Memcheck:Param msync(start) diff -Nru libinput-1.2.2/tools/event-debug.c libinput-0.21.0/tools/event-debug.c --- libinput-1.2.2/tools/event-debug.c 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/tools/event-debug.c 2015-07-31 01:50:42.000000000 +0000 @@ -23,7 +23,6 @@ #define _GNU_SOURCE #include -#include #include #include #include @@ -109,21 +108,9 @@ case LIBINPUT_EVENT_GESTURE_PINCH_END: type = "GESTURE_PINCH_END"; break; - case LIBINPUT_EVENT_TABLET_TOOL_AXIS: - type = "TABLET_TOOL_AXIS"; - break; - case LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY: - type = "TABLET_TOOL_PROXIMITY"; - break; - case LIBINPUT_EVENT_TABLET_TOOL_TIP: - type = "TABLET_TOOL_TIP"; - break; - case LIBINPUT_EVENT_TABLET_TOOL_BUTTON: - type = "TABLET_TOOL_BUTTON"; - break; } - printf("%-7s %-16s ", libinput_device_get_sysname(dev), type); + printf("%-7s %s ", libinput_device_get_sysname(dev), type); } static void @@ -169,9 +156,6 @@ if (libinput_device_has_capability(dev, LIBINPUT_DEVICE_CAP_GESTURE)) printf("g"); - if (libinput_device_has_capability(dev, - LIBINPUT_DEVICE_CAP_TABLET_TOOL)) - printf("T"); if (libinput_device_get_size(dev, &w, &h) == 0) printf("\tsize %.2f/%.2fmm", w, h); @@ -267,144 +251,36 @@ } static void -print_pointer_button_event(struct libinput_event *ev) +print_button_event(struct libinput_event *ev) { struct libinput_event_pointer *p = libinput_event_get_pointer_event(ev); enum libinput_button_state state; - const char *buttonname; - int button; print_event_time(libinput_event_pointer_get_time(p)); - button = libinput_event_pointer_get_button(p); - buttonname = libevdev_event_code_get_name(EV_KEY, button); - state = libinput_event_pointer_get_button_state(p); - printf("%s (%d) %s, seat count: %u\n", - buttonname ? buttonname : "???", - button, - state == LIBINPUT_BUTTON_STATE_PRESSED ? "pressed" : "released", - libinput_event_pointer_get_seat_button_count(p)); -} - -static void -print_tablet_tip_event(struct libinput_event *ev) -{ - struct libinput_event_tablet_tool *p = libinput_event_get_tablet_tool_event(ev); - enum libinput_tablet_tool_tip_state state; - - print_event_time(libinput_event_tablet_tool_get_time(p)); - - state = libinput_event_tablet_tool_get_tip_state(p); - printf("%s\n", state == LIBINPUT_TABLET_TOOL_TIP_DOWN ? "down" : "up"); -} - -static void -print_tablet_button_event(struct libinput_event *ev) -{ - struct libinput_event_tablet_tool *p = libinput_event_get_tablet_tool_event(ev); - enum libinput_button_state state; - - print_event_time(libinput_event_tablet_tool_get_time(p)); - - state = libinput_event_tablet_tool_get_button_state(p); printf("%3d %s, seat count: %u\n", - libinput_event_tablet_tool_get_button(p), + libinput_event_pointer_get_button(p), state == LIBINPUT_BUTTON_STATE_PRESSED ? "pressed" : "released", - libinput_event_tablet_tool_get_seat_button_count(p)); + libinput_event_pointer_get_seat_button_count(p)); } static void -print_pointer_axis_event(struct libinput_event *ev) +print_axis_event(struct libinput_event *ev) { struct libinput_event_pointer *p = libinput_event_get_pointer_event(ev); double v = 0, h = 0; - const char *have_vert = "", - *have_horiz = ""; if (libinput_event_pointer_has_axis(p, - LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) { + LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) v = libinput_event_pointer_get_axis_value(p, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); - have_vert = "*"; - } if (libinput_event_pointer_has_axis(p, - LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) { + LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) h = libinput_event_pointer_get_axis_value(p, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL); - have_horiz = "*"; - } print_event_time(libinput_event_pointer_get_time(p)); - printf("vert %.2f%s horiz %.2f%s\n", v, have_vert, h, have_horiz); -} - -static void -print_tablet_axes(struct libinput_event_tablet_tool *t) -{ - struct libinput_tablet_tool *tool = libinput_event_tablet_tool_get_tool(t); - double x, y; - double dist, pressure; - double rotation, slider, wheel; - double delta; - -#define changed_sym(ev, ax) \ - (libinput_event_tablet_tool_##ax##_has_changed(ev) ? "*" : "") - - x = libinput_event_tablet_tool_get_x(t); - y = libinput_event_tablet_tool_get_x(t); - printf("\t%.2f%s/%.2f%s", - x, changed_sym(t, x), - y, changed_sym(t, y)); - - if (libinput_tablet_tool_has_tilt(tool)) { - x = libinput_event_tablet_tool_get_tilt_x(t); - y = libinput_event_tablet_tool_get_tilt_y(t); - printf("\ttilt: %.2f%s/%.2f%s", - x, changed_sym(t, tilt_x), - y, changed_sym(t, tilt_y)); - } - - if (libinput_tablet_tool_has_distance(tool) || - libinput_tablet_tool_has_pressure(tool)) { - dist = libinput_event_tablet_tool_get_distance(t); - pressure = libinput_event_tablet_tool_get_pressure(t); - if (dist) - printf("\tdistance: %.2f%s", - dist, changed_sym(t, distance)); - else - printf("\tpressure: %.2f%s", - pressure, changed_sym(t, pressure)); - } - - if (libinput_tablet_tool_has_rotation(tool)) { - rotation = libinput_event_tablet_tool_get_rotation(t); - printf("\trotation: %.2f%s", - rotation, changed_sym(t, rotation)); - } - - if (libinput_tablet_tool_has_slider(tool)) { - slider = libinput_event_tablet_tool_get_slider_position(t); - printf("\tslider: %.2f%s", - slider, changed_sym(t, slider)); - } - - if (libinput_tablet_tool_has_wheel(tool)) { - wheel = libinput_event_tablet_tool_get_wheel_delta(t); - delta = libinput_event_tablet_tool_get_wheel_delta_discrete(t); - printf("\twheel: %.2f%s (%d)", - wheel, changed_sym(t, wheel), - (int)delta); - } -} - -static void -print_tablet_axis_event(struct libinput_event *ev) -{ - struct libinput_event_tablet_tool *t = libinput_event_get_tablet_tool_event(ev); - - print_event_time(libinput_event_tablet_tool_get_time(t)); - print_tablet_axes(t); - printf("\n"); + printf("vert %.2f horiz %.2f\n", v, h); } static void @@ -417,96 +293,6 @@ } static void -print_proximity_event(struct libinput_event *ev) -{ - struct libinput_event_tablet_tool *t = libinput_event_get_tablet_tool_event(ev); - struct libinput_tablet_tool *tool = libinput_event_tablet_tool_get_tool(t); - enum libinput_tablet_tool_proximity_state state; - const char *tool_str, - *state_str; - - switch (libinput_tablet_tool_get_type(tool)) { - case LIBINPUT_TABLET_TOOL_TYPE_PEN: - tool_str = "pen"; - break; - case LIBINPUT_TABLET_TOOL_TYPE_ERASER: - tool_str = "eraser"; - break; - case LIBINPUT_TABLET_TOOL_TYPE_BRUSH: - tool_str = "brush"; - break; - case LIBINPUT_TABLET_TOOL_TYPE_PENCIL: - tool_str = "pencil"; - break; - case LIBINPUT_TABLET_TOOL_TYPE_AIRBRUSH: - tool_str = "airbrush"; - break; - case LIBINPUT_TABLET_TOOL_TYPE_MOUSE: - tool_str = "mouse"; - break; - case LIBINPUT_TABLET_TOOL_TYPE_LENS: - tool_str = "lens"; - break; - default: - abort(); - } - - state = libinput_event_tablet_tool_get_proximity_state(t); - - print_event_time(libinput_event_tablet_tool_get_time(t)); - - if (state == LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN) { - print_tablet_axes(t); - state_str = "proximity-in"; - } else if (state == LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT) { - state_str = "proximity-out"; - printf("\t"); - } else { - abort(); - } - - printf("\t%s (%#" PRIx64 ", id %#" PRIx64 ") %s", - tool_str, - libinput_tablet_tool_get_serial(tool), - libinput_tablet_tool_get_tool_id(tool), - state_str); - - printf("\taxes:"); - if (libinput_tablet_tool_has_distance(tool)) - printf("d"); - if (libinput_tablet_tool_has_pressure(tool)) - printf("p"); - if (libinput_tablet_tool_has_tilt(tool)) - printf("t"); - if (libinput_tablet_tool_has_rotation(tool)) - printf("r"); - if (libinput_tablet_tool_has_slider(tool)) - printf("s"); - if (libinput_tablet_tool_has_wheel(tool)) - printf("w"); - - printf("\tbtn:"); - if (libinput_tablet_tool_has_button(tool, BTN_TOUCH)) - printf("T"); - if (libinput_tablet_tool_has_button(tool, BTN_STYLUS)) - printf("S"); - if (libinput_tablet_tool_has_button(tool, BTN_STYLUS2)) - printf("S2"); - if (libinput_tablet_tool_has_button(tool, BTN_LEFT)) - printf("L"); - if (libinput_tablet_tool_has_button(tool, BTN_MIDDLE)) - printf("M"); - if (libinput_tablet_tool_has_button(tool, BTN_RIGHT)) - printf("R"); - if (libinput_tablet_tool_has_button(tool, BTN_SIDE)) - printf("Sd"); - if (libinput_tablet_tool_has_button(tool, BTN_EXTRA)) - printf("Ex"); - - printf("\n"); -} - -static void print_touch_event_with_coords(struct libinput_event *ev) { struct libinput_event_touch *t = libinput_event_get_touch_event(ev); @@ -597,10 +383,10 @@ print_absmotion_event(ev); break; case LIBINPUT_EVENT_POINTER_BUTTON: - print_pointer_button_event(ev); + print_button_event(ev); break; case LIBINPUT_EVENT_POINTER_AXIS: - print_pointer_axis_event(ev); + print_axis_event(ev); break; case LIBINPUT_EVENT_TOUCH_DOWN: print_touch_event_with_coords(ev); @@ -635,18 +421,6 @@ case LIBINPUT_EVENT_GESTURE_PINCH_END: print_gesture_event_without_coords(ev); break; - case LIBINPUT_EVENT_TABLET_TOOL_AXIS: - print_tablet_axis_event(ev); - break; - case LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY: - print_proximity_event(ev); - break; - case LIBINPUT_EVENT_TABLET_TOOL_TIP: - print_tablet_tip_event(ev); - break; - case LIBINPUT_EVENT_TABLET_TOOL_BUTTON: - print_tablet_button_event(ev); - break; } libinput_event_destroy(ev); @@ -697,9 +471,6 @@ struct libinput *li; struct timespec tp; - clock_gettime(CLOCK_MONOTONIC, &tp); - start_time = tp.tv_sec * 1000 + tp.tv_nsec / 1000000; - tools_init_context(&context); if (tools_parse_args(argc, argv, &context)) @@ -709,6 +480,9 @@ if (!li) return 1; + clock_gettime(CLOCK_MONOTONIC, &tp); + start_time = tp.tv_sec * 1000 + tp.tv_nsec / 1000000; + mainloop(li); libinput_unref(li); diff -Nru libinput-1.2.2/tools/event-gui.c libinput-0.21.0/tools/event-gui.c --- libinput-1.2.2/tools/event-gui.c 2016-03-10 07:11:55.000000000 +0000 +++ libinput-0.21.0/tools/event-gui.c 2015-07-31 01:50:42.000000000 +0000 @@ -51,10 +51,6 @@ int x, y; }; -struct point { - double x, y; -}; - struct window { GtkWidget *win; GtkWidget *area; @@ -89,22 +85,6 @@ double x, y; } pinch; - struct { - double x, y; - double x_in, y_in; - double x_down, y_down; - double x_up, y_up; - double pressure; - double distance; - double tilt_x, tilt_y; - - /* these are for the delta coordinates, but they're not - * deltas, theyconverted into - * abs positions */ - size_t ndeltas; - struct point deltas[64]; - } tool; - struct libinput_device *devices[50]; }; @@ -132,11 +112,16 @@ va_end(args); } -static inline void -draw_gestures(struct window *w, cairo_t *cr) +static gboolean +draw(GtkWidget *widget, cairo_t *cr, gpointer data) { - int i; - int offset; + struct window *w = data; + struct touch *t; + int i, offset; + + cairo_set_source_rgb(cr, 1, 1, 1); + cairo_rectangle(cr, 0, 0, w->width, w->height); + cairo_fill(cr); /* swipe */ cairo_save(cr); @@ -174,11 +159,17 @@ cairo_restore(cr); -} + /* draw pointer sprite */ + cairo_set_source_rgb(cr, 0, 0, 0); + cairo_save(cr); + cairo_move_to(cr, w->x, w->y); + cairo_rel_line_to(cr, 10, 15); + cairo_rel_line_to(cr, -10, 0); + cairo_rel_line_to(cr, 0, -15); + cairo_fill(cr); + cairo_restore(cr); -static inline void -draw_scrollbars(struct window *w, cairo_t *cr) -{ + /* draw scroll bars */ cairo_set_source_rgb(cr, .4, .8, 0); cairo_save(cr); @@ -186,13 +177,8 @@ cairo_rectangle(cr, w->hx - 20, w->hy - 10, 40, 20); cairo_fill(cr); cairo_restore(cr); -} - -static inline void -draw_touchpoints(struct window *w, cairo_t *cr) -{ - struct touch *t; + /* touch points */ cairo_set_source_rgb(cr, .8, .2, .2); ARRAY_FOR_EACH(w->touches, t) { @@ -201,22 +187,16 @@ cairo_fill(cr); cairo_restore(cr); } -} -static inline void -draw_abs_pointer(struct window *w, cairo_t *cr) -{ + /* abs position */ cairo_set_source_rgb(cr, .2, .4, .8); cairo_save(cr); cairo_arc(cr, w->absx, w->absy, 10, 0, 2 * M_PI); cairo_fill(cr); cairo_restore(cr); -} -static inline void -draw_buttons(struct window *w, cairo_t *cr) -{ + /* lmr buttons */ cairo_save(cr); if (w->l || w->m || w->r) { cairo_set_source_rgb(cr, .2, .8, .8); @@ -235,102 +215,6 @@ cairo_rectangle(cr, w->width/2 + 30, w->height - 200, 70, 30); cairo_stroke(cr); cairo_restore(cr); -} - -static inline void -draw_tablet(struct window *w, cairo_t *cr) -{ - double x, y; - int first, last, mask; - int i; - - /* tablet tool, square for prox-in location */ - cairo_save(cr); - cairo_set_source_rgb(cr, .8, .8, .8); - if (w->tool.x_in && w->tool.y_in) { - cairo_rectangle(cr, w->tool.x_in - 15, w->tool.y_in - 15, 30, 30); - cairo_stroke(cr); - cairo_restore(cr); - cairo_save(cr); - } - - if (w->tool.x_down && w->tool.y_down) { - cairo_rectangle(cr, w->tool.x_down - 10, w->tool.y_down - 10, 20, 20); - cairo_stroke(cr); - cairo_restore(cr); - cairo_save(cr); - } - - if (w->tool.x_up && w->tool.y_up) { - cairo_rectangle(cr, w->tool.x_up - 10, w->tool.y_up - 10, 20, 20); - cairo_stroke(cr); - cairo_restore(cr); - cairo_save(cr); - } - - if (w->tool.pressure) - cairo_set_source_rgb(cr, .8, .8, .2); - - cairo_translate(cr, w->tool.x, w->tool.y); - cairo_scale(cr, 1.0 + w->tool.tilt_x, 1.0 + w->tool.tilt_y); - cairo_arc(cr, 0, 0, - 1 + 10 * max(w->tool.pressure, w->tool.distance), - 0, 2 * M_PI); - cairo_fill(cr); - cairo_restore(cr); - - /* tablet deltas */ - mask = ARRAY_LENGTH(w->tool.deltas); - first = max(w->tool.ndeltas + 1, mask) - mask; - last = w->tool.ndeltas; - - cairo_save(cr); - cairo_set_source_rgb(cr, .8, .8, .2); - - x = w->tool.deltas[first % mask].x; - y = w->tool.deltas[first % mask].y; - cairo_move_to(cr, x, y); - - for (i = first + 1; i < last; i++) { - x = w->tool.deltas[i % mask].x; - y = w->tool.deltas[i % mask].y; - cairo_line_to(cr, x, y); - } - - cairo_stroke(cr); - -} - -static inline void -draw_pointer(struct window *w, cairo_t *cr) -{ - /* draw pointer sprite */ - cairo_set_source_rgb(cr, 0, 0, 0); - cairo_save(cr); - cairo_move_to(cr, w->x, w->y); - cairo_rel_line_to(cr, 10, 15); - cairo_rel_line_to(cr, -10, 0); - cairo_rel_line_to(cr, 0, -15); - cairo_fill(cr); - cairo_restore(cr); -} - -static gboolean -draw(GtkWidget *widget, cairo_t *cr, gpointer data) -{ - struct window *w = data; - - cairo_set_source_rgb(cr, 1, 1, 1); - cairo_rectangle(cr, 0, 0, w->width, w->height); - cairo_fill(cr); - - draw_gestures(w, cr); - draw_scrollbars(w, cr); - draw_touchpoints(w, cr); - draw_abs_pointer(w, cr); - draw_buttons(w, cr); - draw_tablet(w, cr); - draw_pointer(w, cr); return TRUE; } @@ -667,76 +551,6 @@ } } -static void -handle_event_tablet(struct libinput_event *ev, struct window *w) -{ - struct libinput_event_tablet_tool *t = libinput_event_get_tablet_tool_event(ev); - double x, y; - struct point point; - int idx; - const int mask = ARRAY_LENGTH(w->tool.deltas); - - x = libinput_event_tablet_tool_get_x_transformed(t, w->width); - y = libinput_event_tablet_tool_get_y_transformed(t, w->height); - - switch (libinput_event_get_type(ev)) { - case LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY: - if (libinput_event_tablet_tool_get_proximity_state(t) == - LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT) { - w->tool.x_in = 0; - w->tool.y_in = 0; - w->tool.x_down = 0; - w->tool.y_down = 0; - w->tool.x_up = 0; - w->tool.y_up = 0; - } else { - w->tool.x_in = x; - w->tool.y_in = y; - w->tool.ndeltas = 0; - w->tool.deltas[0].x = w->width/2; - w->tool.deltas[0].y = w->height/2; - } - break; - case LIBINPUT_EVENT_TABLET_TOOL_TIP: - w->tool.pressure = libinput_event_tablet_tool_get_pressure(t); - w->tool.distance = libinput_event_tablet_tool_get_distance(t); - w->tool.tilt_x = libinput_event_tablet_tool_get_tilt_x(t); - w->tool.tilt_y = libinput_event_tablet_tool_get_tilt_y(t); - if (libinput_event_tablet_tool_get_tip_state(t) == - LIBINPUT_TABLET_TOOL_TIP_DOWN) { - w->tool.x_down = x; - w->tool.y_down = y; - } else { - w->tool.x_up = x; - w->tool.y_up = y; - } - /* fallthrough */ - case LIBINPUT_EVENT_TABLET_TOOL_AXIS: - w->tool.x = x; - w->tool.y = y; - w->tool.pressure = libinput_event_tablet_tool_get_pressure(t); - w->tool.distance = libinput_event_tablet_tool_get_distance(t); - w->tool.tilt_x = libinput_event_tablet_tool_get_tilt_x(t); - w->tool.tilt_y = libinput_event_tablet_tool_get_tilt_y(t); - - /* Add the delta to the last position and store them as abs - * coordinates */ - idx = w->tool.ndeltas % mask; - point = w->tool.deltas[idx]; - - idx = (w->tool.ndeltas + 1) % mask; - point.x += libinput_event_tablet_tool_get_dx(t); - point.y += libinput_event_tablet_tool_get_dy(t); - w->tool.deltas[idx] = point; - w->tool.ndeltas++; - break; - case LIBINPUT_EVENT_TABLET_TOOL_BUTTON: - break; - default: - abort(); - } -} - static gboolean handle_event_libinput(GIOChannel *source, GIOCondition condition, gpointer data) { @@ -792,12 +606,6 @@ case LIBINPUT_EVENT_GESTURE_PINCH_END: handle_event_pinch(ev, w); break; - case LIBINPUT_EVENT_TABLET_TOOL_AXIS: - case LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY: - case LIBINPUT_EVENT_TABLET_TOOL_TIP: - case LIBINPUT_EVENT_TABLET_TOOL_BUTTON: - handle_event_tablet(ev, w); - break; } libinput_event_destroy(ev); diff -Nru libinput-1.2.2/tools/libinput-list-devices.c libinput-0.21.0/tools/libinput-list-devices.c --- libinput-1.2.2/tools/libinput-list-devices.c 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/tools/libinput-list-devices.c 2015-07-31 01:50:42.000000000 +0000 @@ -48,18 +48,6 @@ } static const char * -drag_default(struct libinput_device *device) -{ - if (!libinput_device_config_tap_get_finger_count(device)) - return "n/a"; - - if (libinput_device_config_tap_get_default_drag_enabled(device)) - return "enabled"; - else - return "disabled"; -} - -static const char * draglock_default(struct libinput_device *device) { if (!libinput_device_config_tap_get_finger_count(device)) @@ -184,35 +172,6 @@ return str; } -static char* -accel_profiles(struct libinput_device *device) -{ - uint32_t profiles; - char *str; - enum libinput_config_accel_profile profile; - - if (!libinput_device_config_accel_is_available(device)) { - xasprintf(&str, "n/a"); - return str; - } - - profiles = libinput_device_config_accel_get_profiles(device); - if (profiles == LIBINPUT_CONFIG_ACCEL_PROFILE_NONE) { - xasprintf(&str, "none"); - return str; - } - - profile = libinput_device_config_accel_get_default_profile(device); - xasprintf(&str, - "%s%s%s%s", - (profile == LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT) ? "*" : "", - (profiles & LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT) ? "flat" : "", - (profile == LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE) ? "*" : "", - (profiles & LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE) ? "adaptive" : ""); - - return str; -} - static const char * dwt_default(struct libinput_device *device) { @@ -269,13 +228,9 @@ if (libinput_device_has_capability(dev, LIBINPUT_DEVICE_CAP_TOUCH)) printf("touch"); - if (libinput_device_has_capability(dev, - LIBINPUT_DEVICE_CAP_TABLET_TOOL)) - printf("tablet"); printf("\n"); printf("Tap-to-click: %s\n", tap_default(dev)); - printf("Tap-and-drag: %s\n", drag_default(dev)); printf("Tap drag lock: %s\n", draglock_default(dev)); printf("Left-handed: %s\n", left_handed_default(dev)); printf("Nat.scrolling: %s\n", nat_scroll_default(dev)); @@ -294,10 +249,6 @@ printf("Disable-w-typing: %s\n", dwt_default(dev)); - str = accel_profiles(dev); - printf("Accel profiles: %s\n", str); - free(str); - printf("\n"); } diff -Nru libinput-1.2.2/tools/Makefile.am libinput-0.21.0/tools/Makefile.am --- libinput-1.2.2/tools/Makefile.am 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/tools/Makefile.am 2015-07-15 04:18:08.000000000 +0000 @@ -39,5 +39,3 @@ event_gui_CFLAGS = $(CAIRO_CFLAGS) $(GTK_CFLAGS) $(LIBUDEV_CFLAGS) event_gui_LDFLAGS = -no-install endif - -EXTRA_DIST = make-ptraccel-graphs.sh diff -Nru libinput-1.2.2/tools/Makefile.in libinput-0.21.0/tools/Makefile.in --- libinput-1.2.2/tools/Makefile.in 2016-03-15 00:23:56.000000000 +0000 +++ libinput-0.21.0/tools/Makefile.in 2015-08-04 00:58:31.000000000 +0000 @@ -325,12 +325,9 @@ LIBUDEV_LIBS = @LIBUDEV_LIBS@ LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@ LIBUNWIND_LIBS = @LIBUNWIND_LIBS@ -LIBWACOM_CFLAGS = @LIBWACOM_CFLAGS@ -LIBWACOM_LIBS = @LIBWACOM_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -444,7 +441,6 @@ @BUILD_EVENTGUI_TRUE@event_gui_LDADD = ../src/libinput.la libshared.la $(CAIRO_LIBS) $(GTK_LIBS) $(LIBUDEV_LIBS) @BUILD_EVENTGUI_TRUE@event_gui_CFLAGS = $(CAIRO_CFLAGS) $(GTK_CFLAGS) $(LIBUDEV_CFLAGS) @BUILD_EVENTGUI_TRUE@event_gui_LDFLAGS = -no-install -EXTRA_DIST = make-ptraccel-graphs.sh all: all-am .SUFFIXES: diff -Nru libinput-1.2.2/tools/make-ptraccel-graphs.sh libinput-0.21.0/tools/make-ptraccel-graphs.sh --- libinput-1.2.2/tools/make-ptraccel-graphs.sh 2016-01-29 05:56:31.000000000 +0000 +++ libinput-0.21.0/tools/make-ptraccel-graphs.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -#!/bin/bash - -tool=`dirname $0`/ptraccel-debug -gnuplot=/usr/bin/gnuplot - -outfile="ptraccel-linear" -for speed in -1 -0.75 -0.5 -0.25 0 0.5 1; do - $tool --mode=accel --dpi=1000 --filter=linear --speed=$speed > $outfile-$speed.gnuplot -done -$gnuplot < $outfile-$dpi.gnuplot -done - -$gnuplot < $outfile-mouse.gnuplot -$tool --mode=accel --dpi=1000 --filter=touchpad > $outfile-touchpad.gnuplot -$gnuplot < $outfile-mouse.gnuplot -for constaccel in 1 2 3; do - dpi=$((1000/$constaccel)) - $tool --mode=accel --dpi=$dpi --filter=trackpoint > $outfile-trackpoint-$constaccel.gnuplot -done -$gnuplot < ... in motion and delta modes only. Increase dx by step each round\n" "--speed= ... accel speed [-1, 1], default 0\n" "--dpi= ... device resolution in DPI (default: 1000)\n" - "--filter= \n" - " linear ... the default motion filter\n" - " low-dpi ... low-dpi filter, use --dpi with this argument\n" - " touchpad ... the touchpad motion filter\n" - " x230 ... custom filter for the Lenovo x230 touchpad\n" - " trackpoint... trackpoint motion filter\n" "\n" "If extra arguments are present and mode is not given, mode defaults to 'sequence'\n" "and the arguments are interpreted as sequence of delta x coordinates\n" @@ -198,8 +195,6 @@ double custom_deltas[1024]; double speed = 0.0; int dpi = 1000; - const char *filter_type = "linear"; - accel_profile_func_t profile = NULL; enum { OPT_MODE = 1, @@ -208,7 +203,6 @@ OPT_STEP, OPT_SPEED, OPT_DPI, - OPT_FILTER, }; while (1) { @@ -221,7 +215,6 @@ {"step", 1, 0, OPT_STEP }, {"speed", 1, 0, OPT_SPEED }, {"dpi", 1, 0, OPT_DPI }, - {"filter", 1, 0, OPT_FILTER}, {0, 0, 0, 0} }; @@ -272,9 +265,6 @@ case OPT_DPI: dpi = strtod(optarg, NULL); break; - case OPT_FILTER: - filter_type = optarg; - break; default: usage(); exit(1); @@ -282,26 +272,8 @@ } } - if (streq(filter_type, "linear")) { - filter = create_pointer_accelerator_filter_linear(dpi); - profile = pointer_accel_profile_linear; - } else if (streq(filter_type, "low-dpi")) { - filter = create_pointer_accelerator_filter_linear_low_dpi(dpi); - profile = pointer_accel_profile_linear_low_dpi; - } else if (streq(filter_type, "touchpad")) { - filter = create_pointer_accelerator_filter_touchpad(dpi); - profile = touchpad_accel_profile_linear; - } else if (streq(filter_type, "x230")) { - filter = create_pointer_accelerator_filter_lenovo_x230(dpi); - profile = touchpad_lenovo_x230_accel_profile; - } else if (streq(filter_type, "trackpoint")) { - filter = create_pointer_accelerator_filter_trackpoint(dpi); - profile = trackpoint_accel_profile; - } else { - fprintf(stderr, "Invalid filter type %s\n", filter_type); - return 1; - } - + filter = create_pointer_accelerator_filter(pointer_accel_profile_linear, + dpi); assert(filter != NULL); filter_set_speed(filter, speed); @@ -325,7 +297,7 @@ } if (print_accel) - print_accel_func(filter, profile); + print_accel_func(filter); else if (print_delta) print_ptraccel_deltas(filter, step); else if (print_motion) diff -Nru libinput-1.2.2/tools/shared.c libinput-0.21.0/tools/shared.c --- libinput-1.2.2/tools/shared.c 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/tools/shared.c 2015-07-31 01:50:42.000000000 +0000 @@ -45,8 +45,6 @@ OPT_VERBOSE, OPT_TAP_ENABLE, OPT_TAP_DISABLE, - OPT_DRAG_ENABLE, - OPT_DRAG_DISABLE, OPT_DRAG_LOCK_ENABLE, OPT_DRAG_LOCK_DISABLE, OPT_NATURAL_SCROLL_ENABLE, @@ -61,7 +59,6 @@ OPT_SCROLL_METHOD, OPT_SCROLL_BUTTON, OPT_SPEED, - OPT_PROFILE, }; static void @@ -84,8 +81,6 @@ "Features:\n" "--enable-tap\n" "--disable-tap.... enable/disable tapping\n" - "--enable-drag\n" - "--disable-drag.... enable/disable tap-n-drag\n" "--enable-drag-lock\n" "--disable-drag-lock.... enable/disable tapping drag lock\n" "--enable-natural-scrolling\n" @@ -99,7 +94,6 @@ "--set-click-method=[none|clickfinger|buttonareas] .... set the desired click method\n" "--set-scroll-method=[none|twofinger|edge|button] ... set the desired scroll method\n" "--set-scroll-button=BTN_MIDDLE ... set the button to the given button code\n" - "--set-profile=[adaptive|flat].... set pointer acceleration profile\n" "--set-speed=.... set pointer acceleration speed\n" "\n" "These options apply to all applicable devices, if a feature\n" @@ -121,7 +115,6 @@ memset(options, 0, sizeof(*options)); options->tapping = -1; - options->drag = -1; options->drag_lock = -1; options->natural_scroll = -1; options->left_handed = -1; @@ -133,7 +126,6 @@ options->backend = BACKEND_UDEV; options->seat = "seat0"; options->speed = 0.0; - options->profile = LIBINPUT_CONFIG_ACCEL_PROFILE_NONE; } int @@ -152,8 +144,6 @@ { "verbose", 0, 0, OPT_VERBOSE }, { "enable-tap", 0, 0, OPT_TAP_ENABLE }, { "disable-tap", 0, 0, OPT_TAP_DISABLE }, - { "enable-drag", 0, 0, OPT_DRAG_ENABLE }, - { "disable-drag", 0, 0, OPT_DRAG_DISABLE }, { "enable-drag-lock", 0, 0, OPT_DRAG_LOCK_ENABLE }, { "disable-drag-lock", 0, 0, OPT_DRAG_LOCK_DISABLE }, { "enable-natural-scrolling", 0, 0, OPT_NATURAL_SCROLL_ENABLE }, @@ -167,7 +157,6 @@ { "set-click-method", 1, 0, OPT_CLICK_METHOD }, { "set-scroll-method", 1, 0, OPT_SCROLL_METHOD }, { "set-scroll-button", 1, 0, OPT_SCROLL_BUTTON }, - { "set-profile", 1, 0, OPT_PROFILE }, { "speed", 1, 0, OPT_SPEED }, { 0, 0, 0, 0} }; @@ -177,151 +166,131 @@ break; switch(c) { - case 'h': - case OPT_HELP: - tools_usage(); - exit(0); - case OPT_DEVICE: - options->backend = BACKEND_DEVICE; - if (!optarg) { + case 'h': + case OPT_HELP: tools_usage(); - return 1; - } - options->device = optarg; - break; - case OPT_UDEV: - options->backend = BACKEND_UDEV; - if (optarg) - options->seat = optarg; - break; - case OPT_GRAB: - options->grab = 1; - break; - case OPT_VERBOSE: - options->verbose = 1; - break; - case OPT_TAP_ENABLE: - options->tapping = 1; - break; - case OPT_TAP_DISABLE: - options->tapping = 0; - break; - case OPT_DRAG_ENABLE: - options->drag = 1; - break; - case OPT_DRAG_DISABLE: - options->drag = 0; - break; - case OPT_DRAG_LOCK_ENABLE: - options->drag_lock = 1; - break; - case OPT_DRAG_LOCK_DISABLE: - options->drag_lock = 0; - break; - case OPT_NATURAL_SCROLL_ENABLE: - options->natural_scroll = 1; - break; - case OPT_NATURAL_SCROLL_DISABLE: - options->natural_scroll = 0; - break; - case OPT_LEFT_HANDED_ENABLE: - options->left_handed = 1; - break; - case OPT_LEFT_HANDED_DISABLE: - options->left_handed = 0; - break; - case OPT_MIDDLEBUTTON_ENABLE: - options->middlebutton = 1; - break; - case OPT_MIDDLEBUTTON_DISABLE: - options->middlebutton = 0; - break; - case OPT_DWT_ENABLE: - options->dwt = LIBINPUT_CONFIG_DWT_ENABLED; - break; - case OPT_DWT_DISABLE: - options->dwt = LIBINPUT_CONFIG_DWT_DISABLED; - break; - case OPT_CLICK_METHOD: - if (!optarg) { - tools_usage(); - return 1; - } - if (streq(optarg, "none")) { - options->click_method = - LIBINPUT_CONFIG_CLICK_METHOD_NONE; - } else if (streq(optarg, "clickfinger")) { - options->click_method = - LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; - } else if (streq(optarg, "buttonareas")) { - options->click_method = - LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS; - } else { - tools_usage(); - return 1; - } - break; - case OPT_SCROLL_METHOD: - if (!optarg) { - tools_usage(); - return 1; - } - if (streq(optarg, "none")) { - options->scroll_method = - LIBINPUT_CONFIG_SCROLL_NO_SCROLL; - } else if (streq(optarg, "twofinger")) { - options->scroll_method = - LIBINPUT_CONFIG_SCROLL_2FG; - } else if (streq(optarg, "edge")) { - options->scroll_method = - LIBINPUT_CONFIG_SCROLL_EDGE; - } else if (streq(optarg, "button")) { - options->scroll_method = - LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN; - } else { - tools_usage(); - return 1; - } - break; - case OPT_SCROLL_BUTTON: - if (!optarg) { - tools_usage(); - return 1; - } - options->scroll_button = - libevdev_event_code_from_name(EV_KEY, - optarg); - if (options->scroll_button == -1) { - fprintf(stderr, - "Invalid button %s\n", - optarg); - return 1; - } - break; - case OPT_SPEED: - if (!optarg) { - tools_usage(); - return 1; - } - options->speed = atof(optarg); - break; - case OPT_PROFILE: - if (!optarg) { - tools_usage(); - return 1; - } - if (streq(optarg, "adaptive")) { - options->profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE; - } else if (streq(optarg, "flat")) { - options->profile = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT; - } else { + exit(0); + case OPT_DEVICE: + options->backend = BACKEND_DEVICE; + if (!optarg) { + tools_usage(); + return 1; + } + options->device = optarg; + break; + case OPT_UDEV: + options->backend = BACKEND_UDEV; + if (optarg) + options->seat = optarg; + break; + case OPT_GRAB: + options->grab = 1; + break; + case OPT_VERBOSE: + options->verbose = 1; + break; + case OPT_TAP_ENABLE: + options->tapping = 1; + break; + case OPT_TAP_DISABLE: + options->tapping = 0; + break; + case OPT_DRAG_LOCK_ENABLE: + options->drag_lock = 1; + break; + case OPT_DRAG_LOCK_DISABLE: + options->drag_lock = 0; + break; + case OPT_NATURAL_SCROLL_ENABLE: + options->natural_scroll = 1; + break; + case OPT_NATURAL_SCROLL_DISABLE: + options->natural_scroll = 0; + break; + case OPT_LEFT_HANDED_ENABLE: + options->left_handed = 1; + break; + case OPT_LEFT_HANDED_DISABLE: + options->left_handed = 0; + break; + case OPT_MIDDLEBUTTON_ENABLE: + options->middlebutton = 1; + break; + case OPT_MIDDLEBUTTON_DISABLE: + options->middlebutton = 0; + break; + case OPT_DWT_ENABLE: + options->dwt = LIBINPUT_CONFIG_DWT_ENABLED; + break; + case OPT_DWT_DISABLE: + options->dwt = LIBINPUT_CONFIG_DWT_DISABLED; + break; + case OPT_CLICK_METHOD: + if (!optarg) { + tools_usage(); + return 1; + } + if (streq(optarg, "none")) { + options->click_method = + LIBINPUT_CONFIG_CLICK_METHOD_NONE; + } else if (streq(optarg, "clickfinger")) { + options->click_method = + LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; + } else if (streq(optarg, "buttonareas")) { + options->click_method = + LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS; + } else { + tools_usage(); + return 1; + } + break; + case OPT_SCROLL_METHOD: + if (!optarg) { + tools_usage(); + return 1; + } + if (streq(optarg, "none")) { + options->scroll_method = + LIBINPUT_CONFIG_SCROLL_NO_SCROLL; + } else if (streq(optarg, "twofinger")) { + options->scroll_method = + LIBINPUT_CONFIG_SCROLL_2FG; + } else if (streq(optarg, "edge")) { + options->scroll_method = + LIBINPUT_CONFIG_SCROLL_EDGE; + } else if (streq(optarg, "button")) { + options->scroll_method = + LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN; + } else { + tools_usage(); + return 1; + } + break; + case OPT_SCROLL_BUTTON: + if (!optarg) { + tools_usage(); + return 1; + } + options->scroll_button = + libevdev_event_code_from_name(EV_KEY, + optarg); + if (options->scroll_button == -1) { + fprintf(stderr, + "Invalid button %s\n", + optarg); + return 1; + } + break; + case OPT_SPEED: + if (!optarg) { + tools_usage(); + return 1; + } + options->speed = atof(optarg); + break; + default: tools_usage(); return 1; - } - break; - default: - tools_usage(); - return 1; } } @@ -451,9 +420,6 @@ { if (options->tapping != -1) libinput_device_config_tap_set_enabled(device, options->tapping); - if (options->drag != -1) - libinput_device_config_tap_set_drag_enabled(device, - options->drag); if (options->drag_lock != -1) libinput_device_config_tap_set_drag_lock_enabled(device, options->drag_lock); @@ -479,11 +445,7 @@ libinput_device_config_scroll_set_button(device, options->scroll_button); - if (libinput_device_config_accel_is_available(device)) { + if (libinput_device_config_accel_is_available(device)) libinput_device_config_accel_set_speed(device, options->speed); - if (options->profile != LIBINPUT_CONFIG_ACCEL_PROFILE_NONE) - libinput_device_config_accel_set_profile(device, - options->profile); - } } diff -Nru libinput-1.2.2/tools/shared.h libinput-0.21.0/tools/shared.h --- libinput-1.2.2/tools/shared.h 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/tools/shared.h 2015-07-31 01:50:42.000000000 +0000 @@ -39,7 +39,6 @@ int verbose; int tapping; - int drag; int drag_lock; int natural_scroll; int left_handed; @@ -49,7 +48,6 @@ int scroll_button; double speed; int dwt; - enum libinput_config_accel_profile profile; }; struct tools_context { diff -Nru libinput-1.2.2/udev/90-libinput-model-quirks.hwdb libinput-0.21.0/udev/90-libinput-model-quirks.hwdb --- libinput-1.2.2/udev/90-libinput-model-quirks.hwdb 2016-03-15 00:22:40.000000000 +0000 +++ libinput-0.21.0/udev/90-libinput-model-quirks.hwdb 2015-08-03 04:35:00.000000000 +0000 @@ -22,14 +22,10 @@ libinput:name:*AlpsPS/2 ALPS GlidePoint:dmi:* LIBINPUT_MODEL_ALPS_TOUCHPAD=1 -libinput:name:*AlpsPS/2 ALPS DualPoint TouchPad:fwversion:800 -libinput:name:*AlpsPS/2 ALPS GlidePoint:fwversion:800 +libinput:name:*AlpsPS/2 ALPS DualPoint TouchPad:fwversion:8 +libinput:name:*AlpsPS/2 ALPS GlidePoint:fwversion:8 LIBINPUT_ATTR_SIZE_HINT=100x55 -libinput:name:*AlpsPS/2 ALPS DualPoint TouchPad:fwversion:310 -libinput:name:*AlpsPS/2 ALPS GlidePoint:fwversion:310 - LIBINPUT_MODEL_ALPS_RUSHMORE=1 - ########################################## # Apple ########################################## @@ -38,16 +34,6 @@ LIBINPUT_MODEL_APPLE_TOUCHPAD=1 LIBINPUT_ATTR_SIZE_HINT=104x75 -libinput:name:*Apple Inc. Apple Internal Keyboard*:dmi:* - LIBINPUT_MODEL_APPLE_INTERNAL_KEYBOARD=1 - -########################################## -# Cyborg -########################################## -# Saitek Cyborg R.A.T.5 Mouse -libinput:mouse:input:b0003v06A3p0CD5* - LIBINPUT_MODEL_CYBORG_RAT=1 - ########################################## # Elantech ########################################## @@ -77,36 +63,14 @@ libinput:name:Atmel maXTouch Touchpad:dmi:*svn*GOOGLE*:pn*Samus* LIBINPUT_MODEL_CHROMEBOOK=1 -libinput:name:Cypress APA Trackpad (cyapa):dmi:* - LIBINPUT_MODEL_CYAPA=1 - ########################################## # LENOVO ########################################## -# X220 after a bios update updating the touchpad firmware version to 8.1 -# See https://bugzilla.redhat.com/show_bug.cgi?id=1264453 for details -# If the touchpad is unresponsive and dmesg includes this line -# psmouse serio1: synaptics: Touchpad model: 1, fw: 8.1 [...] -# then copy the two lines below into a new file -# /etc/udev/hwdb.d/90-libinput-x220-touchpad-fw81.hwdb, then run -# sudo udevadm hwdb --update and reboot. -# -# Copy the two lines below: -#libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPadX220* -# LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81=1 - # X230 (Tablet) libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPadX230* LIBINPUT_MODEL_LENOVO_X230=1 -# Lenovo T450/T460 and all other Lenovos of the *50 and *60 generation, -# including the X1 Carbon 3rd gen -libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPad??50*: -libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPad??60*: -libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPadX1Carbon3rd:* - LIBINPUT_MODEL_LENOVO_T450_TOUCHPAD=1 - ########################################## # Synaptics ########################################## diff -Nru libinput-1.2.2/udev/90-libinput-model-quirks.rules libinput-0.21.0/udev/90-libinput-model-quirks.rules --- libinput-1.2.2/udev/90-libinput-model-quirks.rules 2016-03-15 00:23:58.000000000 +0000 +++ libinput-0.21.0/udev/90-libinput-model-quirks.rules 2015-08-04 00:58:32.000000000 +0000 @@ -29,10 +29,6 @@ ENV{ID_INPUT_TOUCHPAD}=="1", \ IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=libinput:touchpad:" -# libinput:mouse: -ENV{ID_INPUT_MOUSE}=="1", \ - IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=libinput:mouse:" - # libinput:name::dmi: KERNELS=="input*", \ IMPORT{builtin}="hwdb 'libinput:name:$attr{name}:$attr{[dmi/id]modalias}'" diff -Nru libinput-1.2.2/udev/90-libinput-model-quirks.rules.in libinput-0.21.0/udev/90-libinput-model-quirks.rules.in --- libinput-1.2.2/udev/90-libinput-model-quirks.rules.in 2016-02-19 02:40:07.000000000 +0000 +++ libinput-0.21.0/udev/90-libinput-model-quirks.rules.in 2015-07-31 01:50:42.000000000 +0000 @@ -29,10 +29,6 @@ ENV{ID_INPUT_TOUCHPAD}=="1", \ IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=libinput:touchpad:" -# libinput:mouse: -ENV{ID_INPUT_MOUSE}=="1", \ - IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=libinput:mouse:" - # libinput:name::dmi: KERNELS=="input*", \ IMPORT{builtin}="hwdb 'libinput:name:$attr{name}:$attr{[dmi/id]modalias}'" diff -Nru libinput-1.2.2/udev/libinput-model-quirks.c libinput-0.21.0/udev/libinput-model-quirks.c --- libinput-1.2.2/udev/libinput-model-quirks.c 2016-02-24 06:33:17.000000000 +0000 +++ libinput-0.21.0/udev/libinput-model-quirks.c 2015-08-03 03:44:04.000000000 +0000 @@ -63,9 +63,9 @@ if (sscanf(product, "%x/%x/%x/%x", &bus, &vid, &pid, &version) != 4) return; - /* ALPS' firmware version is the version */ - if (version) - printf("LIBINPUT_MODEL_FIRMWARE_VERSION=%x\n", version); + /* ALPS' firmware version is the PID */ + if (pid) + printf("LIBINPUT_MODEL_FIRMWARE_VERSION=%d\n", pid); } static void @@ -127,7 +127,7 @@ if (!device) goto out; - if (prop_value(device, "ID_INPUT_TOUCHPAD")) + if (udev_device_get_property_value(device, "ID_INPUT_TOUCHPAD")) handle_touchpad(device); rc = 0; diff -Nru libinput-1.2.2/udev/Makefile.in libinput-0.21.0/udev/Makefile.in --- libinput-1.2.2/udev/Makefile.in 2016-03-15 00:23:56.000000000 +0000 +++ libinput-0.21.0/udev/Makefile.in 2015-08-04 00:58:31.000000000 +0000 @@ -288,12 +288,9 @@ LIBUDEV_LIBS = @LIBUDEV_LIBS@ LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@ LIBUNWIND_LIBS = @LIBUNWIND_LIBS@ -LIBWACOM_CFLAGS = @LIBWACOM_CFLAGS@ -LIBWACOM_LIBS = @LIBWACOM_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@