JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ltconfig, ltmain.sh, libtool.m4: Updated from libtool

Browse Source 
multi-language branch, to work around Solaris' /bin/sh bug.  Rebuilt
all affected `configure' scripts.
This commit is contained in:
Alexandre Oliva
2000-09-30 06:06:58 +00:00
parent 8d82847a29
commit a6b9fcde41
4 changed files with 99 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2000-09-30 Alexandre Oliva <aoliva@redhat.com>
* ltconfig, ltmain.sh, libtool.m4: Updated from libtool
multi-language branch, to work around Solaris' /bin/sh bug. Rebuilt
all affected `configure' scripts.
2000-09-25 Alexandre Oliva <aoliva@redhat.com> 2000-09-25 Alexandre Oliva <aoliva@redhat.com>
* Makefile.in (DEVO_SUPPORT): Added gettext.m4, libtool.m4 and * Makefile.in (DEVO_SUPPORT): Added gettext.m4, libtool.m4 and

56
libtool.m4 vendored
View File

@@ -37,12 +37,17 @@ dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
[AC_LIBTOOL_GCJ], [AC_LIBTOOL_GCJ],
[AC_PROVIDE_IFELSE([A][M_PROG_GCJ], [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
[AC_LIBTOOL_GCJ], [AC_LIBTOOL_GCJ],
[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
[AC_LIBTOOL_GCJ],
[ifdef([AC_PROG_GCJ], [ifdef([AC_PROG_GCJ],
[define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
])]) ])])
ifdef([A][M_PROG_GCJ], ifdef([A][M_PROG_GCJ],
[define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
])])])])]) ])])
ifdef([LT_AC_PROG_GCJ],
[define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
])])])])])])
AC_DEFUN(_AC_PROG_LIBTOOL, AC_DEFUN(_AC_PROG_LIBTOOL,
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
@@ -54,7 +59,7 @@ AC_CACHE_SAVE
# Actually configure libtool. ac_aux_dir is where install-sh is found. # Actually configure libtool. ac_aux_dir is where install-sh is found.
AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
@@ -99,7 +104,7 @@ dnl
# Only perform the check for file, if the check method requires it # Only perform the check for file, if the check method requires it
case "$deplibs_check_method" in case "$deplibs_check_method" in
file_magic*) file_magic*)
if test "$file_magic_cmd" = '${MAGIC}'; then if test "$file_magic_cmd" = '$MAGIC_CMD'; then
AC_PATH_MAGIC AC_PATH_MAGIC
fi fi
;; ;;
@@ -168,7 +173,7 @@ case "$host" in
;; ;;
ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw*) [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false) AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -190,7 +195,7 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
[AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
CFLAGS="$SAVE_CFLAGS" ;; CFLAGS="$SAVE_CFLAGS" ;;
*-*-cygwin*) *-*-cygwin* | *-*-pw32*)
# cygwin systems need to pass --dll to the linker, and not link # cygwin systems need to pass --dll to the linker, and not link
# crt.o which will require a WinMain@16 definition. # crt.o which will require a WinMain@16 definition.
lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
@@ -317,16 +322,16 @@ pic_mode=ifelse($#,1,$1,default)])
# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library # AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
AC_DEFUN(AC_PATH_TOOL_PREFIX, AC_DEFUN(AC_PATH_TOOL_PREFIX,
[AC_MSG_CHECKING([for $1]) [AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC, AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case "$MAGIC" in [case "$MAGIC_CMD" in
/*) /*)
lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path. lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
;; ;;
?:/*) ?:/*)
ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path. lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
;; ;;
*) *)
ac_save_MAGIC="$MAGIC" ac_save_MAGIC_CMD="$MAGIC_CMD"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
dnl $ac_dummy forces splitting on constant user-supplied paths. dnl $ac_dummy forces splitting on constant user-supplied paths.
dnl POSIX.2 word splitting is done only on the output of word expansions, dnl POSIX.2 word splitting is done only on the output of word expansions,
@@ -335,12 +340,12 @@ dnl not every word. This closes a longstanding sh security hole.
for ac_dir in $ac_dummy; do for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$1; then if test -f $ac_dir/$1; then
lt_cv_path_MAGIC="$ac_dir/$1" lt_cv_path_MAGIC_CMD="$ac_dir/$1"
if test -n "$file_magic_test_file"; then if test -n "$file_magic_test_file"; then
case "$deplibs_check_method" in case "$deplibs_check_method" in
"file_magic "*) "file_magic "*)
file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
MAGIC="$lt_cv_path_MAGIC" MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
egrep "$file_magic_regex" > /dev/null; then egrep "$file_magic_regex" > /dev/null; then
: :
@@ -364,12 +369,12 @@ EOF
fi fi
done done
IFS="$ac_save_ifs" IFS="$ac_save_ifs"
MAGIC="$ac_save_MAGIC" MAGIC_CMD="$ac_save_MAGIC_CMD"
;; ;;
esac]) esac])
MAGIC="$lt_cv_path_MAGIC" MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC"; then if test -n "$MAGIC_CMD"; then
AC_MSG_RESULT($MAGIC) AC_MSG_RESULT($MAGIC_CMD)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
@@ -380,11 +385,11 @@ fi
AC_DEFUN(AC_PATH_MAGIC, AC_DEFUN(AC_PATH_MAGIC,
[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH) AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
if test -z "$lt_cv_path_MAGIC"; then if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH) AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
else else
MAGIC=: MAGIC_CMD=:
fi fi
fi fi
]) ])
@@ -492,7 +497,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag"
AC_DEFUN(AC_DEPLIBS_CHECK_METHOD, AC_DEFUN(AC_DEPLIBS_CHECK_METHOD,
[AC_CACHE_CHECK([how to recognise dependant libraries], [AC_CACHE_CHECK([how to recognise dependant libraries],
lt_cv_deplibs_check_method, lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='${MAGIC}' [lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file= lt_cv_file_magic_test_file=
lt_cv_deplibs_check_method='unknown' lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support # Need to set the preceding variable on all platforms that support
@@ -523,9 +528,9 @@ bsdi4*)
lt_cv_file_magic_test_file=/shlib/libc.so lt_cv_file_magic_test_file=/shlib/libc.so
;; ;;
cygwin* | mingw*) cygwin* | mingw* |pw32*)
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='${OBJDUMP} -f' lt_cv_file_magic_cmd='$OBJDUMP -f'
;; ;;
freebsd* ) freebsd* )
@@ -682,7 +687,7 @@ AC_DEFUN(AC_CHECK_LIBM,
[AC_REQUIRE([AC_CANONICAL_HOST])dnl [AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM= LIBM=
case "$host" in case "$host" in
*-*-beos* | *-*-cygwin*) *-*-beos* | *-*-cygwin* | *-*-pw32*)
# These system don't have libm # These system don't have libm
;; ;;
*-ncr-sysv4.3*) *-ncr-sysv4.3*)
@@ -765,7 +770,7 @@ lt_save_CFLAGS="$CFLAGS"
dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
dnl is set to the C++ compiler. dnl is set to the C++ compiler.
AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \ AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
MAGIC="$MAGIC" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ MAGIC_CMD="$MAGIC_CMD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
@@ -788,16 +793,17 @@ AC_DEFUN(_AC_LIBTOOL_GCJ,
[AC_REQUIRE([AC_PROG_LIBTOOL]) [AC_REQUIRE([AC_PROG_LIBTOOL])
AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
[AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
[ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
[ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
[AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])]) [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh" LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
lt_save_CC="$CC" lt_save_CC="$CC"
lt_save_CFLAGS="$CFLAGS" lt_save_CFLAGS="$CFLAGS"
dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
dnl is set to the C++ compiler. dnl is set to the C++ compiler.
AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="" \ AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="" \
MAGIC="$MAGIC" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ MAGIC_CMD="$MAGIC_CMD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \

93
ltconfig
View File

@@ -181,7 +181,7 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
PROGRAM=ltconfig PROGRAM=ltconfig
PACKAGE=libtool PACKAGE=libtool
VERSION=1.4a VERSION=1.4a
TIMESTAMP=" (1.641.2.111 2000/09/05 10:29:18)" TIMESTAMP=" (1.641.2.122 2000/09/30 05:27:52)"
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
rm="rm -f" rm="rm -f"
@@ -273,7 +273,7 @@ old_CFLAGS="$CFLAGS"
old_CPPFLAGS="$CPPFLAGS" old_CPPFLAGS="$CPPFLAGS"
old_LDFLAGS="$LDFLAGS" old_LDFLAGS="$LDFLAGS"
old_LIBS="$LIBS" old_LIBS="$LIBS"
old_MAGIC="$MAGIC" old_MAGIC_CMD="$MAGIC_CMD"
old_LD="$LD" old_LD="$LD"
old_LN_S="$LN_S" old_LN_S="$LN_S"
old_LTCC="$LTCC" old_LTCC="$LTCC"
@@ -640,7 +640,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
test -z "$AS" && AS=as test -z "$AS" && AS=as
test -z "$CC" && CC=cc test -z "$CC" && CC=cc
test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$MAGIC" && MAGIC=file test -z "$MAGIC_CMD" && MAGIC_CMD=file
test -z "$LD" && LD=ld test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s" test -z "$LN_S" && LN_S="ln -s"
test -z "$NM" && NM=nm test -z "$NM" && NM=nm
@@ -983,7 +983,7 @@ bsdi4*)
# libtool to hard-code these into programs # libtool to hard-code these into programs
;; ;;
cygwin* | mingw*) cygwin* | mingw* | pw32*)
version_type=windows version_type=windows
need_version=no need_version=no
need_lib_prefix=no need_lib_prefix=no
@@ -1115,14 +1115,13 @@ netbsd*)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so' dynamic_linker='NetBSD (a.out) ld.so'
else else
deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
file_magic_cmd=/usr/bin/file
file_magic_test_file=`echo /usr/lib/libc.so*`
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
soname_spec='${libname}${release}.so$major' soname_spec='${libname}${release}.so$major'
dynamic_linker='NetBSD ld.elf_so' dynamic_linker='NetBSD ld.elf_so'
fi fi
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;; ;;
openbsd*) openbsd*)
@@ -1256,7 +1255,7 @@ case "$host_os" in
aix*) aix*)
symcode='[BCDT]' symcode='[BCDT]'
;; ;;
cygwin* | mingw*) cygwin* | mingw* | pw32*)
symcode='[ABCDGISTW]' symcode='[ABCDGISTW]'
;; ;;
hpux*) # Its linker distinguishes data from code symbols hpux*) # Its linker distinguishes data from code symbols
@@ -1307,11 +1306,11 @@ void nm_test_func(){}
main(){nm_test_var='a';nm_test_func();return(0);} main(){nm_test_var='a';nm_test_func();return(0);}
EOF EOF
echo "$progname:1310: checking if global_symbol_pipe works" >&5 echo "$progname:1309: checking if global_symbol_pipe works" >&5
if { (eval echo $progname:1311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then if { (eval echo $progname:1310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
# Now try to grab the symbols. # Now try to grab the symbols.
nlist=conftest.nm nlist=conftest.nm
if { echo "$progname:1314: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then if { echo "$progname:1313: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
# Try sorting and uniquifying the output. # Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then if sort "$nlist" | uniq > "$nlist"T; then
@@ -1363,7 +1362,7 @@ EOF
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
LIBS="conftstm.$objext" LIBS="conftstm.$objext"
CFLAGS="$CFLAGS$no_builtin_flag" CFLAGS="$CFLAGS$no_builtin_flag"
if { (eval echo $progname:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo $progname:1365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
pipe_works=yes pipe_works=yes
else else
echo "$progname: failed program was:" >&5 echo "$progname: failed program was:" >&5
@@ -1408,7 +1407,7 @@ echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in # Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
# configure.in, otherwise build static only libraries. # configure.in, otherwise build static only libraries.
case "$host_os" in case "$host_os" in
cygwin* | mingw* | os2*) cygwin* | mingw* | pw32* | os2*)
if test x$can_build_shared = xyes; then if test x$can_build_shared = xyes; then
test x$enable_win32_dll = xno && can_build_shared=no test x$enable_win32_dll = xno && can_build_shared=no
echo "checking if package supports dlls... $can_build_shared" 1>&6 echo "checking if package supports dlls... $can_build_shared" 1>&6
@@ -1467,14 +1466,14 @@ else
if test "X${lt_cv_dlopen+set}" != Xset; then if test "X${lt_cv_dlopen+set}" != Xset; then
lt_cv_dlopen=no lt_cv_dlopen_libs= lt_cv_dlopen=no lt_cv_dlopen_libs=
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "$progname:1470: checking for dlopen in -ldl" >&5 echo "$progname:1469: checking for dlopen in -ldl" >&5
if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS" LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1477 "ltconfig" #line 1476 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
@@ -1487,7 +1486,7 @@ int main() {
dlopen() dlopen()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo $progname:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo $progname:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_lib_dl_dlopen=yes ac_cv_lib_dl_dlopen=yes
else else
@@ -1506,12 +1505,12 @@ if test "X$ac_cv_lib_dl_dlopen" = Xyes; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
echo "$progname:1509: checking for dlopen" >&5 echo "$progname:1508: checking for dlopen" >&5
if test "X${ac_cv_func_dlopen+set}" = Xset; then if test "X${ac_cv_func_dlopen+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1514 "ltconfig" #line 1513 "ltconfig"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */ which can conflict with char dlopen(); below. */
#include <assert.h> #include <assert.h>
@@ -1536,7 +1535,7 @@ dlopen();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo $progname:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo $progname:1538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_func_dlopen=yes ac_cv_func_dlopen=yes
else else
@@ -1553,14 +1552,14 @@ if test "X$ac_cv_func_dlopen" = Xyes; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
echo "$progname:1556: checking for dlopen in -lsvld" >&5 echo "$progname:1555: checking for dlopen in -lsvld" >&5
if test "X${ac_cv_lib_svld_dlopen+set}" = Xset; then if test "X${ac_cv_lib_svld_dlopen+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lsvld $LIBS" LIBS="-lsvld $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1563 "ltconfig" #line 1562 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
@@ -1573,7 +1572,7 @@ int main() {
dlopen() dlopen()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo $progname:1576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo $progname:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_lib_svld_dlopen=yes ac_cv_lib_svld_dlopen=yes
else else
@@ -1592,14 +1591,14 @@ if test "X$ac_cv_lib_svld_dlopen" = Xyes; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
echo "$progname:1595: checking for dld_link in -ldld" >&5 echo "$progname:1594: checking for dld_link in -ldld" >&5
if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS" LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1602 "ltconfig" #line 1601 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
@@ -1612,7 +1611,7 @@ int main() {
dld_link() dld_link()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo $progname:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo $progname:1614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_lib_dld_dld_link=yes ac_cv_lib_dld_dld_link=yes
else else
@@ -1631,12 +1630,12 @@ if test "X$ac_cv_lib_dld_dld_link" = Xyes; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load""... $ac_c" 1>&6 echo $ac_n "checking for shl_load""... $ac_c" 1>&6
echo "$progname:1634: checking for shl_load" >&5 echo "$progname:1633: checking for shl_load" >&5
if test "X${ac_cv_func_shl_load+set}" = Xset; then if test "X${ac_cv_func_shl_load+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1639 "ltconfig" #line 1638 "ltconfig"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */ which can conflict with char shl_load(); below. */
#include <assert.h> #include <assert.h>
@@ -1661,7 +1660,7 @@ shl_load();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo $progname:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo $progname:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_func_shl_load=yes ac_cv_func_shl_load=yes
else else
@@ -1679,14 +1678,14 @@ if test "X$ac_cv_func_shl_load" = Xyes; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
echo "$progname:1682: checking for shl_load in -ldld" >&5 echo "$progname:1681: checking for shl_load in -ldld" >&5
if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS" LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1689 "ltconfig" #line 1688 "ltconfig"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@@ -1700,7 +1699,7 @@ int main() {
shl_load() shl_load()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo $progname:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo $progname:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_lib_dld_shl_load=yes ac_cv_lib_dld_shl_load=yes
else else
@@ -1747,18 +1746,18 @@ fi
for ac_hdr in dlfcn.h; do for ac_hdr in dlfcn.h; do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "$progname:1750: checking for $ac_hdr" >&5 echo "$progname:1749: checking for $ac_hdr" >&5
if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1755 "ltconfig" #line 1754 "ltconfig"
#include <$ac_hdr> #include <$ac_hdr>
int fnord = 0; int fnord = 0;
int main () { return(0); } int main () { return(0); }
EOF EOF
ac_try="$ac_compile >/dev/null 2>conftest.out" ac_try="$ac_compile >/dev/null 2>conftest.out"
{ (eval echo $progname:1761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo $progname:1760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@@ -1786,15 +1785,15 @@ done
LIBS="$lt_cv_dlopen_libs $LIBS" LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
echo "$progname:1789: checking whether a program can dlopen itself" >&5 echo "$progname:1788: checking whether a program can dlopen itself" >&5
if test "X${lt_cv_dlopen_self+set}" = Xset; then if test "X${lt_cv_dlopen_self+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
lt_cv_dlopen_self=cross lt_cv_dlopen_self=cross
else else
cat > conftest.c <<EOF cat > conftest.$ac_ext <<EOF
#line 1797 "ltconfig" #line 1796 "ltconfig"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
#include <dlfcn.h> #include <dlfcn.h>
@@ -1840,7 +1839,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
EOF EOF
if { (eval echo $progname:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo $progname:1842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
lt_cv_dlopen_self=yes lt_cv_dlopen_self=yes
else else
@@ -1859,15 +1858,15 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
if test "$lt_cv_dlopen_self" = yes; then if test "$lt_cv_dlopen_self" = yes; then
LDFLAGS="$LDFLAGS $link_static_flag" LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
echo "$progname:1862: checking whether a statically linked program can dlopen itself" >&5 echo "$progname:1861: checking whether a statically linked program can dlopen itself" >&5
if test "X${lt_cv_dlopen_self_static+set}" = Xset; then if test "X${lt_cv_dlopen_self_static+set}" = Xset; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
lt_cv_dlopen_self_static=cross lt_cv_dlopen_self_static=cross
else else
cat > conftest.c <<EOF cat > conftest.$ac_ext <<EOF
#line 1870 "ltconfig" #line 1869 "ltconfig"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
#include <dlfcn.h> #include <dlfcn.h>
@@ -1913,7 +1912,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
EOF EOF
if { (eval echo $progname:1916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo $progname:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
lt_cv_dlopen_self_static=yes lt_cv_dlopen_self_static=yes
else else
@@ -1958,7 +1957,7 @@ case "$ltmain" in
*.sh) *.sh)
# Now quote all the things that may contain metacharacters. # Now quote all the things that may contain metacharacters.
for var in ltecho old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \ for var in ltecho old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \
old_MAGIC old_LD old_LDFLAGS old_LIBS \ old_MAGIC_CMD old_LD old_LDFLAGS old_LIBS \
old_LN_S old_NM old_RANLIB old_STRIP \ old_LN_S old_NM old_RANLIB old_STRIP \
old_AS old_DLLTOOL old_OBJDUMP \ old_AS old_DLLTOOL old_OBJDUMP \
old_OBJEXT old_EXEEXT old_reload_flag \ old_OBJEXT old_EXEEXT old_reload_flag \
@@ -2056,7 +2055,7 @@ EOF
*) *)
# Double-quote the variables that need it (for aesthetics). # Double-quote the variables that need it (for aesthetics).
for var in old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \ for var in old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \
old_MAGIC old_LD old_LDFLAGS old_LIBS \ old_MAGIC_CMD old_LD old_LDFLAGS old_LIBS \
old_LN_S old_NM old_RANLIB old_STRIP \ old_LN_S old_NM old_RANLIB old_STRIP \
old_AS old_DLLTOOL old_OBJDUMP \ old_AS old_DLLTOOL old_OBJDUMP \
old_OBJEXT old_EXEEXT old_reload_flag \ old_OBJEXT old_EXEEXT old_reload_flag \
@@ -2088,7 +2087,7 @@ cat <<EOF >> "$cfgfile"
# #
# AR=$old_AR AR_FLAGS=$old_AR_FLAGS LTCC=$old_LTCC CC=$old_CC \\ # AR=$old_AR AR_FLAGS=$old_AR_FLAGS LTCC=$old_LTCC CC=$old_CC \\
# CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\ # CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
# MAGIC=$old_MAGIC LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\ # MAGIC_CMD=$old_MAGIC_CMD LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
# LN_S=$old_LN_S NM=$old_NM RANLIB=$old_RANLIB STRIP=$old_STRIP \\ # LN_S=$old_LN_S NM=$old_NM RANLIB=$old_RANLIB STRIP=$old_STRIP \\
# AS=$old_AS DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP \\ # AS=$old_AS DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP \\
# objext=$old_OBJEXT exeext=$old_EXEEXT reload_flag=$old_reload_flag \\ # objext=$old_OBJEXT exeext=$old_EXEEXT reload_flag=$old_reload_flag \\
@@ -2150,7 +2149,7 @@ NM=$NM
STRIP=$STRIP STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file" # Used to examine libraries when file_magic_cmd begins "file"
MAGIC=$MAGIC MAGIC_CMD=$MAGIC_CMD
# Used on cygwin: DLL creation program. # Used on cygwin: DLL creation program.
DLLTOOL="$DLLTOOL" DLLTOOL="$DLLTOOL"
@@ -2391,7 +2390,7 @@ EOF
;; ;;
esac esac
case "$host" in case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
cat <<'EOF' >> "$ofile" cat <<'EOF' >> "$ofile"
# This is a source program that is used to create dlls on Windows # This is a source program that is used to create dlls on Windows
# Don't remove nor modify the starting and closing comments # Don't remove nor modify the starting and closing comments

28
ltmain.sh
View File

@@ -55,7 +55,7 @@ modename="$progname"
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
VERSION=1.4a VERSION=1.4a
TIMESTAMP=" (1.641.2.111 2000/09/05 10:29:18)" TIMESTAMP=" (1.641.2.122 2000/09/30 05:27:52)"
default_mode= default_mode=
help="Try \`$progname --help' for more information." help="Try \`$progname --help' for more information."
@@ -545,7 +545,7 @@ if test -z "$show_help"; then
# On Cygwin there's no "real" PIC flag so we must build both object types # On Cygwin there's no "real" PIC flag so we must build both object types
case "$host_os" in case "$host_os" in
cygwin* | mingw* | os2*) cygwin* | mingw* | pw32* | os2*)
pic_mode=default pic_mode=default
;; ;;
esac esac
@@ -557,7 +557,7 @@ if test -z "$show_help"; then
# Calculate the filename of the output object if compiler does # Calculate the filename of the output object if compiler does
# not support -o with -c # not support -o with -c
if test "$compiler_c_o" = no; then if test "$compiler_c_o" = no; then
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext} output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock" lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile" removelist="$removelist $output_obj $lockfile"
trap "$run $rm $removelist; exit 1" 1 2 15 trap "$run $rm $removelist; exit 1" 1 2 15
@@ -778,7 +778,7 @@ EOF
link | relink) link | relink)
modename="$modename: link" modename="$modename: link"
case "$host" in case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
# It is impossible to link a dll without this setting, and # It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out # we shouldn't force the makefile maintainer to figure out
# which system we are compiling for in order to pass an extra # which system we are compiling for in order to pass an extra
@@ -1080,7 +1080,7 @@ EOF
;; ;;
esac esac
case "$host" in case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
case ":$dllsearchpath:" in case ":$dllsearchpath:" in
*":$dir:"*) ;; *":$dir:"*) ;;
*) dllsearchpath="$dllsearchpath:$dir";; *) dllsearchpath="$dllsearchpath:$dir";;
@@ -1093,14 +1093,14 @@ EOF
-l*) -l*)
if test "$arg" = "-lc"; then if test "$arg" = "-lc"; then
case "$host" in case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
# These systems don't actually have c library (as such) # These systems don't actually have c library (as such)
continue continue
;; ;;
esac esac
elif test "$arg" = "-lm"; then elif test "$arg" = "-lm"; then
case "$host" in case "$host" in
*-*-cygwin* | *-*-beos*) *-*-cygwin* | *-*-pw32* | *-*-beos*)
# These systems don't actually have math library (as such) # These systems don't actually have math library (as such)
continue continue
;; ;;
@@ -1122,7 +1122,7 @@ EOF
-no-install) -no-install)
case "$host" in case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
# The PATH hackery in wrapper scripts is required on Windows # The PATH hackery in wrapper scripts is required on Windows
# in order for the loader to find any dlls it needs. # in order for the loader to find any dlls it needs.
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
@@ -2481,10 +2481,10 @@ EOF
;; ;;
windows) windows)
# Like Linux, but with '-' rather than '.', since we only # Use '-' rather than '.', since we only want one
# want one extension on Windows 95. # extension on DOS 8.3 filesystems.
major=`expr $current - $age` major=`expr $current - $age`
versuffix="-$major-$age-$revision" versuffix="-$major"
;; ;;
*) *)
@@ -2599,7 +2599,7 @@ EOF
if test "$build_libtool_libs" = yes; then if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then if test -n "$rpath"; then
case "$host" in case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)! # these systems don't actually have a c library (as such)!
;; ;;
*) *)
@@ -3251,7 +3251,7 @@ EOF
esac esac
fi fi
case "$host" in case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
case ":$dllsearchpath:" in case ":$dllsearchpath:" in
*":$libdir:"*) ;; *":$libdir:"*) ;;
*) dllsearchpath="$dllsearchpath:$libdir";; *) dllsearchpath="$dllsearchpath:$libdir";;
@@ -3785,7 +3785,7 @@ else
case $host in case $host in
# win32 systems need to use the prog path for dll # win32 systems need to use the prog path for dll
# lookup to work # lookup to work
*-*-cygwin*) *-*-cygwin* | *-*-pw32*)
$echo >> $output "\ $echo >> $output "\
exec \$progdir/\$program \${1+\"\$@\"} exec \$progdir/\$program \${1+\"\$@\"}
" "