diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 19:51:44 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 19:51:44 -0700 |
| commit | 4f63878eab32d41c8a010d5e187f0c4cdc7eff32 (patch) | |
| tree | 051d97f608c3a10d83738d3b3ee3ca132f2ae003 | |
| parent | 96a182df6f4168ec0b5585f08b088bfd58a383f6 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 7323c28..349bca4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = bdftopcf -bdftopcf_CFLAGS = @BDFTOPCF_CFLAGS@ +bdftopcf_CFLAGS = $(CWARNFLAGS) @BDFTOPCF_CFLAGS@ bdftopcf_LDADD = @BDFTOPCF_LIBS@ bdftopcf_SOURCES = bdftopcf.c diff --git a/configure.ac b/configure.ac index 3eca14c..8943277 100644 --- a/configure.ac +++ b/configure.ac @@ -27,24 +27,20 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG +# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +XORG_MACROS_VERSION(1.3) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(BDFTOPCF, xfont) -BDFTOPCF_CFLAGS="$CWARNFLAGS $BDFTOPCF_CFLAGS" AC_SUBST(BDFTOPCF_CFLAGS) AC_SUBST(BDFTOPCF_LIBS) XORG_WITH_LINT -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |