diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-05 16:48:31 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-05 16:48:31 -0800 |
| commit | 8384c23cec00f5f4dfc7ba8810e96249402e33bd (patch) | |
| tree | 5096f99eb8d9d7b31b00433db23a2e6062757e68 | |
| parent | cc91490246b4899bcfb637ebea024aff24568196 (diff) | |
Migrate to XORG_DEFAULT_OPTIONS from xorg-macros 1.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 20 |
2 files changed, 6 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 473a5ac..a21b956 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xfindproxy -AM_CFLAGS = $(XFINDPROXY_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XFINDPROXY_CFLAGS) xfindproxy_LDADD = $(XFINDPROXY_LIBS) xfindproxy_SOURCES = \ diff --git a/configure.ac b/configure.ac index b1ab4e3..0fd976b 100644 --- a/configure.ac +++ b/configure.ac @@ -28,25 +28,15 @@ AC_INIT(xfindproxy, [1.0.1], 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 X.Org macros 1.3 or later for 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) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - -XORG_CWARNFLAGS - # Checks for pkg-config packages PKG_CHECK_MODULES(XFINDPROXY, x11 ice xt xproxymngproto) -XFINDPROXY_CFLAGS="$CWARNFLAGS $XFINDPROXY_CFLAGS" -AC_SUBST(XFINDPROXY_CFLAGS) -AC_SUBST(XFINDPROXY_LIBS) - -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |