summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-13 04:14:44 (GMT)
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-13 04:14:44 (GMT)
commitbf8b5f9137b59314c26802d388ad3ad66be706ae (patch)
treed487ba277be4bff6fe75cc4108fa6d27fae30596
parentb4bf6ca53f42eedf49c9322524b400d48d32577c (diff)
downloadxlsatoms-bf8b5f9137b59314c26802d388ad3ad66be706ae.zip
xlsatoms-bf8b5f9137b59314c26802d388ad3ad66be706ae.tar.gz
xlsatoms-bf8b5f9137b59314c26802d388ad3ad66be706ae.tar.bz2
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac14
2 files changed, 7 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index ce4ef71..d328a5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xlsatoms
-xlsatoms_CFLAGS = $(XLSATOMS_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XLSATOMS_CFLAGS)
xlsatoms_LDADD = $(XLSATOMS_LIBS)
xlsatoms_SOURCES = \
@@ -60,7 +60,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 a7262df..e414255 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,25 +26,21 @@ AC_INIT(xlsatoms,[1.0.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 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
# Checks for pkg-config packages
PKG_CHECK_MODULES(XLSATOMS, x11 xmuu)
-XLSATOMS_CFLAGS="$CWARNFLAGS $XLSATOMS_CFLAGS"
AC_SUBST(XLSATOMS_CFLAGS)
AC_SUBST(XLSATOMS_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile])