diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-13 17:17:42 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-13 17:17:42 -0700 |
| commit | fb7a5116803237dbf7c6871e6ba299ca9490c0b5 (patch) | |
| tree | 6143595f3cddbb20032fb2fbd5ffa52f4e5b1dcb | |
| parent | a10568d219ce8f67732a3cfad8b4f173b414c356 (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 fa811ff..746d7dd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = xhost xhost_SOURCES = xhost.c -AM_CFLAGS = $(XHOST_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XHOST_CFLAGS) xhost_LDADD = $(XHOST_LIBS) appman_PRE = xhost.man @@ -44,4 +44,4 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index 7a7167c..a8794e1 100644 --- a/configure.ac +++ b/configure.ac @@ -5,9 +5,10 @@ AC_INIT(xhost,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] 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) @@ -16,11 +17,10 @@ AC_PROG_INSTALL AC_TYPE_SIGNAL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XHOST, x11 xmuu xau) -XHOST_CFLAGS="$CWARNFLAGS $XHOST_CFLAGS" AC_SUBST(XHOST_CFLAGS) AC_SUBST(XHOST_LIBS) @@ -30,8 +30,4 @@ XTRANS_CONNECTION_FLAGS # Secure RPC detection macro from xtrans.m4 XTRANS_SECURE_RPC_FLAGS -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |