mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-01-12 14:06:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

* demo/run.test: removed the unnecessary test

Browse Source 
* demo/Makefile.am: ditto
* ltmain.in: set the DLL search path on cygwin,mingw and os2
This commit is contained in:
Thomas Tanner 1999-04-05 10:20:57 +00:00
parent 6df1c07038
commit 2706767e2c
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
1999-04-05 Thomas Tanner <tanner@gmx.de>
* demo/run.test: removed the unnecessary test
* demo/Makefile.am: ditto
* ltmain.in: set the DLL search path on cygwin,mingw and os2
1999-04-04 Alexandre Oliva <oliva@dcc.unicamp.br>
* ltconfig.in (sunos4*, GNU ld): -Bstatic is not enough for

4
demo/Makefile.am
View File

@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = no-dependencies foreign
EXTRA_DIST = $(TESTS) acinclude.m4
EXTRA_DIST = acinclude.m4
# Build a libtool library, libhello.la for installation in libdir.
lib_LTLIBRARIES = libhello.la
@ -62,8 +62,6 @@ CLEANFILES = $(hardcode_tests)
# to its private directory.
objdir = `sed -n -e 's/^objdir=\(.*\)$$/\1/p' ../libtool`
TESTS = run.test
# The following rules are only for the libtool demo and tests.
# Regenerate our acinclude.m4 only if it doesn't exist.
$(srcdir)/acinclude.m4:

25
ltmain.in
View File

@ -794,6 +794,7 @@ compiler."
old_convenience=
deplibs=
linkopts=
dllsearchpath=
lib_search_path=`pwd`
avoid_version=no
@ -1019,6 +1020,14 @@ compiler."
lib_search_path="$lib_search_path $dir"
;;
esac
case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2*)
case ":$dllsearchpath:" in
*":$dir:"*) ;;
*) dllsearchpath="$dllsearchpath:$dir";;
esac
;;
esac
continue
;;
@ -2918,6 +2927,14 @@ EOF
*) perm_rpath="$perm_rpath $libdir" ;;
esac
fi
case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2*)
case ":$dllsearchpath:" in
*":$libdir:"*) ;;
*) dllsearchpath="$dllsearchpath:$libdir";;
esac
;;
esac
done
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
@ -3420,6 +3437,14 @@ else
"
fi
# fixup the dll searchpath if we need to.
if test -n "$dllsearchpath"; then
$echo >> $output "\
# Add the dll search path components to the executable PATH
PATH=$dllsearchpath:\$PATH
"
fi
$echo >> $output "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.