OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 09:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed jansson from configure.ac (not necessary and shouldn't be build with the project)

Browse source
This commit is contained in:
jp9000 2013-11-21 18:31:27 -07:00
parent 12790a40b5
commit bf8548c415
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -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

6
makefile.am
View file

@ -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