diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-07 09:21:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-07 09:21:18 +0000 |
| commit | b741086f4b268041e1c171c6dc4bb9182e7666d3 (patch) | |
| tree | 02dfe9fd170cddb55b6532de49768133221ef3b6 /libxkbfile/configure.ac | |
| parent | f78ab58911de1fa9a15afffcd4fcdc11ae67c646 (diff) | |
| parent | c73dc01b6de45612b24dc2dd34fba24d81ebf46c (diff) | |
| download | vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.tar.gz vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.tar.bz2 vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libxkbfile/configure.ac')
| -rw-r--r-- | libxkbfile/configure.ac | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libxkbfile/configure.ac b/libxkbfile/configure.ac index fc8b8c347..050630762 100644 --- a/libxkbfile/configure.ac +++ b/libxkbfile/configure.ac @@ -23,27 +23,31 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libxkbfile, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libxkbfile) +AC_INIT(libxkbfile, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libxkbfile) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# 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_DEFAULT_OPTIONS + AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, - [Do not have `strcasecmp'.])) + [Do not have 'strcasecmp'.])) +AC_CHECK_FUNC(getc_unlocked, AC_DEFINE([HAVE_UNLOCKED_STDIO], 1, + ['Unlocked stdio']), []) # Check for dependencies PKG_CHECK_MODULES(XKBFILE, x11 kbproto) - AC_SUBST(XKBFILE_CFLAGS) AC_SUBST(XKBFILE_LIBS) -XORG_RELEASE_VERSION - AC_OUTPUT([Makefile src/Makefile xkbfile.pc]) |