X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=064430ce85b369f3b62b6d5f35c9d8b7e409baf4;hb=473c00819902c05e1892b9d20b8e377adf47fe50;hp=378768b3de4338d9499b51433b0f8c680411dfe1;hpb=2836cbee946f00f7876fb070c5385e36af92aff8;p=platform%2Fupstream%2Fgstreamer.git diff --git a/configure.ac b/configure.ac index 378768b..064430c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,14 @@ -AC_PREREQ(2.60) +AC_PREREQ([2.68]) dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, git and prerelease does Werror too -AC_INIT(GStreamer, 0.11.1.1, - http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, - gstreamer) +dnl +AC_INIT([GStreamer],[1.3.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gstreamer]) AG_GST_INIT dnl initialize automake (we require GNU make) -AM_INIT_AUTOMAKE([-Wno-portability 1.10]) +AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects]) dnl define PACKAGE_VERSION_* variables AS_VERSION @@ -21,10 +20,10 @@ dnl can autoconf find the source ? AC_CONFIG_SRCDIR([gst/gst.c]) dnl define the output header for config -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) dnl AM_MAINTAINER_MODE only provides the option to configure to enable it -AM_MAINTAINER_MODE +AM_MAINTAINER_MODE([enable]) dnl sets host_* variables AC_CANONICAL_HOST @@ -34,29 +33,38 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])], [AM_DEFAULT_VERBOSITY=1 AC_SUBST(AM_DEFAULT_VERBOSITY)]) -dnl our libraries and install dirs use major.minor as a version -GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR -dnl we override it here for release candidates for a new series -GST_MAJORMINOR=0.11 -AC_SUBST(GST_MAJORMINOR) -AC_DEFINE_UNQUOTED(GST_MAJORMINOR, "$GST_MAJORMINOR", - [library major.minor version]) +dnl GStreamer versioning, this is mostly informational +GST_VERSION_MAJOR=$PACKAGE_VERSION_MAJOR +GST_VERSION_MINOR=$PACKAGE_VERSION_MINOR +GST_VERSION_MICRO=$PACKAGE_VERSION_MICRO +GST_VERSION_NANO=$PACKAGE_VERSION_NANO +AC_SUBST(GST_VERSION_MAJOR) +AC_SUBST(GST_VERSION_MINOR) +AC_SUBST(GST_VERSION_MICRO) +AC_SUBST(GST_VERSION_NANO) + +dnl our libraries and install dirs use GST_API_VERSION in the filename +dnl to allow side-by-side installation of different API versions +GST_API_VERSION=1.0 +AC_SUBST(GST_API_VERSION) +AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION", + [GStreamer API Version]) dnl CURRENT, REVISION, AGE dnl - library source changed -> increment REVISION dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 +dnl +dnl Keep CURRENT as MINOR * 100 + MICRO +dnl Ex : 1.0.0 => 0 +dnl 1.0.3 => 3 +dnl 1.1.0 => 100 +dnl 1.2.5 => 205 +dnl 1.10.9 (who knows) => 1009 +dnl dnl sets GST_LT_LDFLAGS -AS_LIBTOOL(GST, 31, 0, 0) - -dnl FIXME: this macro doesn't actually work; -dnl the generated libtool script has no support for the listed tags. -dnl So this needs to be fixed first if we want to use this -dnl AS_LIBTOOL_TAGS - -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL +AS_LIBTOOL(GST, 301, 0, 301) dnl *** autotools stuff **** @@ -70,10 +78,12 @@ dnl set up gettext dnl the version check needs to stay here because autopoint greps for it AM_GNU_GETTEXT_VERSION([0.17]) AM_GNU_GETTEXT([external]) -AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR]) +AG_GST_GETTEXT([gstreamer-$GST_API_VERSION]) dnl *** check for arguments to configure *** +AG_GST_ARG_DISABLE_FATAL_WARNINGS + dnl subsystems - can influence other decisions so needs to be high up dnl we need to AM_CONDITIONAL them here for automake 1.6.x compatibility AG_GST_CHECK_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem]) @@ -104,8 +114,6 @@ else GST_REGISTRY_DOC_TYPES= fi AC_SUBST(GST_REGISTRY_DOC_TYPES) -AG_GST_CHECK_SUBSYSTEM_DISABLE(NET,[network distribution]) -AM_CONDITIONAL(GST_DISABLE_NET, test "x$GST_DISABLE_NET" = "xyes") AG_GST_CHECK_SUBSYSTEM_DISABLE(PLUGIN,[plugin]) AM_CONDITIONAL(GST_DISABLE_PLUGIN, test "x$GST_DISABLE_PLUGIN" = "xyes") @@ -126,9 +134,31 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO], ["${srcdir}/gstreamer.doap"], [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO]) +dnl build static plugins or not +AC_MSG_CHECKING([whether to build static plugins or not]) +AC_ARG_ENABLE( + static-plugins, + AC_HELP_STRING( + [--enable-static-plugins], + [build static plugins @<:@default=no@:>@]), + [AS_CASE( + [$enableval], [no], [], [yes], [], + [AC_MSG_ERROR([bad value "$enableval" for --enable-static-plugins])])], + [enable_static_plugins=no]) +AC_MSG_RESULT([$enable_static_plugins]) +if test "x$enable_static_plugins" = xyes; then + AC_DEFINE(GST_PLUGIN_BUILD_STATIC, 1, + [Define if static plugins should be built]) + GST_PLUGIN_LIBTOOLFLAGS="" +else + GST_PLUGIN_LIBTOOLFLAGS="--tag=disable-static" +fi +AC_SUBST(GST_PLUGIN_LIBTOOLFLAGS) +AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes") + dnl building of tests AC_ARG_ENABLE(tests, - AC_HELP_STRING([--disable-tests], [disable building test apps]), + AS_HELP_STRING([--disable-tests],[disable building test apps]), [ case "${enableval}" in yes) BUILD_TESTS=yes ;; @@ -141,8 +171,7 @@ AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes") dnl tests known to fail AC_ARG_ENABLE(failing-tests, - AC_HELP_STRING([--disable-failing-tests], - [disable building tests known to fail]), + AS_HELP_STRING([--disable-failing-tests],[disable building tests known to fail]), [ case "${enableval}" in yes) BUILD_FAILING_TESTS=yes ;; @@ -158,10 +187,35 @@ else AC_MSG_WARN([Sissy ! By asking to not build the tests known to fail, you hereby waive your right to customer support. If you do not agree with this EULA, please press Ctrl-C before the next line is printed. By allowing the next line to be printed, you expressly acknowledge your acceptance of this EULA.]) fi +dnl building of benchmarks +AC_ARG_ENABLE(benchmarks, + AS_HELP_STRING([--disable-benchmarks],[disable building benchmarks apps]), + [ + case "${enableval}" in + yes) BUILD_BENCHMARKS=yes ;; + no) BUILD_BENCHMARKS=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-benchmarks) ;; + esac + ], +[BUILD_BENCHMARKS=yes]) dnl Default value +AM_CONDITIONAL(BUILD_BENCHMARKS, test "x$BUILD_BENCHMARKS" = "xyes") + +dnl building of tools +AC_ARG_ENABLE(tools, + AS_HELP_STRING([--disable-tools],[disable building tools]), + [ + case "${enableval}" in + yes) BUILD_TOOLS=yes ;; + no) BUILD_TOOLS=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-tools) ;; + esac + ], +[BUILD_TOOLS=yes]) dnl Default value +AM_CONDITIONAL(BUILD_TOOLS, test "x$BUILD_TOOLS" = "xyes") + dnl poison destroyed objects AC_ARG_ENABLE(poisoning, - AC_HELP_STRING([--enable-poisoning], - [enable poisoning of deallocated objects]), + AS_HELP_STRING([--enable-poisoning],[enable poisoning of deallocated objects]), [ case "${enableval}" in yes) USE_POISONING=yes ;; @@ -223,7 +277,7 @@ AC_PROG_CXX dnl CXX may be set to some default even if no c++ compiler is available dnl (thanks autotools!), so just try to compile some c++ code to make sure AC_LANG_PUSH([C++]) -AC_TRY_COMPILE([ class Foo { int bar; };], , working_cxx=yes, working_cxx=no) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ class Foo { int bar; };]], [[]])],[working_cxx=yes],[working_cxx=no]) AC_LANG_POP([C++]) AC_MSG_NOTICE([working c++ compiler found: $working_cxx]) AM_CONDITIONAL(HAVE_CXX, test "x$working_cxx" = "xyes") @@ -248,14 +302,13 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1]) dnl check for documentation tools AG_GST_DOCBOOK_CHECK -GTK_DOC_CHECK([1.3]) -AS_PATH_PYTHON([2.1]) -AG_GST_PLUGIN_DOCS([1.3],[2.1]) +GTK_DOC_CHECK([1.12]) +AG_GST_PLUGIN_DOCS([1.12]) dnl *** checks for libraries *** dnl check for libm, for sin() -AC_CHECK_LIBM +LT_LIB_M AC_SUBST(LIBM) dnl *** checks for header files *** @@ -264,40 +317,40 @@ dnl check if we have ANSI C header files AC_HEADER_STDC dnl Check for ucontext.h -AC_CHECK_HEADERS([ucontext.h]) +AC_CHECK_HEADERS([ucontext.h], [], [], [AC_INCLUDES_DEFAULT]) dnl Check for sys/socket.h -AC_CHECK_HEADERS([sys/socket.h], HAVE_SYS_SOCKET_H=yes) +AC_CHECK_HEADERS([sys/socket.h], [HAVE_SYS_SOCKET_H=yes], [HAVE_SYS_SOCKET_H=no], [AC_INCLUDES_DEFAULT]) AM_CONDITIONAL(HAVE_SYS_SOCKET_H, test "x$HAVE_SYS_SOCKET_H" = "xyes") dnl check for sys/times.h for tests/examples/adapter/ -AC_CHECK_HEADERS([sys/times.h], HAVE_SYS_TIMES_H=yes) -AC_CHECK_HEADERS([unistd.h], HAVE_UNISTD_H=yes) +AC_CHECK_HEADERS([sys/times.h], [HAVE_SYS_TIMES_H=yes], [HAVE_SYS_TIME_H=no], [AC_INCLUDES_DEFAULT]) +AC_CHECK_HEADERS([unistd.h], [HAVE_UNISTD_H=yes], [HAVE_UNISTD_H=no], [AC_INCLUDES_DEFAULT]) AM_CONDITIONAL(HAVE_SYS_TIMES_H_AND_UNISTD_H, test "x$HAVE_SYS_TIMES_H" = "xyes" -a "x$HAVE_UNISTD_H" = "xyes") dnl Check for process.h for getpid() on win32 -AC_CHECK_HEADERS([process.h]) +AC_CHECK_HEADERS([process.h], [], [], [AC_INCLUDES_DEFAULT]) dnl Check for sys/utsname.h for uname -AC_CHECK_HEADERS([sys/utsname.h]) +AC_CHECK_HEADERS([sys/utsname.h], [], [], [AC_INCLUDES_DEFAULT]) dnl Check for stdio_ext.f for __fbufsize -AC_CHECK_HEADERS([stdio_ext.h]) +AC_CHECK_HEADERS([stdio_ext.h], [], [], [AC_INCLUDES_DEFAULT]) dnl check for pthreads -AC_CHECK_HEADERS([pthread.h], HAVE_PTHREAD_H=yes) -AM_CONDITIONAL(HAVE_PTHREAD_H, test "x$HAVE_PTHREAD_H" = "xyes") +AX_PTHREAD([HAVE_PTHREAD=yes], [HAVE_PTHREAD=no]) +AM_CONDITIONAL(HAVE_PTHREAD, test "x$HAVE_PTHREAD" = "xyes") dnl check for sys/prctl for setting thread name on Linux -AC_CHECK_HEADERS([sys/prctl.h], HAVE_SYS_PRCTL_H=yes) +AC_CHECK_HEADERS([sys/prctl.h], [], [], [AC_INCLUDES_DEFAULT]) dnl Check for valgrind.h dnl separate from HAVE_VALGRIND because you can have the program, but not dnl the dev package -AC_CHECK_HEADERS([valgrind/valgrind.h], HAVE_VALGRIND_H=yes) +AC_CHECK_HEADERS([valgrind/valgrind.h], [], [], [AC_INCLUDES_DEFAULT]) dnl used in gst/gstpoll.c -AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes) +AC_CHECK_HEADERS([winsock2.h], [HAVE_WINSOCK2_H=yes], [HAVE_WINSOCK2_H=no], [AC_INCLUDES_DEFAULT]) AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes") if test "x$HAVE_WINSOCK2_H" = "xyes"; then WIN32_LIBS="-lws2_32" @@ -330,14 +383,14 @@ dnl check if the compiler supports __uint128_t (gcc) dnl Actually check for 128-bit division, since that's what we use dnl uint128_t for. AC_CACHE_CHECK(for __uint128_t, gst_cv_uint128_t, - AC_TRY_LINK([ ], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[ static __uint128_t v1 = 100; static __uint128_t v2 = 10; static __uint128_t u; u = v1 / v2; - ], [ + ]])],[ gst_cv_uint128_t=yes - ], [ + ],[ gst_cv_uint128_t=no ]) ) @@ -376,6 +429,8 @@ AC_CHECK_FUNCS([fgetpos]) AC_CHECK_FUNCS([fsetpos]) dnl check for poll(), ppoll() and pselect() +AC_CHECK_HEADERS([sys/poll.h], [], [], [AC_INCLUDES_DEFAULT]) +AC_CHECK_HEADERS([poll.h], [], [], [AC_INCLUDES_DEFAULT]) AC_CHECK_FUNCS([poll]) AC_CHECK_FUNCS([ppoll]) AC_CHECK_FUNCS([pselect]) @@ -388,10 +443,12 @@ AC_MSG_CHECKING([for broken poll]) AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include - #include #ifdef HAVE_SYS_POLL_H #include #endif + #ifdef HAVE_POLL_H + #include + #endif int main(void) { struct pollfd fds[1]; int fd; @@ -423,22 +480,27 @@ AC_CHECK_FUNCS(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime, [ AC_DEFINE(HAVE_CLOCK_GETTIME, 1) LIBS="$LIBS -lrt" + ], [ + AC_CHECK_LIB(pthread, clock_gettime, [ + AC_DEFINE(HAVE_CLOCK_GETTIME, 1) + LIBS="$LIBS -lpthread" + ]) ]) ]) AC_CACHE_CHECK(for posix timers, gst_cv_posix_timers, - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #ifdef HAVE_UNISTD_H #include #endif - ], [ + ]], [[ #if !defined(_POSIX_TIMERS) || _POSIX_TIMERS < 0 || !defined(CLOCK_REALTIME) #error Either _POSIX_TIMERS or CLOCK_REALTIME not defined #endif - ], [ + ]])],[ gst_cv_posix_timers=yes - ], [ + ],[ gst_cv_posix_timers=no ]) ) @@ -453,18 +515,18 @@ AC_SUBST(GST_HAVE_POSIX_TIMERS_DEFINE) AM_CONDITIONAL(GST_HAVE_POSIX_TIMERS, test "$gst_cv_posix_timers" = "yes") AC_CACHE_CHECK(for monotonic clock, gst_cv_monotonic_clock, - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #ifdef HAVE_UNISTD_H #include #endif - ], [ + ]], [[ #if !defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK < 0 || !defined(CLOCK_MONOTONIC) #error Either _POSIX_MONOTONIC_CLOCK or CLOCK_MONOTONIC not defined #endif - ], [ + ]])],[ gst_cv_monotonic_clock=yes - ], [ + ],[ gst_cv_monotonic_clock=no ]) ) @@ -481,25 +543,6 @@ AM_CONDITIONAL(GST_HAVE_MONOTONIC_CLOCK, test "$gst_cv_monotonic_clock" = "yes") dnl Check for a way to display the function name in debug output AG_GST_CHECK_FUNCTION -dnl test for register_printf_specifier or register_printf_function -AC_CHECK_FUNCS([register_printf_specifier register_printf_function], - [HAVE_PRINTF_EXTENSION=yes]) - -if test "$HAVE_PRINTF_EXTENSION" = yes; then - GST_PRINTF_EXTENSION_POINTER_FORMAT_DEFINE="#define GST_PTR_FORMAT \"P\"" - GST_PRINTF_EXTENSION_SEGMENT_FORMAT_DEFINE="#define GST_SEGMENT_FORMAT \"Q\"" - GST_USING_PRINTF_EXTENSION_DEFINE="#define GST_USING_PRINTF_EXTENSION" - AC_DEFINE(HAVE_PRINTF_EXTENSION, 1, - [Defined if we have printf specifier extensions available]) -else - GST_PRINTF_EXTENSION_POINTER_FORMAT_DEFINE="#define GST_PTR_FORMAT \"p\"" - GST_PRINTF_EXTENSION_SEGMENT_FORMAT_DEFINE="#define GST_SEGMENT_FORMAT \"p\"" - GST_USING_PRINTF_EXTENSION_DEFINE="#undef GST_USING_PRINTF_EXTENSION" -fi -AC_SUBST(GST_PRINTF_EXTENSION_POINTER_FORMAT_DEFINE) -AC_SUBST(GST_PRINTF_EXTENSION_SEGMENT_FORMAT_DEFINE) -AC_SUBST(GST_USING_PRINTF_EXTENSION_DEFINE) - dnl test if we have dladdr(); we use it for debugging; see gst/gstinfo.c save_cflags="$CFLAGS" CFLAGS="$CFLAGS -D_GNU_SOURCE" @@ -508,37 +551,40 @@ AC_CHECK_LIB(dl, dladdr, LIBS="$LIBS -ldl") CFLAGS="$save_cflags" -dnl *** checks for socket and nsl libraries *** -AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)]) -AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) +dnl Check printf stuff +if test "x${GST_DISABLE_GST_DEBUG}" != "xyes"; then + AC_TYPE_LONG_LONG_INT + AC_TYPE_UNSIGNED_LONG_LONG_INT + + if test x$ac_cv_type_long_long_int$ac_cv_type_unsigned_long_long_int = xyesyes; then + AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if the system has the type long long]) + fi -dnl check for inet_aton() -save_libs="$LIBS" -AC_CHECK_FUNC(inet_aton, , - AC_CHECK_LIB(nsl, inet_aton, , - AC_CHECK_LIB(socket, inet_aton, , - AC_CHECK_LIB(resolv, inet_aton, ,[AC_DEFINE(NO_INET_ATON, 1, [Define if you have no native inet_aton() function.])])))) -INET_ATON_LIBS=$LIBS -AC_SUBST(INET_ATON_LIBS) -LIBS="$save_libs" + dnl /usr/share/aclocal/inttypes_h.m4 - ships with gettext apparently + gl_AC_HEADER_INTTYPES_H + + dnl /usr/share/aclocal/stdint_h.m4 - ships with gettext apparently + gl_AC_HEADER_STDINT_H + + AC_CHECK_TYPES(ptrdiff_t) + + AC_TYPE_INTMAX_T + AC_TYPE_SIZE_T +fi dnl *** checks for dependency libraries *** dnl GLib -GLIB_REQ=2.26 - +GLIB_REQ=2.32.0 AG_GST_GLIB_CHECK([$GLIB_REQ]) -dnl Check for glib2 without extra fat, useful for the unversioned tool frontends -PKG_CHECK_MODULES(GLIB_ONLY, glib-2.0 >= $GLIB_REQ) - dnl Check for documentation xrefs GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" AC_SUBST(GLIB_PREFIX) dnl building of unit test libraries AC_ARG_ENABLE(check, - AC_HELP_STRING([--disable-check], [disable building unit test libraries]), + AS_HELP_STRING([--disable-check],[disable building unit test libraries]), [ case "${enableval}" in yes) BUILD_CHECK=yes ;; @@ -578,16 +624,15 @@ AC_ARG_WITH([memory-alignment], dnl Check for -Bsymbolic-functions linker flag used to avoid dnl intra-library PLT jumps, if available. AC_ARG_ENABLE(Bsymbolic, - [AC_HELP_STRING([--disable-Bsymbolic], - [avoid linking with -Bsymbolic])],, + [AS_HELP_STRING([--disable-Bsymbolic],[avoid linking with -Bsymbolic])],, [SAVED_LDFLAGS="${LDFLAGS}" AC_MSG_CHECKING([for -Bsymbolic-functions linker flag]) LDFLAGS=-Wl,-Bsymbolic-functions - AC_TRY_LINK([], [int main (void) { return 0; }], + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main (void) { return 0; }]])],[ AC_MSG_RESULT(yes) - enable_Bsymbolic=yes, + enable_Bsymbolic=yes],[ AC_MSG_RESULT(no) - enable_Bsymbolic=no) + enable_Bsymbolic=no]) LDFLAGS="${SAVED_LDFLAGS}"]) @@ -607,9 +652,6 @@ AC_DEFINE_UNQUOTED(GST_DATADIR, "$DATADIR", [data dir]) dnl set location of plugin directory AG_GST_SET_PLUGINDIR -GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-no-export-2.0, gthread-2.0" -AC_SUBST(GST_PKG_DEPS) - dnl make sure it doesn't complain about unused variables if debugging is disabled NO_WARNINGS="" if test "x${GST_DISABLE_GST_DEBUG}" = "xyes"; then @@ -617,7 +659,11 @@ if test "x${GST_DISABLE_GST_DEBUG}" = "xyes"; then fi dnl define an ERROR_CFLAGS Makefile variable -AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wformat-nonliteral -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return -Wno-multichar -Wnested-externs $NO_WARNINGS]) +AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wformat-nonliteral -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return -Wno-multichar -Wnested-externs $NO_WARNINGS]) + +dnl special warning flags for gst/printf +AS_COMPILER_FLAG([-Wno-format-nonliteral], [PRINTF_CFLAGS="-Wno-format-nonliteral"]) +AC_SUBST(PRINTF_CFLAGS) dnl define correct level for debugging messages AG_GST_SET_LEVEL_DEFAULT($GST_GIT) @@ -654,8 +700,8 @@ dnl every flag in GST_OPTION_CFLAGS can be overridden at make time via e.g. dnl make DEPRECATED_CFLAGS='' GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" -GST_OPTION_CFLAGS="$GST_OPTION_CFLAGS -DGST_USE_UNSTABLE_API" -GST_OPTION_CXXFLAGS="$GST_OPTION_CXXFLAGS -DGST_USE_UNSTABLE_API" +GST_OPTION_CFLAGS="$GST_OPTION_CFLAGS" +GST_OPTION_CXXFLAGS="$GST_OPTION_CXXFLAGS" AC_SUBST(GST_OPTION_CFLAGS) AC_SUBST(GST_OPTION_CXXFLAGS) @@ -696,18 +742,18 @@ dnl default vars for all internal objects built on libgstreamer dnl includes GST_ALL_* GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS)" GST_OBJ_CXXFLAGS="\$(GST_ALL_CXXFLAGS)" -GST_OBJ_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_MAJORMINOR.la \$(GST_ALL_LIBS)" +GST_OBJ_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_API_VERSION.la \$(GST_ALL_LIBS)" AC_SUBST(GST_OBJ_CFLAGS) AC_SUBST(GST_OBJ_CXXFLAGS) AC_SUBST(GST_OBJ_LIBS) dnl GST_PLUGIN_LDFLAGS dnl LDFLAGS for plugins; includes GST_ALL_LDFLAGS -GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc.*' $GST_ALL_LDFLAGS" +GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_.*' $GST_ALL_LDFLAGS" AC_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS") dnl plugin scanner locations -AS_AC_EXPAND(GST_PLUGIN_SCANNER_INSTALLED,${libexecdir}/gstreamer-$GST_MAJORMINOR/gst-plugin-scanner) +AS_AC_EXPAND(GST_PLUGIN_SCANNER_INSTALLED,${libexecdir}/gstreamer-$GST_API_VERSION/gst-plugin-scanner) AC_DEFINE_UNQUOTED(GST_PLUGIN_SCANNER_INSTALLED, "$GST_PLUGIN_SCANNER_INSTALLED", [location of the installed gst-plugin-scanner]) AC_SUBST(GST_PLUGIN_SCANNER_INSTALLED) @@ -722,6 +768,7 @@ gst/Makefile gst/gstconfig.h gst/gstversion.h gst/parse/Makefile +gst/printf/Makefile libs/Makefile libs/gst/Makefile libs/gst/base/Makefile @@ -745,6 +792,7 @@ tests/examples/stepping/Makefile tests/examples/helloworld/Makefile tests/examples/launch/Makefile tests/examples/manual/Makefile +tests/examples/memory/Makefile tests/examples/metadata/Makefile tests/examples/queue/Makefile tests/examples/streams/Makefile @@ -777,7 +825,6 @@ pkgconfig/gstreamer-controller.pc pkgconfig/gstreamer-controller-uninstalled.pc pkgconfig/gstreamer-net.pc pkgconfig/gstreamer-net-uninstalled.pc -gst-element-check.m4 gstreamer.spec ) @@ -789,7 +836,7 @@ sed \ -e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \ -e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \ -e 's/.* GST_LICENSE$/#define GST_LICENSE "'$GST_LICENSE'"/' \ - -e 's/.* GST_MAJORMINOR$/#define GST_MAJORMINOR "'$GST_MAJORMINOR'"/' \ + -e 's/.* GST_API_VERSION$/#define GST_API_VERSION "'$GST_API_VERSION'"/' \ -e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \ -e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \ -e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \ @@ -813,7 +860,7 @@ sed \ -e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \ -e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \ -e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \ - -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.11"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.11"\n#endif/' \ + -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-1.0"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-1.0"\n#endif/' \ -e 's/.* GST_PLUGIN_SCANNER_INSTALLED$/#define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\\\gst-plugin-scanner"/' \ -e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \ config.h.in >win32/common/config.h-new @@ -828,7 +875,6 @@ if test "x${GST_DISABLE_TRACE}" = "xno"; then enable_trace="yes"; fi if test "x${GST_DISABLE_ALLOC_TRACE}" = "xno"; then enable_alloc_trace="yes"; fi if test "x${GST_DISABLE_PLUGIN}" = "xno"; then enable_plugin="yes"; fi if test "x${GST_DISABLE_REGISTRY}" = "xno"; then enable_registry="yes"; fi -if test "x${GST_DISABLE_NET}" = "xno"; then enable_net="yes"; fi echo " @@ -850,13 +896,15 @@ Configuration Allocation tracing : ${enable_alloc_trace} Plugin registry : ${enable_registry} Plugin support : ${enable_plugin} - Network support : ${enable_net} + Static plugins : ${enable_static_plugins} Unit testing support : ${BUILD_CHECK} Debug : ${USE_DEBUG} Profiling : ${USE_PROFILING} + Building benchmarks : ${BUILD_BENCHMARKS} Building examples : ${BUILD_EXAMPLES} Building test apps : ${BUILD_TESTS} Building tests that fail : ${BUILD_FAILING_TESTS} + Building tools : ${BUILD_TOOLS} "