]>
Commit | Line | Data |
---|---|---|
00928063 JB |
1 | --- DirectFB-extra-0.9.9/configure.in.orig Thu Jan 10 19:49:32 2002 |
2 | +++ DirectFB-extra-0.9.9/configure.in Wed Nov 6 23:40:30 2002 | |
3 | @@ -114,6 +114,8 @@ | |
4 | # | |
5 | # OpenQuicktime check | |
6 | # | |
7 | +AC_ARG_ENABLE(openquicktime, [ --disable-openquicktime disable openquicktime plugin [default=yes]],, enable_openquicktime=yes) | |
8 | +if test "x$enable_openquicktime" = xyes ; then | |
9 | AC_CHECK_LIB(openquicktime, quicktime_open, openquicktime="yes", openquicktime="no") | |
10 | if test "x$openquicktime" = xyes; then | |
11 | OPENQUICKTIME_LIBS="-lopenquicktime" | |
12 | @@ -127,7 +129,9 @@ | |
13 | fi | |
14 | ||
15 | AC_SUBST(OPENQUICKTIME_LIBS) | |
16 | - | |
17 | +else | |
18 | + openquicktime=no | |
19 | +fi | |
20 | AM_CONDITIONAL(OPENQUICKTIME, test "x$openquicktime" = xyes) | |
21 | ||
22 | ||
23 | @@ -135,6 +139,8 @@ | |
24 | # Imlib2 check | |
25 | # | |
26 | ||
27 | +AC_ARG_ENABLE(imlib2, [ --disable-imlib2 disable imlib2 plugin [default=yes]],, enable_imlib2=yes) | |
28 | +if test "x$enable_imlib2" = xyes ; then | |
29 | AC_PATH_PROG(IMLIB2_CONFIG, imlib2-config, no) | |
30 | if test "x$IMLIB2_CONFIG" = xno; then | |
31 | AC_MSG_WARN([*** Imlib2 library not found, building without Imlib2 support ***]) | |
32 | @@ -147,7 +153,9 @@ | |
33 | ||
34 | AC_SUBST(IMLIB2_LIBS) | |
35 | AC_SUBST(IMLIB2_INCLUDES) | |
36 | - | |
37 | +else | |
38 | + imlib2=no | |
39 | +fi | |
40 | AM_CONDITIONAL(IMLIB2, test "x$imlib2" = xyes) | |
41 | ||
42 | ||
43 | @@ -161,7 +169,7 @@ | |
44 | AM_CONDITIONAL(ENABLE_DEBUG, test "x$enable_debug" = xyes) | |
45 | ||
46 | ||
47 | -if test x$cflags_set != xset ; then | |
48 | +if test "x$cflags_set" != "xset" ; then | |
49 | DFB_CFLAGS="$DFB_CFLAGS $CFLAGS" | |
50 | fi | |
51 | ||
c3beb4f1 JB |
52 | --- DirectFB-extra-0.9.13.orig/interfaces/IDirectFBImageProvider/Makefile.am Thu Jan 10 20:06:09 2002 |
53 | +++ DirectFB-extra-0.9.13/interfaces/IDirectFBImageProvider/Makefile.am Thu Nov 7 12:21:33 2002 | |
54 | @@ -3,7 +3,7 @@ | |
55 | idirectfbimageproviderdir = $(MODULEDIR)/interfaces/IDirectFBImageProvider | |
56 | ||
57 | ||
58 | -CFLAGS = $(DFB_CFLAGS) -DDATADIR=\"@DATADIR@\" | |
59 | +CFLAGS = $(DFB_CFLAGS) -DDATADIR=\"@DATADIR@\" $(IMLIB2_INCLUDES) | |
60 | ||
61 | if IMLIB2 | |
62 | IMLIB2_PROVIDER = libidirectfbimageprovider_imlib2.la |