diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
| commit | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch) | |
| tree | 9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /xkbcomp | |
| parent | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff) | |
| parent | 06872e284da1c00ce03b234ca24aefeac64990d2 (diff) | |
| download | vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2 vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac index 81ec27b2f..fb71294c0 100644 --- a/xkbcomp/configure.ac +++ b/xkbcomp/configure.ac @@ -20,9 +20,14 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xkbcomp], [1.2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbcomp]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS @@ -31,8 +36,6 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AC_CONFIG_HEADERS([config.h]) - # If both the C file and YACC are missing, the package cannot be build. AC_PROG_YACC AC_PATH_PROG([YACC_INST], $YACC) |