Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
969aabf2
Commit
969aabf2
authored
May 01, 2014
by
Glenn Morris
Browse files
* configure.ac (LIBPNG): Consult libpng-config
for the precise form of "-lpng" to use. Fixes: debbugs:17339
parent
28c05b69
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
ChangeLog
ChangeLog
+5
-0
configure.ac
configure.ac
+10
-3
No files found.
ChangeLog
View file @
969aabf2
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>
* configure.ac: Treat MirBSD as OpenBSD. (Bug#17339)
...
...
configure.ac
View file @
969aabf2
...
...
@@ -3101,8 +3101,15 @@ elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
fi
if test "${HAVE_PNG}" = "yes"; then
AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).])
LIBPNG="-lpng -lz -lm"
AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library.])
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,
[],
...
...
@@ -4976,7 +4983,7 @@ echo " Does Emacs use -lXpm? ${HAVE_XPM}"
echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
echo " Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF"
echo " Does Emacs use
-l
png
?
${HAVE_PNG}"
echo " Does Emacs use
a
png
library?
${HAVE_PNG}
$LIBPNG
"
echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
echo " Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment