diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-05-06 08:26:54 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-05-06 08:26:54 +0000 |
commit | 45604db830beef9914992cd568908275987cc0f5 (patch) | |
tree | a9f0430f723984851995423e6a8a81a0bcc5b9d0 /Build/source/texk/xdvik | |
parent | 526582da8c8fabccfebea407a9da54822daa4f88 (diff) |
texk/xdvik: Change default to disable smooth scrolling for native TeX Live builds
utils/biber: Removed from source tree
git-svn-id: svn://tug.org/texlive/trunk@33877 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvik')
-rw-r--r-- | Build/source/texk/xdvik/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/texk/xdvik/configure | 17 | ||||
-rw-r--r-- | Build/source/texk/xdvik/m4/xdvi-xinput-2-1.m4 | 19 |
3 files changed, 29 insertions, 12 deletions
diff --git a/Build/source/texk/xdvik/ChangeLog b/Build/source/texk/xdvik/ChangeLog index e54dad501ee..19318110fdd 100644 --- a/Build/source/texk/xdvik/ChangeLog +++ b/Build/source/texk/xdvik/ChangeLog @@ -1,3 +1,8 @@ +2014-05-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * m4/xdvi-xinput-2-1.m4: Change the default to disable 'smooth + scrolling' for native TL build. + 2014-04-14 Peter Breitenlohner <peb@mppmu.mpg.de> Imported xdvik-22.87.tar.gz diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index 5964f3c776a..265ef9f362a 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -1479,7 +1479,7 @@ Optional Features: --disable-a4 Set default paper size to letter and default unit to inch --enable-xi2-scrolling Use XInput 2.1 'smooth scrolling' if available - (default: enabled) + (default: disabled for native TL build) --enable-magick Use ImageMagick to load/render image files. EXPERIMENTAL - DO NOT USE! @@ -15265,14 +15265,21 @@ if test "$xdvi_cv_func_xkb_bell" = yes; then $as_echo "#define HAVE_XKB_BELL_EXT 1" >>confdefs.h fi - # Check whether --enable-xi2-scrolling was given. if test "${enable_xi2_scrolling+set}" = set; then : enableval=$enable_xi2_scrolling; -else - enable_xi2_scrolling=yes fi +case $enable_xi2_scrolling in #( + yes | no) : + : ;; #( + *) : + if test "x$enable_native_texlive_build" = xyes; then : + enable_xi2_scrolling=no +else + enable_xi2_scrolling=yes +fi ;; +esac if test "x$enable_xi2_scrolling" = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XInput version 2.1 or higher" >&5 $as_echo_n "checking for XInput version 2.1 or higher... " >&6; } @@ -15303,7 +15310,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdvi_cv_xinput_2_1" >&5 $as_echo "$xdvi_cv_xinput_2_1" >&6; } -if test $xdvi_cv_xinput_2_1 = yes; then +if test "x$xdvi_cv_xinput_2_1" = xyes; then $as_echo "#define HAVE_XI21 1" >>confdefs.h diff --git a/Build/source/texk/xdvik/m4/xdvi-xinput-2-1.m4 b/Build/source/texk/xdvik/m4/xdvi-xinput-2-1.m4 index 3795c161f99..7cb9b6d45f0 100644 --- a/Build/source/texk/xdvik/m4/xdvi-xinput-2-1.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-xinput-2-1.m4 @@ -6,15 +6,20 @@ # with or without modifications, as long as this notice is preserved. # XDVI_XINPUT_2_1 -# ------------------------- +# --------------- # Check for whether XInput version 2.1 is supported in the X libraries. dnl ### Check for XInput 2.1 functionality. -AC_DEFUN([XDVI_XINPUT_2_1],[ -AC_ARG_ENABLE(xi2-scrolling, -[ --enable-xi2-scrolling Use XInput 2.1 'smooth scrolling' if available - (default: enabled)], -[], [enable_xi2_scrolling=yes]) +AC_DEFUN([XDVI_XINPUT_2_1], [dnl +AC_ARG_ENABLE([xi2-scrolling], +AS_HELP_STRING([--enable-xi2-scrolling], +[Use XInput 2.1 'smooth scrolling' if available (default: disabled + for native TL build)])) +AS_CASE([$enable_xi2_scrolling], + [yes | no], [:], + [AS_IF([test "x$enable_native_texlive_build" = xyes], + [enable_xi2_scrolling=no], + [enable_xi2_scrolling=yes])]) if test "x$enable_xi2_scrolling" = xyes; then AC_CACHE_CHECK([for XInput version 2.1 or higher], xdvi_cv_xinput_2_1, @@ -24,7 +29,7 @@ xdvi_cv_xinput_2_1, choke me "XInput version is < 2.1" #endif ], xdvi_cv_xinput_2_1=yes, xdvi_cv_xinput_2_1=no)]) -if test $xdvi_cv_xinput_2_1 = yes; then +if test "x$xdvi_cv_xinput_2_1" = xyes; then AC_DEFINE([HAVE_XI21], 1, [Define if your system has XInput version 2.1 or higher.]) X_PRE_LIBS="$X_PRE_LIBS -lXi" |