Mercurial > hg > xemacs-beta
diff configure.in @ 84:ac0620f6398e r20-0b92
Import from CVS: tag r20-0b92
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:08:29 +0200 |
| parents | 6a378aca36af |
| children | 821dec489c24 |
line wrap: on
line diff
--- a/configure.in Mon Aug 13 09:07:39 2007 +0200 +++ b/configure.in Mon Aug 13 09:08:29 2007 +0200 @@ -2461,9 +2461,20 @@ fi fi test -z "${with_png}" && { AC_HEADER_CHECK(png.h, , with_png="no") } -test -z "${with_png}" && { AC_HAVE_LIBRARY(-lpng, , with_png="no") } -test -z "${with_png}" && { AC_HAVE_LIBRARY(-lz, with_png="yes") } -test -z "${with_png}" && { AC_HAVE_LIBRARY(-lgz, with_png="gnuz", with_png="no") } +test -z "${with_png}" && { AC_FUNC_CHECK(pow, , with_png="no") } +if test -z "${with_png}" ; then + AC_HAVE_LIBRARY(-lz, with_png="yes") + test -z "${with_png}" && { AC_HAVE_LIBRARY(-lgz, with_png="gnuz", with_png="no") } + if test "${with_png}" != "no"; then + png_save_libs="${LIBS}" + case "${with_png}" in + yes ) LIBS="${LIBS} -lz" ;; + gnuz ) LIBS="${LIBS} -lgz" ;; + esac + AC_HAVE_LIBRARY(-lpng, , with_png="no") + LIBS="$png_save_libs" + fi +fi case "${with_png}" in yes ) AC_DEFINE(HAVE_PNG) ;; gnuz ) AC_DEFINE(HAVE_PNG) AC_DEFINE(HAVE_PNG_GNUZ) ;;