diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-01 22:28:05 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-01 22:28:05 -0700 |
| commit | cb8df63ef0a8a70dfff21eef02f9d50095854ec0 (patch) | |
| tree | 809fb896cf92b6551c5402cc94f6a54de4a986ae | |
| parent | 394342d73472c3921eb941bf5f07c24237d89b1a (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 2056806..c7948fe 100644 --- a/configure.ac +++ b/configure.ac @@ -34,15 +34,15 @@ AC_INIT(libXrender, 0.9.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=x 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 -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Check render configuration, strip extra digits from package version to # find the required protocol version @@ -53,12 +53,9 @@ fi RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(RENDER_VERSION) PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION) -RENDER_CFLAGS="$CWARNFLAGS $RENDER_CFLAGS" AC_SUBST(RENDER_CFLAGS) XORG_CHECK_MALLOC_ZERO -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 7482017..7474b43 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,5 @@ -AM_CFLAGS = $(RENDER_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include/X11/extensions $(MALLOC_ZERO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(RENDER_CFLAGS) $(MALLOC_ZERO_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/X11/extensions lib_LTLIBRARIES = libXrender.la |