Mercurial > mxe-octave

annotate src/xine-lib-1-configure_ac.patch @ 3725:2acaa9943159

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4
author John Donoghue
date Mon, 20 Oct 2014 11:01:00 -0400
parents 5aba05f2226e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3629
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 This file is part of MXE.
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 See index.html for further information.
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 diff -urN xine-lib-1.2.4/configure.ac xine-lib-1.2.4-patch/configure.ac
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 --- xine-lib-1.2.4/configure.ac 2013-09-20 16:04:44.000000000 +0300
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 +++ xine-lib-1.2.4-patch/configure.ac 2013-12-17 11:45:43.657189416 +0200
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 @@ -343,7 +343,7 @@
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 AC_CHECK_HEADERS([alloca.h])
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 AC_CHECK_HEADERS([assert.h byteswap.h dirent.h errno.h execinfo.h fcntl.h glob.h])
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 AC_CHECK_HEADERS([libgen.h malloc.h netdb.h stdbool.h ucontext.h])
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 -AC_CHECK_HEADERS([sys/ioctl.h sys/mixer.h sys/mman.h sys/param.h sys/times.h sys/wait.h])
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 +AC_CHECK_HEADERS([sys/mixer.h sys/mman-win32.h sys/param.h sys/times.h sys/wait.h])
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 dnl This is duplicative due to AC_HEADER_STDC, but src/input/vcd stuff needs to
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 dnl have HAVE_STDIO_H defined, or it won't compile.
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 @@ -378,7 +378,7 @@
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 AC_CACHE_CHECK([type of request parameter for ioctl()], [ac_cv_ioctl_request], [
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 for ac_ioctl_request_type in "unsigned long" "int"; do
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/ioctl.h>
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <windows.h>
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 int ioctl(int fd, $ac_ioctl_request_type request, ...);]], [[]])],
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 [ac_cv_ioctl_request=$ac_ioctl_request_type], [])
5aba05f2226e update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 done