diff options
author | Ryan Lortie <desrt@desrt.ca> | 2014-02-13 21:59:49 -0500 |
---|---|---|
committer | Ryan Lortie <desrt@desrt.ca> | 2014-02-14 07:08:17 -0500 |
commit | 9f2d893a27e98bc9335ebf8b65da8360f0170805 (patch) | |
tree | d9a140d68d0ef977bc116c94fcab7a2982256770 | |
parent | 30246de72061bb8ade42ddca58d58dcc42c9f8ca (diff) |
vala.m4: don't keep generated files in git
This is automatically taken during autogen from the vala install. This
file was recently updated and having our own copy prevents the updated
version from being used.
https://bugzilla.gnome.org/show_bug.cgi?id=724339
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | m4/vala.m4 | 70 |
2 files changed, 1 insertions, 70 deletions
@@ -14,6 +14,7 @@ Bugs fixed: • Bug 723054 - edsf-persona.vala:1666.21-1666.79: error: Reference transfer not supported for this expression • Bug 723540 — standalone-individuals test failing with master + • Bug 724339 — vala.m4: don't keep generated files in git API changes: • Add Individual.display_name diff --git a/m4/vala.m4 b/m4/vala.m4 deleted file mode 100644 index 37359488..00000000 --- a/m4/vala.m4 +++ /dev/null @@ -1,70 +0,0 @@ -dnl vala.m4 -dnl -dnl Copyright 2010 Marc-Andre Lureau -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# _VALA_CHECK_COMPILE_WITH_ARGS(ARGS, [ACTION-IF-TRUE], -# [ACTION-IF-FALSE]) -# -------------------------------------- -# Check that Vala compile with ARGS. -# -AC_DEFUN([_VALA_CHECK_COMPILE_WITH_ARGS], -[AC_REQUIRE([AM_PROG_VALAC])[]dnl - - cat <<_ACEOF >conftest.vala -void main(){} -_ACEOF - - AS_IF([vala_error=`$VALAC $1 -q -o conftest$ac_exeext conftest.vala 2>&1`], - [$2], [$3]) -]) - -])# _VALA_CHECK_COMPILE_WITH_ARGS - -# VALA_CHECK_PACKAGES(PKGS, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -------------------------------------- -# Check that PKGS Vala bindings are installed and usable. -# -AC_DEFUN([VALA_CHECK_PACKAGES], -[ - ac_save_ifs="$IFS"; unset IFS - for vala_pkg in $(echo "$1"); do - vala_pkgs="$vala_pkgs --pkg $vala_pkg" - vala_bindings="$vala_bindings $vala_pkg" - done - IFS="$ac_save_ifs" - AC_MSG_CHECKING([for $vala_bindings vala bindings]) - _VALA_CHECK_COMPILE_WITH_ARGS([$vala_pkgs], - [vala_pkg_exists=yes], - [vala_pkg_exists=no]) - -AS_IF([test x${vala_pkg_exists} = xno],[ - ifelse([$3], , [AC_MSG_ERROR([]dnl -[Package requirements were not met: $1 - -$vala_error - -Consider adjusting the XDG_DATA_DIRS environment variable if you -installed bindings in a non-standard prefix. -])], - [AC_MSG_RESULT([no]) -$3])],[ - AC_MSG_RESULT([yes]) - ifelse([$2], , :, [$2])[]dnl -]) - -])# VALA_CHECK_PACKAGES |