diff --git a/configure.ac b/configure.ac
index 5f0b535e5..a35566ab6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@ AM_SILENT_RULES([yes])
 
 # Checks for programs.
 AC_PROG_CC_STDC
+AC_PROG_OBJC
 AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_SED
@@ -117,18 +118,12 @@ AC_FUNC_FSEEKO
 AC_FUNC_STRTOD
 AC_CHECK_FUNCS([memmove memset socket strstr strtol strtoul])
 
-AC_ARG_ENABLE([build_jansson],
-	      [AS_HELP_STRING([--build-jansson], [build jansson])])
-if test "x$build_jansson" = xyes; then
-	AC_CONFIG_SUBDIRS([deps/jansson])
-fi
-
 AC_CONFIG_FILES([makefile
 		 build/makefile
 		 obs/makefile
 		 test/makefile
 		 test/test-input/makefile
-		 test/win/makefile
 		 libobs/makefile
 		 libobs-opengl/makefile])
+
 AC_OUTPUT
diff --git a/makefile.am b/makefile.am
index 726a24ef7..681a96276 100644
--- a/makefile.am
+++ b/makefile.am
@@ -1,3 +1,3 @@
-ACLOCAL_AMFLAGS=-I m4
-SUBDIRS=libobs libobs-opengl test build obs
-EXTRA_DIST=autogen.sh COPYING README
+ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = autogen.sh COPYING README
+SUBDIRS = libobs libobs-opengl test build obs