diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 00:00:52 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 00:00:52 -0700 |
| commit | fe83e7331c147d76daa2bb5f61879d69a919aeca (patch) | |
| tree | 2770e38171915413f497795d3ee3364920666a37 | |
| parent | 960aa044e0667d10b7a09bcdc4d3ad6f8597481d (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index b2c3ebf..028a7b6 100644 --- a/configure.ac +++ b/configure.ac @@ -27,25 +27,24 @@ AC_INIT(libWindowsWM, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product 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) +# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS # Check for dependencies PKG_CHECK_MODULES(WINDOWSWM, x11 xext xextproto windowswmproto) -WINDOWSWM_CFLAGS="$CWARNFLAGS $WINDOWSWM_CFLAGS" AC_SUBST(WINDOWSWM_CFLAGS) AC_SUBST(WINDOWSWM_LIBS) XORG_CHECK_MALLOC_ZERO -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index f12529a..5a90192 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libWindowsWM.la libWindowsWM_la_SOURCES = \ windowswm.c -AM_CFLAGS = @WINDOWSWM_CFLAGS@ @MALLOC_ZERO_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) @WINDOWSWM_CFLAGS@ @MALLOC_ZERO_CFLAGS@ libWindowsWM_la_LIBADD = @WINDOWSWM_LIBS@ libWindowsWM_la_LDFLAGS = -version-info 7:0:0 -no-undefined |