Allow building libjpeg.so if --enable-shared is passed to configure (but disable shared library build by default)
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3958 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/jpeg/Makefile.am b/common/jpeg/Makefile.am
index 26fe44c..bafa3d4 100644
--- a/common/jpeg/Makefile.am
+++ b/common/jpeg/Makefile.am
@@ -1,4 +1,13 @@
+if WITH_SHARED
+
+lib_LTLIBRARIES = libjpeg.la
+
+else
+
noinst_LTLIBRARIES = libjpeg.la
+
+endif
+
noinst_HEADERS = jconfig.h jerror.h jmorecfg.h jpeglib.h
HDRS = jchuff.h jdct.h jdhuff.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
diff --git a/common/jpeg/configure.ac b/common/jpeg/configure.ac
index 0b37132..6ef2b89 100644
--- a/common/jpeg/configure.ac
+++ b/common/jpeg/configure.ac
@@ -11,6 +11,8 @@
# 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
@@ -113,6 +115,7 @@
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