diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2013-01-03 09:34:05 -0800 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2013-01-03 09:34:05 -0800 |
| commit | 8f2e33f4c40fb3baa3d0b2b153ff029112bb6071 (patch) | |
| tree | 43723c84b5e22e8aa1eac9efe74fa752dfacd42f | |
| parent | 6ef02c79f1713e45475c56e3ca84df619a55c0f6 (diff) | |
configure.ac: foreign and use XORG_COMPILER_FLAGS
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 89283ea..6e12fa8 100644 --- a/configure.ac +++ b/configure.ac @@ -24,22 +24,22 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) AC_INIT(libXTrap, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXTrap) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign 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_COMPILER_FLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.17 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.17) AC_CONFIG_HEADERS([config.h]) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS +XORG_COMPILER_FLAGS # Check for dependencies PKG_CHECK_MODULES(XTRAP, x11 xt trapproto xext xextproto) -XTRAP_CFLAGS="$CWARNFLAGS $XTRAP_CFLAGS" +XTRAP_CFLAGS="$BASE_CFLAGS $XTRAP_CFLAGS" AC_SUBST(XTRAP_CFLAGS) AC_SUBST(XTRAP_LIBS) |
