Changeset 3110

Timestamp:

Nov 10, 2013, 12:42:16 AM (10 years ago)

Author:

Peter

Message:

Fix test of YAT_LT_LINK_IFELSE. The macro/linking worked also against
static library, which is unexpected. When I modified to an library
with more symbols (libyat) I get the error: "relocation..." as
expected. refs #737.

configure.ac: AC_SUBST lt_vc_objdir from libtool
test/defs.sh.in: define dito
test/gen_libmy_static.sh: copy libyat.a rather than creating a small libmy-static.a from scratch.
yat_lt_link_la_ifelse_test.sh: link against theplu::yat::utility::version(void) as libmy-static now just is a alias for libyat.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• test/defs.sh.in (modified) (1 diff)
• test/gen_libmy_static.sh (modified) (3 diffs)
• test/yat_lt_link_la_ifelse_test.sh (modified) (1 diff)

trunk/configure.ac

@@ -495 +495 @@
 AC_SUBST([enable_static])
 
+# Name of directory libtool put stuff int - needed for some tests
+AC_SUBST([lt_cv_objdir])
+
 YAT_SVN_RELEASE([am/maintainer.am])
 

trunk/test/defs.sh.in

@@ -125 +125 @@
 abs_top_builddir=@abs_top_builddir@
 abs_top_srcdir=@abs_top_srcdir@
+lt_cv_objdir=@lt_cv_objdir@
 have_doxygen="@have_doxygen@"
 mkdir_p="@MKDIR_P@ --verbose"

trunk/test/gen_libmy_static.sh

@@ -26 +26 @@
 cd $test_dir
 
-# redefine so we can call check_requirment without exit
+# redefine so we can call check_requirements without exit
 exit_skip ()
 {
@@ -32 +32 @@
 }
 
-required="autoconf automake static"
+required="static"
 check_requirements > stdout 2> stderr
 
-# if requirments are misssing we just create an empty dummy file (to
+# if requirements are misssing we just create an empty dummy file (to
 # avoid triggering the make target over and over again)
 if test x$req_failed = xyes; then
@@ -43 +43 @@
 fi
 
-cat > configure.ac <<EOF
-AC_INIT([foo], [1])
-AM_INIT_AUTOMAKE([foreign])
-AC_PROG_CXX
-AC_PROG_RANLIB
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-EOF
+# include to get variable $old_library
+. $abs_top_builddir/yat/libyat.la
+test x"${old_library}" != x"" || exit 1
 
-cat > Makefile.am <<EOF
-lib_LIBRARIES = libmy-static.a
-libmy_static_a_SOURCES = foo.cc
-EOF
-
-cat > foo.cc <<EOF
-int foo_static(void) { return 0; }
-EOF
-
-verbose=
-bootstrap
-./configure --prefix=$abs_top_builddir/test || exit 1
-
-unset MAKEFLAGS
-make install V=0 || exit 1
+cp $abs_top_builddir/yat/${lt_cv_objdir}/${old_library} \
+$abs_top_builddir/test/lib/libmy-static.a
 exit 0

trunk/test/yat_lt_link_la_ifelse_test.sh

@@ -52 +52 @@
 AC_MSG_CHECKING([whether linking against -lmy-static works])
 YAT_LT_LINK_LA_IFELSE([
-    int foo_static(void);
-    int my_func(void) { return foo_static(); }
+namespace theplu {
+namespace yat {
+namespace utility {
+    int version(void);
+}}}
+    int my_func(void) { return theplu::yat::utility::version(); }
   ],[
     AC_MSG_RESULT([yes])
-    AC_MSG_FAILURE
+    AC_MSG_FAILURE([expected configure to fail])
   ],[
     AC_MSG_RESULT([no])