|
Line 0
Link Here
|
|
|
1 |
--- config.m4.orig 2006-09-30 02:14:15.000000000 +0800 |
| 2 |
+++ config.m4 2008-07-28 15:53:18.099676966 +0800 |
| 3 |
@@ -6,7 +6,11 @@ |
| 4 |
|
| 5 |
AC_MSG_CHECKING(for ffmpeg headers) |
| 6 |
for i in $PHP_FFMPEG /usr/local /usr ; do |
| 7 |
- if test -f $i/include/ffmpeg/avcodec.h; then |
| 8 |
+ if test -f $i/include/libavcodec/avcodec.h; then |
| 9 |
+ FFMPEG_DIR=$i |
| 10 |
+ FFMPEG_INCDIR="$i/include/libavcodec $i/include/libavformat" |
| 11 |
+ break |
| 12 |
+ elif test -f $i/include/ffmpeg/avcodec.h; then |
| 13 |
FFMPEG_DIR=$i |
| 14 |
FFMPEG_INCDIR=$i/include/ffmpeg |
| 15 |
break |
| 16 |
@@ -45,7 +49,10 @@ |
| 17 |
|
| 18 |
PHP_ADD_LIBRARY_WITH_PATH(avcodec, $FFMPEG_LIBDIR, FFMPEG_SHARED_LIBADD) |
| 19 |
PHP_ADD_LIBRARY_WITH_PATH(avformat, $FFMPEG_LIBDIR, FFMPEG_SHARED_LIBADD) |
| 20 |
- PHP_ADD_INCLUDE($FFMPEG_INCDIR) |
| 21 |
+ |
| 22 |
+ for i in $FFMPEG_INCDIR; do |
| 23 |
+ PHP_ADD_INCLUDE($i) |
| 24 |
+ done |
| 25 |
|
| 26 |
PHP_NEW_EXTENSION(ffmpeg, ffmpeg-php.c ffmpeg_movie.c ffmpeg_frame.c ffmpeg_animated_gif.c, $ext_shared,, \\$(GDLIB_CFLAGS)) |
| 27 |
PHP_SUBST(FFMPEG_SHARED_LIBADD) |