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

Added a bit of libJPEG 6.0b

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-04-17 17:54:07 +00:00
parent 6836fdedc0
commit e19291405f
76 changed files with 27722 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure.in
View File

@@ -837,7 +837,7 @@ DEFAULT_wxUSE_IOSTREAMH=1
DEFAULT_wxUSE_ZLIB=1
DEFAULT_wxUSE_LIBPNG=1
DEFAULT_wxUSE_LIBJPEG=0
DEFAULT_wxUSE_LIBJPEG=1
DEFAULT_wxUSE_ODBC=1
DEFAULT_wxUSE_TIMEDATE=1
@@ -939,15 +939,15 @@ dnl user options for libraries
dnl ----------------------------------------------------------------
AC_OVERRIDES(zlib,zlib,
**--with-zlib use zlib for LZW comression,
**--without-zlib don't use zlib for LZW comression,
wxUSE_ZLIB)
AC_OVERRIDES(libpng,libpng,
**--with-libpng use libpng (PNG image format),
**--without-libpng don't use libpng (PNG image format),
wxUSE_LIBPNG)
AC_OVERRIDES(libjpeg,libjpeg,
**--with-libjpeg use libjpeg (JPEG image format),
**--without-libjpeg don't use libjpeg (JPEG image format),
wxUSE_LIBJPEG)
AC_OVERRIDES(odbc,odbc,
@@ -1296,12 +1296,18 @@ if test "$wxUSE_LIBPNG" = 1 ; then
fi
AC_SUBST(PNG_C_SRC)
JPEG_LINK=""
if test "$wxUSE_LIBJPEG" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_LIBJPEG,$wxUSE_LIBJPEG)
AC_CHECK_LIB(jpeg,main,,AC_MSG_ERROR("libjpeg is not available."))
JPEG_LINK="-ljpeg"
JPEG_C_SRC="\$(JPEG_C_SRC)"
fi
AC_SUBST(JPEG_C_SRC)
JPEG_LINK=""
dnl if test "$wxUSE_LIBJPEG" = 1 ; then
dnl AC_DEFINE_UNQUOTED(wxUSE_LIBJPEG,$wxUSE_LIBJPEG)
dnl AC_CHECK_LIB(jpeg,main,,AC_MSG_ERROR("libjpeg is not available."))
dnl JPEG_LINK="-ljpeg"
dnl fi
AC_SUBST(JPEG_LINK)
IODBC_C_SRC=""