diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-19 15:48:59 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-19 15:49:25 -0700 |
| commit | d8068fe9e666bb384a9eeac8983cb1ac8c2824a1 (patch) | |
| tree | 220ba64c56e0eade6bf9fbdc0907a523c5dd63e5 | |
| parent | 1d7eab63f9aee89767d8083dc971623863173c78 (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 | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 3884d94..38a0c9f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = xcompmgr man_MANS = xcompmgr.1 -AM_CFLAGS = $(XCOMPMGR_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XCOMPMGR_CFLAGS) xcompmgr_LDADD = $(XCOMPMGR_LIBS) -lm EXTRA_DIST = \ diff --git a/configure.ac b/configure.ac index af9985a..bd11e92 100644 --- a/configure.ac +++ b/configure.ac @@ -6,14 +6,17 @@ AC_INIT([xcompmgr], [1.1.4], [xorg@freedesktop.org]) AC_CONFIG_SRCDIR([xcompmgr.c]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) 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 1.3 or later: 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) + AC_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_CC -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for header files. AC_HEADER_STDC @@ -28,10 +31,7 @@ AC_FUNC_MALLOC AC_CHECK_FUNCS([gettimeofday localtime_r]) PKG_CHECK_MODULES(XCOMPMGR, xcomposite xfixes xdamage xrender) -XCOMPMGR_CFLAGS="$CWARNFLAGS $XCOMPMGR_CFLAGS" AC_SUBST(XCOMPMGR_CFLAGS) AC_SUBST(XCOMPMGR_LIBS) -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |