Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't check for libjpeg,libtiff and libpng when building wxMGL,

Browse Source 
they are part of libmgl and we want to reuse them (for two reasons: one, they are
dynamically loaded at runtime; and two, we get symbols conflicts otherwise


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-01-26 00:21:42 +00:00
parent bdffd806c3
commit 81809c07b4
2 changed files with 544 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

878
configure vendored
View File

File diff suppressed because it is too large Load Diff

21
configure.in
View File

@@ -1465,13 +1465,21 @@ PNG_LINK=
if test "$wxUSE_LIBPNG" != "no" ; then
AC_DEFINE(wxUSE_LIBPNG)
if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
AC_MSG_WARN([wxMGL doesn't work with builtin png library, will use MGL one instead])
wxUSE_LIBPNG=sys
fi
dnl for the check below to have a chance to succeed, we must already have
dnl libz somewhere
if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
dnl libz somewhere (don't do this when bulding wxMGL since its libpng
dnl doesn't depend on zlib)
if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
wxUSE_LIBPNG=builtin
fi
if test "$wxUSE_MGL" != 1 ; then
dnl Don't check for libpng when building wxMGL, libmgl contains it
if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
AC_CHECK_HEADER(png.h,
AC_CHECK_LIB(png, png_check_sig,
@@ -1492,6 +1500,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
wxUSE_LIBPNG=yes
fi
fi
fi
if test "$wxUSE_LIBPNG" = "builtin" ; then
PNG_INCLUDE="-I\${top_srcdir}/src/png"
@@ -1509,6 +1518,13 @@ JPEG_LINK=
if test "$wxUSE_LIBJPEG" != "no" ; then
AC_DEFINE(wxUSE_LIBJPEG)
if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
AC_MSG_WARN([wxMGL doesn't work with builtin jpeg library, will use MGL one instead])
wxUSE_LIBJPEG=sys
fi
if test "$wxUSE_MGL" != 1 ; then
dnl Don't check for libjpeg when building wxMGL, libmgl contains it
if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
dnl HAVE_STDLIB_H which are already defined and this provokes
@@ -1545,6 +1561,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
wxUSE_LIBJPEG=sys
fi
fi
fi
if test "$wxUSE_LIBJPEG" = "builtin" ; then
JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"