Update to xf86-input-synaptics 1.8.0.

ok matthieu@, tested claudio@

1 files changed, 42 insertions, 78 deletions

diff --git a/driver/xf86-input-synaptics/configure b/driver/xf86-input-synaptics/configure
index fa28a028d..bcdbe5df0 100755
--- a/driver/xf86-input-synaptics/configure
+++ b/driver/xf86-input-synaptics/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-input-synaptics 1.7.5.
+# Generated by GNU Autoconf 2.69 for xf86-input-synaptics 1.8.0.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xf86-input-synaptics'
 PACKAGE_TARNAME='xf86-input-synaptics'
-PACKAGE_VERSION='1.7.5'
-PACKAGE_STRING='xf86-input-synaptics 1.7.5'
+PACKAGE_VERSION='1.8.0'
+PACKAGE_STRING='xf86-input-synaptics 1.8.0'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -649,8 +649,8 @@ BUILD_PSMCOMM_FALSE
 BUILD_PSMCOMM_TRUE
 BUILD_EVENTCOMM_FALSE
 BUILD_EVENTCOMM_TRUE
-MTDEV_LIBS
-MTDEV_CFLAGS
+LIBEVDEV_LIBS
+LIBEVDEV_CFLAGS
 DEBUG_FALSE
 DEBUG_TRUE
 HAS_XORG_CONF_DIR_FALSE
@@ -736,9 +736,6 @@ build_vendor
 build_cpu
 build
 LIBTOOL
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 am__untar
 am__tar
 AMTAR
@@ -803,7 +800,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_maintainer_mode
 enable_static
 enable_shared
 with_pic
@@ -836,8 +832,8 @@ PKG_CONFIG_LIBDIR
 XORG_MALLOC_DEBUG_ENV
 XORG_CFLAGS
 XORG_LIBS
-MTDEV_CFLAGS
-MTDEV_LIBS
+LIBEVDEV_CFLAGS
+LIBEVDEV_LIBS
 XI_CFLAGS
 XI_LIBS
 XTST_CFLAGS
@@ -1382,7 +1378,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-input-synaptics 1.7.5 to adapt to many kinds of systems.
+\`configure' configures xf86-input-synaptics 1.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1453,7 +1449,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xf86-input-synaptics 1.7.5:";;
+     short | recursive ) echo "Configuration of xf86-input-synaptics 1.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1461,9 +1457,6 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode
-                          enable make rules and dependencies not useful (and
-                          sometimes confusing) to the casual installer
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1518,9 +1511,10 @@ Some influential environment variables:
               Environment variables to enable memory checking in tests
   XORG_CFLAGS C compiler flags for XORG, overriding pkg-config
   XORG_LIBS   linker flags for XORG, overriding pkg-config
-  MTDEV_CFLAGS
-              C compiler flags for MTDEV, overriding pkg-config
-  MTDEV_LIBS  linker flags for MTDEV, overriding pkg-config
+  LIBEVDEV_CFLAGS
+              C compiler flags for LIBEVDEV, overriding pkg-config
+  LIBEVDEV_LIBS
+              linker flags for LIBEVDEV, overriding pkg-config
   XI_CFLAGS   C compiler flags for XI, overriding pkg-config
   XI_LIBS     linker flags for XI, overriding pkg-config
   XTST_CFLAGS C compiler flags for XTST, overriding pkg-config
@@ -1592,7 +1586,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-input-synaptics configure 1.7.5
+xf86-input-synaptics configure 1.8.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1916,7 +1910,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-input-synaptics $as_me 1.7.5, which was
+It was created by xf86-input-synaptics $as_me 1.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2745,7 +2739,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-input-synaptics'
- VERSION='1.7.5'
+ VERSION='1.8.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2792,29 +2786,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
 # Initialize libtool
 # Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then :
@@ -17950,22 +17921,20 @@ if test "x$BUILD_EVENTCOMM" = xyes; then
 $as_echo "#define BUILD_EVENTCOMM 1" >>confdefs.h
 
 
-    # Obtain compiler/linker options for mtdev
-
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTDEV" >&5
-$as_echo_n "checking for MTDEV... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEVDEV" >&5
+$as_echo_n "checking for LIBEVDEV... " >&6; }
 
-if test -n "$MTDEV_CFLAGS"; then
-    pkg_cv_MTDEV_CFLAGS="$MTDEV_CFLAGS"
+if test -n "$LIBEVDEV_CFLAGS"; then
+    pkg_cv_LIBEVDEV_CFLAGS="$LIBEVDEV_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mtdev\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "mtdev") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libevdev >= 0.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libevdev >= 0.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MTDEV_CFLAGS=`$PKG_CONFIG --cflags "mtdev" 2>/dev/null`
+  pkg_cv_LIBEVDEV_CFLAGS=`$PKG_CONFIG --cflags "libevdev >= 0.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -17973,16 +17942,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$MTDEV_LIBS"; then
-    pkg_cv_MTDEV_LIBS="$MTDEV_LIBS"
+if test -n "$LIBEVDEV_LIBS"; then
+    pkg_cv_LIBEVDEV_LIBS="$LIBEVDEV_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mtdev\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "mtdev") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libevdev >= 0.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libevdev >= 0.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MTDEV_LIBS=`$PKG_CONFIG --libs "mtdev" 2>/dev/null`
+  pkg_cv_LIBEVDEV_LIBS=`$PKG_CONFIG --libs "libevdev >= 0.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -18003,22 +17972,22 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MTDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mtdev" 2>&1`
+	        LIBEVDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevdev >= 0.4" 2>&1`
         else
-	        MTDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mtdev" 2>&1`
+	        LIBEVDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevdev >= 0.4" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$MTDEV_PKG_ERRORS" >&5
+	echo "$LIBEVDEV_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (mtdev) were not met:
+	as_fn_error $? "Package requirements (libevdev >= 0.4) were not met:
 
-$MTDEV_PKG_ERRORS
+$LIBEVDEV_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 MTDEV_CFLAGS
-and MTDEV_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBEVDEV_CFLAGS
+and LIBEVDEV_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
@@ -18029,15 +17998,15 @@ as_fn_error $? "The pkg-config script could not be found or is too old.  Make su
 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 MTDEV_CFLAGS
-and MTDEV_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBEVDEV_CFLAGS
+and LIBEVDEV_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	MTDEV_CFLAGS=$pkg_cv_MTDEV_CFLAGS
-	MTDEV_LIBS=$pkg_cv_MTDEV_LIBS
+	LIBEVDEV_CFLAGS=$pkg_cv_LIBEVDEV_CFLAGS
+	LIBEVDEV_LIBS=$pkg_cv_LIBEVDEV_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -18291,7 +18260,7 @@ if test "${with_sdkdir+set}" = set; then :
 fi
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile tools/Makefile conf/Makefile include/Makefile test/Makefile xorg-synaptics.pc"
+ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile tools/Makefile conf/Makefile include/Makefile xorg-synaptics.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18418,10 +18387,6 @@ else
   am__EXEEXT_FALSE=
 fi
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18855,7 +18820,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xf86-input-synaptics $as_me 1.7.5, which was
+This file was extended by xf86-input-synaptics $as_me 1.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18921,7 +18886,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xf86-input-synaptics config.status 1.7.5
+xf86-input-synaptics config.status 1.8.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19336,7 +19301,6 @@ do
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "conf/Makefile") CONFIG_FILES="$CONFIG_FILES conf/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "xorg-synaptics.pc") CONFIG_FILES="$CONFIG_FILES xorg-synaptics.pc" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;