Back out r3958 and r3959. They aren't needed anymore, because the libjpeg-turbo SourceForge project is online, and they broke libvnc.so
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3964 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/jpeg/Makefile.am b/common/jpeg/Makefile.am
index 53e6a43..26fe44c 100644
--- a/common/jpeg/Makefile.am
+++ b/common/jpeg/Makefile.am
@@ -1,16 +1,6 @@
-if WITH_SHARED
-
-lib_LTLIBRARIES = libjpeg.la
-libjpeg_la_LDFLAGS = -version-number 62:0:0 -no-undefined
-include_HEADERS = jconfig.h jerror.h jmorecfg.h jpeglib.h
-
-else
-
noinst_LTLIBRARIES = libjpeg.la
noinst_HEADERS = jconfig.h jerror.h jmorecfg.h jpeglib.h
-endif
-
HDRS = jchuff.h jdct.h jdhuff.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
jpegint.h jpeglib.h jversion.h jsimd.h jsimddct.h turbojpeg.h
diff --git a/common/jpeg/configure.ac b/common/jpeg/configure.ac
index 6ef2b89..0b37132 100644
--- a/common/jpeg/configure.ac
+++ b/common/jpeg/configure.ac
@@ -11,8 +11,6 @@
# Don't use undefined types
AC_DEFINE([INCOMPLETE_TYPES_BROKEN], 1, [Define if you want use complete types])
-AC_DISABLE_SHARED
-
# Checks for programs.
AC_PROG_CPP
AC_PROG_CC
@@ -115,7 +113,6 @@
AM_CONDITIONAL([WITH_SIMD], [test "x$with_simd" != "xno"])
AM_CONDITIONAL([SIMD_I386], [test "x$simd_arch" = "xi386"])
AM_CONDITIONAL([SIMD_X86_64], [test "x$simd_arch" = "xx86_64"])
-AM_CONDITIONAL([WITH_SHARED], [test "x$enable_shared" != "xno"])
# jconfig.h is the file we use, but we have another before that to
# fool autoheader. the reason is that we include this header in our