diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 10:44:07 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 10:44:07 -0700 |
| commit | be736ebbfc5510997ae227e903a5b9d66ba0ee1a (patch) | |
| tree | 1df1a158feb6a71b897316290ff9c07aa6f7ffd6 | |
| parent | ebc9f3d2483623dcb2ccca7f12cc2769173eb4a9 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 10 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 4620843..69fac3e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ bin_PROGRAMS = sessreg -AM_CFLAGS = $(SESSREG_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(SESSREG_CFLAGS) sessreg_SOURCES = \ sessreg.h \ @@ -57,13 +57,14 @@ MAN_SUBSTS = -f filenames.sed \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ sessreg.$(APP_MAN_SUFFIX): filenames.sed filenames.sed: filenames.sed.c - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's|__' > $@ + $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \ + grep 's|__' > $@ if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ diff --git a/configure.ac b/configure.ac index 3d07a58..afdfba8 100644 --- a/configure.ac +++ b/configure.ac @@ -29,14 +29,15 @@ 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 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_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS AC_CHECK_HEADERS([lastlog.h utmpx.h sys/param.h]) AC_CHECK_MEMBER([struct utmpx.ut_syslen], @@ -50,14 +51,9 @@ AC_SYS_LARGEFILE # Checks for pkg-config packages PKG_CHECK_MODULES(SESSREG, xproto) -SESSREG_CFLAGS="$CWARNFLAGS $SESSREG_CFLAGS" AC_SUBST(SESSREG_CFLAGS) # Allow checking code with lint, sparse, etc. XORG_WITH_LINT -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |