diff --git a/ChangeLog b/ChangeLog
index dc5c0c857f..b688e1a93d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-09  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* configure.ac:
+	  Disable libvisual
+
+	* examples/Makefile.am:
+	* gst-libs/gst/audio/Makefile.am:
+	* gst-libs/gst/riff/Makefile.am:
+	* gst-libs/gst/tag/Makefile.am:
+	* gst-libs/gst/video/Makefile.am:
+	  Fixups for missing variables.
+
 2005-05-09  Wim Taymans  <wim@fluendo.com>
 
 	* examples/seeking/seek.c: (make_theora_pipeline),
diff --git a/configure.ac b/configure.ac
index 6a6cbd74b4..f500013886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ dnl decide on error flags
 AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
 
 if test "x$GST_WALL" = "xyes"; then
-  GST_ERROR="$GST_ERROR -Wall -Wno-pointer-sign"
+  GST_ERROR="$GST_ERROR -Wall"
 
   if test "x$GST_CVS" = "xyes"; then
     AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
@@ -625,6 +625,7 @@ GST_CHECK_FEATURE(GNOME_VFS, [Gnome VFS], gnomevfssrc, [
 ])
 
 dnl *** libvisual ***
+USE_LIBVISUAL=no
 translit(dnm, m, l) AM_CONDITIONAL(USE_LIBVISUAL, true)
 GST_CHECK_FEATURE(LIBVISUAL, [libvisual visualization plugins], libvisual, [
   PKG_CHECK_MODULES(LIBVISUAL, libvisual = 0.2.0, HAVE_LIBVISUAL="yes", HAVE_LIBVISUAL="no")
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b70c700d12..1a2f419bdf 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -7,7 +7,7 @@ endif
 # if HAVE_GTK
 # GTK_SUBDIRS=dynparams $(FT2_SUBDIRS)
 # else
-# GTK_SUBDIRS=
+GTK_SUBDIRS=
 # endif
 
 SUBDIRS=$(GTK_SUBDIRS)
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 21766e6ff1..8b177cd4a9 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -33,11 +33,11 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \
 
 libgstaudio_@GST_MAJORMINOR@_la_LIBADD =
 libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LDFLAGS) $(GST_BASE_LIBS)
+libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS) $(GST_BASE_LIBS)
 
 libgstaudiofilter_@GST_MAJORMINOR@_la_SOURCES = gstaudiofilter.c gstaudiofilter.h
 libgstaudiofilter_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstaudiofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LDFLAGS)
+libgstaudiofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS)
 
 libgstaudiofilterexample_la_SOURCES = gstaudiofilterexample.c
 libgstaudiofilterexample_la_CFLAGS = $(GST_CFLAGS)
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index e70bf09b69..143e93781f 100644
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -13,4 +13,4 @@ libgstriff_@GST_MAJORMINOR@include_HEADERS = \
 
 libgstriff_@GST_MAJORMINOR@_la_LIBADD =
 libgstriff_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstriff_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LDFLAGS)
+libgstriff_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS)
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
index 8c050c9422..5f24d7c5a4 100644
--- a/gst-libs/gst/tag/Makefile.am
+++ b/gst-libs/gst/tag/Makefile.am
@@ -9,7 +9,6 @@ lib_LTLIBRARIES = libgsttagedit-@GST_MAJORMINOR@.la
 libgsttagedit_@GST_MAJORMINOR@_la_SOURCES = gstvorbistag.c gsttagediting.c gstid3tag.c
 libgsttagedit_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
 libgsttagedit_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) 
-libgsttagedit_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LDFLAGS)
 
 noinst_HEADERS = gsttageditingprivate.h
 
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index b16583a296..bbfb81072a 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -8,4 +8,4 @@ libgstvideoinclude_HEADERS = video.h videosink.h
 
 libgstvideo_@GST_MAJORMINOR@_la_LIBADD =
 libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LDFLAGS) $(GST_BASE_LIBS)
+libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS) $(GST_BASE_LIBS)
diff --git a/tests/old/examples/Makefile.am b/tests/old/examples/Makefile.am
index b70c700d12..1a2f419bdf 100644
--- a/tests/old/examples/Makefile.am
+++ b/tests/old/examples/Makefile.am
@@ -7,7 +7,7 @@ endif
 # if HAVE_GTK
 # GTK_SUBDIRS=dynparams $(FT2_SUBDIRS)
 # else
-# GTK_SUBDIRS=
+GTK_SUBDIRS=
 # endif
 
 SUBDIRS=$(GTK_SUBDIRS)