mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
* ltconfig.in (dlopen, dlopen_self): default is unknown
* ltmain.in: fixed -dlopen self, print a warning if -dlopen is used without AC_LIBTOOL_DLOPEN * mdemo/Makefile.am: use -dlopen self
This commit is contained in:
parent
635040153e
commit
3a381a67c0
@ -1,3 +1,10 @@
|
||||
1999-02-22 Thomas Tanner <tanner@gmx.de>
|
||||
|
||||
* ltconfig.in (dlopen, dlopen_self): default is unknown
|
||||
* ltmain.in: fixed -dlopen self, print a warning
|
||||
if -dlopen is used without AC_LIBTOOL_DLOPEN
|
||||
* mdemo/Makefile.am: use -dlopen self
|
||||
|
||||
1999-02-22 Alexandre Oliva <oliva@dcc.unicamp.br>
|
||||
|
||||
* ltmain.in: added missing mkdir $progdir for on-demand executable
|
||||
|
@ -177,8 +177,8 @@ can_build_shared=yes
|
||||
enable_shared=yes
|
||||
# All known linkers require a `.a' archive for static linking.
|
||||
enable_static=yes
|
||||
enable_dlopen=no
|
||||
enable_dlopen_self=no
|
||||
enable_dlopen=unknown
|
||||
enable_dlopen_self=unknown
|
||||
ltmain=
|
||||
silent=
|
||||
srcdir=
|
||||
|
12
ltmain.in
12
ltmain.in
@ -869,9 +869,11 @@ compiler."
|
||||
self)
|
||||
if test "$prev" = dlprefiles; then
|
||||
dlself=yes
|
||||
elif test "$prev" = dlfiles && test "$dlopen_self" = no; then
|
||||
elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
|
||||
dlself=yes
|
||||
fi
|
||||
prev=
|
||||
continue
|
||||
;;
|
||||
*)
|
||||
dlprefiles="$dlprefiles $arg"
|
||||
@ -1186,7 +1188,7 @@ compiler."
|
||||
# This library was specified with -dlopen.
|
||||
if test "$prev" = dlfiles; then
|
||||
dlfiles="$dlfiles $arg"
|
||||
if test -z "$dlname" || test "$dlopen" = no || test "$build_libtool_libs" = no; then
|
||||
if test -z "$dlname" || test "$dlopen" != yes || test "$build_libtool_libs" = no; then
|
||||
# If there is no dlname, no dlopen support or we're linking statically,
|
||||
# we need to preload.
|
||||
prev=dlprefiles
|
||||
@ -2166,6 +2168,12 @@ EOF
|
||||
$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
|
||||
fi
|
||||
|
||||
if test "$preload" = yes; then
|
||||
if test "$dlopen" = unknown || test "$dlopen_self" = unknown; then
|
||||
$echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$dlself" = yes && test "$export_dynamic" = no; then
|
||||
$echo "$modename: error: \`-dlopen self' requires \`-export-dynamic'" 1>&2
|
||||
exit 1
|
||||
|
@ -30,7 +30,8 @@ mdemo_SOURCES = main.c
|
||||
mdemo_LDFLAGS = -export-dynamic ## FIXME: remove this when libtool and libltdl
|
||||
## handle dependencies of modules
|
||||
## The quotes around -dlopen below fool automake into accepting it
|
||||
mdemo_LDADD = ../libltdl/libltdl.la "-dlopen" foo1.la "-dlopen" libfoo2.la
|
||||
mdemo_LDADD = ../libltdl/libltdl.la "-dlopen" self \
|
||||
"-dlopen" foo1.la "-dlopen" libfoo2.la
|
||||
mdemo_DEPENDENCIES = ../libltdl/libltdl.la foo1.la libfoo2.la
|
||||
|
||||
# Create a statically linked version of mdemo.
|
||||
|
Loading…
Reference in New Issue
Block a user