much build fixage turns out synaesthesia and smoothwav depend on gtk, maybe they...

Original commit message from CVS:
much build fixage
turns out synaesthesia and smoothwav depend on gtk, maybe they should go to
ext/

diff --git a/Makefile.am b/Makefile.am
index 50801b0..3dfc9c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS=gst sys ext gst-libs
+SUBDIRS=gst-libs gst sys ext
 
-DIST_SUBDIRS=gst sys ext gst-libs
+DIST_SUBDIRS=gst-libs gst sys ext
 
 EXTRA_DIST=gst-plugins.spec AUTHORS COPYING README ChangeLog

diff --git a/configure.ac b/configure.ac
index 7c5888d..c037fbb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -311,6 +311,21 @@ AC_ARG_WITH(plugins,
 
 AC_SUBST(GST_PLUGINS_SELECTED)
 
+dnl needed for smoothwave, FIXME!
+if test x$USE_GLIB2 = xno; then
+  AM_PATH_GTK(1.2.0,,
+              AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?))
+  HAVE_GTK=yes
+  # we have to have it
+else
+  PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
+
+  GTK_CFLAGS=$GTK2_CFLAGS
+  GTK_LIBS=$GTK2_LIBS
+fi
+AC_SUBST(GTK_LIBS)
+AC_SUBST(GTK_CFLAGS)
+
 dnl ==========================================================================
 dnl ============================= sys plugins ================================
 dnl ==========================================================================
@@ -1076,7 +1091,6 @@ sys/vcd/Makefile
 sys/vga/Makefile
 sys/xvideo/Makefile
 ext/Makefile
-ext/a52/Makefile
 ext/aalib/Makefile
 ext/alsa/Makefile
 ext/audiofile/Makefile
@@ -1088,6 +1102,7 @@ ext/vorbis/Makefile
 gst-libs/Makefile
 gst-libs/gst/Makefile
 gst-libs/gst/audio/Makefile
+gst-libs/gst/resample/Makefile
 gst-plugins.spec
 )
 

diff --git a/ext/Makefile.am b/ext/Makefile.am
index ff91846..0edd708 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -1,8 +1,8 @@
-if USE_A52
-A52_DIR=a52
-else
-A52_DIR=
-endif
+#if USE_A52
+#A52_DIR=a52
+#else
+#A52_DIR=
+#endif
 
 if USE_AALIB
 AALIB_DIR=aalib
@@ -52,9 +52,10 @@ else
 VORBIS_DIR=
 endif
 
-
-SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \
+#$A52_DIR
+SUBDIRS=$(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \
         $(LAME_DIR) $(MAD_DIR) \
        $(SDL_DIR) $(VORBIS_DIR)
 
-DIST_SUBDIRS=a52 aalib alsa audiofile esd lame mad sdl vorbis
+#a52
+DIST_SUBDIRS=aalib alsa audiofile esd lame mad sdl vorbis

diff --git a/gst/cutter/Makefile.am b/gst/cutter/Makefile.am
index d31d6f1..68c6c2e 100644 (file)
--- a/gst/cutter/Makefile.am
+++ b/gst/cutter/Makefile.am
@@ -3,6 +3,7 @@ filterdir = $(libdir)/gst
 filter_LTLIBRARIES = libgstcutter.la
 
 libgstcutter_la_SOURCES = gstcutter.c
+libgstcutter_la_CFLAGS = $(GST_CFLAGS)
 
 noinst_HEADERS = gstcutter.h filter.func
 

diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c
index 8161d50..26c4b0c 100644 (file)
--- a/gst/cutter/gstcutter.c
+++ b/gst/cutter/gstcutter.c
@@ -18,8 +18,8 @@
  */
 
 #include <gst/gst.h>
-#include <libs/audio/gstaudio.h>
-#include "cutter.h"
+#include <gst/audio/audio.h>
+#include "gstcutter.h"
 #include "math.h"