frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require macros 1.2.0 or newer for XORG_CHANGELOG and XORG_CWARNFLAGS.

This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-12-07 18:52:23 -02:00
parent 5a8068b390
commit c3bf15ba85
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -53,8 +53,7 @@ MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog .PHONY: ChangeLog
ChangeLog: ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \ $(CHANGELOG_CMD)
(touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog dist-hook: ChangeLog

16
configure.ac
View File

@ -32,6 +32,11 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE 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 this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally. dnl don't ever actually use it, internally.
AC_CONFIG_HEADERS(include/do-not-use-config.h) 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 # 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 # when -rdynamic is passed to it, other compilers/linkers may need to be added
# here. # here.
XORG_CWARNFLAGS
if test "x$GCC" = "xyes"; then 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 if test "x$WERROR" = "xyes"; then
GCC_WARNINGS="${GCC_WARNINGS} -Werror" CWARNFLAGS="${CWARNFLAGS} -Werror"
fi fi
XSERVER_CFLAGS="$GCC_WARNINGS $XSERVER_CFLAGS"
LD_EXPORT_SYMBOLS_FLAG="-rdynamic" LD_EXPORT_SYMBOLS_FLAG="-rdynamic"
fi fi
XSERVER_CFLAGS="$CWARNFLAGS $XSERVER_CFLAGS"
case $host_os in case $host_os in
openbsd*) openbsd*)
LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic" LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic"
@ -1851,6 +1852,7 @@ AC_SUBST([prefix])
# Man page sections - used in config utils & generating man pages # Man page sections - used in config utils & generating man pages
XORG_MANPAGE_SECTIONS XORG_MANPAGE_SECTIONS
XORG_CHANGELOG
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile