automake-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-


From: Stefano Lattarini
Subject: [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-61-g8923364
Date: Wed, 11 Apr 2012 20:21:14 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=89233647eed3b8035226805555fcf81c7ed01737

The branch, ng/master has been updated
       via  89233647eed3b8035226805555fcf81c7ed01737 (commit)
       via  af779b87d72abcc70a67544b1ad95d342f213747 (commit)
       via  ecd851d12a0b77e9e96f8451db69812735de25c9 (commit)
       via  8036e5a14904b1a0ea97be52cc83a33c9955f3fb (commit)
       via  b35dca6bf9910b3e7ced1ce485772c3336255c24 (commit)
       via  68be923ceda6b4458123bd74c4fb5eb71589db00 (commit)
       via  ee6eb9fa97eab1c826a2501fad564f5b28bc3cb9 (commit)
       via  66cccef3098d034f6c1b271f3c2e7399c5ac72d4 (commit)
       via  66ca4b0c256025a01bc9e3a85df516d02728dd79 (commit)
       via  faffcc8718dbf67e8aa84dda93a13ca3824eafcc (commit)
       via  0d0cafcdcae41ce4d4018448d3f5d95f815111a8 (commit)
       via  3d5d5eace287c0aad4a1e9221dcebc62e2a886ee (commit)
      from  1490961b7bfcb4a5bba24925ff45e2ff32fa93f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 89233647eed3b8035226805555fcf81c7ed01737
Merge: 1490961 af779b8
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 11 22:19:22 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      self checks: avoid spurious failures when keep_testdirs=yes
      fixup: some weaknesses in a self-check test case
      maintcheck: avoid yet more spurious failures (2)
      maintcheck: avoid yet more spurious failures (1)
      hacking: fixlets w.r.t. the release procedure
      maintcheck: fix spurious failures
      maint: version bump after beta release
      Beta release 1.11b (will become 1.12)
      sync: some auxiliary files synced from upstream
      hacking: described new branching policy for 1.12 an later
      vala tests: avoid spurious failure with older GObject
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 HACKING                  |   59 +++++++++--------------------
 NEWS                     |    4 +-
 lib/INSTALL              |    8 ++--
 lib/texinfo.tex          |   92 +++++++++++++++++++++++++++++++--------------
 syntax-checks.mk         |    6 +-
 t/gettext-macros.sh      |    4 ++
 t/self-check-cleanup.tap |   31 ++++++++++-----
 t/self-check-dir.tap     |    1 +
 t/tap-doc2.sh            |    2 +
 t/vala2.sh               |    2 +-
 t/vala3.sh               |    2 +-
 t/vala5.sh               |    4 +-
 12 files changed, 123 insertions(+), 92 deletions(-)

diff --git a/HACKING b/HACKING
index 29c0e4a..c57da67 100644
--- a/HACKING
+++ b/HACKING
@@ -103,37 +103,22 @@
   latest stable version of Autoconf installed and available early
   in your PATH.
 
-* The git tree currently carries a number of branches: master for the
-  current development, and release branches named branch-X.Y.  The maint
-  branch serves as common ground for both master and the active release
-  branches.  Changes intended for both should be applied to maint, which
-  should then be merged to release branches and master, of course after
-  suitable testing.  It is advisable to merge only after a set of related
-  commits have been applied.
-
-* Example work flow for patches to maint:
-
-  # 1. Checkout the "maint" branch:
-  git checkout maint
-
-  # 2. Apply the patch(es) with "git am" (or create them with $EDITOR):
-  git am -3 0*.patch
-  # 2a. Run required tests, if any ...
-
-  # 3. Merge maint into branch-1.11:
-  git checkout branch-1.11
-  git merge maint
-  # 3a. Run required tests, if any ...
-
-  # 4. Redo steps 3 and 3a for master:
-  git checkout master
-  git merge maint
-  # testing ...
-
-  # 5. Push the maint and master branches:
-  git push --dry-run origin maint branch-1.11 master
-  # if all seems ok, then actually push:
-  git push origin maint branch-1.11 master
+* The Automake git tree currently carries two basic branches: 'master' for
+  the current development, and 'maint' for maintenance and bug fixes.  The
+  maint branch should be kept regularly merged into the master branch.
+  It is advisable to merge only after a set of related commits have been
+  applied, to avoid introducing too much noise in the history.
+
+* There may be a number of longer-lived feature branches for new
+  developments.  They should be based off of a common ancestor of all
+  active branches to which the feature should or might be merged later.
+  in the future, we might introduce a special branch named 'next' that
+  may serve as common ground for feature merging and testing, should
+  they not yet be ready for master.
+
+* After a major release is done, the master branch is to be merged into
+  the maint branch, and then a "new" master branch created stemming
+  from the resulting commit.
 
 * When fixing a bug (especially a long-standing one), it may be useful
   to commit the fix to a new temporary branch based off the commit that
@@ -141,12 +126,6 @@
   the active branches descending from the buggy commit.  This offers a
   simple way to fix the bug consistently and effectively.
 
-* There may be a number of longer-lived feature branches for new developments.
-  They should be based off of a common ancestor of all active branches to
-  which the feature should or might be merged later.  The next branch may
-  serve as common ground for feature merging and testing, should they not
-  be ready for master yet.
-
 * For merges from branches other than maint, prefer 'git merge --log' over
   plain 'git merge', so that a later 'git log' gives an indication of which
   actual patches were merged even when they don't appear early in the list.
@@ -240,9 +219,9 @@
   releases as well.  Where differences are expected, they will be
   explicitly described.
 
-* Fetch new versions of the files that are maintained by the FSF.
-  Commit.  Unfortunately you need an FSF account to do this.
-  (You can also use "make fetch", but that is still woefully incomplete.)
+* Fetch new versions of the files that are maintained by the FSF by
+  running "make fetch".  In case any file in the automake repository
+  has been updated, commit and re-run the testsuite.
 
 * Update NEWS.
 
diff --git a/NEWS b/NEWS
index 957ec82..5c654ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.11a:
+New in 1.11c:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -217,7 +217,7 @@ New in 1.11a:
     '-Wall'.  In previous versions, one has to use '-Wextra-portability'
     to enable them.
 
-Bugs fixed in 1.11a:
+Bugs fixed in 1.11c:
 
   - Various minor bugfixes for recent or long-standing bugs.
 
diff --git a/lib/INSTALL b/lib/INSTALL
index a1e89e1..6e90e07 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler 
(unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -367,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index 85b68e7..e4dca02 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2012-03-11.15}
+\def\texinfoversion{2012-04-06.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4451,6 +4451,7 @@ end
   \definedummyword\guillemetright
   \definedummyword\guilsinglleft
   \definedummyword\guilsinglright
+  \definedummyword\lbracechar
   \definedummyword\leq
   \definedummyword\minus
   \definedummyword\ogonek
@@ -4463,6 +4464,7 @@ end
   \definedummyword\quoteleft
   \definedummyword\quoteright
   \definedummyword\quotesinglbase
+  \definedummyword\rbracechar
   \definedummyword\result
   \definedummyword\textdegree
   %
@@ -4514,6 +4516,7 @@ end
   \definedummyword\t
   %
   % Commands that take arguments.
+  \definedummyword\abbr
   \definedummyword\acronym
   \definedummyword\anchor
   \definedummyword\cite
@@ -4525,7 +4528,9 @@ end
   \definedummyword\emph
   \definedummyword\env
   \definedummyword\file
+  \definedummyword\image
   \definedummyword\indicateurl
+  \definedummyword\inforef
   \definedummyword\kbd
   \definedummyword\key
   \definedummyword\math
@@ -4572,7 +4577,10 @@ end
   % content at all.  So for index sorting, we map @{ and @} to strings
   % starting with |, since that ASCII character is between ASCII { and }.
   \def\{{|a}%
+  \def\lbracechar{|a}%
+  %
   \def\}{|b}%
+  \def\rbracechar{|b}%
   %
   % Non-English letters.
   \def\AA{AA}%
@@ -7807,7 +7815,7 @@ end
   \fi\fi
 }
 
-
+% 
 % @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
 % the node name, #2 the name of the Info cross-reference, #3 the printed
 % node name, #4 the name of the Info file, #5 the name of the printed
@@ -7817,16 +7825,21 @@ end
 \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
 \def\ref#1{\xrefX[#1,,,,,,,]}
 %
-\newbox\topbox
+\newbox\toprefbox
 \newbox\printedrefnamebox
+\newbox\infofilenamebox
 \newbox\printedmanualbox
 %
 \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
   \unsepspaces
   %
+  % Get args without leading/trailing spaces.
   \def\printedrefname{\ignorespaces #3}%
   \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
   %
+  \def\infofilename{\ignorespaces #4}%
+  \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
+  %
   \def\printedmanual{\ignorespaces #5}%
   \setbox\printedmanualbox  = \hbox{\printedmanual\unskip}%
   %
@@ -7861,11 +7874,18 @@ end
      \turnoffactive
      \makevalueexpandable
      % This expands tokens, so do it after making catcode changes, so _
-     % etc. don't get their TeX definitions.
+     % etc. don't get their TeX definitions.  This ignores all spaces in
+     % #4, including (wrongly) those in the middle of the filename.
      \getfilename{#4}%
      %
+     % This (wrongly) does not take account of leading or trailing
+     % spaces in #1, which should be ignored.
      \edef\pdfxrefdest{#1}%
-     \txiescapepdf\pdfxrefdest
+     \ifx\pdfxrefdest\empty
+       \def\pdfxrefdest{Top}% no empty targets
+     \else
+       \txiescapepdf\pdfxrefdest  % escape PDF special chars
+     \fi
      %
      \leavevmode
      \startlink attr{/Border [0 0 0]}%
@@ -7898,7 +7918,7 @@ end
       \printedrefname
     \fi
     %
-    % if the user also gave the printed manual name (fifth arg), append
+    % If the user also gave the printed manual name (fifth arg), append
     % "in MANUALNAME".
     \ifdim \wd\printedmanualbox > 0pt
       \space \putwordin{} \cite{\printedmanual}%
@@ -7913,32 +7933,20 @@ end
     % this is a loss.  Therefore, we give the text of the node name
     % again, so it is as if TeX is seeing it for the first time.
     % 
-    % Cross-manual reference.  Only include the "Section ``foo'' in" if
-    % the foo is neither missing or Top.  Thus, @xref{,,,foo,The Foo Manual}
-    % outputs simply "see The Foo Manual".
     \ifdim \wd\printedmanualbox > 0pt
-      % What is the 7sp about?  The idea is that we also want to omit
-      % the Section part if we would be printing "Top", since they are
-      % clearly trying to refer to the whole manual.  But, this being
-      % TeX, we can't easily compare strings while ignoring the possible
-      % spaces before and after in the input.  By adding the arbitrary
-      % 7sp, we make it much less likely that a real node name would
-      % happen to have the same width as "Top" (e.g., in a monospaced font).
-      % I hope it will never happen in practice.
+      % Cross-manual reference with a printed manual name.
       % 
-      % For the same basic reason, we retypeset the "Top" at every
-      % reference, since the current font is indeterminate.
+      \crossmanualxref{\cite{\printedmanual\unskip}}%
+    %
+    \else\ifdim \wd\infofilenamebox > 0pt
+      % Cross-manual reference with only an info filename (arg 4), no
+      % printed manual name (arg 5).  This is essentially the same as
+      % the case above; we output the filename, since we have nothing else.
       % 
-      \setbox\topbox = \hbox{Top\kern7sp}%
-      \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
-      \ifdim \wd2 > 7sp
-        \ifdim \wd2 = \wd\topbox \else
-          \putwordSection{} ``\printedrefname'' \putwordin{}\space
-        \fi
-      \fi
-      \cite{\printedmanual}%
+      \crossmanualxref{\code{\infofilename\unskip}}%
+    %
     \else
-      % Reference in this manual.
+      % Reference within this manual.
       %
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
@@ -7959,11 +7967,37 @@ end
       %
       % output the `page 3'.
       \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-    \fi
+    \fi\fi
   \fi
   \endlink
 \endgroup}
 
+% Output a cross-manual xref to #1.  Used just above (twice).
+% 
+% Only include the text "Section ``foo'' in" if the foo is neither
+% missing or Top.  Thus, @xref{,,,foo,The Foo Manual} outputs simply
+% "see The Foo Manual", the idea being to refer to the whole manual.
+% 
+% But, this being TeX, we can't easily compare our node name against the
+% string "Top" while ignoring the possible spaces before and after in
+% the input.  By adding the arbitrary 7sp below, we make it much less
+% likely that a real node name would have the same width as "Top" (e.g.,
+% in a monospaced font).  Hopefully it will never happen in practice.
+% 
+% For the same basic reason, we retypeset the "Top" at every
+% reference, since the current font is indeterminate.
+% 
+\def\crossmanualxref#1{%
+  \setbox\toprefbox = \hbox{Top\kern7sp}%
+  \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+  \ifdim \wd2 > 7sp  % nonempty?
+    \ifdim \wd2 = \wd\toprefbox \else  % same as Top?
+      \putwordSection{} ``\printedrefname'' \putwordin{}\space
+    \fi
+  \fi
+  #1%
+}
+
 % This macro is called from \xrefX for the `[nodename]' part of xref
 % output.  It's a separate macro only so it can be changed more easily,
 % since square brackets don't work well in some documents.  Particularly
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 4297225..930d2b2 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -33,7 +33,7 @@ xtests := $(shell \
 
 xdefs = $(srcdir)/defs $(srcdir)/defs-static.in
 
-ams := $(shell find $(srcdir) -name '*.am')
+ams := $(shell find $(srcdir) '(' -name '*.dir' -prune ')' -a -name '*.am')
 
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
@@ -214,7 +214,7 @@ sc_no_for_variable_in_macro:
 sc_mkinstalldirs:
        @if grep -n 'mkinstalldirs' $(ams) \
              | grep -F -v '$$(mkinstalldirs)' \
-             | grep -v '^\./lib/Makefile.am:[0-9][0-9]*:  *mkinstalldirs 
\\$$'; \
+             | grep -v '^\./Makefile.am:[0-9][0-9]*:  *lib/mkinstalldirs 
\\$$'; \
        then \
          echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
          exit 1; \
@@ -561,7 +561,7 @@ sc_tests_no_configure_in:
 ## AM_RECURSIVE_TARGETS.  Suggest keeping test directories around for
 ## greppability of the Makefile.in files.
 sc_ensure_testsuite_has_run:
-       @if test ! -f t/test-suite.log; then \
+       @if test ! -f '$(TEST_SUITE_LOG)'; then \
          echo 'Run "env keep_testdirs=yes make check" before' \
               'running "make maintainer-check"' >&2; \
          exit 1; \
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index 38749d3..8adcb0d 100755
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -86,6 +86,10 @@ $ACLOCAL --force -I m4 || cat >> get.sh <<'END'
 ACLOCAL="$ACLOCAL -Wno-syntax"
 END
 
+# Remove any Makefile.in possibly created by gettextize/autopoint, to
+# avoid spurious maintainer-check failures.
+rm -f `find . -name Makefile.in`
+
 # The file gettextize or autopoint might have copied in the 'm4'
 # subdirectory of the test directory are going to be needed by
 # other tests, so we must not remove the test directory.
diff --git a/t/self-check-cleanup.tap b/t/self-check-cleanup.tap
index 3ea5281..a56854b 100755
--- a/t/self-check-cleanup.tap
+++ b/t/self-check-cleanup.tap
@@ -23,7 +23,7 @@ if test x"$sh_errexit_works" != x"yes"; then
   skip_all_ "$me: no working exit trap with 'set -e'"
 fi
 
-plan_ 42
+plan_ 43
 
 # We still need a little hack to make ./defs work outside automake's
 # tree 'tests' subdirectory.  Not a big deal.
@@ -34,6 +34,7 @@ diff "$am_top_builddir"/defs-static defs-static \
 cp "$am_top_builddir"/defs .
 
 AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
+keep_testdirs=; unset keep_testdirs
 
 if ln -s defs foo && test -h foo; then
   have_symlinks=yes
@@ -48,11 +49,21 @@ do_clean ()
   # Don't try to be smart and use find here, that has caused issues
   # and extra ERROR results in the past.  Be dumb and safe.
   for d in t t/* t/*/* t/*/*/*; do
-    test ! -d t/$d || chmod u+rwx t/$d || :
+    test ! -d $d || chmod u+rwx $d || :
   done
   rm -rf t
 }
 
+# Exporting 'keep_testdirs' to "yes" in the environment should cause
+# the cleanup code not to be run, so that the temporary directories
+# are left on disk.
+command_ok_ '"keep_testdirs=yes" causes testdir to be kept around' eval '
+     keep_testdirs=yes $SHELL -c ". ./defs && echo okok >foo" t/dummy.sh \
+     && test -f t/dummy.dir/foo \
+     && test okok = `cat t/dummy.dir/foo`'
+
+do_clean
+
 # Check that pre-test cleanup works also with directories with
 # "null" permissions, and containing broken symlinks.
 mkdir t t/dummy.dir t/dummy.dir/sub
@@ -68,11 +79,11 @@ chmod 000 t/dummy.dir/sub/* t/dummy.dir/file
 test $have_symlinks = yes && chmod 000 t/dummy.dir/symlink
 chmod 500 t/dummy.dir/sub t/dummy.dir
 command_ok_ "pre-cleanup can deal with low-perms testdir" \
-            $SHELL -c  '. ./defs' dummy.sh
+            $SHELL -c  '. ./defs' t/dummy.sh
 command_ok_ "pre-cleanup removed low-perms testdir" \
-            eval 'test ! -f dummy.dir \
-               && test ! -d dummy.dir \
-               && test ! -r dummy.dir'
+            eval 'test ! -f t/dummy.dir \
+               && test ! -d t/dummy.dir \
+               && test ! -r t/dummy.dir'
 
 do_clean
 
@@ -97,9 +108,9 @@ command_ok_ "post-cleanup can deal with low-perms testdir" \
   :
 ' t/dummy.sh
 command_ok_ "post-cleanup removed null-perms testdir" \
-            eval 'test ! -f dummy.dir \
-               && test ! -d dummy.dir \
-               && test ! -r dummy.dir'
+            eval 'test ! -f t/dummy.dir \
+               && test ! -d t/dummy.dir \
+               && test ! -r t/dummy.dir'
 
 do_clean
 
@@ -116,7 +127,7 @@ if test $have_symlinks = yes; then
   (cd t/dummy.dir && ln -s ../../dir ../../file .)
 
   command_ok_ "pre-cleanup with testdir with zero-perms symlinks" \
-               $SHELL -c '. ./defs' dummy.sh
+               $SHELL -c '. ./defs' t/dummy.sh
   ls -l # For debugging.
   command_ok_ "pre-cleanup chmod doesn't follow symlinks to files" \
                eval 'ls -l file | grep "^----------.*file"'
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap
index 322677a..736238c 100755
--- a/t/self-check-dir.tap
+++ b/t/self-check-dir.tap
@@ -25,6 +25,7 @@ am_create_testdir=no
 plan_ 5
 
 AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
+keep_testdirs=; unset keep_testdirs
 
 # This needs to be consistent with what $SHELL deems to be the
 # current working directory.
diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
index 55bf002..95fb546 100755
--- a/t/tap-doc2.sh
+++ b/t/tap-doc2.sh
@@ -134,4 +134,6 @@ echo AM_TEST_LOG_DRIVER_FLAGS = --ignore-exit >> Makefile.in
 ./config.status Makefile
 $MAKE distcheck
 
+rm -f Makefile.in # To avoid a maintainer-check failure.
+
 :
diff --git a/t/vala2.sh b/t/vala2.sh
index bd90433..199c294 100755
--- a/t/vala2.sh
+++ b/t/vala2.sh
@@ -26,7 +26,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 AM_PROG_VALAC([0.7.0])
-PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_CONFIG_FILES([src/Makefile])
 AC_OUTPUT
 END
diff --git a/t/vala3.sh b/t/vala3.sh
index 0ff9e37..641268f 100755
--- a/t/vala3.sh
+++ b/t/vala3.sh
@@ -26,7 +26,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 AM_PROG_VALAC([0.7.0])
-PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_OUTPUT
 END
 
diff --git a/t/vala5.sh b/t/vala5.sh
index e72ee0b..164fa6e 100755
--- a/t/vala5.sh
+++ b/t/vala5.sh
@@ -25,7 +25,7 @@ cat >> configure.ac <<'END'
 AC_PROG_CC
 AM_PROG_CC_C_O
 AM_PROG_VALAC([0.7.0])
-PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.10])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_CONFIG_FILES([src/Makefile])
 AC_OUTPUT
 END
@@ -70,7 +70,7 @@ $AUTOMAKE -a
 
 grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found"
 
-./configure
+./configure || skip_ "configure failure"
 $MAKE
 
 if cross_compiling; then :; else


hooks/post-receive
-- 
GNU Automake



reply via email to

[Prev in Thread] Current Thread [Next in Thread]