Commit 47428dfa authored by Alan Coopersmith's avatar Alan Coopersmith

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: default avatarAlan Coopersmith <alan.coopersmith@sun.com>
parent 334aca2e
......@@ -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) < $< > $@
......@@ -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])
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment