summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rwxr-xr-xconfigure5
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 14d2c356..7f640c8c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# See the main source file 'xineliboutput.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile,v 1.90 2010-05-25 13:43:12 phintuka Exp $
+# $Id: Makefile,v 1.91 2010-07-09 22:14:32 phintuka Exp $
#
# The official name of this plugin.
@@ -339,7 +339,7 @@ $(VDRPLUGIN_SXFE): $(OBJS_SXFE_SO)
@-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION)
@cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION)
$(VDRSXFE): $(OBJS_SXFE)
- $(CC) -g $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@
+ $(CC) -g $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
#
# vdr-fbfe
@@ -350,14 +350,14 @@ $(VDRPLUGIN_FBFE): $(OBJS_FBFE_SO)
@-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION)
@cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION)
$(VDRFBFE): $(OBJS_FBFE)
- $(CC) -g $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) -o $@
+ $(CC) -g $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
#
# xine plugins
#
$(XINEINPUTVDR): $(OBJS_XINEINPUTVDR)
- $(CC) $(CFLAGS) $(LDFLAGS_SO) $(LIBS_XINE) $(LIBS_AVUTIL) -o $@ $(OBJS_XINEINPUTVDR)
+ $(CC) $(CFLAGS) $(LDFLAGS_SO) $(LIBS_XINE) $(LIBS_AVUTIL) $(LIBS_PTHREAD) -o $@ $(OBJS_XINEINPUTVDR)
$(XINEPOSTAUTOCROP): xine_post_autocrop.o
$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LIBS_XINE) -o $@ $<
$(XINEPOSTSWSCALE): xine_post_swscale.o
diff --git a/configure b/configure
index 88b093eb..837eebbe 100755
--- a/configure
+++ b/configure
@@ -7,7 +7,7 @@
# See the main source file 'xineliboutput.c' for copyright information and
# how to reach the author.
#
-# * $Id: configure,v 1.25 2010-05-26 11:34:38 phintuka Exp $
+# * $Id: configure,v 1.26 2010-07-09 22:14:32 phintuka Exp $
#
PKG_CONFIG="pkg-config"
@@ -358,6 +358,8 @@ if enabled libxine; then
test_library AVUTIL libavutil "libavutil/mem.h" "-lavutil" "av_mallocz(1)"
test_library JPEG libjpeg "jpeglib.h" "-ljpeg" "jpeg_create_compress(0)"
test_library X11 x11 "X11/X.h" "-lX11" "XInitThreads()"
+ test_library VDR dlfcn "dlfcn.h" "-ldl" "dlopen(0,0)"
+ test_library PTHREAD pthread "pthread.h" "-lpthread" "pthread_create(0,0,0,0)"
if enabled x11; then
test_library X11 xext "X11/extensions/Xext.h" "-lXext" ""
test_library X11 xshm "X11/extensions/XShm.h" "-lXext" "XShmQueryExtension(0)"
@@ -454,6 +456,7 @@ echo "CFLAGS_X11 += $CFLAGS_X11">>$makefile
echo "LIBS_XINE += $LIBS_XINE">>$makefile
echo "LIBS_JPEG += $LIBS_JPEG">>$makefile
echo "LIBS_AVUTIL += $LIBS_AVUTIL">>$makefile
+echo "LIBS_PTHREAD += $LIBS_PTHREAD">>$makefile
echo "LIBS_VDR += $LIBS_VDR">>$makefile
echo "LIBS_X11 += $LIBS_X11">>$makefile