diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2013-07-11 10:28:06 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2013-07-11 10:28:06 +0200 |
| commit | 2fdc6ef88ad267284fb408bdc2a44dbc85a4f1d2 (patch) | |
| tree | 1e54b3ff054e52ab78c764491d824313ba8a3ed8 | |
| parent | 5c6bb3052fa79f2359fa9f712917086a016f4775 (diff) | |
configure: compile cgroup example conditionally
Only compile the cgroup example when we have libcgroup
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | examples/Makefile.am | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index aafa57f..0c2ad62 100644 --- a/configure.ac +++ b/configure.ac @@ -232,6 +232,7 @@ AC_SUBST([GST_OBJ_LIBS]) PKG_CHECK_MODULES(LIBCGROUP, libcgroup >= 0.26, HAVE_LIBCGROUP="yes", HAVE_LIBCGROUP="no") AC_SUBST(LIBCGROUP_CFLAGS) AC_SUBST(LIBCGROUP_LIBS) +AM_CONDITIONAL(HAVE_LIBCGROUP, test "x$HAVE_LIBCGROUP" = "xyes") dnl this really should only contain flags, not libs - they get added before dnl whatevertarget_LIBS and -L flags here affect the rest of the linking @@ -265,6 +266,7 @@ Configuration Source code location : ${srcdir} Prefix : ${prefix} Compiler : ${CC} + CGroups example : ${HAVE_LIBCGROUP} gst-rtsp-server configured. Type 'make' to build. " diff --git a/examples/Makefile.am b/examples/Makefile.am index 20b6cb9..deec57c 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,8 +1,14 @@ noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme \ test-launch test-sdp test-uri test-auth \ - test-multicast test-multicast2 test-cgroups + test-multicast test-multicast2 #INCLUDES = -I$(top_srcdir) -I$(srcdir) AM_CFLAGS = $(GST_OBJ_CFLAGS) -AM_LDFLAGS = $(GST_OBJ_LIBS) $(GIO_LIBS) $(LIBCGROUP_LIBS) +AM_LDFLAGS = $(GST_OBJ_LIBS) $(GIO_LIBS) + +if HAVE_LIBCGROUP +noinst_PROGRAMS += test-cgroups +AM_LDFLAGS += $(LIBCGROUP_LIBS) +endif + |