diff options
| author | Stefan Holst <holstsn@users.sourceforge.net> | 2003-04-06 15:50:56 +0000 |
|---|---|---|
| committer | Stefan Holst <holstsn@users.sourceforge.net> | 2003-04-06 15:50:56 +0000 |
| commit | ea9ae4923bc169fd74b32aa090fd60b684fbd09a (patch) | |
| tree | e6c64b03953e4be0ec35775ec2cd3fd090862dbc /configure.ac | |
| parent | cdbcc573496460d11714e827c02644e42a5bc5e2 (diff) | |
| download | xine-lib-ea9ae4923bc169fd74b32aa090fd60b684fbd09a.tar.gz xine-lib-ea9ae4923bc169fd74b32aa090fd60b684fbd09a.tar.bz2 | |
- freetype2 support for osd
- png autoconf improvements
CVS patchset: 4554
CVS date: 2003/04/06 15:50:56
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index d1ceb2bf9..f533f979c 100644 --- a/configure.ac +++ b/configure.ac @@ -628,16 +628,47 @@ AC_SUBST(MNG_LIBS) dnl --------------------------------------------- dnl PNG lib. dnl --------------------------------------------- -AC_CHECK_LIB(png, png_create_read_struct, - [ AC_CHECK_HEADER(png.h, - [ have_libpng=yes - PNG_LIBS="-lpng" ], - AC_MSG_RESULT([*** image decoder will be disabled ***]))], - AC_MSG_RESULT([*** image decoder will be disabled ***])) -AM_CONDITIONAL(HAVE_LIBPNG, test x"$have_libpng" = "xyes") +dnl AC_CHECK_LIB(png, png_create_read_struct, +dnl [ AC_CHECK_HEADER(png.h, +dnl [ have_libpng=yes +dnl PNG_LIBS="-lpng" ], +dnl AC_MSG_RESULT([*** image decoder will be disabled ***]))], +dnl AC_MSG_RESULT([*** image decoder will be disabled ***])) +dnl AM_CONDITIONAL(HAVE_LIBPNG, test x"$have_libpng" = "xyes") +dnl AC_SUBST(PNG_LIBS) + +AC_PATH_PROG(LIBPNG_CONFIG, libpng-config, no) +if test "$LIBPNG_CONFIG" = "no" ; then + AC_MSG_RESULT([*** libpng-config not found, png support disabled ***]) +else + PNG_CFLAGS=`$LIBPNG_CONFIG --cflags` + PNG_LIBS=`$LIBPNG_CONFIG --libs` + have_libpng="yes" + AC_DEFINE(HAVE_LIBPNG,1,[Define this if you have png library]) +fi + +AM_CONDITIONAL(HAVE_LIBPNG, test x"$have_libpng" = "xyes" ) +AC_SUBST(PNG_CFLAGS) AC_SUBST(PNG_LIBS) dnl --------------------------------------------- +dnl freetype2 lib. +dnl --------------------------------------------- +AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +if test "$FREETYPE_CONFIG" = "no" ; then + AC_MSG_RESULT([*** freetype-config not found, freetype2 support disabled ***]) +else + FT2_CFLAGS=`$FREETYPE_CONFIG --cflags` + FT2_LIBS=`$FREETYPE_CONFIG --libs` + have_ft2="yes" + AC_DEFINE(HAVE_FT2,1,[Define this if you have freetype2 library]) +fi + +AM_CONDITIONAL(HAVE_FT2, test x"$have_ft2" = "xyes" ) +AC_SUBST(FT2_CFLAGS) +AC_SUBST(FT2_LIBS) + +dnl --------------------------------------------- dnl OSS style audio interface dnl --------------------------------------------- AC_MSG_CHECKING(for OSS audio support) |