diff options
| author | Josep Torra <n770galaxy@gmail.com> | 2016-08-26 21:46:18 +0200 |
|---|---|---|
| committer | Josep Torra <n770galaxy@gmail.com> | 2016-08-26 21:47:04 +0200 |
| commit | 410b0e3842c1fa7cd1331946d2b980f72873e408 (patch) | |
| tree | 4d7246fbb893c76e09b77a58a9de99afd7d9c82a | |
| parent | e5ceb287d3e5c5e20ad7cf382c8ef237b267bc7f (diff) | |
| download | gst-libav-410b0e3842c1fa7cd1331946d2b980f72873e408.tar.gz | |
build: silence error about pthread for 'make check' in osx
Fixes "clang: error: argument unused during compilation: '-pthread'"
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 826373c..1626447 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,9 @@ dnl check for libm, for sin() LT_LIB_M AC_SUBST(LIBM) +dnl check for pthreads +AX_PTHREAD + dnl *** checks for header files *** dnl check if we have ANSI C header files @@ -305,7 +308,7 @@ if test "x$with_system_libav" = "xyes"; then fi else AC_MSG_NOTICE([Using local Libav snapshot]) - + dnl libgstlibav.la: include dirs LIBAV_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav \ -I \$(top_builddir)/gst-libs/ext/libav \ @@ -347,7 +350,7 @@ else AC_DEFINE(HAVE_AVI_H) AC_DEFINE([LIBAV_SOURCE], ["local snapshot"], [Describes where the Libav libraries come from.]) - AC_ARG_WITH(libav-extra-configure, + AC_ARG_WITH(libav-extra-configure, AC_HELP_STRING([--with-libav-extra-configure="xxx"], [extra configure options for internal libav ./configure script]),, with_libav=no) @@ -471,7 +474,7 @@ AC_SUBST(SWSCALE_CFLAGS) AC_SUBST(SWSCALE_DEPS) AC_SUBST(SWSCALE_LIBS) AC_SUBST(WIN32_LIBS) - + if test x$HAVE_LIBAV_UNINSTALLED = x1; then AC_DEFINE(HAVE_LIBAV_UNINSTALLED, [], [Defined if building against uninstalled Libav source]) fi diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 42e42ae..5429eb2 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -33,7 +33,8 @@ TESTS = $(check_PROGRAMS) noinst_PROGRAMS = AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) \ - $(GST_OPTION_CFLAGS) -DGST_TEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\"" + $(GST_OPTION_CFLAGS) -DGST_TEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\"" \ + $(PTHREAD_CFLAGS) LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) |