diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-09-21 02:35:01 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-09-21 02:35:01 +0000 |
| commit | 88374bab9adfe73dc445d4202a28e4d6021a674f (patch) | |
| tree | c87bb817b5aa0accb7581eac3b7151e8704f64a1 | |
| parent | dbd0485a6e1926e7b94fdffb3e71de27c4a29012 (diff) | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 32 |
2 files changed, 40 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2005-09-20 Alan Coopersmith <alan.coopersmith@sun.com> + + * configure.ac: + 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. + 2005-08-01 Keith Packard <keithp@keithp.com> * Makefile.am: 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 |