added JPEG support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
13
configure.in
13
configure.in
@@ -749,6 +749,7 @@ DEFAULT_wxUSE_IOSTREAMH=1
|
||||
|
||||
DEFAULT_wxUSE_ZLIB=1
|
||||
DEFAULT_wxUSE_LIBPNG=1
|
||||
DEFAULT_wxUSE_LIBJPEG=1
|
||||
DEFAULT_wxUSE_ODBC=1
|
||||
|
||||
DEFAULT_wxUSE_TIMEDATE=1
|
||||
@@ -851,6 +852,10 @@ AC_OVERRIDES(libpng,libpng,
|
||||
**--with-libpng use libpng (PNG image format),
|
||||
wxUSE_LIBPNG)
|
||||
|
||||
AC_OVERRIDES(libjpeg,libjpeg,
|
||||
**--with-libjpeg use libjpeg (JPEG image format),
|
||||
wxUSE_LIBJPEG)
|
||||
|
||||
AC_OVERRIDES(odbc,odbc,
|
||||
**--with-odbc use iODBC and wxODBC classes,
|
||||
wxUSE_ODBC)
|
||||
@@ -1184,6 +1189,14 @@ 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_HAVE_LIBRARY(jpeg)
|
||||
JPEG_LINK="-ljpeg"
|
||||
fi
|
||||
AC_SUBST(JPEG_LINK)
|
||||
|
||||
IODBC_C_SRC=""
|
||||
if test "$wxUSE_ODBC" = 1 ; then
|
||||
AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC)
|
||||
|
Reference in New Issue
Block a user