* 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
This commit is contained in:
Thomas Tanner 1999-06-30 12:50:59 +00:00 committed by Thomas Tanner
parent 86180ef4d5
commit 17e3fe3947
3 changed files with 19 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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