summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-10 19:57:34 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-10 19:57:34 -0700
commite772cc19bf632b3f94c5a6e841f4eef4f7b89e72 (patch)
tree35edbb74c41be96cd55f331803b3b552280e9c6d
parent42a6f0bc10530c31643b2fd768c48750ec451391 (diff)
downloadiceauth-e772cc19bf632b3f94c5a6e841f4eef4f7b89e72.tar.gz
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, 8 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 5ee5aa4..5ac555f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = iceauth
-AM_CFLAGS = $(ICEAUTH_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(ICEAUTH_CFLAGS)
iceauth_LDADD = $(ICEAUTH_LIBS)
iceauth_SOURCES = \
@@ -71,7 +71,7 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
diff --git a/configure.ac b/configure.ac
index 7ced5cd..8e9c214 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,25 +28,23 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_WITH_LINT, 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
AC_TYPE_SIGNAL
-XORG_CWARNFLAGS
+
+XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(ICEAUTH, xproto ice)
-ICEAUTH_CFLAGS="$CWARNFLAGS $ICEAUTH_CFLAGS"
AC_SUBST(ICEAUTH_CFLAGS)
AC_SUBST(ICEAUTH_LIBS)
XORG_WITH_LINT
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile])