mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 19:31:02 -08:00
Code Issues Projects Releases Wiki Activity

* configure.ac (LIBPNG): Consult libpng-config

Browse source 
for the precise form of "-lpng" to use.

Fixes: debbugs:17339
This commit is contained in:
Glenn Morris 2014-05-01 17:57:27 -04:00
parent 28c05b699f
commit 969aabf250
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-05-01 Glenn Morris <rgm@gnu.org>
* configure.ac (LIBPNG): Consult libpng-config for the precise
form of "-lpng" to use. (Bug#17339)
2014-04-29 Glenn Morris <rgm@gnu.org> 2014-04-29 Glenn Morris <rgm@gnu.org>
* configure.ac: Treat MirBSD as OpenBSD. (Bug#17339) * configure.ac: Treat MirBSD as OpenBSD. (Bug#17339)

13
configure.ac
View file

@ -3101,8 +3101,15 @@ elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
fi fi
if test "${HAVE_PNG}" = "yes"; then if test "${HAVE_PNG}" = "yes"; then
AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).]) AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library.])
LIBPNG="-lpng -lz -lm"
dnl Some systems, eg NetBSD 6, only provide eg "libpng16", not "libpng".
lpng=`libpng-config --libs 2> /dev/null`
case $lpng in
-l*) : ;;
*) lpng="-lpng" ;;
esac
LIBPNG="$lpng -lz -lm"
AC_CHECK_DECL(png_longjmp, AC_CHECK_DECL(png_longjmp,
[], [],
@ -4976,7 +4983,7 @@ echo " Does Emacs use -lXpm? ${HAVE_XPM}"
echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
echo " Does Emacs use -ltiff? ${HAVE_TIFF}" echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
echo " Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF" echo " Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF"
echo " Does Emacs use -lpng? ${HAVE_PNG}" echo " Does Emacs use a png library? ${HAVE_PNG} $LIBPNG"
echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
echo " Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}" echo " Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}"