diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-19 15:54:41 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-19 15:54:41 -0200 |
| commit | 5dca07cec68fbfc75ef2002422215647ca5b8c03 (patch) | |
| tree | 6e6f9929096dc8888c7acc4373218a612f7ca95f /configure.ac | |
| parent | 4c3f466f67a7819a912a736f4f2a97262bdaf589 (diff) | |
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and all gcc 4.3 and sparse warnings.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1e9a626..2c34324 100644 --- a/configure.ac +++ b/configure.ac @@ -26,11 +26,17 @@ AC_INIT(setxkbmap,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=x AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL +XORG_CWARNFLAGS + AC_ARG_WITH(xkb-config-root, AC_HELP_STRING([--with-xkb-config-root=<paths>], [Set default XKB config root (default: ${datadir}/X11/xkb)]), @@ -40,6 +46,7 @@ AC_SUBST([XKBCONFIGROOT]) # Checks for pkg-config packages PKG_CHECK_MODULES(SETXKBMAP, xkbfile x11) +SETXKBMAP_CFLAGS="$CWARNFLAGS $SETXKBMAP_CFLAGS" AC_SUBST(SETXKBMAP_CFLAGS) AC_SUBST(SETXKBMAP_LIBS) @@ -48,5 +55,6 @@ XORG_WITH_LINT XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |