From 6e51e19b1cca34452f43f49ce30dba90cef058b5 Mon Sep 17 00:00:00 2001 From: DRC Date: Thu, 24 Feb 2011 19:36:02 +0000 Subject: [PATCH] Use a proper version script for libturbojpeg, since we've added functions to it since 1.0 git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@436 632fc199-4ca6-4c93-a231-07263d6284db --- Makefile.am | 7 +------ configure.ac | 25 +------------------------ turbojpeg-mapfile | 8 +++++++- 3 files changed, 9 insertions(+), 31 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1a8e532..19f692c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,14 +37,9 @@ endif libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h \ turbojpeg-mapfile -if ANON_VERSION_SCRIPT - -libturbojpeg_la_LDFLAGS += $(ANON_VERSION_SCRIPT_FLAG)$(srcdir)/turbojpeg-mapfile - -endif - if VERSION_SCRIPT +libturbojpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)$(srcdir)/turbojpeg-mapfile libjpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)libjpeg.map endif diff --git a/configure.ac b/configure.ac index c520b61..78a391a 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 <