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
9 AC_PATH_PROGS(PERL, perl5 perl)
13 if test -z "$LIBZ"; then
14 AC_CHECK_LIB(z, gzsetparams,
15 - AC_CHECK_HEADER(zlib.h,
16 + [AC_CHECK_HEADER(zlib.h,
19 -*** libz header files not found. PNG image provider will not be built.])),
21 -*** libz not found. PNG image provider will not be built.]))
23 +*** libz header files not found. PNG image provider will not be built.])])],
25 +*** libz not found. PNG image provider will not be built.])])
29 if test -z "$LIBPNG" && test -n "$LIBZ"; then
30 AC_CHECK_LIB(png, png_read_info,
31 - AC_CHECK_HEADER(png.h,
32 + [AC_CHECK_HEADER(png.h,
35 -*** PNG header files not found. PNG image provider will not be built.])),
37 -*** PNG library not found. PNG image provider will not be built.]), $LIBZ -lm)
39 +*** PNG header files not found. PNG image provider will not be built.])])],
41 +*** PNG library not found. PNG image provider will not be built.])], $LIBZ -lm)
42 if test "$png_ok" = yes; then
43 AC_MSG_CHECKING([for png_structp in png.h])
44 AC_TRY_COMPILE([#include <png.h>],
47 if test x$enable_flash = xyes; then
48 AC_CHECK_LIB(flash, FlashGetInfo,
49 - AC_CHECK_HEADER(flash.h,
50 + [AC_CHECK_HEADER(flash.h,
54 -*** libflash headers not found -- Flash media provider will not be built.])),
56 -*** libflash not found -- Flash media provider will not be built.]), $LIBJPEG $LIBZ -lm)
58 +*** libflash headers not found -- Flash media provider will not be built.])])],
60 +*** libflash not found -- Flash media provider will not be built.])], $LIBJPEG $LIBZ -lm)
63 AM_CONDITIONAL(FLASH_PROVIDER, test x$FLASH = xyes)
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,
73 -*** libmpeg3 headers not found -- Libmpeg3 video provider will not be built.])),
75 -*** libmpeg3 not found -- Libmpeg3 video provider will not be build.]), -lm -lpthread)
77 +*** libmpeg3 headers not found -- Libmpeg3 video provider will not be built.])])],
79 +*** libmpeg3 not found -- Libmpeg3 video provider will not be build.])], -lm -lpthread)
82 AM_CONDITIONAL(LIBMPEG3_PROVIDER, test x$MPEG3 = xyes)
90 -*** Matrox G200/400/450/550 gfxdriver will not be built.]))
91 +*** Matrox G200/400/450/550 gfxdriver will not be built.])])
93 AM_CONDITIONAL(GFX_MATROX, test x$matrox = xyes)
102 -*** 3DFX Voodoo/Banshee gfxdriver will not be built.]))
103 +*** 3DFX Voodoo/Banshee gfxdriver will not be built.])])
105 AM_CONDITIONAL(GFX_TDFX, test x$tdfx = xyes)
114 -*** nVidia RIVA TNT gfxdriver will not be built.]))
115 +*** nVidia RIVA TNT gfxdriver will not be built.])])
117 AM_CONDITIONAL(GFX_NVIDIA, test x$nvidia = xyes)
126 -*** Savage gfxdriver will not be built.]))
127 +*** Savage gfxdriver will not be built.])])
129 AM_CONDITIONAL(GFX_SAVAGE, test x$savage = xyes)
131 @@ -469,25 +470,25 @@
134 dnl Test for H3600 Touchscreen support
135 -AC_CHECK_HEADER( [linux/h3600_ts.h], h3600_ts=yes, h3600_ts=no
136 +AC_CHECK_HEADER( [linux/h3600_ts.h], h3600_ts=yes, [h3600_ts=no
138 -*** H3600 Touchscreen driver will not be built.]))
139 +*** H3600 Touchscreen driver will not be built.])])
141 AM_CONDITIONAL(H3600_TS, test x$h3600_ts = xyes)
144 dnl Test for SonyPI Jogdial support
145 -AC_CHECK_HEADER( [linux/sonypi.h], sonypi=yes, sonypi=no
146 +AC_CHECK_HEADER( [linux/sonypi.h], sonypi=yes, [sonypi=no
148 -*** SonyPI Jogdial driver will not be built.]))
149 +*** SonyPI Jogdial driver will not be built.])])
151 AM_CONDITIONAL(SONYPI, test x$sonypi = xyes)
154 dnl Test for DBox2 Remote support
155 -AC_CHECK_HEADER( [dbox/fp.h], dbox2remote=yes, dbox2remote=no
156 +AC_CHECK_HEADER( [dbox/fp.h], dbox2remote=yes, [dbox2remote=no
158 -*** DBox2 Remote driver will not be built.]))
159 +*** DBox2 Remote driver will not be built.])])
161 AM_CONDITIONAL(DBOX2REMOTE, test x$dbox2remote = xyes)
163 @@ -496,11 +496,11 @@
164 DFB_CFLAGS="$DFB_CFLAGS $DFB_INTERNAL_CFLAGS"
165 DFB_CXXFLAGS="$DFB_CFLAGS"
167 -if test x$cflags_set != xset ; then
168 +if test "x$cflags_set" != "xset" ; then
169 DFB_CFLAGS="$DFB_CFLAGS $CFLAGS"
172 -if test x$cxxflags_set != xset ; then
173 +if test "x$cxxflags_set" != "xset" ; then
174 DFB_CXXFLAGS="$DFB_CXXFLAGS $CXXFLAGS"