Merge lp:~jpakkane/frame/c1x-fixes into lp:frame

[Jussi Pakkanen]

Two minor fixes. First only try to use Generics when the current standards version supports it. Secondly add a check for xorg-server package to configure.

[Chase Douglas (chasedouglas)]

We don't need the 1.11.4 version of the X server in particular. I suggest adding a dependency without the version. Also, our xserver package has a bug where it reports itself as 1.11.3, so this will cause build failures.

review: Needs Fixing

[Stephen M. Webb (bregma)]

When I changed the versioned xorg-server dependency to 1.11.3, the change did indeed seem to fix the described probelms, so I'm giving an approval conditional on removing the required version in that dependency (as in Chase's Needs Fixing comment).

review: Approve

[lp:~jpakkane/frame/c1x-fixes]

81. By Jussi Pakkanen on 2012-04-24

Do not depend on a specific version of xorg-server.

=== modified file 'configure.ac'
--- configure.ac	2012-03-31 02:31:54 +0000
+++ configure.ac	2012-04-24 07:18:18 +0000
@@ -28,7 +28,7 @@
 PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
 PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0.5])
 
-PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.5.99.1] [inputproto >= 2.1.99.6],
+PKG_CHECK_MODULES(XINPUT, x11 xext xorg-server [xi >= 1.5.99.1] [inputproto >= 2.1.99.6],
                   HAVE_XI22="yes"; AC_DEFINE(HAVE_XI22, 1, [XI22 available]),
                   HAVE_XI22="no")
 AM_CONDITIONAL([HAVE_XI22], [test "$HAVE_XI22" = "yes"])
 
=== modified file 'include/utouch/frame.h'
--- include/utouch/frame.h	2012-03-25 22:07:41 +0000
+++ include/utouch/frame.h	2012-04-24 07:18:18 +0000
@@ -45,12 +45,12 @@
   #endif
 #endif
 
-/* Clang provides __has_extension, but GCC does not */
-#ifdef __has_extension
-#if __has_extension(c_generic_selections)
+/* Clang provides __has_feature, but GCC does not */
+#ifdef __has_feature
+#if __has_feature(c_generic_selections)
 #define HAS_C_GENERIC_SELECTIONS
-#endif // __has_extension
-#endif // __has_extension(c_generic_selections)
+#endif // __has_feature
+#endif // __has_feature(c_generic_selections)
 
 #ifdef __cplusplus
 extern "C" {