Build libjpeg/SIMD by default and replace --with-included-jpeg switch with --with-system-jpeg switch
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 84d7cc2..2bd44fe 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -61,13 +61,13 @@
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 3445bc3..20bd348 100644
--- a/unix/README
+++ b/unix/README
@@ -52,10 +52,17 @@
% ./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
=============