diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index fb46901..6e05acc 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,9 @@ AC_INIT(xdm,[1.1.8],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xd AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS, 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) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) @@ -40,11 +40,12 @@ AM_PROG_LIBTOOL AC_PROG_INSTALL XORG_PROG_RAWCPP -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS +XORG_WITH_LINT -XDM_CFLAGS="$CWARNFLAGS $XDM_CFLAGS" -GREETER_CFLAGS="$CWARNFLAGS $GREETER_CFLAGS" -CHOOSER_CFLAGS="$CWARNFLAGS $CHOOSER_CFLAGS" +XDM_CFLAGS="$XDM_CFLAGS" +GREETER_CFLAGS="$GREETER_CFLAGS" +CHOOSER_CFLAGS="$CHOOSER_CFLAGS" # Check for mktemp to prevent security issue noted in Xorg bug #5898 # See https://bugs.freedesktop.org/show_bug.cgi?id=5898 for details. @@ -581,9 +582,4 @@ AC_SUBST(appdefaultdir) AC_SUBST(MKTEMP_COMMAND) -XORG_WITH_LINT -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile config/Makefile greeter/Makefile]) |