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
8 if test "x$have_x86" = xon; then
10 ## HACK HACK HACK automake uses @AS@ like a gcc
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])
18 if test x$enable_jpeg = xyes; then
19 if test -z "$LIBJPEG"; then
20 AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
25 if test "$jpeg_ok" = yes; then
26 AC_CHECK_HEADER(jpeglib.h,
31 if test "$jpeg_ok" = yes; then
38 - AM_CONDITIONAL(JPEG_PROVIDER, test x$JPEG = xyes)
39 + AM_CONDITIONAL(JPEG_PROVIDER, [test x$JPEG = xyes])
42 dnl Test for libpng and libz
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])
48 if test x$enable_png = xyes; then
51 if test -z "$LIBZ"; then
52 - AC_CHECK_LIB(z, gzsetparams,
53 + AC_CHECK_LIB(z, gzsetparams,[
54 AC_CHECK_HEADER(zlib.h,
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.]))
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.])])
64 if test -z "$LIBPNG" && test -n "$LIBZ"; then
65 AC_CHECK_LIB(png, png_read_info,
66 - AC_CHECK_HEADER(png.h,
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,
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>],
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
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])
93 AM_CONDITIONAL(GIF_PROVIDER, test x$enable_gif = xyes)
97 if test -z "$LIBFLASH"; then
98 AC_CHECK_LIB(flash, FlashGetInfo,
99 - AC_CHECK_HEADER(flash.h,
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,
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])
111 AM_CONDITIONAL(FLASH_PROVIDER, test x$FLASH = xyes)
117 - AC_MSG_WARN(*** ATI Rage 128 gfxdriver will not be built.))
119 + AC_MSG_WARN([*** ATI Rage 128 gfxdriver will not be built.])])
121 AM_CONDITIONAL(GFX_ATI, test x$ati = xyes)
128 - AC_MSG_WARN(*** Matrox G200/400 gfxdriver will not be built.))
130 + AC_MSG_WARN([*** Matrox G200/400 gfxdriver will not be built.])])
132 AM_CONDITIONAL(GFX_MATROX, test x$matrox = xyes)
139 - AC_MSG_WARN(*** 3DFX Voodoo/Banshee gfxdriver will not be built.))
141 + AC_MSG_WARN([*** 3DFX Voodoo/Banshee gfxdriver will not be built.])])
143 AM_CONDITIONAL(GFX_TDFX, test x$tdfx = xyes)
150 - AC_MSG_WARN(*** nVidia RIVA TNT gfxdriver will not be built.))
152 + AC_MSG_WARN([*** nVidia RIVA TNT gfxdriver will not be built.])])
154 AM_CONDITIONAL(GFX_NVIDIA, test x$nvidia = xyes)
156 @@ -410,22 +411,22 @@
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.])])
165 AM_CONDITIONAL(H3600_TS, test x$h3600_ts = xyes)
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.])])
174 AM_CONDITIONAL(SONYPI, test x$sonypi = xyes)
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.])])
183 AM_CONDITIONAL(DBOX2REMOTE, test x$dbox2remote = xyes)