[geany/geany-plugins] 8be6db: Merge pull request #195 from b4n/vala-check

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 27 Feb 2015 13:16:31 UTC
Commit:      8be6dbbd1fa0897a3f4772504edfd9a9a1812ae8
             https://github.com/geany/geany-plugins/commit/8be6dbbd1fa0897a3f4772504edfd9a9a1812ae8

Log Message:
-----------
Merge pull request #195 from b4n/vala-check

Improve Autotools Vala checks and fix them on Automake < 1.12.5.


Modified Paths:
--------------
    build/multiterm.m4
    build/vala.m4

Modified: build/multiterm.m4
11 lines changed, 1 insertions(+), 10 deletions(-)
===================================================================
@@ -2,16 +2,7 @@ AC_DEFUN([GP_CHECK_MULTITERM],
 [
     GP_ARG_DISABLE([multiterm], [auto])
 
-    AS_IF([test "$enable_multiterm" != "no"],
-    [
-        dnl FIXME: if the C sources are present (e.g. in a release tarball),
-        dnl        we don't actually need valac
-        AM_PROG_VALAC([0.7.0])
-        AS_IF([test "$VALAC" = "valac"],
-              [AS_IF([test "$enable_multiterm" = "auto"],
-                     [enable_multiterm=no],
-                     [AC_MSG_ERROR([valac not found])])])
-    ])
+    GP_CHECK_PLUGIN_VALA([multiterm])
     GP_CHECK_PLUGIN_DEPS([multiterm], [MULTITERM], [gtk+-2.0 geany vte])
     GP_COMMIT_PLUGIN_STATUS([MultiTerm])
 


Modified: build/vala.m4
35 lines changed, 35 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,35 @@
+dnl GP_CHECK_VALAC([version], [action-if-found], [action-if-not-found])
+dnl Checks for the Vala compiler.  Similar to AM_PROG_VALAC but supports
+dnl 2nd and 3rd arguments with Automake < 1.12.5
+AC_DEFUN([GP_CHECK_VALAC],
+[
+    gp_have_valac=yes
+    AM_PROG_VALAC([$1],,[gp_have_valac=no])
+    dnl Automake < 1.12.5 does not support 3rd arg but leaves $VALAC
+    dnl empty if not found, so emulate it
+    AS_IF([test "x$VALAC" = x], [gp_have_valac=no])
+    AS_IF([test "$gp_have_valac" = yes],
+          [m4_default([$2], [:])],
+          [m4_default([$3], [:])])
+])
+
+dnl GP_CHECK_PLUGIN_VALA(plugin, [valac-version])
+dnl Checks for the Vala compiler and takes the appropriate action on
+dnl $plugin depending on its presence.
+dnl FIXME: take into account that the compiler is optional if we have
+dnl        the generated C sources
+AC_DEFUN([GP_CHECK_PLUGIN_VALA],
+[
+    AS_IF([test "$m4_tolower(AS_TR_SH(enable_$1))" = no],[],
+          [GP_CHECK_VALAC([$2],
+                          [dnl we fake the checking messages here because
+                           dnl GP_CHECK_VALAC outputs messages itself
+                           AC_MSG_CHECKING([whether the vala compiler is compatible with $1])
+                           AC_MSG_RESULT([yes])],
+                          [AC_MSG_CHECKING([whether the vala compiler is compatible with $1])
+                           AC_MSG_RESULT([no])
+                           AS_IF([test "$m4_tolower(AS_TR_SH(enable_$1))" = yes],
+                                 [AC_MSG_ERROR([$1 requires the Vala compiler])],
+                                 [test "$m4_tolower(AS_TR_SH(enable_$1))" = auto],
+                                 [m4_tolower(AS_TR_SH(enable_$1))=no])])])
+])



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).