diff options
Diffstat (limited to 'lib/libXt/configure.ac')
| -rw-r--r-- | lib/libXt/configure.ac | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/lib/libXt/configure.ac b/lib/libXt/configure.ac index 043ab5fc7..81a4b3f21 100644 --- a/lib/libXt/configure.ac +++ b/lib/libXt/configure.ac @@ -25,20 +25,20 @@ AC_PREREQ([2.57]) dnl dnl -AC_INIT(libXt, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt) +AC_INIT(libXt, 1.0.7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# 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])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL AM_PROG_CC_C_O -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS if test x"$CC_FOR_BUILD" = x; then if test x"$cross_compiling" = xyes; then @@ -48,8 +48,12 @@ if test x"$CC_FOR_BUILD" = x; then fi fi AC_SUBST([CC_FOR_BUILD]) +CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} +AC_SUBST(CFLAGS_FOR_BUILD) +LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} +AC_SUBST(LDFLAGS_FOR_BUILD) -PKG_CHECK_MODULES(XT, sm x11 xproto kbproto) +PKG_CHECK_MODULES(XT, sm ice x11 xproto kbproto) # 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>])) @@ -96,7 +100,7 @@ AC_ARG_WITH(appdefaultdir, [Set app-default directory (default: ${datadir}/X11/app-defaults)]), [appdefaultdir="$withval"], [appdefaultdir=${datadir}/X11/app-defaults]) -AC_DEFINE_DIR([appdefaultdir], [appdefaultdir], [app default data directory]) +AX_DEFINE_DIR([appdefaultdir], [appdefaultdir], [app default data directory]) # Replacement for Imake ToolkitStringsABIOptions, controls string tables # generated by util/string.list in StringDefs.h & Shell.h @@ -123,18 +127,12 @@ case $host_os in ;; esac -XT_CFLAGS="$CWARNFLAGS $XT_CFLAGS $OS_CFLAGS" +XT_CFLAGS="$XT_CFLAGS $OS_CFLAGS" # Man page processing requirements XORG_PROG_RAWCPP -XORG_MANPAGE_SECTIONS - -# Check render configuration, strip extra digits from package version to -# find the required protocol version XORG_CHECK_MALLOC_ZERO -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile |