From: DRC <dcommander@users.sourceforge.net>
Date: Thu, 28 Jan 2010 05:34:53 +0000 (+0000)
Subject: Allow building libjpeg.so if --enable-shared is passed to configure (but disable... 
X-Git-Tag: 0.0.90~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c0f304e8dfe06009f72e01b6fb4552e9b5116d1;p=libjpeg-turbo

Allow building libjpeg.so if --enable-shared is passed to configure (but disable shared library build by default)



git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@71 632fc199-4ca6-4c93-a231-07263d6284db
---

diff --git a/Makefile.am b/Makefile.am
index 26fe44c..bafa3d4 100644
--- a/Makefile.am
+++ b/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/configure.ac b/configure.ac
index 0b37132..6ef2b89 100644
--- a/configure.ac
+++ b/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