diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-01-28 05:34:53 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-01-28 05:34:53 +0000 |
| commit | d4611464b70f0fa9798334b60b9d7b798076600f (patch) | |
| tree | 5f9bbcb7f18257f2c3ab54ef5a2869fd51490787 | |
| parent | 43d6823de9c7bf848bb606f6ee2209d0372473ab (diff) | |
| download | tigervnc-d4611464b70f0fa9798334b60b9d7b798076600f.tar.gz tigervnc-d4611464b70f0fa9798334b60b9d7b798076600f.zip | |
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
| -rw-r--r-- | common/jpeg/Makefile.am | 9 | ||||
| -rw-r--r-- | common/jpeg/configure.ac | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/common/jpeg/Makefile.am b/common/jpeg/Makefile.am index 26fe44c5..bafa3d49 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 0b371329..6ef2b89e 100644 --- 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 |