mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 17:52:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix configure checks and installation location for Vala bindings

Browse source 
Fixes bug #628676.
This commit is contained in:
Sebastian Dröge 2010-09-22 18:12:50 +02:00
parent 0e6e03fafb
commit 6b771d391d
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/vala/Makefile.am
View file

@ -5,7 +5,7 @@ VAPI_FILES = gst-rtsp-server-0.10.vapi
gst-rtsp-server-0.10.deps:
cp $(srcdir)/packages/gst-rtsp-server-0.10.deps $@
vapidir = $(VAPIDIR)
vapidir = $(datadir)/vala/vapi
vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
EXTRA_DIST = packages $(VAPI_FILES)

29
configure.ac
View file

@ -113,23 +113,18 @@ fi
AM_CONDITIONAL(WITH_PYTHON, [test "x$HAVE_PYTHON_BINDINGS" = "xyes"])
dnl Check for vala
PKG_CHECK_EXISTS([vala-1.0], [HAVE_VALA="yes"], [HAVE_VALA="no"])
dnl Check for Vala
AC_ARG_ENABLE([vala],
AC_HELP_STRING([--enable-vala],[enable Vala bindings (default=yes)]),
[case "${enableval}" in
yes) enable_vala=yes ;;
no) enable_vala=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-vala) ;;
esac
],
[enable_vala=yes]) dnl Default value
AM_CONDITIONAL(WITH_VALA, [test "x$enable_vala" = "xyes"])
AM_CONDITIONAL(WITH_VALA, [test "x$HAVE_VALA" = "xyes"])
AC_ARG_WITH([vapidir],
AS_HELP_STRING([--with-vapidir], [Define where to install the VAPI files]))
if test "x$HAVE_VALA" = "xyes"; then
if test "x$with_vapidir" = "x"; then
VAPIDIR="`pkg-config --variable vapidir vala-1.0`"
else
VAPIDIR="$with_vapidir"
fi
fi
AC_SUBST(VAPIDIR)
dnl *** checks for libraries ***
dnl *** checks for header files ***
@ -284,7 +279,7 @@ Configuration
Source code location : ${srcdir}
Prefix : ${prefix}
Compiler : ${CC}
Vala bindings : ${HAVE_VALA}
Vala bindings : ${enable_vala}
Python bindings: : ${HAVE_PYTHON_BINDINGS}
Gst-rtsp-server configured. Type 'make' to build.