diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:31:59 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:31:59 -0700 |
| commit | db43f974d4b653cc903dbbc9d22fca0711cf0ee6 (patch) | |
| tree | 659217066ec6e4b4406d2cd5e948d6fb78a0f488 | |
| parent | 6519b61438b36e66a42e44b42fbf6b7f75a450d0 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index fb787ab..70c8a0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = smproxy -smproxy_CFLAGS = $(SMPROXY_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(SMPROXY_CFLAGS) smproxy_LDADD = $(SMPROXY_LIBS) smproxy_SOURCES = \ @@ -62,7 +62,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog diff --git a/configure.ac b/configure.ac index 515fa8b..a10cf47 100644 --- a/configure.ac +++ b/configure.ac @@ -25,28 +25,24 @@ AC_INIT(smproxy,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xor 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 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) AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS AC_CHECK_FUNC([mkstemp], AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.])) # Checks for pkg-config packages PKG_CHECK_MODULES(SMPROXY, xt xmu) -SMPROXY_CFLAGS="$CWARNFLAGS $SMPROXY_CFLAGS" AC_SUBST(SMPROXY_CFLAGS) AC_SUBST(SMPROXY_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |