diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-16 17:41:20 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-16 17:41:20 -0700 |
| commit | 47428dfabe933239919dfb4a51a9187ad4e2cb48 (patch) | |
| tree | b7ec0bdd3d5a438d02d6e558b02e0e8018d0ccce | |
| parent | 334aca2e5ab6d046659fdd60b16b0109aa0fe441 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 7e9a768..700be05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,9 @@ bin_PROGRAMS = xcursorgen xcursorgen_SOURCES = xcursorgen.c -AM_CFLAGS = @XCURSORGEN_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) $(XCURSORGEN_CFLAGS) -xcursorgen_LDADD = @XCURSORGEN_LIBS@ +xcursorgen_LDADD = $(XCURSORGEN_LIBS) appmandir = $(APP_MAN_DIR) @@ -26,6 +26,8 @@ dist-hook: ChangeLog XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 +SED = sed + MAN_SUBSTS = \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ @@ -34,4 +36,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 ba76f37..1a7da20 100644 --- a/configure.ac +++ b/configure.ac @@ -5,23 +5,21 @@ AC_INIT(xcursorgen, [1.0.2], [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(XCURSORGEN, x11 xcursor libpng12) -XCURSORGEN_CFLAGS="$CWARNFLAGS $XCURSORGEN_CFLAGS" AC_SUBST(XCURSORGEN_CFLAGS) AC_SUBST(XCURSORGEN_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |