diff options
Diffstat (limited to 't/location.sh')
-rw-r--r-- | t/location.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/t/location.sh b/t/location.sh index da63ef7f1..2c63a46f9 100644 --- a/t/location.sh +++ b/t/location.sh @@ -19,7 +19,6 @@ . test-init.sh cat >> configure.ac << 'END' -AM_CONDITIONAL([COND1], [true]) AM_CONDITIONAL([COND2], [true]) AC_PROG_CC AM_PROG_AR @@ -31,9 +30,6 @@ bin_PROGRAMS = libfoo.a if COND2 lib_LIBRARIES = libfoo.a endif -if COND1 - bin_PROGRAMS += ctags -endif VAR = 1 \ 2 \ 3 @@ -60,8 +56,8 @@ smash_useless_diffs stderr >observed # Apparently useless use of sed here required to avoid spuriously # triggering some maintainer-checks failures. sed 's/^> //' > expected << 'END' -> Makefile.am:12: warning: VAR multiply defined in condition TRUE ... -> Makefile.am:8: ... 'VAR' previously defined here +> Makefile.am:9: warning: VAR multiply defined in condition TRUE ... +> Makefile.am:5: ... 'VAR' previously defined here > automake: error: libfoo_a_OBJECTS should not be defined > Makefile.am:3: while processing library 'libfoo.a' > automake: error: use 'libfoo_a_LDADD', not 'libfoo_a_LIBADD' @@ -75,9 +71,6 @@ sed 's/^> //' > expected << 'END' > Makefile.am:1: while processing program 'libfoo.a' > library.am: ... 'libfoo.a' previously defined here > Makefile.am:3: while processing library 'libfoo.a' -> tags.am: warning: redefinition of 'ctags' ... -> program.am: ... 'ctags$(EXEEXT)' previously defined here -> Makefile.am:6: while processing program 'ctags' END cat expected |