Add checks for poll & snprintf & define old Imake names if found Enable XKB

    usage in Xt unless --disable-xkb is specified Set STRINGSABIOPTIONS for
    building StringDefs files on Solaris, SCO, and SVR4 systems.

1 files changed, 32 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 3d4dc6b..9e7320c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,38 @@ PKG_CHECK_MODULES(XT, sm x11 xproto)
 # Needed for including Xalloca.h
 AC_CHECK_HEADER([alloca.h], AC_DEFINE(INCLUDE_ALLOCA_H, 1, [Define to 1 if Xalloca.h should include <alloca.h>]))
 
+# Map function checks to old Imake #defines
+AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,1,
+        [Define to 1 if you have the `poll' function.]))
+AC_CHECK_FUNC(snprintf, AC_DEFINE(USE_SNPRINTF,1,
+        [Define to 1 if you have the `snprintf' function.]))
+
+# Options
+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
+	XKB="$enableval", XKB="yes")
+if test "x$XKB" = "xyes" ; then
+	AC_DEFINE(XKB, 1, [Define to 1 to use XKB for keysym resolution.])
+fi
+
+# Replacement for Imake ToolkitStringsABIOptions, controls string tables
+# generated by util/string.list in StringDefs.h & Shell.h
+case $host_os in
+	solaris*)
+		case $host_cpu in
+		    sparc*) STRINGSABIOPTIONS="-sparcabi -solarisabinames" ;;
+	   		 *) STRINGSABIOPTIONS="-intelabi -solarisabinames" ;;
+		esac
+		;;
+	sco* | svr4*)
+		case $host_cpu in
+		    i*86) STRINGSABIOPTIONS="-intelabi" ;;
+		       *) STRINGSABIOPTIONS="" ;;
+		esac
+		;;
+esac
+AC_SUBST(STRINGSABIOPTIONS)
+
+
 # Check render configuration, strip extra digits from package version to
 # find the required protocol version