diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
| commit | be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (patch) | |
| tree | 807b5640d1fedc88ddcda752f101ffdb3071092a /libXfont/configure.ac | |
| parent | 11b60c4ebaf348b01051bfff19f947b073028a99 (diff) | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.gz vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.bz2 vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update following packages:
Conflicts:
X11/Xwinsock.h
apps/xhost/xhost.c
libXaw/src/Vendor.c
libXfont/include/X11/fonts/bdfint.h
libXfont/src/fontfile/catalogue.c
Diffstat (limited to 'libXfont/configure.ac')
| -rw-r--r-- | libXfont/configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libXfont/configure.ac b/libXfont/configure.ac index b274a8f9e..e0e81bb21 100644 --- a/libXfont/configure.ac +++ b/libXfont/configure.ac @@ -21,14 +21,13 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXfont], [1.4.5], +AC_INIT([libXfont], [1.4.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL @@ -47,7 +46,7 @@ XORG_CHECK_SGML_DOCTOOLS(1.7) AC_CHECK_HEADERS([endian.h poll.h sys/poll.h]) # Checks for library functions. -AC_CHECK_FUNCS([poll]) +AC_CHECK_FUNCS([poll readlink]) # If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config # must first be located explicitly. |