Build libjpeg/SIMD by default and replace --with-included-jpeg switch with --with...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3735 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/configure.ac b/common/configure.ac
index 84d7cc2179dba44f5a5d59e4f071a0c97d75e363..2bd44fe37511d90d1e6ba64677ed59bd5062b6c0 100644 (file)
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -61,13 +61,13 @@ AM_CONDITIONAL([INCLUDED_ZLIB], [ test "x$INCLUDED_ZLIB" = xyes ])
 AC_CONFIG_SUBDIRS([zlib])
 
 dnl Check for libjpeg library
-INCLUDED_JPEG=no
-AC_ARG_WITH([included-jpeg],
-       AS_HELP_STRING([--with-included-jpeg], 
-                      [use libjpeg which is distributed with VNC]),
-       [INCLUDED_JPEG=yes],
-       [AC_SEARCH_LIBS([jpeg_destroy_compress], [jpeg], [],
-                       [INCLUDED_JPEG=yes])])
+INCLUDED_JPEG=yes
+AC_ARG_WITH([system-jpeg],
+       AS_HELP_STRING([--with-system-jpeg], 
+                      [use libjpeg which is distributed with the O/S]),
+       [AC_SEARCH_LIBS([jpeg_destroy_compress], [jpeg],
+                       [INCLUDED_JPEG=no], [])],
+       [])
 
 AM_CONDITIONAL([INCLUDED_JPEG], [ test "x$INCLUDED_JPEG" = xyes ])
 AC_CONFIG_SUBDIRS([jpeg])

diff --git a/unix/README b/unix/README
index 3445bc33da688b010aad37a64643caad6d7683a3..20bd3485866b3f8f83f253f2f9ba5d153ba37ac8 100644 (file)
--- a/unix/README
+++ b/unix/README
@@ -52,10 +52,17 @@ To build everything but Xvnc, do:
   % ./configure
   % make
 
-This should build first some libraries - zlib, jpeg, rdr, network, Xregion, rfb
-and tx - then vncviewer, vncconfig and vncpasswd.  System zlib and jpeg are
-preferred. If you want use zlib and jpeg distributed with TigerVNC you have to
-run configure "./configure --with-included-zlib --with-included-jpeg".
+This should first build some libraries - rdr, network, Xregion, rfb and tx -
+followed by the vncviewer, vncconfig and vncpasswd applications.
+
+The default is to build an optimized version of libjpeg included with the
+TigerVNC source and link these applications against it.  To instead link
+against the version of libjpeg provided by the operating system, pass an
+argument of "--with-system-jpeg" to configure.
+
+The default is to link against the version of zlib provided by the operating
+system.  If you wish instead to build a static version of zlib and link
+against it, pass an argument of "--with-included-zlib" to configure.
 
 Building Xvnc
 =============