cpw.qulogic.vala: 220ff035: Add configure option for vapidir.
qulogic at pidgin.im
qulogic at pidgin.im
Fri Dec 24 04:26:39 EST 2010
----------------------------------------------------------------------
Revision: 220ff03571223ba683882d3ec284fcbed2b125e8
Parent: 384fb2ff552ebca35380eb67afd02e92dde5edf6
Author: qulogic at pidgin.im
Date: 12/20/10 22:48:32
Branch: im.pidgin.cpw.qulogic.vala
URL: http://d.pidgin.im/viewmtn/revision/info/220ff03571223ba683882d3ec284fcbed2b125e8
Changelog:
Add configure option for vapidir.
Changes against parent 384fb2ff552ebca35380eb67afd02e92dde5edf6
patched configure.ac
patched vapi/Makefile.am
-------------- next part --------------
============================================================
--- configure.ac b063edcff5565378172afe5216bc1ae7473612c3
+++ configure.ac 3b3d158dd955d000db15f37c7ea5fae7f1c9d399
@@ -1723,8 +1723,20 @@ if test "x$enable_vala" != "xno"; then
AC_PATH_PROG(VAPIGEN, vapigen)
if test "x$VAPIGEN" = "x"; then
- AC_MSG_ERROR([Cannot fine "vapigen" in your PATH])
+ AC_MSG_ERROR([Cannot find "vapigen" in your PATH])
fi
+
+ AC_ARG_WITH(vapidir,
+ [AC_HELP_STRING([--with-vapidir=<dir>], [directory to store Vala vapi files])])
+ AC_MSG_CHECKING(for vapidir)
+ VAPIDIR=""
+ if test "x$with_vapidir" = "x" ; then
+ VAPIDIR=`$PKG_CONFIG --variable=vapidir vala-$VALA_PKG`
+ else
+ VAPIDIR="$with_vapidir"
+ fi
+ AC_MSG_RESULT($VAPIDIR)
+ AC_SUBST(VAPIDIR)
fi
AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" = "xyes")
============================================================
--- vapi/Makefile.am f6995750ec9d4c19e9b4e49944cd55be9714e916
+++ vapi/Makefile.am 1c40d9ab0b84c8e88fb07f25c256a60844cc4021
@@ -1,5 +1,5 @@
-vapidir=$(datadir)/vala/vapi
+vapidir=$(VAPIDIR)
targets=purple
purple_VALAFLAGS=-I at top_srcdir@/libpurple $(GLIB_CFLAGS)
More information about the Commits
mailing list