diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-24 17:53:43 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-24 17:53:43 -0700 |
| commit | da0d7d89130b9a9e31905897627f0c805a58b2b3 (patch) | |
| tree | ed572f358a7c35b98a7fc6dd9068d59a76eb3c6a | |
| parent | 1b52fc41b59899b45dd1b06f9c1268b4458f9cd6 (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 abf6d1a..a73beca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ AUTOMAKE_OPTIONS = foreign bin_PROGRAMS = xbacklight -AM_CFLAGS = $(XRANDR_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XRANDR_CFLAGS) xbacklight_LDADD = $(XRANDR_LIBS) xbacklight_SOURCES = \ diff --git a/configure.ac b/configure.ac index 7536fbc..3c5b9a7 100644 --- a/configure.ac +++ b/configure.ac @@ -26,25 +26,20 @@ AC_INIT(xbacklight,[1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo 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) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0 xrender x11) -XRANDR_CFLAGS="$CWARNFLAGS $XRANDR_CFLAGS" AC_SUBST(XRANDR_CFLAGS) AC_SUBST(XRANDR_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |