diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-16 09:44:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-16 09:44:59 +0000 |
| commit | 06615d6166af0efaf2893c6b7328b96c5a86b786 (patch) | |
| tree | f6771f6813846d2c7aa771f5caef11ee5e398929 /libXt/configure.ac | |
| parent | ed13095ef146649dce4a58c891544d7ff31915c7 (diff) | |
| parent | b958ead07bdfe03e2d697fd701bdfa82016ae5cb (diff) | |
| download | vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.tar.gz vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.tar.bz2 vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libXt/configure.ac')
| -rw-r--r-- | libXt/configure.ac | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/libXt/configure.ac b/libXt/configure.ac index 81a4b3f21..ebda9f654 100644 --- a/libXt/configure.ac +++ b/libXt/configure.ac @@ -25,20 +25,21 @@ AC_PREREQ([2.57]) dnl dnl -AC_INIT(libXt, 1.0.7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_INIT(libXt, 1.0.8, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL AM_PROG_CC_C_O -XORG_DEFAULT_OPTIONS if test x"$CC_FOR_BUILD" = x; then if test x"$cross_compiling" = xyes; then @@ -60,9 +61,8 @@ AC_CHECK_HEADER([alloca.h], AC_DEFINE(INCLUDE_ALLOCA_H, 1, [Define to 1 if Xallo # Map function checks to old Imake #defines case $host_os in - # darwin has poll() but can't be used to poll character devices - # darwin10 (SnowLeopard) should be tested as well once released - darwin7*) ;; darwin8*) ;; darwin9*) ;; + # darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard) + darwin*) ;; *) AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,1, [Define to 1 if you have the "poll" function.])) @@ -80,12 +80,6 @@ if test "x$XKB" = "xyes" ; then AC_DEFINE(XKB, 1, [Define to 1 to use XKB for keysym resolution.]) fi -AC_ARG_ENABLE(install-makestrs, - AC_HELP_STRING([--disable-install-makestrs], [Disable installing makestrs]), - INSTALL_MAKESTRS="$enableval", - INSTALL_MAKESTRS="yes") -AM_CONDITIONAL([INSTALL_MAKESTRS], [test "x$INSTALL_MAKESTRS" = xyes]) - # Replaces XFileSearchPathDefault from Imake configs XFILESEARCHPATHDEFAULT='$(sysconfdir)/X11/%L/%T/%N%C%S:$(sysconfdir)/X11/%l/%T/%N%C%S:$(sysconfdir)/X11/%T/%N%C%S:$(sysconfdir)/X11/%L/%T/%N%S:$(sysconfdir)/X11/%l/%T/%N%S:$(sysconfdir)/X11/%T/%N%S:$(datadir)/X11/%L/%T/%N%C%S:$(datadir)/X11/%l/%T/%N%C%S:$(datadir)/X11/%T/%N%C%S:$(datadir)/X11/%L/%T/%N%S:$(datadir)/X11/%l/%T/%N%S:$(datadir)/X11/%T/%N%S:$(libdir)/X11/%L/%T/%N%C%S:$(libdir)/X11/%l/%T/%N%C%S:$(libdir)/X11/%T/%N%C%S:$(libdir)/X11/%L/%T/%N%S:$(libdir)/X11/%l/%T/%N%S:$(libdir)/X11/%T/%N%S' |