diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-13 19:51:11 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-13 19:51:11 -0700 |
| commit | 42432a7776c0cc94c6ec5360c1ab74f484328167 (patch) | |
| tree | e6a2b13c6ff2d3008f7b40f77f58b55874532586 | |
| parent | 458673cf5192f800621bcd2b371eb55be9b5ba50 (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 | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 1786844..42967dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xclipboard xcutsel -AM_CFLAGS = $(XCLIPBOARD_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XCLIPBOARD_CFLAGS) # xclipboard @@ -82,7 +82,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 e83c948..74413e9 100644 --- a/configure.ac +++ b/configure.ac @@ -26,20 +26,20 @@ AC_INIT(xclipboard,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product= 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(XCLIPBOARD, xaw7) -XCLIPBOARD_CFLAGS="$CWARNFLAGS $XCLIPBOARD_CFLAGS" +PKG_CHECK_MODULES(XCLIPBOARD, xaw7 xmu xt x11) AC_SUBST(XCLIPBOARD_CFLAGS) AC_SUBST(XCLIPBOARD_LIBS) |