diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-12-01 22:18:45 +0100 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-06 17:09:28 -0200 |
| commit | 898ed95cad1133940a83dcf428865c5d3fb2c939 (patch) | |
| tree | 212d496d76395b1b311f257e3ffb1f2858bd2394 | |
| parent | a99fbad09ab850e65ddd57e4d4488e4726295e14 (diff) | |
use xorg-macros-1.2.1
Use XORG_CHANGELOG for rule to generate ChangeLog from git log
Use XORG_CWARNFLAGS for compiler warning flags, leave CFLAGS to user
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index bf06f07..5d79b62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ CLEANFILES = 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 918e129..de0726e 100644 --- a/configure.ac +++ b/configure.ac @@ -36,17 +36,19 @@ AC_DEFINE(ICE_t, 1, [Xtrans transport type]) # Checks for header files. AC_HEADER_STDC +# Require xorg-macros at least 1.2.1 +XORG_MACROS_VERSION([1.2.1]) +m4_ifndef([XORG_MACROS_VERSION], + [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) + dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([ICE]) LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}" -if test "x$GCC" = "xyes"; then - GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs -fno-strict-aliasing" - CFLAGS="$GCC_WARNINGS $CFLAGS" -fi +XORG_CHANGELOG + +XORG_CWARNFLAGS XORG_RELEASE_VERSION |