From 9fa95594c29c2f6ca70344b6f56b44fe7c48e7d7 Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Fri, 25 Feb 2011 00:23:44 +0000
Subject: [PATCH] Use a proper version script for libturbojpeg

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@442 632fc199-4ca6-4c93-a231-07263d6284db
---
 Makefile.am           |  7 +------
 configure.ac          | 25 +------------------------
 turbojpeg-mapfile     | 10 ++++++++--
 turbojpeg-mapfile.jni | 21 ++++++++++++++++-----
 4 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 312ec41..30c9c6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,14 +50,9 @@ endif
 
 libturbojpeg_la_SOURCES += $(TJMAPFILE)
 
-if ANON_VERSION_SCRIPT
-
-libturbojpeg_la_LDFLAGS += $(ANON_VERSION_SCRIPT_FLAG)$(srcdir)/$(TJMAPFILE)
-
-endif
-
 if VERSION_SCRIPT
 
+libturbojpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)$(srcdir)/$(TJMAPFILE)
 libjpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)libjpeg.map
 
 endif
diff --git a/configure.ac b/configure.ac
index 84fca81..ec1d45d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,36 +168,13 @@ if test "x$VERSION_SCRIPT_FLAG" = "x"; then
   VERSION_SCRIPT=no
   AC_MSG_RESULT(no)
 fi
-
-ANON_VERSION_SCRIPT=yes
-AC_MSG_CHECKING([whether the linker supports anonymous version scripts])
-LDFLAGS="$SAVED_LDFLAGS -Wl,--version-script,conftest.map"
-cat > conftest.map <<EOF
-{
-  global: main;
-  local: *;
-};
-EOF
-AC_LINK_IFELSE(AC_LANG_PROGRAM([], []),
-  [ANON_VERSION_SCRIPT_FLAG=-Wl,--version-script,; AC_MSG_RESULT([yes (GNU style)])], [])
-if test "x$ANON_VERSION_SCRIPT_FLAG" = "x"; then
-  LDFLAGS="$SAVED_LDFLAGS -Wl,-M,conftest.map"
-  AC_LINK_IFELSE(AC_LANG_PROGRAM([], []),
-    [ANON_VERSION_SCRIPT_FLAG=-Wl,-M,; AC_MSG_RESULT([yes (Sun style)])], [])
-fi
-if test "x$ANON_VERSION_SCRIPT_FLAG" = "x"; then
-  ANON_VERSION_SCRIPT=no
-  AC_MSG_RESULT(no)
-fi
 LDFLAGS="$SAVED_LDFLAGS"
 
-AC_MSG_CHECKING([whether to use version script when building libjpeg])
+AC_MSG_CHECKING([whether to use version script when building libjpeg-turbo])
 AC_MSG_RESULT($VERSION_SCRIPT)
 
 AM_CONDITIONAL(VERSION_SCRIPT, test "x$VERSION_SCRIPT" = "xyes")
-AM_CONDITIONAL(ANON_VERSION_SCRIPT, test "x$ANON_VERSION_SCRIPT" = "xyes")
 AC_SUBST(VERSION_SCRIPT_FLAG)
-AC_SUBST(ANON_VERSION_SCRIPT_FLAG)
 
 AC_MSG_CHECKING([whether to include arithmetic encoding support])
 AC_ARG_WITH([arith-enc],
diff --git a/turbojpeg-mapfile b/turbojpeg-mapfile
index 7fc4a2d..eb95471 100755
--- a/turbojpeg-mapfile
+++ b/turbojpeg-mapfile
@@ -1,12 +1,11 @@
+TURBOJPEG_1.0
 {
 	global:
 		tjInitCompress;
 		tjCompress;
 		TJBUFSIZE;
-		TJBUFSIZEYUV;
 		tjInitDecompress;
 		tjDecompressHeader;
-		tjDecompressHeader2;
 		tjScaledSize;
 		tjDecompress;
 		tjDestroy;
@@ -14,3 +13,10 @@
 	local:
 		*;
 };
+
+TURBOJPEG_1.1
+{
+	global:
+		TJBUFSIZEYUV;
+		tjDecompressHeader2;
+} TURBOJPEG_1.0;
diff --git a/turbojpeg-mapfile.jni b/turbojpeg-mapfile.jni
index 7c930b8..6459bd6 100755
--- a/turbojpeg-mapfile.jni
+++ b/turbojpeg-mapfile.jni
@@ -1,16 +1,29 @@
+TURBOJPEG_1.0
 {
 	global:
 		tjInitCompress;
 		tjCompress;
 		TJBUFSIZE;
-		TJBUFSIZEYUV;
 		tjInitDecompress;
 		tjDecompressHeader;
-		tjDecompressHeader2;
 		tjScaledSize;
 		tjDecompress;
 		tjDestroy;
 		tjGetErrorStr;
+	local:
+		*;
+};
+
+TURBOJPEG_1.1
+{
+	global:
+		TJBUFSIZEYUV;
+		tjDecompressHeader2;
+} TURBOJPEG_1.0;
+
+TURBOJPEG_1.2
+{
+	global:
 		Java_org_libjpegturbo_turbojpeg_TJ_bufSize;
 		Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV;
 		Java_org_libjpegturbo_turbojpeg_TJCompressor_init;
@@ -24,6 +37,4 @@
 		Java_org_libjpegturbo_turbojpeg_TJDecompressor_destroy;		
 		Java_org_libjpegturbo_turbojpeg_TJDecompressor_getScaledHeight;
 		Java_org_libjpegturbo_turbojpeg_TJDecompressor_getScaledWidth;
-	local:
-		*;
-};
+} TURBOJPEG_1.1;
-- 
2.40.0