From: Thomas Tanner <tanner@ffii.org>
Date: Wed, 30 Jun 1999 12:50:59 +0000 (+0000)
Subject: * demo/foo.h: use LT_PARAMS instead of LTDL_PARAMS (this is not libltdl)
X-Git-Tag: release-1-3b~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17e3fe3947fc31e0e8d394d88409916e1bfc52e4;p=thirdparty%2Flibtool.git

* demo/foo.h: use LT_PARAMS instead of LTDL_PARAMS (this is not libltdl)
* tests/build-relink.test: also check for hardcode_into_libs = yes,
  if set, we need to relink at install-time
---

diff --git a/ChangeLog b/ChangeLog
index d0acb6ff5..91b5632ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-06-30  Thomas Tanner  <tanner@ffii.org>
+
+	* demo/foo.h: use LT_PARAMS instead of LTDL_PARAMS (this is not libltdl)
+	* tests/build-relink.test: also check for hardcode_into_libs = yes,
+	  if set, we need to relink at install-time
+
 1999-06-29  Thomas Tanner  <tanner@ffii.org>
 
 	* NEWS: mention -no-fast-install, rename dummy to force
diff --git a/demo/foo.h b/demo/foo.h
index 9cc61950f..6d4fee709 100644
--- a/demo/foo.h
+++ b/demo/foo.h
@@ -50,10 +50,10 @@ USA. */
    compilers can issue warnings about type mismatches. */
 #undef LTDL_PARAMS
 #if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(__CYGWIN32__) || defined(__cplusplus)
-# define LTDL_PARAMS(protos) protos
+# define LT_PARAMS(protos) protos
 # define lt_ptr_t     void*
 #else
-# define LTDL_PARAMS(protos) ()
+# define LT_PARAMS(protos) ()
 # define lt_ptr_t     char*
 #endif
 
@@ -82,8 +82,8 @@ USA. */
 
 /* Declarations.  Note the wonderful use of the above macros. */
 __BEGIN_DECLS
-int foo LTDL_PARAMS((void));
-int hello LTDL_PARAMS((void));
+int foo LT_PARAMS((void));
+int hello LT_PARAMS((void));
 EXTERN int nothing;
 __END_DECLS
 
diff --git a/tests/build-relink.test b/tests/build-relink.test
index 515678eba..dd5b4856e 100755
--- a/tests/build-relink.test
+++ b/tests/build-relink.test
@@ -58,6 +58,13 @@ if test "$hardcode_direct" = NONE; then
   exit 1
 fi
 
+hardcode_into_libs=NONE
+eval `egrep -e '^hardcode_into_libs=' ./libtool 2>/dev/null`
+if test "$hardcode_into_libs" = NONE; then
+  echo "hardcode_into_libs not set in ../demo/libtool" 1>&2
+  exit 1
+fi
+
 ./hell # so that it links on-demand if needed
 
 echo "removing libhello.la from ../demo"
@@ -92,7 +99,8 @@ else
   echo "Failed, as expected"
 fi
 
-if test "x$hardcode_action" = xrelink; then
+if test "x$hardcode_action" = xrelink ||
+   test "x$hardcode_into_libs" = xyes; then
   echo "= Exiting: install-time relinking is required"
   exit 0
 fi