[PATCH xorg-gtest 1/2] Switch from utouch-evemu to evemu
The upstream project has been renamed. Signed-off-by: Chase Douglas chase.doug...@canonical.com --- aclocal/xorg-gtest.m4 |6 +++--- configure.ac |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal/xorg-gtest.m4 b/aclocal/xorg-gtest.m4 index 062842c..a8e0204 100644 --- a/aclocal/xorg-gtest.m4 +++ b/aclocal/xorg-gtest.m4 @@ -74,7 +74,7 @@ AC_DEFUN([CHECK_XORG_GTEST], PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no]) - # Check if we should include support for utouch-evemu + # Check if we should include support for evemu AC_ARG_WITH([evemu], [AS_HELP_STRING([--with-evemu], [support Linux input device recording playback @@ -83,10 +83,10 @@ AC_DEFUN([CHECK_XORG_GTEST], [with_evemu=check]) AS_IF([test x$with_evemu = xyes], -[PKG_CHECK_MODULES(EVEMU, [utouch-evemu], [have_xorg_gtest_evemu=yes])], +[PKG_CHECK_MODULES(EVEMU, [evemu], [have_xorg_gtest_evemu=yes])], [test x$with_evemu = xcheck], [PKG_CHECK_MODULES(EVEMU, - [utouch-evemu], + [evemu], [have_xorg_gtest_evemu=yes], [have_xorg_gtest_evemu=no])]) AS_IF([test x$have_xorg_gtest_evemu = xyes], diff --git a/configure.ac b/configure.ac index 6e9e458..611df5a 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AS_IF([test x$have_gtest != xyes], AC_SUBST([GTEST_CPPFLAGS]) -# Check if we should include support for utouch-evemu +# Check if we should include support for evemu AC_ARG_WITH([evemu], [AS_HELP_STRING([--with-evemu], [support Linux input device recording playback (default: enabled if available)])], @@ -43,9 +43,9 @@ AC_ARG_WITH([evemu], [with_evemu=check]) AS_IF([test x$with_evemu == xyes], - [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes])], + [PKG_CHECK_MODULES(EVEMU, evemu, [have_evemu=yes])], [test x$with_evemu == xcheck], - [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes], [:])]) + [PKG_CHECK_MODULES(EVEMU, evemu, [have_evemu=yes], [:])]) AM_CONDITIONAL([HAVE_EVEMU], [test x$have_evemu = xyes]) AS_IF([test x$have_evemu = xyes], [AC_DEFINE([HAVE_EVEMU])]) -- 1.7.10.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-gtest 1/2] Switch from utouch-evemu to evemu
On Thu, Jul 05, 2012 at 03:40:58PM -0700, Chase Douglas wrote: The upstream project has been renamed. Signed-off-by: Chase Douglas chase.doug...@canonical.com Reviewed-by: Peter Hutterer peter.hutte...@who-t.net Cheers, Peter --- aclocal/xorg-gtest.m4 |6 +++--- configure.ac |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal/xorg-gtest.m4 b/aclocal/xorg-gtest.m4 index 062842c..a8e0204 100644 --- a/aclocal/xorg-gtest.m4 +++ b/aclocal/xorg-gtest.m4 @@ -74,7 +74,7 @@ AC_DEFUN([CHECK_XORG_GTEST], PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no]) - # Check if we should include support for utouch-evemu + # Check if we should include support for evemu AC_ARG_WITH([evemu], [AS_HELP_STRING([--with-evemu], [support Linux input device recording playback @@ -83,10 +83,10 @@ AC_DEFUN([CHECK_XORG_GTEST], [with_evemu=check]) AS_IF([test x$with_evemu = xyes], -[PKG_CHECK_MODULES(EVEMU, [utouch-evemu], [have_xorg_gtest_evemu=yes])], +[PKG_CHECK_MODULES(EVEMU, [evemu], [have_xorg_gtest_evemu=yes])], [test x$with_evemu = xcheck], [PKG_CHECK_MODULES(EVEMU, - [utouch-evemu], + [evemu], [have_xorg_gtest_evemu=yes], [have_xorg_gtest_evemu=no])]) AS_IF([test x$have_xorg_gtest_evemu = xyes], diff --git a/configure.ac b/configure.ac index 6e9e458..611df5a 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AS_IF([test x$have_gtest != xyes], AC_SUBST([GTEST_CPPFLAGS]) -# Check if we should include support for utouch-evemu +# Check if we should include support for evemu AC_ARG_WITH([evemu], [AS_HELP_STRING([--with-evemu], [support Linux input device recording playback (default: enabled if available)])], @@ -43,9 +43,9 @@ AC_ARG_WITH([evemu], [with_evemu=check]) AS_IF([test x$with_evemu == xyes], - [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes])], + [PKG_CHECK_MODULES(EVEMU, evemu, [have_evemu=yes])], [test x$with_evemu == xcheck], - [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes], [:])]) + [PKG_CHECK_MODULES(EVEMU, evemu, [have_evemu=yes], [:])]) AM_CONDITIONAL([HAVE_EVEMU], [test x$have_evemu = xyes]) AS_IF([test x$have_evemu = xyes], [AC_DEFINE([HAVE_EVEMU])]) -- 1.7.10.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-gtest 1/2] Switch from utouch-evemu to evemu
On Fri, Jul 06, 2012 at 10:24:22AM +1000, Peter Hutterer wrote: On Thu, Jul 05, 2012 at 03:40:58PM -0700, Chase Douglas wrote: The upstream project has been renamed. Signed-off-by: Chase Douglas chase.doug...@canonical.com Reviewed-by: Peter Hutterer peter.hutte...@who-t.net having thought about this some more, please update the pkg-config check to test for utouch-evemu if evemu cannot be found. we don't have a hard requirement on the latest version anyway, so we should check for both until utouch-evemu is truly superseeded. Cheers, Peter --- aclocal/xorg-gtest.m4 |6 +++--- configure.ac |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal/xorg-gtest.m4 b/aclocal/xorg-gtest.m4 index 062842c..a8e0204 100644 --- a/aclocal/xorg-gtest.m4 +++ b/aclocal/xorg-gtest.m4 @@ -74,7 +74,7 @@ AC_DEFUN([CHECK_XORG_GTEST], PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no]) - # Check if we should include support for utouch-evemu + # Check if we should include support for evemu AC_ARG_WITH([evemu], [AS_HELP_STRING([--with-evemu], [support Linux input device recording playback @@ -83,10 +83,10 @@ AC_DEFUN([CHECK_XORG_GTEST], [with_evemu=check]) AS_IF([test x$with_evemu = xyes], -[PKG_CHECK_MODULES(EVEMU, [utouch-evemu], [have_xorg_gtest_evemu=yes])], +[PKG_CHECK_MODULES(EVEMU, [evemu], [have_xorg_gtest_evemu=yes])], [test x$with_evemu = xcheck], [PKG_CHECK_MODULES(EVEMU, - [utouch-evemu], + [evemu], [have_xorg_gtest_evemu=yes], [have_xorg_gtest_evemu=no])]) AS_IF([test x$have_xorg_gtest_evemu = xyes], diff --git a/configure.ac b/configure.ac index 6e9e458..611df5a 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AS_IF([test x$have_gtest != xyes], AC_SUBST([GTEST_CPPFLAGS]) -# Check if we should include support for utouch-evemu +# Check if we should include support for evemu AC_ARG_WITH([evemu], [AS_HELP_STRING([--with-evemu], [support Linux input device recording playback (default: enabled if available)])], @@ -43,9 +43,9 @@ AC_ARG_WITH([evemu], [with_evemu=check]) AS_IF([test x$with_evemu == xyes], - [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes])], + [PKG_CHECK_MODULES(EVEMU, evemu, [have_evemu=yes])], [test x$with_evemu == xcheck], - [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes], [:])]) + [PKG_CHECK_MODULES(EVEMU, evemu, [have_evemu=yes], [:])]) AM_CONDITIONAL([HAVE_EVEMU], [test x$have_evemu = xyes]) AS_IF([test x$have_evemu = xyes], [AC_DEFINE([HAVE_EVEMU])]) -- 1.7.10.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
