[patch] electricsheep-9999-external-ffmpeg.patch

electricsheep-9999-external-ffmpeg.patch (text/plain), 1.02 KB, created by David Leverton on 2009-06-28 21:12:46 UTC

Index: client/configure.in
===================================================================
--- client/configure.in	(revision 1257)
+++ client/configure.in	(working copy)
@@ -2,7 +2,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT
-AC_CONFIG_SUBDIRS(ffmpeg)
 AC_CONFIG_SRCDIR([electricsheep.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE(electricsheep,"2.7b11")
Index: client/Makefile.am
===================================================================
--- client/Makefile.am	(revision 1257)
+++ client/Makefile.am	(working copy)
@@ -1,15 +1,11 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-ffmpeg = ./ffmpeg
+AM_CFLAGS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"
 
-SUBDIRS = ffmpeg
-
-AM_CFLAGS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -I$(ffmpeg)
-
 electricsheep_LDADD = \
-	$(ffmpeg)/libavformat/libavformat.a \
-	$(ffmpeg)/libavcodec/libavcodec.a \
-	$(ffmpeg)/libavutil/libavutil.a \
+	-lavformat \
+	-lavcodec \
+	-lavutil \
 	-lm -lz
 
 bin_PROGRAMS = electricsheep electricsheep-preferences