diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-06 17:05:00 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-06 17:05:00 -0700 |
| commit | a3d95aedf3a6d1859387fb08b46cd66cd61cec83 (patch) | |
| tree | 11ccbccf0df3924fdb7f8d7eab7bafcb5b226671 | |
| parent | d36a99d961c6649ca1b0319c2aadc6763edb07ad (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, 6 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 3a3822b..c1dd57d 100644 --- a/configure.ac +++ b/configure.ac @@ -27,15 +27,16 @@ AC_INIT(libxkbfile, 1.0.5, [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) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_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 AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, [Do not have 'strcasecmp'.])) @@ -44,13 +45,9 @@ AC_CHECK_FUNC(getc_unlocked, AC_DEFINE([HAVE_UNLOCKED_STDIO], 1, # Check for dependencies PKG_CHECK_MODULES(XKBFILE, x11 kbproto) -XKBFILE_CFLAGS="$CWARNFLAGS $XKBFILE_CFLAGS" AC_SUBST(XKBFILE_CFLAGS) AC_SUBST(XKBFILE_LIBS) -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile xkbfile.pc]) diff --git a/src/Makefile.am b/src/Makefile.am index 6e3ec5f..98e1614 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11/extensions/ libxkbfile_la_LIBADD = @XKBFILE_LIBS@ -AM_CFLAGS = @XKBFILE_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@ libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined |