* depdemo/main.c: Support -alt.

* tests/build-relink2.test: Try it.

diff --git a/ChangeLog b/ChangeLog
index 55d10112f225aba21ec89dcb9c993080b31f6f00..cdbbd72dd25006922172d42d74d7dc88e8fa0590 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-05  Alexandre Oliva  <aoliva@redhat.com>
 
+       * depdemo/main.c: Support -alt.
+       * tests/build-relink2.test: Try it.
+
        * ltconfig.in: Removed all references to what used to be
        hardcode_into_libs=all.  2000-09-03's patch was wrong.
        * ltmain.in: Likewise.

diff --git a/depdemo/main.c b/depdemo/main.c
index 6940b624beda1299f27736bfa3facf0077b1bb69..79a9296789f479a70e9af724727b519157cab3b6 100644 (file)
--- a/depdemo/main.c
+++ b/depdemo/main.c
@@ -1,5 +1,6 @@
 /* main.c -- inter-library dependency test program
-   Copyright (C) 1998-1999 Thomas Tanner <tanner@ffii.org>
+   Copyright (C) 1998, 1999, 2000 Free Software Foundation
+   by Thomas Tanner <tanner@ffii.org>
    This file is part of GNU Libtool.
 
 This program is free software; you can redistribute it and/or modify
@@ -32,6 +33,9 @@ main (argc,argv)
   func_l1(0);
   func_l2(0);
   func_l4(0);
+  if (argc == 2 && strcmp (argv[1], "-alt") == 0
+      && var_l1 + var_l2 + var_l4 == 8)
+       return 0;
   if (var_l1 + var_l2 + var_l4 != 20)
        return 1;
   return 0;

diff --git a/tests/build-relink2.test b/tests/build-relink2.test
index d0b560e07133a0834108d71de92705c019f016db..42fe1e7e1b8228049839b38e528502b8666c5f69 100755 (executable)
--- a/tests/build-relink2.test
+++ b/tests/build-relink2.test
@@ -71,7 +71,12 @@ echo "removing libl3.la from ../depdemo/l3"
 rm -rf l3/libl3.la l3/$objdir
 
 echo "running ../depdemo/depdemo"
-if ./depdemo; then
+if ./depdemo ||
+   # On AIX 4.1, when the installed copy of libl3 is loaded, it brings
+   # with it the installed copies of libl1 and libl2, with disjoint
+   # counters var_l1 and var_l2.  This is arguably acceptable behavior,
+   # but it's definitely not enough of a reason for the test to fail.
+   ./depdemo -alt; then
   :
 elif test "x,$hardcode_action,$hardcode_direct" = x,relink,yes; then
   echo "Ok, uninstalled programs fail after uninstalled libraries are removed"