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

Don't link with -ljpeg on MS-Windows, to avoid dependency on DLL

Browse source 
* configure.ac (LIBJPEG): Leave it empty for MinGW.
This commit is contained in:
Eli Zaretskii 2015-04-16 19:02:41 +03:00
parent 3ab1784327
commit abba535271
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -3186,7 +3186,6 @@ fi
AC_SUBST(LIBXPM) AC_SUBST(LIBXPM)
### Use -ljpeg if available, unless `--with-jpeg=no'. ### Use -ljpeg if available, unless `--with-jpeg=no'.
### mingw32 doesn't use -ljpeg, since it loads the library dynamically.
HAVE_JPEG=no HAVE_JPEG=no
LIBJPEG= LIBJPEG=
if test "${with_jpeg}" != "no"; then if test "${with_jpeg}" != "no"; then
@ -3222,7 +3221,11 @@ if test "${with_jpeg}" != "no"; then
HAVE_JPEG=yes HAVE_JPEG=yes
AC_DEFINE([HAVE_JPEG], 1, AC_DEFINE([HAVE_JPEG], 1,
[Define to 1 if you have the jpeg library (typically -ljpeg).]) [Define to 1 if you have the jpeg library (typically -ljpeg).])
test "$emacs_cv_jpeglib" != yes && LIBJPEG=$emacs_cv_jpeglib ### mingw32 doesn't use -ljpeg, since it loads the library
### dynamically when needed, and doesn't want a run-time
### dependency on the jpeglib DLL.
test "$emacs_cv_jpeglib" != yes && test "${opsys}" != "mingw32" \
&& LIBJPEG=$emacs_cv_jpeglib
fi fi
fi fi
AC_SUBST(LIBJPEG) AC_SUBST(LIBJPEG)