]>
Commit | Line | Data |
---|---|---|
da560325 AF |
1 | --- DirectFB-0.9.10/configure.in.wiget Fri Apr 12 18:46:58 2002 |
2 | +++ DirectFB-0.9.10/configure.in Fri Apr 26 12:25:54 2002 | |
3 | @@ -107,6 +107,7 @@ | |
4 | ;; | |
5 | esac | |
6 | ||
7 | +AM_PROG_AS | |
8 | if test "x$have_x86" = xon; then | |
9 | ## | |
10 | ## HACK HACK HACK automake uses @AS@ like a gcc | |
11 | @@ -198,17 +199,17 @@ | |
12 | dnl Test for libjpeg | |
13 | JPEG=no | |
14 | ||
15 | - AC_ARG_ENABLE(jpeg, [ --enable-jpeg build JPEG image provider [default=yes]], enable_jpeg="$enableval", enable_jpeg=yes) | |
16 | + AC_ARG_ENABLE(jpeg, [ --enable-jpeg build JPEG image provider [default=yes]], [enable_jpeg="$enableval"], [enable_jpeg=yes]) | |
17 | ||
18 | if test x$enable_jpeg = xyes; then | |
19 | if test -z "$LIBJPEG"; then | |
20 | AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, | |
21 | - jpeg_ok=yes, | |
22 | - jpeg_ok=no) | |
23 | + [jpeg_ok=yes], | |
24 | + [jpeg_ok=no]) | |
25 | if test "$jpeg_ok" = yes; then | |
26 | AC_CHECK_HEADER(jpeglib.h, | |
27 | - jpeg_ok=yes, | |
28 | - jpeg_ok=no) | |
29 | + [jpeg_ok=yes], | |
30 | + [jpeg_ok=no]) | |
31 | if test "$jpeg_ok" = yes; then | |
32 | JPEG=yes | |
33 | LIBJPEG='-ljpeg' | |
34 | @@ -223,32 +224,32 @@ | |
35 | fi | |
36 | fi | |
37 | ||
38 | - AM_CONDITIONAL(JPEG_PROVIDER, test x$JPEG = xyes) | |
39 | + AM_CONDITIONAL(JPEG_PROVIDER, [test x$JPEG = xyes]) | |
40 | ||
41 | ||
42 | dnl Test for libpng and libz | |
43 | PNG=no | |
44 | ||
45 | - AC_ARG_ENABLE(png, [ --enable-png build PNG image provider [default=yes]], enable_png="$enableval", enable_png=yes) | |
46 | + AC_ARG_ENABLE(png, [ --enable-png build PNG image provider [default=yes]], [enable_png="$enableval"], [enable_png=yes]) | |
47 | ||
48 | if test x$enable_png = xyes; then | |
49 | ||
50 | dnl Test for libz | |
51 | if test -z "$LIBZ"; then | |
52 | - AC_CHECK_LIB(z, gzsetparams, | |
53 | + AC_CHECK_LIB(z, gzsetparams,[ | |
54 | AC_CHECK_HEADER(zlib.h, | |
55 | - LIBZ='-lz', | |
56 | - AC_MSG_WARN([*** libz header files not found. PNG image provider will not be built.])), | |
57 | - AC_MSG_WARN([*** libz not found. PNG image provider will not be built.])) | |
58 | + [LIBZ='-lz'], | |
59 | + [AC_MSG_WARN([*** libz header files not found. PNG image provider will not be built.])])], | |
60 | + [AC_MSG_WARN([*** libz not found. PNG image provider will not be built.])]) | |
61 | fi | |
62 | ||
63 | dnl Test for libpng | |
64 | if test -z "$LIBPNG" && test -n "$LIBZ"; then | |
65 | AC_CHECK_LIB(png, png_read_info, | |
66 | - AC_CHECK_HEADER(png.h, | |
67 | - png_ok=yes, | |
68 | - AC_MSG_WARN([*** PNG header files not found. PNG image provider will not be built.])), | |
69 | - AC_MSG_WARN([*** PNG library not found. PNG image provider will not be built.]), $LIBZ -lm) | |
70 | + [AC_CHECK_HEADER(png.h, | |
71 | + [png_ok=yes], | |
72 | + [AC_MSG_WARN([*** PNG header files not found. PNG image provider will not be built.])])], | |
73 | + [AC_MSG_WARN([*** PNG library not found. PNG image provider will not be built.])], $LIBZ -lm) | |
74 | if test "$png_ok" = yes; then | |
75 | AC_MSG_CHECKING([for png_structp in png.h]) | |
76 | AC_TRY_COMPILE([#include <png.h>], | |
77 | @@ -256,7 +257,7 @@ | |
78 | png_infop info; | |
79 | png_colorp cmap; | |
80 | png_create_read_struct;], | |
81 | - png_ok=yes, png_ok=no) | |
82 | + [png_ok=yes], [png_ok=no]) | |
83 | AC_MSG_RESULT($png_ok) | |
84 | if test "$png_ok" = yes; then | |
85 | PNG=yes | |
86 | @@ -276,7 +277,7 @@ | |
87 | ||
88 | ||
89 | dnl Allow to disable GIF support | |
90 | - AC_ARG_ENABLE(gif, [ --enable-gif build GIF image provider [default=yes]], enable_gif="$enableval", enable_gif=yes) | |
91 | + AC_ARG_ENABLE(gif, [ --enable-gif build GIF image provider [default=yes]], [enable_gif="$enableval"], [enable_gif=yes]) | |
92 | ||
93 | AM_CONDITIONAL(GIF_PROVIDER, test x$enable_gif = xyes) | |
94 | ||
95 | @@ -323,11 +324,11 @@ | |
96 | ||
97 | if test -z "$LIBFLASH"; then | |
98 | AC_CHECK_LIB(flash, FlashGetInfo, | |
99 | - AC_CHECK_HEADER(flash.h, | |
100 | - FLASH=yes | |
101 | - LIBFLASH='-lflash', | |
102 | - AC_MSG_WARN([*** libflash headers not found -- SWF media provider will not be built.])), | |
103 | - AC_MSG_WARN([*** libflash not found -- SWF media provider will not be built.]), $LIBJPEG $LIBZ -lm) | |
104 | + [AC_CHECK_HEADER(flash.h, | |
105 | + [FLASH=yes | |
106 | + LIBFLASH='-lflash'], | |
107 | + [AC_MSG_WARN([*** libflash headers not found -- SWF media provider will not be built.])])], | |
108 | + [AC_MSG_WARN([*** libflash not found -- SWF media provider will not be built.])], [$LIBJPEG $LIBZ -lm]) | |
109 | fi | |
110 | ||
111 | AM_CONDITIONAL(FLASH_PROVIDER, test x$FLASH = xyes) | |
112 | @@ -360,8 +361,8 @@ | |
113 | yes | |
114 | #endif | |
115 | ], ati=yes, | |
116 | - ati=no | |
117 | - AC_MSG_WARN(*** ATI Rage 128 gfxdriver will not be built.)) | |
118 | + [ati=no | |
119 | + AC_MSG_WARN([*** ATI Rage 128 gfxdriver will not be built.])]) | |
120 | ||
121 | AM_CONDITIONAL(GFX_ATI, test x$ati = xyes) | |
122 | ||
123 | @@ -373,8 +374,8 @@ | |
124 | yes | |
125 | #endif | |
126 | ], matrox=yes, | |
127 | - matrox=no | |
128 | - AC_MSG_WARN(*** Matrox G200/400 gfxdriver will not be built.)) | |
129 | + [matrox=no | |
130 | + AC_MSG_WARN([*** Matrox G200/400 gfxdriver will not be built.])]) | |
131 | ||
132 | AM_CONDITIONAL(GFX_MATROX, test x$matrox = xyes) | |
133 | ||
134 | @@ -386,8 +387,8 @@ | |
135 | yes | |
136 | #endif | |
137 | ], tdfx=yes, | |
138 | - tdfx=no | |
139 | - AC_MSG_WARN(*** 3DFX Voodoo/Banshee gfxdriver will not be built.)) | |
140 | + [tdfx=no | |
141 | + AC_MSG_WARN([*** 3DFX Voodoo/Banshee gfxdriver will not be built.])]) | |
142 | ||
143 | AM_CONDITIONAL(GFX_TDFX, test x$tdfx = xyes) | |
144 | ||
145 | @@ -399,8 +400,8 @@ | |
146 | yes | |
147 | #endif | |
148 | ], nvidia=yes, | |
149 | - nvidia=no | |
150 | - AC_MSG_WARN(*** nVidia RIVA TNT gfxdriver will not be built.)) | |
151 | + [nvidia=no | |
152 | + AC_MSG_WARN([*** nVidia RIVA TNT gfxdriver will not be built.])]) | |
153 | ||
154 | AM_CONDITIONAL(GFX_NVIDIA, test x$nvidia = xyes) | |
155 | ||
156 | @@ -410,22 +411,22 @@ | |
157 | ||
158 | ||
159 | dnl Test for H3600 Touchscreen support | |
160 | -AC_CHECK_HEADER( [linux/h3600_ts.h], h3600_ts=yes, h3600_ts=no | |
161 | - AC_MSG_WARN(*** H3600 Touchscreen driver will not be built.)) | |
162 | +AC_CHECK_HEADER( [linux/h3600_ts.h], h3600_ts=yes, [h3600_ts=no | |
163 | + AC_MSG_WARN([*** H3600 Touchscreen driver will not be built.])]) | |
164 | ||
165 | AM_CONDITIONAL(H3600_TS, test x$h3600_ts = xyes) | |
166 | ||
167 | ||
168 | dnl Test for SonyPI Jogdial support | |
169 | -AC_CHECK_HEADER( [linux/sonypi.h], sonypi=yes, sonypi=no | |
170 | - AC_MSG_WARN(*** SonyPI Jogdial driver will not be built.)) | |
171 | +AC_CHECK_HEADER( [linux/sonypi.h], sonypi=yes, [sonypi=no | |
172 | + AC_MSG_WARN([*** SonyPI Jogdial driver will not be built.])]) | |
173 | ||
174 | AM_CONDITIONAL(SONYPI, test x$sonypi = xyes) | |
175 | ||
176 | ||
177 | dnl Test for DBox2 Remote support | |
178 | -AC_CHECK_HEADER( [dbox/fp.h], dbox2remote=yes, dbox2remote=no | |
179 | - AC_MSG_WARN(*** DBox2 Remote driver will not be built.)) | |
180 | +AC_CHECK_HEADER( [dbox/fp.h], dbox2remote=yes, [dbox2remote=no | |
181 | + AC_MSG_WARN([*** DBox2 Remote driver will not be built.])]) | |
182 | ||
183 | AM_CONDITIONAL(DBOX2REMOTE, test x$dbox2remote = xyes) | |
184 |