diff options
author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-13 17:12:28 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-13 17:14:56 -0800 |
commit | 8b964692255243aee0fd4c9d69ac479e0e49c842 (patch) | |
tree | c542562ff0e49aed36877d5f8b91976780efd272 | |
parent | 8d9ff581207978b43c3b58c309408514bd4c4aa6 (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 | 16 |
2 files changed, 7 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 9ca0998..a055b78 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xfwp -AM_CFLAGS = $(XFWP_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XFWP_CFLAGS) $(OS_CFLAGS) xfwp_LDADD = $(XFWP_LIBS) xfwp_SOURCES = \ @@ -69,7 +69,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 ead8a13..6a3d2e4 100644 --- a/configure.ac +++ b/configure.ac @@ -25,17 +25,16 @@ AC_PREREQ([2.57]) AC_INIT(xfwp,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfwp) 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) - AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS +# 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) +XORG_DEFAULT_OPTIONS AC_CANONICAL_HOST case $host_os in @@ -49,7 +48,6 @@ esac # Checks for pkg-config packages PKG_CHECK_MODULES(XFWP, x11 ice xproxymngproto) -XFWP_CFLAGS="$CWARNFLAGS $XFWP_CFLAGS $OS_CFLAGS" AC_SUBST(XFWP_CFLAGS) AC_SUBST(XFWP_LIBS) @@ -57,8 +55,4 @@ AC_SUBST(XFWP_LIBS) # and defines like BSD44SOCKETS needed on others XTRANS_TCP_FLAGS -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |