openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-10 19:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Update to libX11 1.6RC. No bump needed.

Browse Source
This commit is contained in:
matthieu
2013-04-28 16:55:55 +00:00
parent 31b7754eaf
commit f2c99c06c2
324 changed files with 16172 additions and 32390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libX11/configure.ac
View File

@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([libX11], [1.5.0],
AC_INIT([libX11], [1.5.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
@@ -15,7 +15,6 @@ AC_USE_SYSTEM_EXTENSIONS
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
@@ -177,7 +176,7 @@ else
AC_DEFINE(HAVE_DLOPEN,1,[Use dlopen to load shared libraries])
AC_CHECK_HEADERS([dlfcn.h])
fi
if test x$ac_cv_header_dlcfn_h -o x$ac_cv_header_dl_h; then
if test "x$ac_cv_header_dlfcn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then
HAVE_LOADABLE_MODULES=yes
else
HAVE_LOADABLE_MODULES=no
@@ -306,7 +305,15 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
# Find keysymdef.h
#
AC_MSG_CHECKING([keysym definitions])
KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
AC_ARG_WITH([keysymdefdir],
[AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
[KEYSYMDEFDIR=$withval],
[KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11])
if test ! -d "$KEYSYMDEFDIR"; then
AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory])
fi
FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
for i in $FILES; do
if test -f "$KEYSYMDEFDIR/$i"; then
@@ -431,7 +438,7 @@ locales="\
iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \
iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 \
iso8859-8 iso8859-9 iso8859-9e ja ja.JIS ja_JP.UTF-8\
ja.S90 ja.SJIS ja.U90 ko koi8-c koi8-r \
ja.SJIS ko koi8-c koi8-r \
koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \
microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 \
tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii \