diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-06 13:19:45 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-06 13:19:45 -0700 |
| commit | 459a6ac9876b86533b17c996200a8a492e32841c (patch) | |
| tree | 2771765fbc909f9f1b38832a0408aa2931ddc87d | |
| parent | 8a5876f71cbad2a02eb6c47772cf46c17bc1f451 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 27736f8..dd2ac31 100644 --- a/configure.ac +++ b/configure.ac @@ -26,27 +26,24 @@ AC_INIT(libXvMC, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT -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, XORG_WITH_LINT +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 -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Check for dependencies PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto) -XVMC_CFLAGS="$CWARNFLAGS $XVMC_CFLAGS" AC_SUBST(XVMC_CFLAGS) AC_SUBST(XVMC_LIBS) AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions])) XORG_CHECK_MALLOC_ZERO -XORG_RELEASE_VERSION -XORG_CHANGELOG dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT diff --git a/src/Makefile.am b/src/Makefile.am index 513c476..741e7c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,8 @@ libXvMC_la_SOURCES = \ libXvMCW_la_SOURCES = \ XvMCWrapper.c -AM_CFLAGS = @XVMC_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) @XVMC_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@ libXvMC_la_LIBADD = @XVMC_LIBS@ libXvMC_la_CFLAGS = $(AM_CFLAGS) |