[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11b-52-g8052682

[Stefano Lattarini]

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=80526828985bc37e8c682b83c779919fdde78d31

The branch, master has been updated
       via  80526828985bc37e8c682b83c779919fdde78d31 (commit)
       via  f357bed82aed91aa3eef5e157df4814c7fc26028 (commit)
       via  1837e206e69dadeffbf3b1364c468235f19d5815 (commit)
      from  f450cd19f4efa6ab3bafa072d7756239b6888ae0 (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 80526828985bc37e8c682b83c779919fdde78d31
Merge: f450cd1 f357bed 1837e20
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 25 13:11:08 2012 +0200

    Merge branches 'fix-pr11302-opensuse' and 'fix-pr11306-macosx'
    
    * fix-pr11302-opensuse:
      tests: cater to systems installing libs in /lib64
    
    * fix-pr11306-macosx:
      tests: fix spurious failure on Mac OS X

commit f357bed82aed91aa3eef5e157df4814c7fc26028
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 23 15:51:25 2012 +0200

    tests: cater to systems installing libs in /lib64
    
    See automake bug#11302.
    
    On at least OpenSUSE 12.1, "make install" will install libraries in
    the '${prefix}/lib64'  directory by default.  This is due to the
    $CONFIG_SITE set by /etc/profile.d/site.sh, which sets a libdir
    that ends in '/lib64' rather than '/lib' if it finds that the compiler
    is generating 64-bit code.  This behaviour was causing some spurious
    failures in our testsuite.  Fix them.
    
    * t/posixsubst-libraries.sh: Assume the libraries are installed in
    '$(libdir)' rather than in '$(prefix)/lib'.
    * t/posixsubst-ltlibraries.sh: Likewise.
    * t/posixsubst-scripts.sh: Similarly, don't assume that '$(bindir)',
    '$(sbindir)' and '$(libexedir)' always defaults to respectively
    '$(prefix)/bin', '$(prefix)/sbin' and '$(prefix)/libexec'.
    * t/transform3.test: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 1837e206e69dadeffbf3b1364c468235f19d5815
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 23 12:47:43 2012 +0200

    tests: fix spurious failure on Mac OS X
    
    See automake bug#11306.
    
    * t/lex-libobj.sh: We used to pass LEXLIB='-L /lib' to the ./configure
    invocation, to prevent it from explicitly searching for a "lex library".
    But the linker on MacOS X 10.5 apparently chokes on that:
    
      cc -g -O2  -o foo foo.o -L /lib yywrap.o
      ld: file not found: /lib
      collect2: ld returned 1 exit status
    
    So, we now instead pass LEXLIB=' ', which being non-empty is enough
    to prevent the search of a "lex library".  And since we are at it,
    enhance comments on this non-obvious usage.
    
    Co-authored-by: Bruno Haible <address@hidden>
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 t/lex-libobj.sh             |    9 +++++++--
 t/posixsubst-libraries.sh   |    8 ++++----
 t/posixsubst-ltlibraries.sh |    8 ++++----
 t/posixsubst-scripts.sh     |   22 +++++++++++-----------
 t/transform3.sh             |   41 +++++++++++++++++++++++------------------
 5 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh
index 3bc2981..3f4b860 100755
--- a/t/lex-libobj.sh
+++ b/t/lex-libobj.sh
@@ -67,8 +67,13 @@ grep LIBOBJS Makefile # For debugging.
 $MAKE
 $MAKE distclean
 
-# Force "no system lex library".
-./configure LEXLIB='-L /lib'
+# Force "no system lex library".  Setting LEXLIB to a non-empty value
+# ensures that configure won't search for a "lex library", and simply
+# rely on the LEXLIB to provide it, if needed.  So, by setting LEXLIB
+# to a blank but non-empty value we can fool configure into thinking
+# that no system-level library providing a 'yywrap' function is
+# available.  See also discussion on automake bug#11306.
+./configure LEXLIB=' '
 grep LIBOBJS Makefile # For debugging.
 grep '^LIBOBJS *=.*yywrap.*\.o' Makefile # Sanity check.
 $MAKE
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
index 8e6b265..f437571 100755
--- a/t/posixsubst-libraries.sh
+++ b/t/posixsubst-libraries.sh
@@ -41,10 +41,10 @@ libbar.c:
 CLEANFILES = libbar.c # For FreeBSD make.
 
 installcheck-local:
-       ls -l $(prefix)/lib
-       test -f $(prefix)/lib/libfoo1.a
-       test -f $(prefix)/lib/libfoo2.a
-       test -f $(prefix)/lib/libbar.a
+       ls -l $(libdir)
+       test -f $(libdir)/libfoo1.a
+       test -f $(libdir)/libfoo2.a
+       test -f $(libdir)/libbar.a
 END
 
 echo 'int bar1(void) { return 0; }' > libfoo1.c
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
index 6a4cbd5..b4b2a92 100755
--- a/t/posixsubst-ltlibraries.sh
+++ b/t/posixsubst-ltlibraries.sh
@@ -41,10 +41,10 @@ libbar.c:
 CLEANFILES = libbar.c # For FreeBSD make.
 
 installcheck-local:
-       ls -l $(prefix)/lib
-       test -f $(prefix)/lib/libfoo1.la
-       test -f $(prefix)/lib/libfoo2.la
-       test -f $(prefix)/lib/libbar.la
+       ls -l $(libdir)
+       test -f $(libdir)/libfoo1.la
+       test -f $(libdir)/libfoo2.la
+       test -f $(libdir)/libbar.la
 END
 
 echo 'int bar1(void) { return 0; }' > libfoo1.c
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh
index 934b82e..cda515f 100755
--- a/t/posixsubst-scripts.sh
+++ b/t/posixsubst-scripts.sh
@@ -65,17 +65,17 @@ test2: distdir
        test ! -r $(distdir)/quux.pl
 
 installcheck-local:
-       ls -l $(prefix)/libexec $(prefix)/bin $(prefix)/sbin
-       test -f $(prefix)/sbin/foo1.sh
-       test -x $(prefix)/sbin/foo1.sh
-       test -f $(prefix)/sbin/foo2.sh
-       test -x $(prefix)/sbin/foo2.sh
-       test -f $(prefix)/libexec/bar1
-       test -x $(prefix)/libexec/bar1
-       test -f $(prefix)/libexec/bar2
-       test -x $(prefix)/libexec/bar2
-       test -f $(prefix)/bin/quux.pl
-       test -x $(prefix)/bin/quux.pl
+       ls -l $(libexecdir) $(bindir) $(sbindir)
+       test -f $(sbindir)/foo1.sh
+       test -x $(sbindir)/foo1.sh
+       test -f $(sbindir)/foo2.sh
+       test -x $(sbindir)/foo2.sh
+       test -f $(libexecdir)/bar1
+       test -x $(libexecdir)/bar1
+       test -f $(libexecdir)/bar2
+       test -x $(libexecdir)/bar2
+       test -f $(bindir)/quux.pl
+       test -x $(bindir)/quux.pl
 END
 
 cat > foo1.sh <<'END'
diff --git a/t/transform3.sh b/t/transform3.sh
index aaa69cb..6f1b811 100755
--- a/t/transform3.sh
+++ b/t/transform3.sh
@@ -35,6 +35,27 @@ bin_SCRIPTS = foo
 pkgdata_DATA = bar.txt
 pkglib_LIBRARIES = libzap.a
 pkglibexec_SCRIPTS = mu
+
+test-install: install
+       find $(prefix) ;: For debugging.
+       test   -f $(bindir)/gnu-foo
+       test   -x $(bindir)/gnu-foo
+       test   -f $(datadir)/foo/bar.txt
+       test ! -d $(datadir)/gnu-foo
+       test   -f $(libdir)/foo/libzap.a
+       test ! -d $(libdir)/gnu-foo
+       test   -f $(libexecdir)/foo/gnu-mu
+       test   -x $(libexecdir)/foo/gnu-mu
+       test ! -d $(libexecdir)/gnu-foo
+
+test-installdirs: installdirs
+       find $(prefix) ;: For debugging.
+       test   -d $(datadir)/foo
+       test ! -d $(datadir)/gnu-foo
+       test   -d $(libdir)/foo
+       test ! -d $(libdir)/gnu-foo
+       test   -d $(libexecdir)/foo
+       test ! -d $(libexecdir)/gnu-foo
 END
 
 cat > libzap.c <<'END'
@@ -59,29 +80,13 @@ $AUTOMAKE -a
 
 ./configure --program-prefix=gnu- --prefix "`pwd`/inst"
 
-$MAKE install
-find inst # For debugging.
-test -f inst/bin/gnu-foo
-test -x inst/bin/gnu-foo
-test -f inst/share/foo/bar.txt
-test ! -d inst/share/gnu-foo
-test -f inst/lib/foo/libzap.a
-test ! -d inst/lib/gnu-foo
-test -f inst/libexec/foo/gnu-mu
-test -x inst/libexec/foo/gnu-mu
-test ! -d inst/libexec/gnu-foo
+$MAKE test-install
 
 $MAKE uninstall
 test `find inst -type f -print | wc -l` = 0
 
 # Opportunistically test for installdirs.
 rm -rf inst
-$MAKE installdirs
-test -d inst/share/foo
-test ! -d inst/share/gnu-foo
-test -d inst/lib/foo
-test ! -d inst/lib/gnu-foo
-test -d inst/libexec/foo
-test ! -d inst/libexec/gnu-foo
+$MAKE test-installdirs
 
 :


hooks/post-receive
-- 
GNU Automake