diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 18:07:57 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 18:07:57 -0700 |
| commit | 25b170accac2cdd405a9c98be6ffe2122da18083 (patch) | |
| tree | a8b6985e3aa3b0d453e9ff52c4507f857db4416f | |
| parent | fea57c0200b1dce5b5ea45682f11760911e7a4f1 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 82ca466..0910437 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = appres -AM_CFLAGS = $(APPRES_CFLAGS) +AM_CFLAGS = $(APPRES_CFLAGS) $(CWARNFLAGS) appres_LDADD = $(APPRES_LIBS) appres_SOURCES = \ diff --git a/configure.ac b/configure.ac index d924bb6..0f312b0 100644 --- a/configure.ac +++ b/configure.ac @@ -28,23 +28,18 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# 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) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(APPRES, x11 xt) -APPRES_CFLAGS="$CWARNFLAGS $APPRES_CFLAGS" AC_SUBST(APPRES_CFLAGS) AC_SUBST(APPRES_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |