Switch to Xkbkeycodetokeysym as XKeycodeToKeysym is deprecated
Remove unused variable
Updates for new version of autotools