xserver: Branch 'master' - 2 commits

[Paulo Cesar Pereira de Andrade]

 Makefile.am                   |    3 +--
 configure.ac                  |   16 +++++++++-------
 hw/xfree86/x86emu/Makefile.am |    4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit c3bf15ba85fd3ab2e1fe809428b75bf34db25cc8
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date:   Sun Dec 7 18:52:23 2008 -0200

    Require macros 1.2.0 or newer for XORG_CHANGELOG and XORG_CWARNFLAGS.

diff --git a/Makefile.am b/Makefile.am
index 8991104..f5ab8a5 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 9e65680..0270fc3 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
commit 5a8068b390b7d30eb526e954443d8e43a199b971
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date:   Sun Dec 7 18:31:32 2008 -0200

    Convert libx86emu.a to a "libtool convenience library".

diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am
index acd249c..987ea8b 100644
--- a/hw/xfree86/x86emu/Makefile.am
+++ b/hw/xfree86/x86emu/Makefile.am
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libx86emu.a
+noinst_LTLIBRARIES = libx86emu.la
 
-libx86emu_a_SOURCES = debug.c \
+libx86emu_la_SOURCES = debug.c \
                       decode.c \
                       fpu.c \
                       ops2.c \