[xiph-commits] r13291 - trunk/Tremor

[giles at svn.xiph.org]

Author: giles
Date: 2007-07-23 15:35:47 -0700 (Mon, 23 Jul 2007)
New Revision: 13291

Added:
   trunk/Tremor/Version_script.in
Modified:
   trunk/Tremor/configure.in
Log:
Only export symbols explicitly listed in Version_script.in when the
linker supports it (GNU ld on linux or solaris) to avoid conflicts
from internal symbols, most specifically the ogg implementation.


Added: trunk/Tremor/Version_script.in
===================================================================
--- trunk/Tremor/Version_script.in	                        (rev 0)
+++ trunk/Tremor/Version_script.in	2007-07-23 22:35:47 UTC (rev 13291)
@@ -0,0 +1,49 @@
+#
+# Export file for libvorbisidec
+#
+# Only the symbols listed in the global section will be callable from
+# applications linking to libvorbisidec.
+#
+
+ at PACKAGE@.so.1
+{
+	global:
+		ov_clear;
+		ov_open;
+		ov_open_callbacks;
+		ov_test;
+		ov_test_callbacks;
+		ov_test_open;
+		ov_bitrate;
+		ov_bitrate_instant;
+		ov_streams;
+		ov_seekable;
+		ov_serialnumber;
+		ov_raw_total;
+		ov_pcm_total;
+		ov_time_total;
+		ov_raw_seek;
+		ov_pcm_seek;
+		ov_pcm_seek_page;
+		ov_time_seek;
+		ov_time_seek_page;
+		ov_raw_tell;
+		ov_pcm_tell;
+		ov_time_tell;
+		ov_info;
+		ov_comment;
+		ov_read;
+
+		vorbis_info_init;
+		vorbis_info_clear;
+		vorbis_info_blocksize;
+		vorbis_comment_init;
+		vorbis_comment_add;
+		vorbis_comment_add_tag;
+		vorbis_comment_query;
+		vorbis_comment_query_count;
+		vorbis_comment_clear;
+
+	local:
+		*;
+};

Modified: trunk/Tremor/configure.in
===================================================================
--- trunk/Tremor/configure.in	2007-07-23 20:35:17 UTC (rev 13290)
+++ trunk/Tremor/configure.in	2007-07-23 22:35:47 UTC (rev 13291)
@@ -71,6 +71,24 @@
 CFLAGS="$CFLAGS $cflags_save -D_REENTRANT"
 LDFLAGS="$LDFLAGS $ldflags_save"
 
+
+# Test whenever ld supports -version-script
+AC_PROG_LD
+AC_PROG_LD_GNU
+if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
+   SHLIB_VERSION_ARG="Wl,--version-script=Version_script"
+
+   dnl Set extra linker options
+   case "$target_os" in
+  linux* | solaris* )
+    SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
+    ;;
+  *)
+    ;;
+   esac
+   LDFLAGS="$LDFLAGS $SHLIB_VERSION_ARG"
+fi
+
 dnl --------------------------------------------------
 dnl Options 
 dnl --------------------------------------------------
@@ -110,4 +128,4 @@
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile Version_script)