]>
Commit | Line | Data |
---|---|---|
830f6201 ER |
1 | --- gtkpod-2.1.0/./CMakeLists.txt~ 2011-07-17 20:46:59.000000000 +0300 |
2 | +++ gtkpod-2.1.0/./CMakeLists.txt 2011-08-18 01:19:43.993660139 +0300 | |
3 | @@ -51,7 +51,7 @@ | |
4 | # typedef void* MP4FileHandle;//> | |
5 | # #include <mp4v2/itmf_tags.h> | |
6 | # This matches the way it's used in the code, and the autoconf test | |
7 | -CHECK_INCLUDE_FILES("mp4v2/platform.h>\ntypedef void* MP4FileHandle\;//;mp4v2/itmf_tags.h" HAVE_MP4V2_ITMF_TAGS_H) | |
8 | +CHECK_INCLUDE_FILES("mp4v2/platform.h>\ninclude <stdint.h>\ntypedef void* MP4FileHandle\;//;mp4v2/itmf_tags.h" HAVE_MP4V2_ITMF_TAGS_H) | |
9 | ||
10 | set(OPT_INCLUDES "") | |
11 | set(OPT_CFLAGS "") | |
12 | --- gtkpod-2.1.0/configure.ac 2011-08-18 01:19:58.317693619 +0300 | |
13 | +++ gtkpod-2.1.0/configure.ac 2011-08-18 01:24:48.655205091 +0300 | |
14 | @@ -280,9 +280,12 @@ | |
15 | dnl rollback to older mp4 library - should help with distros | |
16 | dnl not using 1.9.1 of the mp4v2 library | |
17 | AC_CHECK_HEADERS([mp4.h], have_mp4=yes, have_mp4=no) | |
18 | +else | |
19 | + AC_CHECK_HEADERS([mp4v2/platform.h], [], []) | |
20 | fi | |
21 | AC_CHECK_HEADERS([mp4v2/itmf_tags.h], [], [], | |
22 | - [#ifdef HAVE_MP4V2_PLATFORM_H | |
23 | + [#include <stdint.h> | |
24 | + #ifdef HAVE_MP4V2_PLATFORM_H | |
25 | # include <mp4v2/platform.h> | |
26 | #endif | |
27 | typedef void* MP4FileHandle; |