added JPEG support

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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) 

include/wx/msw/setup.h

@@ -150,6 +150,8 @@
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
+#define wxUSE_LIBJPEG       0
+                                  // Use JPEG bitmap code
 #define wxUSE_STD_IOSTREAM  1
                                   // Use standard C++ streams if 1. If 0, use wxWin
                                   // streams implementation.

include/wx/msw/setup0.h

@@ -150,6 +150,8 @@
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
+#define wxUSE_LIBJPEG       0
+                                  // Use JPEG bitmap code
 #define wxUSE_STD_IOSTREAM  1
                                   // Use standard C++ streams if 1. If 0, use wxWin
                                   // streams implementation.

setup/setup.hin

@@ -47,6 +47,10 @@
  * Use libpng
  */
 #define wxUSE_LIBPNG 0
+/*
+ * Use libjpeg
+ */
+#define wxUSE_LIBJPEG 0
 /*
  * Use iODBC
  */

setup/substit.in

@@ -48,3 +48,4 @@ s|*UNIX_THREAD*|@UNIX_THREAD@|g
 s|*IODBC_C_SRC*|@IODBC_C_SRC@|g
 s|*PNG_C_SRC*|@PNG_C_SRC@|g
 s|*Z_C_SRC*|@Z_C_SRC@|g
+s|*JPEG_LINK*|@JPEG_LINK@|g

wx-config.in

@@ -47,7 +47,7 @@ while test $# -gt 0; do
 
       ;;
     --libs)
-      echo -L@libdir@ @THREADS_LINK@ @WX_LINK@ @DL_LIBRARY@ @GUI_TK_LIBRARY@ @EXTRA_LINK@
+      echo -L@libdir@ @THREADS_LINK@ @WX_LINK@ @DL_LIBRARY@ @GUI_TK_LIBRARY@ @EXTRA_LINK@ @JPEG_LINK@
       ;;
     *)
       echo "${usage}" 1>&2