summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-12 21:44:42 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-12 21:47:02 +0900
commitf40c91941d5992b4a12802c42e709cbd9861faa1 (patch)
tree2e5030ca6f8776b955ca7fc38aabff922710dbdd /configure.ac
parenta2a0ccf36b5becdd00005f339e03bb19154f8fdc (diff)
libinput check - move up to requiring 1.6 as a minimum for libinput
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac34
1 files changed, 2 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac
index fe9be24..ba9b783 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3740,7 +3740,6 @@ EFL_LIB_END([Eldbus])
3740 3740
3741 3741
3742#### Ecore_Drm 3742#### Ecore_Drm
3743have_libinput_new="no"
3744EFL_LIB_START_OPTIONAL([Ecore_Drm], [test "${want_ecore_drm}" = "yes"]) 3743EFL_LIB_START_OPTIONAL([Ecore_Drm], [test "${want_ecore_drm}" = "yes"])
3745 3744
3746### Additional options to configure 3745### Additional options to configure
@@ -3763,24 +3762,10 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [efl])
3763EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eina]) 3762EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eina])
3764 3763
3765EFL_DEPEND_PKG([ECORE_DRM], [DRM], [libdrm >= 2.4 xkbcommon >= 0.3.0 gbm]) 3764EFL_DEPEND_PKG([ECORE_DRM], [DRM], [libdrm >= 2.4 xkbcommon >= 0.3.0 gbm])
3766EFL_DEPEND_PKG([ECORE_DRM], [LIBINPUT], [libinput >= 0.6.0]) 3765EFL_DEPEND_PKG([ECORE_DRM], [LIBINPUT], [libinput >= 1.6.0])
3767 3766
3768EFL_ADD_LIBS([ECORE_DRM], [-lm]) 3767EFL_ADD_LIBS([ECORE_DRM], [-lm])
3769 3768
3770# API change from 0.7 to 0.8. So we define this to support both for now.
3771PKG_CHECK_EXISTS([libinput >= 0.8.0],
3772 [have_libinput_new="yes"],
3773 [have_libinput_new="no"])
3774AC_MSG_CHECKING([Use new libinput API (newer than 0.8.0)])
3775AC_MSG_RESULT([${have_libinput_new}])
3776if test "x${have_libinput_new}" = "xyes";then
3777 AC_DEFINE_UNQUOTED([LIBINPUT_HIGHER_08], [1], [libinput version >= 0.8])
3778fi
3779if test "x${have_libinput_new}" = "xno";then
3780 AC_DEFINE_UNQUOTED([LIBINPUT_HIGHER_08], [0], [libinput version >= 0.8])
3781fi
3782
3783
3784EFL_EVAL_PKGS([ECORE_DRM]) 3769EFL_EVAL_PKGS([ECORE_DRM])
3785 3770
3786### Checks for header files 3771### Checks for header files
@@ -3800,7 +3785,6 @@ EFL_LIB_END_OPTIONAL([Ecore_Drm])
3800 3785
3801 3786
3802#### Elput 3787#### Elput
3803have_libinput_new="no"
3804EFL_LIB_START_OPTIONAL([Elput], [test "${want_elput}" = "yes"]) 3788EFL_LIB_START_OPTIONAL([Elput], [test "${want_elput}" = "yes"])
3805 3789
3806### Additional options to configure 3790### Additional options to configure
@@ -3821,26 +3805,13 @@ EFL_INTERNAL_DEPEND_PKG([ELPUT], [eeze])
3821EFL_INTERNAL_DEPEND_PKG([ELPUT], [eo]) 3805EFL_INTERNAL_DEPEND_PKG([ELPUT], [eo])
3822EFL_INTERNAL_DEPEND_PKG([ELPUT], [eina]) 3806EFL_INTERNAL_DEPEND_PKG([ELPUT], [eina])
3823 3807
3824EFL_DEPEND_PKG([ELPUT], [LIBINPUT], [libinput >= 0.6.0 xkbcommon >= 0.3.0 libudev]) 3808EFL_DEPEND_PKG([ELPUT], [LIBINPUT], [libinput >= 1.6.0 xkbcommon >= 0.3.0 libudev])
3825 3809
3826EFL_OPTIONAL_DEPEND_PKG([ELPUT], [${want_systemd}], [SYSTEMD], [libsystemd]) 3810EFL_OPTIONAL_DEPEND_PKG([ELPUT], [${want_systemd}], [SYSTEMD], [libsystemd])
3827EFL_ADD_FEATURE([ELPUT], [systemd-logind], [${want_systemd}]) 3811EFL_ADD_FEATURE([ELPUT], [systemd-logind], [${want_systemd}])
3828 3812
3829EFL_ADD_LIBS([ELPUT], [-lm]) 3813EFL_ADD_LIBS([ELPUT], [-lm])
3830 3814
3831# API change from 0.7 to 0.8. So we define this to support both for now.
3832PKG_CHECK_EXISTS([libinput >= 0.8.0],
3833 [have_libinput_new="yes"],
3834 [have_libinput_new="no"])
3835AC_MSG_CHECKING([Use new libinput API (newer than 0.8.0)])
3836AC_MSG_RESULT([${have_libinput_new}])
3837if test "x${have_libinput_new}" = "xyes";then
3838 AC_DEFINE_UNQUOTED([LIBINPUT_HIGHER_08], [1], [libinput version >= 0.8])
3839fi
3840if test "x${have_libinput_new}" = "xno";then
3841 AC_DEFINE_UNQUOTED([LIBINPUT_HIGHER_08], [0], [libinput version >= 0.8])
3842fi
3843
3844 3815
3845EFL_EVAL_PKGS([ELPUT]) 3816EFL_EVAL_PKGS([ELPUT])
3846 3817
@@ -3860,7 +3831,6 @@ EFL_LIB_END_OPTIONAL([Elput])
3860#### End of Elput 3831#### End of Elput
3861 3832
3862#### Ecore_Drm2 3833#### Ecore_Drm2
3863have_libinput_new="no"
3864EFL_LIB_START_OPTIONAL([Ecore_Drm2], [test "${want_drm}" = "yes"]) 3834EFL_LIB_START_OPTIONAL([Ecore_Drm2], [test "${want_drm}" = "yes"])
3865 3835
3866### Additional options to configure 3836### Additional options to configure