Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7718

Modified Files:
        automake1.13.info automake1.12.info automake1.11.patch 
        automake1.11.info automake1.10.info 
Added Files:
        automake1.14.info automake1.14.patch 
Log Message:
automake1.14 and sync other automakes with 10.7 versions

Index: automake1.11.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/automake1.11.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- automake1.11.info   19 Feb 2013 18:33:10 -0000      1.14
+++ automake1.11.info   4 Sep 2013 11:39:13 -0000       1.15
@@ -1,17 +1,17 @@
 Package: automake1.11
 Version: 1.11.6
-Revision: 5
+Revision: 7
 Source: mirror:gnu:automake/automake-%v.tar.xz
 Source-MD5: cf4752287ad708f83bd3689da57a32c9
 # versions of dpkg < 1.10.21-1233 have a buggy install-info command
 BuildDepends: fink (>= 0.32), dpkg (>= 1.10.21-1234)
 Depends: %N-core (>= %v-%r)
-Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13
-Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13
+Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
+Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
 Provides: automaken
 
 PatchFile: %n.patch
-PatchFile-MD5: 22386c11a27201c9b4d05f13890a8898
+PatchFile-MD5: 1ef80d80490de9f80f83f74e94356fb2
 PatchScript: <<
   #!/bin/sh -ev
   %{default_script}
@@ -26,6 +26,9 @@
   # fink's libtool2 has %p/bin/glibtool not %p/bin/libtool and Apple's
   # /usr/bin/libtool is different beast
   ln -s %p/bin/glibtool tests/libtool
+
+  # make sure pkg-config macros are available to the test harness
+  ln -s %p/share/aclocal/pkg.m4 m4
 <<
 
 # HACK: Set ac_cv_prog_TEX to disable any TeX or texinfo related tests,
@@ -51,7 +54,7 @@
 
 SplitOff: <<
  Package: %N-core
- Depends: autoconf | autoconf2.6
+ Depends: autoconf2.6 | autoconf
  Conflicts: %N (<< 1.11.6-2)
  Replaces: %N (<< 1.11.6-2)
  # TODO: Add Provides: automaken-core ??
@@ -63,7 +66,7 @@
 # TODO: Perhaps rename automake.info* to automake-X.Y.info* ?
 InfoTest: <<
   TestScript: make check || exit 2
-  TestDepends: dejagnu, libtool2
+  TestDepends: dejagnu, libtool2, pkgconfig
 <<
 DocFiles: COPYING README AUTHORS NEWS THANKS
 InfoDocs: automake.info
@@ -85,7 +88,8 @@
 Previous versions by Christoph Pfisterer, Max Horn.
 Desc adapted from debian :-)
 
-  Import patches from automake1.12 changes to vala-vapi.test
+  Import patches from automake1.12 changes to vala-vapi.test (misc
+  fix), and other vala-*.test (propagate gobject compiler flags)
 <<
 License: GPL
 Maintainer: Chris Zubrzycki <bere...@users.sourceforge.net>

Index: automake1.13.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/automake1.13.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- automake1.13.info   10 May 2013 05:04:28 -0000      1.4
+++ automake1.13.info   4 Sep 2013 11:39:13 -0000       1.5
@@ -1,13 +1,13 @@
 Package: automake1.13
-Version: 1.13.1
+Version: 1.13.4
 Revision: 2
 Source: mirror:gnu:automake/automake-%v.tar.xz
-Source-MD5: a60380ab11e1481376b7747d1b42ced2
+Source-MD5: 71b03c1bc4f587add12604587d9276d1
 # versions of dpkg < 1.10.21-1233 have a buggy install-info command
 BuildDepends: fink (>= 0.32), dpkg (>= 1.10.21-1234)
 Depends: %N-core (>= %v-%r)
-Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13
-Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13
+Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
+Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
 Provides: automaken
 
 PatchScript: <<
@@ -45,7 +45,7 @@
 
 SplitOff: <<
  Package: %N-core
- Depends: autoconf | autoconf2.6
+ Depends: autoconf2.6
  # TODO: Add Provides: automaken-core ??
  # TODO: Add custom Description?
  Files: bin/aclocal-* bin/automake-* share/aclocal-* share/automake-* 
share/man/man1/aclocal-* share/man/man1/automake-*

--- NEW FILE: automake1.14.patch ---
>From 3759f24379c98b984a56b52c7d23a2dfbf36efcf Mon Sep 17 00:00:00 2001
Message-Id: 
<3759f24379c98b984a56b52c7d23a2dfbf36efcf.1372337066.git.stefano.lattarini <at> 
gmail.com>
From: Stefano Lattarini <stefano.lattarini <at> gmail.com>
Date: Thu, 27 Jun 2013 14:43:12 +0200
Subject: [PATCH] tests: avoid a spurious failure on MacOS X 10.6.8

Fixes automake bug#14706.

* t/depcomp2.sh: Strip, from the redirected ./configure stderr, the
possible error message "rm: conftest.dSYM: is a directory", generated
by cleanup code that doesn't cater to the existence of *.dSYM
directories sometimes created by the compiler on MacOS X.  This
"massaging" of ./configure stderr is legitimate, since the spurious
error message is due not to automake-related code, but to a know
buglet/limitation of either Autoconf or Mac OS X bundles gcc:
<http://lists.gnu.org/archive/html/bug-autoconf/2007-11/msg00017.html>
Actually, from that link it appears that the original Autoconf issue
had been fixed, but it must have been re-introduced in the meantime :-(

Signed-off-by: Stefano Lattarini <stefano.lattarini <at> gmail.com>
---
 t/depcomp2.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/t/depcomp2.sh b/t/depcomp2.sh
index 2182164..3eba12d 100644
--- a/t/depcomp2.sh
+++ b/t/depcomp2.sh
@@ -45,6 +45,9 @@ $AUTOMAKE --add-missing
 $AUTOCONF
 ./configure 2>stderr || { cat stderr >&2; exit 1; }
 cat stderr >&2
-test ! -s stderr
+# Ignore warning messages sometimes seen on Mac OS X; they are
+# not automake's fault anyway, but either autoconf's or Mac's.
+sed '/rm:.* conftest\.dSYM/d' stderr >stderr2
+test -s stderr2 && { cat stderr2; exit 1; }

 :
-- 
1.8.3.1.448.gfb7dfaa

>From 4d7dcafc0f419378cd80e46f9390950c6fbaffa0 Mon Sep 17 00:00:00 2001
Message-Id: 
<4d7dcafc0f419378cd80e46f9390950c6fbaffa0.1374421729.git.stefano.lattar...@gmail.com>
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Sun, 21 Jul 2013 13:46:48 +0100
Subject: [PATCH] test: avoid false positives in 'cc-no-c-o' script

Fixes automake bug#14991.

* t/ax/cc-no-c-o.in: Be more careful in determining whether both the
'-c' and '-o' options have been passed on the command line to the
compiler.  In particular, do not spuriously complain in the face of
options like '-compatibility_version' or '-current_version' (seen on
Mac OS X 10.7).
* THANKS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com>
---
 THANKS            |  1 +
 t/ax/cc-no-c-o.in | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/THANKS b/THANKS
index b708943..1482da2 100644
--- a/THANKS
+++ b/THANKS
@@ -145,6 +145,7 @@ Gwenole Beauchesne              gbeauche...@mandrakesoft.com
 H.J. Lu                         h...@lucon.org
 H.Merijn Brand                  h.m.br...@hccnet.nl
 Hans Ulrich Niedermann          h...@n-dimensional.de
+Hanspeter Niederstrasser        f...@snaggledworks.com
 Harald Dunkel                   har...@coware.com
 Harlan Stenn                    harlan.st...@pfcs.com
 He Li                           tippa...@yahoo.com
diff --git a/t/ax/cc-no-c-o.in b/t/ax/cc-no-c-o.in
index c18f9b9..bbc9ec9 100644
--- a/t/ax/cc-no-c-o.in
+++ b/t/ax/cc-no-c-o.in
@@ -19,11 +19,23 @@

 am_CC=${AM_TESTSUITE_GNU_CC-'@GNU_CC@'}

-case " $* " in
- *\ -c*\ -o* | *\ -o*\ -c*)
+seen_c=false
+seen_o=false
+
+for arg
+do
+  case $arg in
+    -c)
+      seen_c=true;;
+    # It is acceptable not to leave a space between the '-o' option
+    # and its argument, so we have to cater for that.
+    -o|-o*)
+      seen_o=true;;
+  esac
+  if $seen_c && $seen_o; then
     echo "$0: both '-o' and '-c' seen on the command line" >&2
     exit 2
-    ;;
-esac
+  fi
+done

 exec $am_CC "$@"
-- 1.8.3.1.605.g85318f5 

Index: automake1.10.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/automake1.10.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- automake1.10.info   19 Feb 2013 18:33:10 -0000      1.14
+++ automake1.10.info   4 Sep 2013 11:39:13 -0000       1.15
@@ -1,13 +1,13 @@
 Package: automake1.10
 Version: 1.10.3
-Revision: 6
+Revision: 8
 Source: mirror:gnu:automake/automake-%v.tar.bz2
 Source-MD5: b8e67fb458da396bc35555af7ef2b49f
 # versions of dpkg < 1.10.21-1233 have a buggy install-info command
 BuildDepends: fink (>= 0.32), dpkg (>= 1.10.21-1234)
 Depends: %N-core (>= %v-%r)
-Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13
-Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13
+Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
+Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
 Provides: automaken
 
 PatchFile: %n.patch
@@ -44,7 +44,7 @@
 
 SplitOff: <<
  Package: %N-core
- Depends: autoconf | autoconf2.6
+ Depends: autoconf2.6 | autoconf
  Conflicts: %N (<< 1.10.3-3)
  Replaces: %N (<< 1.10.3-3)
  # TODO: Add Provides: automaken-core ??

--- NEW FILE: automake1.14.info ---
Package: automake1.14
Version: 1.14
Revision: 1
Source: mirror:gnu:automake/automake-%v.tar.xz
Source-MD5: cb3fba6d631cddf12e230fd0cc1890df
# versions of dpkg < 1.10.21-1233 have a buggy install-info command
BuildDepends: fink (>= 0.32), dpkg (>= 1.10.21-1234)
Depends: %N-core (>= %v-%r)
Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
Provides: automaken

PatchFile: %n.patch
PatchFile-MD5: d98b470fb21effc7bbabd564ff379ac9
PatchScript: <<
  #!/bin/sh -ev
  %{default_script}

  # Disable one of the lex tests which is incompatible with our flex
  # package (but not with flex-devel, nor with the flex Apple ships).
  /usr/bin/sed -i.orig -E -e 's|t/lex-header.sh||g' Makefile.in


  # fink's libtool2 has %p/bin/glibtool not %p/bin/libtool and Apple's
  # /usr/bin/libtool is different beast
  ln -s %p/bin/glibtool t/wrap/libtool
<<

# HACK: Set ac_cv_prog_TEX to disable any TeX or texinfo related tests,
# until the day we get a non-broken install-info.
ConfigureParams: --infodir=%p/share/info PERL=/usr/bin/perl ac_cv_prog_TEX=
InstallScript: <<
 #!/bin/sh -ex
 make install DESTDIR=%d
 
 VERSION=1.14
 for tool in aclocal automake ; do
   # Replace man page alias by symlink
   rm %i/share/man/man1/$tool.1
   ln -s %p/share/man/man1/$tool-$VERSION.1 %i/share/man/man1/$tool.1
   # Normally, the versioned executable name is a symlink to the unversioned 
name.
   # We swap this, turning the unversioned name into a symlink, and
   # store the executable under the versioned name.
   rm %i/bin/$tool-$VERSION
   mv %i/bin/$tool %i/bin/$tool-$VERSION
   ln -s %p/bin/$tool-$VERSION %i/bin/$tool
 done
<<

SplitOff: <<
 Package: %N-core
 Depends: autoconf2.6
 # TODO: Add Provides: automaken-core ??
 # TODO: Add custom Description?
 Files: bin/aclocal-* bin/automake-* share/aclocal-* share/automake-* 
share/man/man1/aclocal-* share/man/man1/automake-*
 DocFiles: COPYING README AUTHORS NEWS THANKS
<<

# TODO: Perhaps rename automake.info* to automake-X.Y.info* ?
InfoTest: <<
  # fails t/objc-megademo.sh on 10.6/i386 and 10.6/x86_64
  # (passes on 10.7)
  # see: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13761
  # Patch for t/depcomp2 test failure
  # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14706
  # Patch for t/ccnoco-lt test failure
  # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14911
  TestConflicts: coreutils-default
  ### texinfo-legacy is needed to provide install-info as
  ### t/txinfo-nodist-info.sh fails with dpkg-1.10's install-info 
  TestScript: <<
        #!/bin/sh -ev
        export PATH=%p/opt/texinfo-legacy/bin:$PATH
        make check || exit 2
  <<
  TestDepends: dejagnu, libtool2, pkgconfig, texinfo-legacy
<<
DocFiles: COPYING README AUTHORS NEWS THANKS
InfoDocs: automake.info

Description: GNU Standards-compliant Makefile generator
DescDetail: <<
Automake is a tool for automatically generating `Makefile.in's from files 
called `Makefile.am'.

The goal of Automake is to remove the burden of Makefile maintenance from the 
back of the individual GNU maintainer (and put it on the back of the Automake 
maintainer).

The `Makefile.am' is basically a series of `make' macro definitions (with 
rules being thrown in occasionally). The generated `Makefile.in's are 
compliant with the GNU Makefile standards.
<<
DescPackaging: <<
Previous versions by Christoph Pfisterer, Max Horn.
Desc adapted from debian :-)
<<
License: GPL
Maintainer: Chris Zubrzycki <bere...@users.sourceforge.net>
Homepage: http://www.gnu.org/software/automake/

Index: automake1.12.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/automake1.12.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- automake1.12.info   19 Feb 2013 17:02:36 -0000      1.11
+++ automake1.12.info   4 Sep 2013 11:39:13 -0000       1.12
@@ -1,13 +1,13 @@
 Package: automake1.12
 Version: 1.12.6
-Revision: 1
+Revision: 3
 Source: mirror:gnu:automake/automake-%v.tar.xz
 Source-MD5: 140e084223bf463a24c1a28427c6aec7
 # versions of dpkg < 1.10.21-1233 have a buggy install-info command
 BuildDepends: fink (>= 0.32), dpkg (>= 1.10.21-1234)
 Depends: %N-core (>= %v-%r)
-Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13
-Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13
+Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
+Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13, automake1.14
 Provides: automaken
 
 PatchFile: %n.patch
@@ -49,7 +49,7 @@
 
 SplitOff: <<
  Package: %N-core
- Depends: autoconf | autoconf2.6
+ Depends: autoconf2.6 | autoconf
  Conflicts: %N (<< 1.12.3-2)
  Replaces: %N (<< 1.12.3-2)
  # TODO: Add Provides: automaken-core ??

Index: automake1.11.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/automake1.11.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- automake1.11.patch  19 Sep 2012 07:07:45 -0000      1.3
+++ automake1.11.patch  4 Sep 2013 11:39:13 -0000       1.4
@@ -1,7 +1,93 @@
+diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-mix.test 
automake-1.11.6/tests/vala-mix.test
+--- automake-1.11.6.orig/tests/vala-mix.test   2012-07-09 11:39:58.000000000 
-0400
++++ automake-1.11.6/tests/vala-mix.test        2013-08-27 04:35:17.000000000 
-0400
+@@ -16,7 +16,7 @@
+ 
+ # Vala sources and C sources in the same program.  Functional test.
+ 
+-required='valac cc GNUmake'
++required='valac cc pkg-config GNUmake'
+ . ./defs || Exit 1
+ 
+ set -e
+@@ -25,16 +25,18 @@
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AM_PROG_VALAC([0.7.3])
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am <<'END'
+ bin_PROGRAMS = zardoz mu baz
+-AM_VALAFLAGS = --profile=posix
++AM_CFLAGS = $(GOBJECT_CFLAGS)
++LDADD = $(GOBJECT_LIBS)
+ zardoz_SOURCES = foo.vala bar.c
+ mu_SOURCES = 1.vala 2.c
+ mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run
+-mu_CFLAGS = -DHAVE_MU
++mu_CFLAGS = -DHAVE_MU $(GOBJECT_CFLAGS)
+ baz_SOURCES = baz.c
+ END
+ 
+diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-mix2.test 
automake-1.11.6/tests/vala-mix2.test
+--- automake-1.11.6.orig/tests/vala-mix2.test  2012-07-09 11:39:58.000000000 
-0400
++++ automake-1.11.6/tests/vala-mix2.test       2013-08-26 23:31:08.000000000 
-0400
+@@ -17,7 +17,7 @@
+ # Vala sources, C and C++ sources and C and C++ headers in the same
+ # program.  Functional test.  See automake bug#10894.
+ 
+-required='valac cc c++ GNUmake'
++required='valac cc c++ pkg-config GNUmake'
+ . ./defs || Exit 1
+ 
+ set -e
+@@ -26,12 +26,14 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ AM_PROG_VALAC([0.7.3])
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am <<'END'
+ bin_PROGRAMS = zardoz
+-AM_VALAFLAGS = --profile=posix
++AM_CFLAGS = $(GOBJECT_CFLAGS)
++zardoz_LDADD = $(GOBJECT_LIBS)
+ zardoz_SOURCES = zardoz.vala foo.h bar.c baz.c zen.hh master.cxx
+ END
+ 
 diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-vapi.test 
automake-1.11.6/tests/vala-vapi.test
 --- automake-1.11.6.orig/tests/vala-vapi.test  2012-07-09 11:39:58.000000000 
-0400
-+++ automake-1.11.6/tests/vala-vapi.test       2012-09-19 02:15:05.000000000 
-0400
-@@ -42,7 +42,9 @@
++++ automake-1.11.6/tests/vala-vapi.test       2013-08-26 23:32:24.000000000 
-0400
+@@ -16,7 +16,7 @@
+ 
+ # Test and that vapi files are correctly handled by Vala support.
+ 
+-required='valac cc GNUmake'
++required='pkg-config valac cc GNUmake'
+ . ./defs || Exit 1
+ 
+ set -e
+@@ -25,12 +25,14 @@
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AM_PROG_VALAC([0.7.3])
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am <<'END'
+ bin_PROGRAMS = zardoz
+-AM_VALAFLAGS = --profile=posix
++AM_CFLAGS = $(GOBJECT_CFLAGS)
++LDADD = $(GOBJECT_LIBS)
+ zardoz_SOURCES = zardoz.vala foo.vapi foo.h
+ END
+ 
+@@ -42,7 +44,9 @@
  }
  END
  
@@ -12,7 +98,7 @@
  
  cat > foo.vapi <<'END'
  [CCode (cprefix="", lower_case_cprefix="", cheader_filename="foo.h")]
-@@ -76,7 +78,9 @@
+@@ -76,7 +80,9 @@
  
  # Simple check on remake rules.
  $sleep
@@ -23,3 +109,31 @@
  sed 's/BARBAR/BAZBAZ/' zardoz.vala > t && mv -f t zardoz.vala || Exit 99
  $MAKE && Exit 1
  sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || Exit 99
+diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-vpath.test 
automake-1.11.6/tests/vala-vpath.test
+--- automake-1.11.6.orig/tests/vala-vpath.test 2012-07-09 11:39:58.000000000 
-0400
++++ automake-1.11.6/tests/vala-vpath.test      2013-08-26 23:30:41.000000000 
-0400
+@@ -17,7 +17,7 @@
+ # Test to make sure vala support handles from-scratch VPATH builds.
+ # See automake bug#8753.
+ 
+-required="valac GNUmake"
++required="valac pkg-config GNUmake"
+ . ./defs || Exit 1
+ 
+ set -e
+@@ -26,12 +26,14 @@
+ AC_CONFIG_SRCDIR([hello.vala])
+ AC_PROG_CC
+ AM_PROG_VALAC([0.7.3])
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am <<'END'
+ bin_PROGRAMS = foo
+-foo_VALAFLAGS = --profile=posix
++AM_CFLAGS = $(GOBJECT_CFLAGS)
++LDADD = $(GOBJECT_LIBS)
+ foo_SOURCES = hello.vala
+ END
+ 


------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to