Fix crosscompile to use build and host definition from autoconf, rather than using hacksaround. Also replace the whole pthread check with an improved macro originally written for XCB, this way it's not going to try linking the fake -lpthread on Darwin, and it also does not force a -I/usr/local/include on FreeBSD. The new macro respects the same variables set by ports, so that it's even more transparent to FreeBSD users.

CVS patchset: 8739
CVS date: 2007/03/22 20:44:58

5 files changed, 6 insertions, 6 deletions

diff --git a/src/post/audio/Makefile.am b/src/post/audio/Makefile.am
index 7ed37bc5b..9cb93dd5a 100644
--- a/src/post/audio/Makefile.am
+++ b/src/post/audio/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = xineplug_post_audio_filters.la
 
 xineplug_post_audio_filters_la_SOURCES = \
         upmix.c upmix_mono.c filter.c window.c stretch.c volnorm.c audio_filters.c
-xineplug_post_audio_filters_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS) -lm
+xineplug_post_audio_filters_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -lm
 xineplug_post_audio_filters_la_CFLAGS = $(VISIBILITY_FLAG)
 xineplug_post_audio_filters_la_LDFLAGS = -avoid-version -module
 
diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am
index 4031f4f93..4aeda8f04 100644
--- a/src/post/goom/Makefile.am
+++ b/src/post/goom/Makefile.am
@@ -27,7 +27,7 @@ xineplug_post_goom_la_SOURCES = $(extra_files) xine_goom.c \
 	gfontlib.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c goomsl_heap.c \
 	goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c \
 	plugin_info.c sound_tester.c surf3d.c tentacle3d.c v3d.c
-xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(THREAD_LIBS) -lm
+xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(PTHREAD_LIBS) -lm
 xineplug_post_goom_la_CFLAGS = $(VISIBILITY_FLAG)
 xineplug_post_goom_la_LDFLAGS = -avoid-version -module
 
diff --git a/src/post/mosaico/Makefile.am b/src/post/mosaico/Makefile.am
index aefb290c6..f5497b1af 100644
--- a/src/post/mosaico/Makefile.am
+++ b/src/post/mosaico/Makefile.am
@@ -5,11 +5,11 @@ libdir = $(XINE_PLUGINDIR)/post
 lib_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la
 
 xineplug_post_mosaico_la_SOURCES = mosaico.c
-xineplug_post_mosaico_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
+xineplug_post_mosaico_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_post_mosaico_la_CFLAGS = $(VISIBILITY_FLAG)
 xineplug_post_mosaico_la_LDFLAGS = -avoid-version -module
 
 xineplug_post_switch_la_SOURCES = switch.c
-xineplug_post_switch_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
+xineplug_post_switch_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_post_switch_la_CFLAGS = $(VISIBILITY_FLAG)
 xineplug_post_switch_la_LDFLAGS = -avoid-version -module
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index 3440ff6ec..2e60671b5 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -22,7 +22,7 @@ lib_LTLIBRARIES = xineplug_post_planar.la
 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_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(PTHREAD_LIBS)
 xineplug_post_planar_la_LDFLAGS = -avoid-version -module \
 	@IMPURE_TEXT_LDFLAGS@
 xineplug_post_planar_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
diff --git a/src/post/visualizations/Makefile.am b/src/post/visualizations/Makefile.am
index 8891b1c53..dc7679103 100644
--- a/src/post/visualizations/Makefile.am
+++ b/src/post/visualizations/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = xineplug_post_visualizations.la
 
 xineplug_post_visualizations_la_SOURCES = \
         visualizations.c fft.c fftscope.c oscope.c fftgraph.c
-xineplug_post_visualizations_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS) -lm
+xineplug_post_visualizations_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -lm
 xineplug_post_visualizations_la_CFLAGS = $(VISIBILITY_FLAG)
 xineplug_post_visualizations_la_LDFLAGS = -avoid-version -module