From 72ff1f5bade797c9afe53f3bf69ed5af6440baf6 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 3 Jul 2006 08:32:01 +0000 Subject: [PATCH] better configure checks mean that evas will build on rhas 3 SVN revision: 23685 --- legacy/evas/configure.in | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index ec9a28b743..a8c9139cca 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -115,7 +115,7 @@ AC_HELP_STRING([--with-qtdir=QT_DIR],[use qt directory specified]), qt_dir="/opt/Qtopia"; ]) # check for freetype -AC_PATH_GENERIC(freetype, 9.5.0, +AC_PATH_GENERIC(freetype, 9.3.0, [ ], [ AC_MSG_ERROR(Freetype isn't installed) ] ) @@ -708,10 +708,21 @@ if test "x$have_png" = "xyes"; then [ have_png="no" ] ) fi +# RHEL 3 has broken png libs. the default /usr/include/png*.h files are from +# libpng 1.0 but the default libpng.so is from 1.2 - bad bad. need to try link +# to libpng10 first. if test "x$have_png" = "xyes"; then AC_DEFINE(BUILD_LOADER_PNG, 1, [PNG Image Loader Support]) png_cflags="" - png_libs="-lpng -lz -lm" + AC_CHECK_LIB(libpng10, png_check_sig, [ + png_libs="-lpng10 -lz -lm" + ], [ + AC_CHECK_LIB(libpng, png_check_sig, [ + have_png="no" + ], [ + png_libs="-lpng -lz -lm" + ], -lz -lm) + ], -lz -lm) fi AM_CONDITIONAL(BUILD_LOADER_PNG, test x$have_png = xyes)