Allow building libjpeg.so if --enable-shared is passed to configure (but disable...

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 26fe44c510df8399857e71178adab3e0a5e6b857..bafa3d491321ef330bba396f98441a2177413a04 100644 (file)
--- 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 0b371329a727d3d0efd9bc1ba6a519a44552803c..6ef2b89ef27af7a256b2b76eea35bd9b6259c793 100644 (file)
--- a/common/jpeg/configure.ac
+++ b/common/jpeg/configure.ac
@@ -11,6 +11,8 @@ AC_DEFINE([HAVE_PROTOTYPES], 1, [Define if your compiler supports prototypes])
 # 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 @@ fi
 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