Revision: 4310
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4310&view=rev
Author: ossman_
Date: 2011-03-02 15:38:19 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Remove the included libjpeg-turbo from the tree and rely completely on one
being provided by the system.
Modified Paths:
--------------
trunk/common/CMakeLists.txt
trunk/common/Makefile.am
trunk/common/rfb/CMakeLists.txt
trunk/common/rfb/Makefile.am
trunk/configure.ac
trunk/unix/README
Removed Paths:
-------------
trunk/common/jpeg/
Modified: trunk/common/CMakeLists.txt
===================================================================
--- trunk/common/CMakeLists.txt 2011-03-02 12:45:57 UTC (rev 4309)
+++ trunk/common/CMakeLists.txt 2011-03-02 15:38:19 UTC (rev 4310)
@@ -1,6 +1,5 @@
add_subdirectory(os)
add_subdirectory(zlib)
-add_subdirectory(jpeg)
add_subdirectory(rdr)
add_subdirectory(network)
add_subdirectory(Xregion)
Modified: trunk/common/Makefile.am
===================================================================
--- trunk/common/Makefile.am 2011-03-02 12:45:57 UTC (rev 4309)
+++ trunk/common/Makefile.am 2011-03-02 15:38:19 UTC (rev 4310)
@@ -3,9 +3,6 @@
if INCLUDED_ZLIB
SUBDIRS += zlib
endif
-if INCLUDED_JPEG
-SUBDIRS += jpeg
-endif
SUBDIRS += rdr network Xregion rfb
Modified: trunk/common/rfb/CMakeLists.txt
===================================================================
--- trunk/common/rfb/CMakeLists.txt 2011-03-02 12:45:57 UTC (rev 4309)
+++ trunk/common/rfb/CMakeLists.txt 2011-03-02 15:38:19 UTC (rev 4310)
@@ -1,5 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/win
- ${CMAKE_SOURCE_DIR}/common/jpeg ${CMAKE_SOURCE_DIR}/common/jpeg/win)
+include_directories(${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/win)
set(RFB_SOURCES
Blacklist.cxx
Modified: trunk/common/rfb/Makefile.am
===================================================================
--- trunk/common/rfb/Makefile.am 2011-03-02 12:45:57 UTC (rev 4309)
+++ trunk/common/rfb/Makefile.am 2011-03-02 15:38:19 UTC (rev 4310)
@@ -62,11 +62,6 @@
librfb_la_LIBADD += $(PAM_LIBS)
endif
-if INCLUDED_JPEG
-librfb_la_CPPFLAGS += -I$(top_srcdir)/common/jpeg -I$(top_builddir)/common/jpeg
-librfb_la_LIBADD += $(top_builddir)/common/jpeg/libjpeg.la
-endif
-
if BUILD_WIN
librfb_la_SOURCES += WinPasswdValidator.h WinPasswdValidator.cxx
endif
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-03-02 12:45:57 UTC (rev 4309)
+++ trunk/configure.ac 2011-03-02 15:38:19 UTC (rev 4310)
@@ -10,7 +10,7 @@
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
-AC_CONFIG_SUBDIRS([common/jpeg common/zlib])
+AC_CONFIG_SUBDIRS([common/zlib])
AC_CONFIG_HEADERS([config.h])
@@ -195,17 +195,8 @@
AC_CONFIG_SUBDIRS([zlib])
dnl Check for libjpeg library
-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], [])],
- [])
+AC_SEARCH_LIBS([jpeg_destroy_compress], [jpeg])
-AM_CONDITIONAL([INCLUDED_JPEG], [ test "x$INCLUDED_JPEG" = xyes ])
-AC_CONFIG_SUBDIRS([jpeg])
-
AC_CHECK_FUNCS([vsnprintf snprintf strcasecmp strncasecmp])
# Network functions
Modified: trunk/unix/README
===================================================================
--- trunk/unix/README 2011-03-02 12:45:57 UTC (rev 4309)
+++ trunk/unix/README 2011-03-02 15:38:19 UTC (rev 4310)
@@ -61,11 +61,6 @@
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.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
