]>
Commit | Line | Data |
---|---|---|
0a702e53 SS |
1 | --- vlc-0.8.6f/configure.ac.orig 2008-04-04 23:18:55.905073604 +0200 |
2 | +++ vlc-0.8.6f/configure.ac 2008-04-04 23:20:53.396998652 +0200 | |
3 | @@ -3990,32 +3990,13 @@ | |
4 | [ --enable-directfb DirectFB support (default disabled)]) | |
5 | if test "${enable_directfb}" = "yes" | |
6 | then | |
7 | - if test "${with_directfb}" = "no" | |
8 | - then | |
9 | - AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false") | |
10 | - if test "${have_directfb}"= "true" | |
11 | - then | |
12 | - VLC_ADD_PLUGINS([directfb]) | |
13 | - VLC_ADD_LDFLAGS([directfb],[-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl]) | |
14 | - VLC_ADD_CPPFLAGS([directfb],[-I/usr/include/directfb -D_REENTRANT]) | |
15 | - else | |
16 | - AC_MSG_ERROR([cannot find /usr/include/directfb headers, make sure directfb is installed on your system or use --disable-directfb]) | |
17 | - fi | |
18 | - else | |
19 | - CPPFLAGS_save="${CPPFLAGS}" | |
20 | - CPPFLAGS="${CPPFLAGS} -I${with_directfb}/include" | |
21 | - AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false") | |
22 | - CPPFLAGS="${CPPFLAGS_save}" | |
23 | - AC_ARG_WITH(directfb, | |
24 | - [ --with-directfb=PATH path to directfb], | |
25 | - [ if test "${with_directfb}" != "no" -a -n "${with_directfb}" | |
26 | - then | |
27 | - VLC_ADD_PLUGINS([directfb]) | |
28 | - VLC_ADD_CPPFLAGS([directfb],[-I${with_directfb}/include -D_REENTRANT]) | |
29 | - VLC_ADD_LDFLAGS([directfb],[-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl]) | |
30 | - fi ], | |
31 | - [ AC_MSG_ERROR([cannot find directfb headers in ${with_directfb}/include]) ]) | |
32 | - fi | |
33 | + if pkg-config --exists directfb; then | |
34 | + VLC_ADD_PLUGINS([directfb]) | |
35 | + VLC_ADD_LDFLAGS([directfb],[`pkg-config --libs directfb`]) | |
36 | + VLC_ADD_CPPFLAGS([directfb],[`pkg-config --cflags directfb`]) | |
37 | + else | |
38 | + AC_MSG_ERROR([cannot find /usr/include/directfb headers, make sure directfb is installed on your system or use --disable-directfb]) | |
39 | + fi | |
40 | fi | |
41 | ||
42 | dnl |