diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-11 23:09:14 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-11 23:09:14 -0800 |
| commit | b14dc70f4d7d538071b725e3fd453dbfe2b9e0d4 (patch) | |
| tree | ee16c297e755491abb9854524edef3b9fa882b54 | |
| parent | c6db604b4cb0f3a5f596d78826ac8a95fb0bcc3f (diff) | |
| download | xorg-lib-libXp-b14dc70f4d7d538071b725e3fd453dbfe2b9e0d4.tar.gz | |
config: Update to XORG_DEFAULT_OPTIONS from xorg-macros 1.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 7 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 6c30bb8..cbff9ed 100644 --- a/configure.ac +++ b/configure.ac @@ -27,27 +27,23 @@ AC_INIT(libXp, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], 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 minimum of 1.3 for XORG_DEFAULT_OPTIONS +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 -XORG_CWARNFLAGS # Check for X and print proto PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto) -XPRINT_CFLAGS="$CWARNFLAGS $XPRINT_CFLAGS" AC_SUBST(XPRINT_CFLAGS) AC_SUBST(XPRINT_LIBS) -XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile man/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index b109a77..3ca2659 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,7 @@ libXp_la_SOURCES = \ libXp_la_LIBADD = $(XPRINT_LIBS) -AM_CFLAGS = $(XPRINT_CFLAGS) $(MALLOC_ZERO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XPRINT_CFLAGS) $(MALLOC_ZERO_CFLAGS) INCLUDES = -I$(top_srcdir)/include/X11/extensions |