Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
xfce4-vala
xfce4-vala-multiple-vala-versions.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File xfce4-vala-multiple-vala-versions.patch of Package xfce4-vala
Index: xfce4-vala-4.8.1/configure.ac =================================================================== --- xfce4-vala-4.8.1.orig/configure.ac +++ xfce4-vala-4.8.1/configure.ac @@ -33,14 +33,32 @@ M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libx M8T_CHECK_PACKAGE([EXO], [exo-1], [0.6.0]) dnl Check for Vala -M8T_CHECK_VALA([0.12.0]) +PKG_CHECK_MODULES([VALA], [libvala-0.16], [AC_SUBST([VALA_VERSION], [0.16])], [ + PKG_CHECK_MODULES([VALA], [libvala-0.14], [AC_SUBST([VALA_VERSION], [0.14])], [ + PKG_CHECK_MODULES([VALA], [libvala-0.12], [AC_SUBST([VALA_VERSION], [0.12])], [ + PKG_CHECK_MODULES([VALA], [vala-0.10], [AC_SUBST([VALA_VERSION], [0.10])]) + ]) + ]) +]) +if test "${VALA_VERSION}" = "0.10" ; then + AC_SUBST([VALA_NAME], [vala]) +else + AC_SUBST([VALA_NAME], [libvala]) +fi +AC_PATH_PROG([VALAC], [valac], [valac]) +AC_SUBST([VAPIGEN], + `$PKG_CONFIG --variable=vapigen ${VALA_NAME}-${VALA_VERSION}`) +AC_SUBST([VALAGI], + `$PKG_CONFIG --variable=vala_gen_introspect ${VALA_NAME}-${VALA_VERSION}`) +AC_SUBST([vapidir], + `$PKG_CONFIG --variable=vapidir ${VALA_NAME}-${VALA_VERSION}`) AC_ARG_WITH([default-vapidir], AC_HELP_STRING([--with-default-vapidir], [Use default VAPI prefix from Vala installation]), [], [with_default_vapidir=no]) if test x"$with_default_vapidir" == xno ; then - AC_SUBST([vapidir], [${datarootdir}/vala-0.12/vapi]) + AC_SUBST([vapidir], [${datarootdir}/vala-${VALA_VERSION}/vapi]) fi dnl Makefile outputs
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor