projects
/
platform
/
upstream
/
automake.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8d0391c
1da044d
)
Merge branch 'fix-vala-test'
author
Peter Rosin
<peda@lysator.liu.se>
Fri, 2 Mar 2012 10:49:18 +0000
(11:49 +0100)
committer
Peter Rosin
<peda@lysator.liu.se>
Fri, 2 Mar 2012 10:49:18 +0000
(11:49 +0100)
* fix-vala-test:
tests: fix (harmless) botched merge
1
2
tests/vala.test
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tests/vala.test
index
b4e2d76
,
280c9ee
..
71c2ee6
---
1
/
tests/vala.test
---
2
/
tests/vala.test
+++ b/
tests/vala.test
@@@
-24,11
-25,11
+24,11
@@@
AC_DEFUN([AC_PROG_LIBTOOL]
[AC_SUBST([LIBTOOL], [:])])
END
-cat >> 'configure.
in
' << 'END'
+cat >> 'configure.
ac
' << 'END'
AC_PROG_CC
AC_PROG_CXX
- AC_PROG_LIBTOOL
AM_PROG_AR
+ AC_PROG_LIBTOOL
AM_PROG_VALAC
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT