diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 16:57:41 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 17:41:11 -0700 |
| commit | f8cfb3736878e8bd894afadcc3ce45dfa3e95a22 (patch) | |
| tree | db7d6073e31f8da8802ef4df0cf3efa42c25250d | |
| parent | 9f47f2b67f0f105c1c396da171ca46b06905301f (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 | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index bdefeca..f7357e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,6 +34,8 @@ bin_PROGRAMS = constype constype_SOURCES = constype.c +AM_CFLAGS = $(CWARNFLAGS) + appman_PRE = constype.man appmandir = $(APP_MAN_DIR) @@ -87,6 +89,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 02ad48e..930e08f 100644 --- a/configure.ac +++ b/configure.ac @@ -40,12 +40,14 @@ AM_CONFIG_HEADER(config.h) # Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) +XORG_MACROS_VERSION(1.3) AC_PROG_CC AC_PROG_INSTALL XORG_PROG_RAWCPP +XORG_DEFAULT_OPTIONS + AC_HEADER_STDC AC_CHECK_HEADERS([sys/visual_io.h sys/fbio.h machine/fbio.h sun/fbio.h], [BUILD_CONSTYPE=yes]) @@ -53,7 +55,5 @@ AC_CHECK_HEADERS([sys/visual_io.h sys/fbio.h machine/fbio.h sun/fbio.h], AM_CONDITIONAL(BUILD_CONSTYPE, [test x$BUILD_CONSTYPE = xyes]) XORG_WITH_LINT -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) |