diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-06-23 09:36:07 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-06-23 09:36:07 +0000 |
commit | 1ed489e3febf1033cfde659287f60f3e67a94e93 (patch) | |
tree | ed0eae5c9954ae37d6daf69066741d9dd3476b52 /Build/source/texk/xdvik/configure | |
parent | e31eb756dfde607d76f8ad421fa7b85701393b7c (diff) |
xdvik: Use link instead of compile check for XInput 2.1
Do not include c-auto.h from headers
git-svn-id: svn://tug.org/texlive/trunk@34354 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvik/configure')
-rwxr-xr-x | Build/source/texk/xdvik/configure | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index e9061a8b3e3..4112ea92b58 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -15286,27 +15286,37 @@ $as_echo_n "checking for XInput version 2.1 or higher... " >&6; } if ${xdvi_cv_xinput_2_1+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + xdvi_xi2_save_LIBS=$LIBS +xdvi_xi2_save_CFLAGS=$CFLAGS +xdvi_xi2_save_CPPFLAGS=$CPPFLAGS +xdvi_xi2_save_LDFLAGS=$LDFLAGS +LIBS="$X_PRE_LIBS -lXi $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <X11/extensions/XI2.h> - +#include <X11/extensions/XInput2.h> int main () { -#if (XI_2_Major < 2 || (XI_2_Major == 2 && XI_2_Minor < 1)) -choke me "XInput version is < 2.1" -#endif - +Display *DISP; int ndevices; +XIDeviceInfo *info = XIQueryDevice(DISP, XIAllDevices, &ndevices); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : xdvi_cv_xinput_2_1=yes else xdvi_cv_xinput_2_1=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$xdvi_xi2_save_LIBS +CFLAGS=$xdvi_xi2_save_CFLAGS +CPPFLAGS=$xdvi_xi2_save_CPPFLAGS +LDFLAGS=$xdvi_xi2_save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdvi_cv_xinput_2_1" >&5 $as_echo "$xdvi_cv_xinput_2_1" >&6; } |