]>
Commit | Line | Data |
---|---|---|
bb829f4a JB |
1 | --- DirectFB-0.9.12/configure.in.orig Mon Jun 10 13:39:16 2002 |
2 | +++ DirectFB-0.9.12/configure.in Sun Sep 1 01:29:59 2002 | |
3 | @@ -62,6 +62,7 @@ | |
4 | AC_PROG_MAKE_SET | |
5 | AC_HEADER_STDC | |
6 | AC_C_CONST | |
da560325 | 7 | +AM_PROG_AS |
da560325 | 8 | |
bb829f4a | 9 | AC_PATH_PROGS(PERL, perl5 perl) |
da560325 | 10 | |
bb829f4a | 11 | @@ -259,23 +260,23 @@ |
da560325 AF |
12 | dnl Test for libz |
13 | if test -z "$LIBZ"; then | |
bb829f4a JB |
14 | AC_CHECK_LIB(z, gzsetparams, |
15 | - AC_CHECK_HEADER(zlib.h, | |
16 | + [AC_CHECK_HEADER(zlib.h, | |
17 | LIBZ='-lz', | |
18 | - AC_MSG_WARN([ | |
19 | -*** libz header files not found. PNG image provider will not be built.])), | |
20 | - AC_MSG_WARN([ | |
21 | -*** libz not found. PNG image provider will not be built.])) | |
22 | + [AC_MSG_WARN([ | |
23 | +*** libz header files not found. PNG image provider will not be built.])])], | |
24 | + [AC_MSG_WARN([ | |
25 | +*** libz not found. PNG image provider will not be built.])]) | |
da560325 AF |
26 | fi |
27 | ||
28 | dnl Test for libpng | |
29 | if test -z "$LIBPNG" && test -n "$LIBZ"; then | |
30 | AC_CHECK_LIB(png, png_read_info, | |
31 | - AC_CHECK_HEADER(png.h, | |
da560325 | 32 | + [AC_CHECK_HEADER(png.h, |
bb829f4a JB |
33 | png_ok=yes, |
34 | - AC_MSG_WARN([ | |
35 | -*** PNG header files not found. PNG image provider will not be built.])), | |
36 | - AC_MSG_WARN([ | |
37 | -*** PNG library not found. PNG image provider will not be built.]), $LIBZ -lm) | |
38 | + [AC_MSG_WARN([ | |
39 | +*** PNG header files not found. PNG image provider will not be built.])])], | |
40 | + [AC_MSG_WARN([ | |
41 | +*** PNG library not found. PNG image provider will not be built.])], $LIBZ -lm) | |
da560325 AF |
42 | if test "$png_ok" = yes; then |
43 | AC_MSG_CHECKING([for png_structp in png.h]) | |
44 | AC_TRY_COMPILE([#include <png.h>], | |
bb829f4a JB |
45 | @@ -363,13 +364,13 @@ |
46 | ||
47 | if test x$enable_flash = xyes; then | |
da560325 AF |
48 | AC_CHECK_LIB(flash, FlashGetInfo, |
49 | - AC_CHECK_HEADER(flash.h, | |
da560325 | 50 | + [AC_CHECK_HEADER(flash.h, |
bb829f4a JB |
51 | FLASH=yes |
52 | LIBFLASH='-lflash', | |
53 | - AC_MSG_WARN([ | |
54 | -*** libflash headers not found -- Flash media provider will not be built.])), | |
55 | - AC_MSG_WARN([ | |
56 | -*** libflash not found -- Flash media provider will not be built.]), $LIBJPEG $LIBZ -lm) | |
57 | + [AC_MSG_WARN([ | |
58 | +*** libflash headers not found -- Flash media provider will not be built.])])], | |
59 | + [AC_MSG_WARN([ | |
60 | +*** libflash not found -- Flash media provider will not be built.])], $LIBJPEG $LIBZ -lm) | |
da560325 AF |
61 | fi |
62 | ||
63 | AM_CONDITIONAL(FLASH_PROVIDER, test x$FLASH = xyes) | |
bb829f4a JB |
64 | @@ -381,13 +382,13 @@ |
65 | ||
66 | if test x$enable_mpeg3 = xyes; then | |
67 | AC_CHECK_LIB(mpeg3, mpeg3_open, | |
68 | - AC_CHECK_HEADER(libmpeg3.h, | |
69 | + [AC_CHECK_HEADER(libmpeg3.h, | |
70 | MPEG3=yes | |
71 | LIBMPEG3='-lmpeg3', | |
72 | - AC_MSG_WARN([ | |
73 | -*** libmpeg3 headers not found -- Libmpeg3 video provider will not be built.])), | |
74 | - AC_MSG_WARN([ | |
75 | -*** libmpeg3 not found -- Libmpeg3 video provider will not be build.]), -lm -lpthread) | |
76 | + [AC_MSG_WARN([ | |
77 | +*** libmpeg3 headers not found -- Libmpeg3 video provider will not be built.])])], | |
78 | + [AC_MSG_WARN([ | |
79 | +*** libmpeg3 not found -- Libmpeg3 video provider will not be build.])], -lm -lpthread) | |
80 | fi | |
da560325 | 81 | |
bb829f4a JB |
82 | AM_CONDITIONAL(LIBMPEG3_PROVIDER, test x$MPEG3 = xyes) |
83 | @@ -415,9 +416,9 @@ | |
da560325 AF |
84 | yes |
85 | #endif | |
86 | ], matrox=yes, | |
87 | - matrox=no | |
da560325 | 88 | + [matrox=no |
bb829f4a JB |
89 | AC_MSG_WARN([ |
90 | -*** Matrox G200/400/450/550 gfxdriver will not be built.])) | |
91 | +*** Matrox G200/400/450/550 gfxdriver will not be built.])]) | |
da560325 AF |
92 | |
93 | AM_CONDITIONAL(GFX_MATROX, test x$matrox = xyes) | |
94 | ||
bb829f4a | 95 | @@ -429,9 +430,9 @@ |
da560325 AF |
96 | yes |
97 | #endif | |
98 | ], tdfx=yes, | |
99 | - tdfx=no | |
da560325 | 100 | + [tdfx=no |
bb829f4a JB |
101 | AC_MSG_WARN([ |
102 | -*** 3DFX Voodoo/Banshee gfxdriver will not be built.])) | |
103 | +*** 3DFX Voodoo/Banshee gfxdriver will not be built.])]) | |
da560325 AF |
104 | |
105 | AM_CONDITIONAL(GFX_TDFX, test x$tdfx = xyes) | |
106 | ||
bb829f4a | 107 | @@ -443,9 +444,9 @@ |
da560325 AF |
108 | yes |
109 | #endif | |
110 | ], nvidia=yes, | |
111 | - nvidia=no | |
da560325 | 112 | + [nvidia=no |
bb829f4a JB |
113 | AC_MSG_WARN([ |
114 | -*** nVidia RIVA TNT gfxdriver will not be built.])) | |
115 | +*** nVidia RIVA TNT gfxdriver will not be built.])]) | |
da560325 AF |
116 | |
117 | AM_CONDITIONAL(GFX_NVIDIA, test x$nvidia = xyes) | |
118 | ||
bb829f4a JB |
119 | @@ -457,9 +458,9 @@ |
120 | yes | |
121 | #endif | |
122 | ], savage=yes, | |
123 | - savage=no | |
124 | + [savage=no | |
125 | AC_MSG_WARN([ | |
126 | -*** Savage gfxdriver will not be built.])) | |
127 | +*** Savage gfxdriver will not be built.])]) | |
128 | ||
129 | AM_CONDITIONAL(GFX_SAVAGE, test x$savage = xyes) | |
130 | ||
131 | @@ -469,25 +470,25 @@ | |
da560325 AF |
132 | |
133 | ||
134 | dnl Test for H3600 Touchscreen support | |
135 | -AC_CHECK_HEADER( [linux/h3600_ts.h], h3600_ts=yes, h3600_ts=no | |
da560325 | 136 | +AC_CHECK_HEADER( [linux/h3600_ts.h], h3600_ts=yes, [h3600_ts=no |
bb829f4a JB |
137 | AC_MSG_WARN([ |
138 | -*** H3600 Touchscreen driver will not be built.])) | |
139 | +*** H3600 Touchscreen driver will not be built.])]) | |
da560325 AF |
140 | |
141 | AM_CONDITIONAL(H3600_TS, test x$h3600_ts = xyes) | |
142 | ||
143 | ||
144 | dnl Test for SonyPI Jogdial support | |
145 | -AC_CHECK_HEADER( [linux/sonypi.h], sonypi=yes, sonypi=no | |
da560325 | 146 | +AC_CHECK_HEADER( [linux/sonypi.h], sonypi=yes, [sonypi=no |
bb829f4a JB |
147 | AC_MSG_WARN([ |
148 | -*** SonyPI Jogdial driver will not be built.])) | |
149 | +*** SonyPI Jogdial driver will not be built.])]) | |
da560325 AF |
150 | |
151 | AM_CONDITIONAL(SONYPI, test x$sonypi = xyes) | |
152 | ||
153 | ||
154 | dnl Test for DBox2 Remote support | |
155 | -AC_CHECK_HEADER( [dbox/fp.h], dbox2remote=yes, dbox2remote=no | |
da560325 | 156 | +AC_CHECK_HEADER( [dbox/fp.h], dbox2remote=yes, [dbox2remote=no |
bb829f4a JB |
157 | AC_MSG_WARN([ |
158 | -*** DBox2 Remote driver will not be built.])) | |
159 | +*** DBox2 Remote driver will not be built.])]) | |
da560325 AF |
160 | |
161 | AM_CONDITIONAL(DBOX2REMOTE, test x$dbox2remote = xyes) | |
162 | ||
bb829f4a JB |
163 | @@ -496,11 +496,11 @@ |
164 | DFB_CFLAGS="$DFB_CFLAGS $DFB_INTERNAL_CFLAGS" | |
165 | DFB_CXXFLAGS="$DFB_CFLAGS" | |
166 | ||
167 | -if test x$cflags_set != xset ; then | |
168 | +if test "x$cflags_set" != "xset" ; then | |
169 | DFB_CFLAGS="$DFB_CFLAGS $CFLAGS" | |
170 | fi | |
171 | ||
172 | -if test x$cxxflags_set != xset ; then | |
173 | +if test "x$cxxflags_set" != "xset" ; then | |
174 | DFB_CXXFLAGS="$DFB_CXXFLAGS $CXXFLAGS" | |
175 | fi | |
176 |