diff --git a/ChangeLog b/ChangeLog
index 3e803281e6..b3de9f228c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,61 @@
+2005-10-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  correctly make conditionals
+	* gst/elements/Makefile.am:
+	* gst/elements/gstelements.c:
+	  fix typo causing fdsrc not to build
+
+2005-10-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* testsuite/Makefile.am:
+	* testsuite/bytestream/.cvsignore:
+	* testsuite/bytestream/Makefile.am:
+	* testsuite/bytestream/filepadsink.c:
+	* testsuite/bytestream/gstbstest.c:
+	* testsuite/bytestream/test1.c:
+	* testsuite/bytestream/testfile1:
+	* testsuite/caps/normalisation.c:
+	* testsuite/caps/random.c: (main):
+	* testsuite/cleanup/.cvsignore:
+	* testsuite/cleanup/Makefile.am:
+	* testsuite/cleanup/cleanup1.c:
+	* testsuite/cleanup/cleanup2.c:
+	* testsuite/cleanup/cleanup3.c:
+	* testsuite/cleanup/cleanup4.c:
+	* testsuite/cleanup/cleanup5.c:
+	* testsuite/controller/interpolator.c:
+	* testsuite/debug/printf_extension.c: (main):
+	* testsuite/elements/tee.c:
+	* testsuite/negotiation/.cvsignore:
+	* testsuite/negotiation/Makefile.am:
+	* testsuite/negotiation/pad_link.c:
+	* testsuite/pad/Makefile.am:
+	* testsuite/pad/chainnopull.c:
+	* testsuite/pad/getnopush.c:
+	* testsuite/pad/link.c:
+	* testsuite/refcounting/sched.c: (create_pipeline):
+	* testsuite/registry/Makefile.am:
+	* testsuite/registry/gst-print-formats.c:
+	* testsuite/schedulers/.cvsignore:
+	* testsuite/schedulers/142183-2.c:
+	* testsuite/schedulers/142183.c:
+	* testsuite/schedulers/143777-2.c:
+	* testsuite/schedulers/143777.c:
+	* testsuite/schedulers/147713.c:
+	* testsuite/schedulers/147819.c:
+	* testsuite/schedulers/147894-2.c:
+	* testsuite/schedulers/147894.c:
+	* testsuite/schedulers/Makefile.am:
+	* testsuite/schedulers/group_link.c:
+	* testsuite/schedulers/queue_link.c:
+	* testsuite/schedulers/relink.c:
+	* testsuite/schedulers/unlink.c:
+	* testsuite/schedulers/unref.c:
+	* testsuite/schedulers/useless_iteration.c:
+	* testsuite/states/bin.c:
+	  clean out/remove some stuff from the testsuite directories
+
 2005-10-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 44db17274d..9dcdf20145 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,7 +379,8 @@ AC_HEADER_STDC
 
 dnl Check for ucontext.h
 AC_CHECK_HEADERS([ucontext.h])
-AC_CHECK_HEADERS([sys/socket.h])
+AC_CHECK_HEADERS([sys/socket.h], HAVE_SYS_SOCKET_H=yes)
+echo $HAVE_SYS_SOCKET_H
 AM_CONDITIONAL(HAVE_SYS_SOCKET_H, test "x$HAVE_SYS_SOCKET_H" = "xyes")
 
 dnl *** checks for library functions ***
@@ -396,13 +397,13 @@ AC_CHECK_FUNCS([fsetpos])
 
 dnl check for mmap()
 AC_FUNC_MMAP
-AM_CONDITIONAL(HAVE_MMAP, test "x$HAVE_MMAP" = "xyes")
+AM_CONDITIONAL(HAVE_MMAP, test "x$ac_cv_func_mmap_fixed_mapped" = "xyes")
 
 dnl common/m4/gst-mcsc.m4
 dnl check for makecontext and define HAVE_MAKECONTEXT if we have it
 AC_CHECK_MCSC
 if test "$ac_cv_check_mcsc" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_MAKECONTEXT, $HAVE_MAKECONTEXT,
+  AC_DEFINE_UNQUOTED(HAVE_MAKECONTEXT, 1,
                      [defined if we have makecontext ()])
 fi
 
@@ -646,20 +647,14 @@ tests/seeking/Makefile
 tests/sched/Makefile
 tests/threadstate/Makefile
 testsuite/Makefile
-testsuite/bytestream/Makefile
 testsuite/caps/Makefile
-testsuite/cleanup/Makefile
-testsuite/controller/Makefile
 testsuite/debug/Makefile
 testsuite/dlopen/Makefile
 testsuite/elements/Makefile
 testsuite/indexers/Makefile
-testsuite/negotiation/Makefile
-testsuite/pad/Makefile
 testsuite/parse/Makefile
 testsuite/plugin/Makefile
 testsuite/refcounting/Makefile
-testsuite/schedulers/Makefile
 testsuite/states/Makefile
 testsuite/threads/Makefile
 testsuite/trigger/Makefile
diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index 9392721785..399f8e2f4b 100644
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -18,7 +18,7 @@ libgstelements_la_SOURCES =	\
 	gstcapsfilter.c		\
 	gstfakesrc.c		\
 	gstfakesink.c		\
-	$(GSTFDRSRC)		\
+	$(GSTFDSRC)		\
 	gstfilesink.c		\
 	gstfilesrc.c		\
 	gstidentity.c		\
diff --git a/gst/elements/gstelements.c b/gst/elements/gstelements.c
index e35220924b..03ce73733d 100644
--- a/gst/elements/gstelements.c
+++ b/gst/elements/gstelements.c
@@ -51,7 +51,7 @@ static struct _elements_entry _elements[] = {
   {"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
   {"fakesrc", GST_RANK_NONE, gst_fake_src_get_type},
   {"fakesink", GST_RANK_NONE, gst_fake_sink_get_type},
-#ifdef HAVE_SYS_SOCKET_H
+#if HAVE_SYS_SOCKET_H
   {"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type},
 #endif
   {"filesrc", GST_RANK_NONE, gst_file_src_get_type},
diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 9392721785..399f8e2f4b 100644
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -18,7 +18,7 @@ libgstelements_la_SOURCES =	\
 	gstcapsfilter.c		\
 	gstfakesrc.c		\
 	gstfakesink.c		\
-	$(GSTFDRSRC)		\
+	$(GSTFDSRC)		\
 	gstfilesink.c		\
 	gstfilesrc.c		\
 	gstidentity.c		\
diff --git a/plugins/elements/gstelements.c b/plugins/elements/gstelements.c
index e35220924b..03ce73733d 100644
--- a/plugins/elements/gstelements.c
+++ b/plugins/elements/gstelements.c
@@ -51,7 +51,7 @@ static struct _elements_entry _elements[] = {
   {"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
   {"fakesrc", GST_RANK_NONE, gst_fake_src_get_type},
   {"fakesink", GST_RANK_NONE, gst_fake_sink_get_type},
-#ifdef HAVE_SYS_SOCKET_H
+#if HAVE_SYS_SOCKET_H
   {"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type},
 #endif
   {"filesrc", GST_RANK_NONE, gst_file_src_get_type},