diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-07 18:52:23 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-07 18:52:23 -0200 |
| commit | c3bf15ba85fd3ab2e1fe809428b75bf34db25cc8 (patch) | |
| tree | be6d26885296d4062ce29ebd646c7379c12b0439 | |
| parent | 5a8068b390b7d30eb526e954443d8e43a199b971 (diff) | |
Require macros 1.2.0 or newer for XORG_CHANGELOG and XORG_CWARNFLAGS.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 89911045c..f5ab8a5ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,8 +53,7 @@ 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 9e656808f..0270fc39c 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,11 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE +# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG and +# XORG_CWARNFLAGS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. AC_CONFIG_HEADERS(include/do-not-use-config.h) @@ -1146,18 +1151,14 @@ AC_SUBST([UTILS_SYS_LIBS]) # Some platforms require extra flags to do this. gcc should set these flags # when -rdynamic is passed to it, other compilers/linkers may need to be added # here. +XORG_CWARNFLAGS if test "x$GCC" = "xyes"; then - GCC_WARNINGS1="-Wall -Wpointer-arith -Wstrict-prototypes" - GCC_WARNINGS2="-Wmissing-prototypes -Wmissing-declarations" - GCC_WARNINGS3="-Wnested-externs -fno-strict-aliasing" - GCC_WARNINGS="$GCC_WARNINGS1 $GCC_WARNINGS2 $GCC_WARNINGS3" if test "x$WERROR" = "xyes"; then - GCC_WARNINGS="${GCC_WARNINGS} -Werror" + CWARNFLAGS="${CWARNFLAGS} -Werror" fi - XSERVER_CFLAGS="$GCC_WARNINGS $XSERVER_CFLAGS" - LD_EXPORT_SYMBOLS_FLAG="-rdynamic" fi +XSERVER_CFLAGS="$CWARNFLAGS $XSERVER_CFLAGS" case $host_os in openbsd*) LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic" @@ -1851,6 +1852,7 @@ AC_SUBST([prefix]) # Man page sections - used in config utils & generating man pages XORG_MANPAGE_SECTIONS +XORG_CHANGELOG AC_OUTPUT([ Makefile |