Commit 61bb7758 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 8f9d685e
......@@ -23,7 +23,8 @@ bin_PROGRAMS = luit
LOCALEALIASFILE = @LOCALEALIASFILE@
AM_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
AM_CFLAGS = $(CWARNFLAGS) $(LUIT_CFLAGS) \
-DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
luit_LDADD = $(LUIT_LIBS)
luit_SOURCES = \
......@@ -84,4 +85,4 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
......@@ -26,9 +26,9 @@ AC_INIT(luit,[1.0.3], [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: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
......@@ -36,7 +36,7 @@ AC_PROG_CC
AC_PROG_INSTALL
AC_CANONICAL_HOST
XORG_CWARNFLAGS
XORG_DEFAULT_OPTIONS
AC_CHECK_HEADERS([poll.h pty.h stropts.h sys/param.h sys/select.h])
AC_CHECK_FUNCS([poll select grantpt])
......@@ -62,12 +62,8 @@ case $host_os in
;;
esac
LUIT_CFLAGS="$CWARNFLAGS $LUIT_CFLAGS $OS_CFLAGS"
LUIT_CFLAGS="$LUIT_CFLAGS $OS_CFLAGS"
AC_SUBST(LUIT_CFLAGS)
AC_SUBST(LUIT_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