File xfce4-vala-multiple-vala-versions.patch of Package xfce4-vala

Overview Repositories Revisions Requests Users Attributes Meta

File xfce4-vala-multiple-vala-versions.patch of Package xfce4-vala (Revision f54c768557e4a964a94e7b4f09817813)

Currently displaying revision f54c768557e4a964a94e7b4f09817813 , Show latest

Index: xfce4-vala-4.10.2/configure.ac
===================================================================
--- xfce4-vala-4.10.2.orig/configure.ac
+++ xfce4-vala-4.10.2/configure.ac
@@ -34,14 +34,34 @@ M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libx
 M8T_CHECK_PACKAGE([EXO], [exo-1], [0.8.0])
 
 dnl Check for Vala
-M8T_CHECK_VALA([0.16.0])
+PKG_CHECK_MODULES([VALA], [libvala-0.18], [AC_SUBST([VALA_VERSION], [0.18])], [
+    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.16/vapi])
+	AC_SUBST([vapidir], [${datarootdir}/vala-${VALA_VERSION}/vapi])
 fi
 
 dnl Makefile outputs

Places

File xfce4-vala-multiple-vala-versions.patch of Package xfce4-vala (Revision f54c768557e4a964a94e7b4f09817813)

Places