Mark text as impure where necessary to fix build under Solaris/IA32.

CVS patchset: 8060
CVS date: 2006/06/19 12:08:45

5 files changed, 27 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index f384150ce..a7193933f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1959,6 +1959,7 @@ case "$host_or_hostalias" in
     AC_DEFINE_UNQUOTED(ARCH_X86,,[Define this if you're running x86 architecture])
     AC_DEFINE(FPM_INTEL,1,[Define to select libmad fixed point arithmetic implementation])
     enable_ffmmx="yes"
+    enable_impure_text="yes"
 
     case "$host_or_hostalias" in
       *-*-cygwin) 
@@ -2087,7 +2088,23 @@ fi
 
 AC_SUBST(XINE_PLUGIN_MIN_SYMS)
 
+dnl ---------------------------------------------
+dnl Set IMPURE_TEXT_LDFLAGS
+dnl ---------------------------------------------
 
+IMPURE_TEXT_LDFLAGS=""
+if test x"$enable_impure_text" = xyes; then
+  case "$host_or_hostalias" in
+    *solaris*)
+      if test "$GCC" = yes; then
+        IMPURE_TEXT_LDFLAGS="-mimpure-text"
+      else
+        IMPURE_TEXT_LDFLAGS="-z textoff"
+      fi
+    ;;
+  esac
+fi
+AC_SUBST(IMPURE_TEXT_LDFLAGS)
 
 dnl ---------------------------------------------
 dnl HAVE_ARMV4L is currently used in libavcodec makefile.am
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index e85063fe1..50c9b183a 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -34,7 +34,8 @@ else
 AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS)
 xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
                                 mpeg_parser.c
-xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ \
+                                @IMPURE_TEXT_LDFLAGS@
 endif
 
 xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index e7c3bfc8f..53caf4bcf 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -16,7 +16,8 @@ lib_LTLIBRARIES = $(w32dll_codec) $(qt_codec)
 EXTRA_DIST = common.c
 
 xineplug_decode_w32dll_la_SOURCES = w32codec.c
-xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module \
+	@XINE_PLUGIN_MIN_SYMS@ @IMPURE_TEXT_LDFLAGS@
 xineplug_decode_w32dll_la_LIBADD = \
 	$(top_builddir)/src/libw32dll/wine/libwine.la \
 	$(XINE_LIB) \
@@ -25,7 +26,8 @@ xineplug_decode_w32dll_la_LIBADD = \
 	@KSTAT_LIBS@
 
 xineplug_decode_qt_la_SOURCES = qt_decoder.c
-xineplug_decode_qt_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+xineplug_decode_qt_la_LDFLAGS = -avoid-version -module \
+	@XINE_PLUGIN_MIN_SYMS@ @IMPURE_TEXT_LDFLAGS@
 xineplug_decode_qt_la_LIBADD = \
 	$(top_builddir)/src/libw32dll/wine/libwine.la \
 	$(XINE_LIB) \
diff --git a/src/post/deinterlace/Makefile.am b/src/post/deinterlace/Makefile.am
index b1c35cb99..29853a405 100644
--- a/src/post/deinterlace/Makefile.am
+++ b/src/post/deinterlace/Makefile.am
@@ -13,6 +13,7 @@ xineplug_post_tvtime_la_SOURCES = xine_plugin.c \
 xineplug_post_tvtime_la_LIBADD = $(XINE_LIB) \
 	$(top_builddir)/src/post/deinterlace/plugins/libdeinterlaceplugins.la
 
-xineplug_post_tvtime_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+xineplug_post_tvtime_la_LDFLAGS = -avoid-version -module \
+	@XINE_PLUGIN_MIN_SYMS@ @IMPURE_TEXT_LDFLAGS@
 
 noinst_HEADERS = deinterlace.h pulldown.h speedtools.h speedy.h tvtime.h
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index 61a7c7956..d4f50320b 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -23,7 +23,8 @@ xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \
                                   denoise3d.c eq.c eq2.c unsharp.c pp.c noise.c
 xineplug_post_planar_la_DEPENDENCIES = $(postproc_dep)
 xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(THREAD_LIBS)
-xineplug_post_planar_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+xineplug_post_planar_la_LDFLAGS = -avoid-version -module \
+	@XINE_PLUGIN_MIN_SYMS@ @IMPURE_TEXT_LDFLAGS@
 
 $(POSTPROC_INT_LIB):
 	cd $(top_builddir)/src/libffmpeg/libavcodec/libpostproc && $(MAKE) libpostprocess.la