3196 lines
111 KiB
Diff
3196 lines
111 KiB
Diff
diff -Naur libtool-2.4.2-orig/configure libtool-2.4.2/configure
|
|
--- libtool-2.4.2-orig/configure 2011-10-17 10:18:58.000000000 +0000
|
|
+++ libtool-2.4.2/configure 2013-06-05 04:43:28.557617200 +0000
|
|
@@ -5313,7 +5313,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -5502,7 +5502,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -5510,12 +5510,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -5581,7 +5581,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -5736,7 +5736,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -6054,7 +6054,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -6547,7 +6547,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7940,7 +7940,7 @@
|
|
enable_win32_dll=yes
|
|
|
|
case $host in
|
|
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}as; ac_word=$2
|
|
@@ -8797,7 +8797,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -8881,7 +8881,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -9372,7 +9372,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -9487,7 +9487,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -9944,7 +9944,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -10897,7 +10897,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -10929,6 +10929,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -10963,7 +10969,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -11624,7 +11630,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -12542,7 +12548,7 @@
|
|
beos*)
|
|
LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
|
|
;;
|
|
-cygwin* | mingw* | os2* | pw32*)
|
|
+cygwin* | msys* | mingw* | os2* | pw32*)
|
|
ac_fn_c_check_decl "$LINENO" "cygwin_conv_path" "ac_cv_have_decl_cygwin_conv_path" "#include <sys/cygwin.h>
|
|
"
|
|
if test "x$ac_cv_have_decl_cygwin_conv_path" = xyes; then :
|
|
@@ -12961,7 +12967,7 @@
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
case $host_os in #(
|
|
- *cygwin*)
|
|
+ *cygwin* | *msys*)
|
|
lt_cv_sys_argz_works=no
|
|
if test "$cross_compiling" != no; then
|
|
lt_cv_sys_argz_works="guessing no"
|
|
@@ -14195,7 +14201,7 @@
|
|
esac
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
case $GXX,$cc_basename in
|
|
,cl* | no,cl*)
|
|
# Native MSVC
|
|
@@ -15228,7 +15234,7 @@
|
|
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -15298,7 +15304,7 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
|
|
@@ -15783,7 +15789,7 @@
|
|
pw32*)
|
|
export_symbols_cmds_CXX="$ltdll_cmds"
|
|
;;
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
case $cc_basename in
|
|
cl*)
|
|
exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
@@ -16052,7 +16058,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -16083,6 +16089,11 @@
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -16117,7 +16128,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -17122,7 +17133,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -17206,7 +17217,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
|
|
@@ -17682,7 +17693,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -17797,7 +17808,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec_F77='-L$libdir'
|
|
@@ -18242,7 +18253,7 @@
|
|
export_dynamic_flag_spec_F77=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -18994,7 +19005,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -19025,6 +19036,11 @@
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -19059,7 +19075,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -20194,7 +20210,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -20278,7 +20294,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic_FC='-DDLL_EXPORT'
|
|
@@ -20754,7 +20770,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -20869,7 +20885,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec_FC='-L$libdir'
|
|
@@ -21314,7 +21330,7 @@
|
|
export_dynamic_flag_spec_FC=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -22066,7 +22082,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -22097,6 +22113,11 @@
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -22131,7 +22152,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -22994,7 +23015,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -23078,7 +23099,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic_GO='-DDLL_EXPORT'
|
|
@@ -23554,7 +23575,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -23669,7 +23690,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, GO) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec_GO='-L$libdir'
|
|
@@ -24126,7 +24147,7 @@
|
|
export_dynamic_flag_spec_GO=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -25091,7 +25112,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -25175,7 +25196,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
|
|
@@ -25651,7 +25672,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -25766,7 +25787,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec_GCJ='-L$libdir'
|
|
@@ -26223,7 +26244,7 @@
|
|
export_dynamic_flag_spec_GCJ=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
diff -Naur libtool-2.4.2-orig/libltdl/config/compile libtool-2.4.2/libltdl/config/compile
|
|
--- libtool-2.4.2-orig/libltdl/config/compile 2011-10-17 09:49:28.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/config/compile 2013-06-05 04:48:52.823242200 +0000
|
|
@@ -54,7 +54,7 @@
|
|
MINGW*)
|
|
file_conv=mingw
|
|
;;
|
|
- CYGWIN*)
|
|
+ CYGWIN*|MSYS*)
|
|
file_conv=cygwin
|
|
;;
|
|
*)
|
|
@@ -68,7 +68,7 @@
|
|
mingw/*)
|
|
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
|
;;
|
|
- cygwin/*)
|
|
+ cygwin/*|msys/*)
|
|
file=`cygpath -m "$file" || echo "$file"`
|
|
;;
|
|
wine/*)
|
|
diff -Naur libtool-2.4.2-orig/libltdl/config/config.guess libtool-2.4.2/libltdl/config/config.guess
|
|
--- libtool-2.4.2-orig/libltdl/config/config.guess 2011-10-17 09:49:28.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/config/config.guess 2013-06-05 04:50:06.213867200 +0000
|
|
@@ -803,6 +803,9 @@
|
|
i*:CYGWIN*:*)
|
|
echo ${UNAME_MACHINE}-pc-cygwin
|
|
exit ;;
|
|
+ i*:MSYS*:*)
|
|
+ echo ${UNAME_MACHINE}-pc-msys
|
|
+ exit ;;
|
|
*:MINGW*:*)
|
|
echo ${UNAME_MACHINE}-pc-mingw32
|
|
exit ;;
|
|
@@ -843,6 +846,9 @@
|
|
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
|
echo x86_64-unknown-cygwin
|
|
exit ;;
|
|
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
|
+ echo x86_64-unknown-msys
|
|
+ exit ;;
|
|
p*:CYGWIN*:*)
|
|
echo powerpcle-unknown-cygwin
|
|
exit ;;
|
|
diff -Naur libtool-2.4.2-orig/libltdl/config/config.sub libtool-2.4.2/libltdl/config/config.sub
|
|
--- libtool-2.4.2-orig/libltdl/config/config.sub 2011-10-17 09:49:28.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/config/config.sub 2013-06-05 04:50:21.416992200 +0000
|
|
@@ -1343,7 +1343,7 @@
|
|
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
| -chorusos* | -chorusrdb* | -cegcc* \
|
|
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
| -mingw32* | -linux-gnu* | -linux-android* \
|
|
| -linux-newlib* | -linux-uclibc* \
|
|
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
diff -Naur libtool-2.4.2-orig/libltdl/config/ltmain.m4sh libtool-2.4.2/libltdl/config/ltmain.m4sh
|
|
--- libtool-2.4.2-orig/libltdl/config/ltmain.m4sh 2011-10-17 10:17:05.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/config/ltmain.m4sh 2013-06-05 04:56:50.385742200 +0000
|
|
@@ -398,7 +398,7 @@
|
|
test "$opt_debug" = : || func_append preserve_args " --debug"
|
|
|
|
case $host in
|
|
- *cygwin* | *mingw* | *pw32* | *cegcc*)
|
|
+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
|
|
# don't eliminate duplications in $postdeps and $predeps
|
|
opt_duplicate_compiler_generated_deps=:
|
|
;;
|
|
@@ -1336,7 +1336,7 @@
|
|
|
|
# On Cygwin there's no "real" PIC flag so we must build both object types
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | os2* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
|
|
pic_mode=default
|
|
;;
|
|
esac
|
|
@@ -2205,7 +2205,7 @@
|
|
'exit $?'
|
|
tstripme="$stripme"
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
case $realname in
|
|
*.dll.a)
|
|
tstripme=""
|
|
@@ -2311,7 +2311,7 @@
|
|
|
|
# Do a test to see if this is really a libtool program.
|
|
case $host in
|
|
- *cygwin* | *mingw*)
|
|
+ *cygwin* | *msys* | *mingw*)
|
|
if func_ltwrapper_executable_p "$file"; then
|
|
func_ltwrapper_scriptname "$file"
|
|
wrapper=$func_ltwrapper_scriptname_result
|
|
@@ -2386,7 +2386,7 @@
|
|
# remove .exe since cygwin /usr/bin/install will append another
|
|
# one anyway
|
|
case $install_prog,$host in
|
|
- */usr/bin/install*,*cygwin*)
|
|
+ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
|
|
case $file:$destfile in
|
|
*.exe:*.exe)
|
|
# this is ok
|
|
@@ -2536,7 +2536,7 @@
|
|
$RM $export_symbols
|
|
eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
|
|
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
|
|
;;
|
|
@@ -2548,7 +2548,7 @@
|
|
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
|
|
eval '$MV "$nlist"T "$nlist"'
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
|
|
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
|
|
;;
|
|
@@ -2562,7 +2562,7 @@
|
|
func_basename "$dlprefile"
|
|
name="$func_basename_result"
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
# if an import library, we need to obtain dlname
|
|
if func_win32_import_lib_p "$dlprefile"; then
|
|
func_tr_sh "$dlprefile"
|
|
@@ -2715,7 +2715,7 @@
|
|
# Transform the symbol file into the correct name.
|
|
symfileobj="$output_objdir/${my_outputname}S.$objext"
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
if test -f "$output_objdir/$my_outputname.def"; then
|
|
compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
|
finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
|
@@ -3588,7 +3588,7 @@
|
|
{
|
|
EOF
|
|
case "$host" in
|
|
- *mingw* | *cygwin* )
|
|
+ *mingw* | *cygwin* | *msys* )
|
|
# make stdout use "unix" line endings
|
|
echo " setmode(1,_O_BINARY);"
|
|
;;
|
|
@@ -4307,7 +4307,7 @@
|
|
{
|
|
$opt_debug
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
# It is impossible to link a dll without this setting, and
|
|
# we shouldn't force the makefile maintainer to figure out
|
|
# which system we are compiling for in order to pass an extra
|
|
@@ -4794,7 +4794,7 @@
|
|
;;
|
|
esac
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
|
|
case :$dllsearchpath: in
|
|
*":$dir:"*) ;;
|
|
@@ -4814,7 +4814,7 @@
|
|
-l*)
|
|
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
# These systems don't actually have a C or math library (as such)
|
|
continue
|
|
;;
|
|
@@ -4892,7 +4892,7 @@
|
|
|
|
-no-install)
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
|
|
# The PATH hackery in wrapper scripts is required on Windows
|
|
# and Darwin in order for the loader to find any dlls it needs.
|
|
func_warning "\`-no-install' is ignored for $host"
|
|
@@ -5758,7 +5758,7 @@
|
|
fi
|
|
case "$host" in
|
|
# special handling for platforms with PE-DLLs.
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
# Linker will automatically link against shared library if both
|
|
# static and shared are present. Therefore, ensure we extract
|
|
# symbols from the import library if a shared library is present
|
|
@@ -5902,7 +5902,7 @@
|
|
if test -n "$library_names" &&
|
|
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc*)
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc*)
|
|
# No point in relinking DLLs because paths are not encoded
|
|
func_append notinst_deplibs " $lib"
|
|
need_relink=no
|
|
@@ -5972,7 +5972,7 @@
|
|
elif test -n "$soname_spec"; then
|
|
# bleh windows
|
|
case $host in
|
|
- *cygwin* | mingw* | *cegcc*)
|
|
+ *cygwin* | *msys* | mingw* | *cegcc*)
|
|
func_arith $current - $age
|
|
major=$func_arith_result
|
|
versuffix="-$major"
|
|
@@ -6833,7 +6833,7 @@
|
|
if test "$build_libtool_libs" = yes; then
|
|
if test -n "$rpath"; then
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
# these systems don't actually have a c library (as such)!
|
|
;;
|
|
*-*-rhapsody* | *-*-darwin1.[012])
|
|
@@ -7347,7 +7347,7 @@
|
|
|
|
orig_export_symbols=
|
|
case $host_os in
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
|
|
# exporting using user supplied symfile
|
|
if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
|
|
@@ -7903,7 +7903,7 @@
|
|
|
|
prog)
|
|
case $host in
|
|
- *cygwin*) func_stripname '' '.exe' "$output"
|
|
+ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
|
|
output=$func_stripname_result.exe;;
|
|
esac
|
|
test -n "$vinfo" && \
|
|
@@ -8016,7 +8016,7 @@
|
|
esac
|
|
fi
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
|
|
case :$dllsearchpath: in
|
|
*":$libdir:"*) ;;
|
|
@@ -8094,7 +8094,7 @@
|
|
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
|
|
wrappers_required=no
|
|
;;
|
|
- *cygwin* | *mingw* )
|
|
+ *cygwin* | *msys* | *mingw* )
|
|
if test "$build_libtool_libs" != yes; then
|
|
wrappers_required=no
|
|
fi
|
|
@@ -8241,14 +8241,14 @@
|
|
esac
|
|
# test for cygwin because mv fails w/o .exe extensions
|
|
case $host in
|
|
- *cygwin*)
|
|
+ *cygwin* | *msys*)
|
|
exeext=.exe
|
|
func_stripname '' '.exe' "$outputname"
|
|
outputname=$func_stripname_result ;;
|
|
*) exeext= ;;
|
|
esac
|
|
case $host in
|
|
- *cygwin* | *mingw* )
|
|
+ *cygwin* | *msys* | *mingw* )
|
|
func_dirname_and_basename "$output" "" "."
|
|
output_name=$func_basename_result
|
|
output_path=$func_dirname_result
|
|
@@ -8578,7 +8578,7 @@
|
|
# tests/bindir.at for full details.
|
|
tdlname=$dlname
|
|
case $host,$output,$installed,$module,$dlname in
|
|
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
|
|
+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
|
|
# If a -bindir argument was supplied, place the dll there.
|
|
if test "x$bindir" != x ;
|
|
then
|
|
diff -Naur libtool-2.4.2-orig/libltdl/config/ltmain.sh libtool-2.4.2/libltdl/config/ltmain.sh
|
|
--- libtool-2.4.2-orig/libltdl/config/ltmain.sh 2011-10-17 10:19:35.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/config/ltmain.sh 2013-06-05 05:01:13.057617200 +0000
|
|
@@ -1180,7 +1180,7 @@
|
|
test "$opt_debug" = : || func_append preserve_args " --debug"
|
|
|
|
case $host in
|
|
- *cygwin* | *mingw* | *pw32* | *cegcc*)
|
|
+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
|
|
# don't eliminate duplications in $postdeps and $predeps
|
|
opt_duplicate_compiler_generated_deps=:
|
|
;;
|
|
@@ -2123,7 +2123,7 @@
|
|
|
|
# On Cygwin there's no "real" PIC flag so we must build both object types
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | os2* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
|
|
pic_mode=default
|
|
;;
|
|
esac
|
|
@@ -2992,7 +2992,7 @@
|
|
'exit $?'
|
|
tstripme="$stripme"
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
case $realname in
|
|
*.dll.a)
|
|
tstripme=""
|
|
@@ -3098,7 +3098,7 @@
|
|
|
|
# Do a test to see if this is really a libtool program.
|
|
case $host in
|
|
- *cygwin* | *mingw*)
|
|
+ *cygwin* | *msys* | *mingw*)
|
|
if func_ltwrapper_executable_p "$file"; then
|
|
func_ltwrapper_scriptname "$file"
|
|
wrapper=$func_ltwrapper_scriptname_result
|
|
@@ -3173,7 +3173,7 @@
|
|
# remove .exe since cygwin /usr/bin/install will append another
|
|
# one anyway
|
|
case $install_prog,$host in
|
|
- */usr/bin/install*,*cygwin*)
|
|
+ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
|
|
case $file:$destfile in
|
|
*.exe:*.exe)
|
|
# this is ok
|
|
@@ -3323,7 +3323,7 @@
|
|
$RM $export_symbols
|
|
eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
|
|
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
|
|
;;
|
|
@@ -3335,7 +3335,7 @@
|
|
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
|
|
eval '$MV "$nlist"T "$nlist"'
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
|
|
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
|
|
;;
|
|
@@ -3349,7 +3349,7 @@
|
|
func_basename "$dlprefile"
|
|
name="$func_basename_result"
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
# if an import library, we need to obtain dlname
|
|
if func_win32_import_lib_p "$dlprefile"; then
|
|
func_tr_sh "$dlprefile"
|
|
@@ -3502,7 +3502,7 @@
|
|
# Transform the symbol file into the correct name.
|
|
symfileobj="$output_objdir/${my_outputname}S.$objext"
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
if test -f "$output_objdir/$my_outputname.def"; then
|
|
compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
|
finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
|
@@ -4375,7 +4375,7 @@
|
|
{
|
|
EOF
|
|
case "$host" in
|
|
- *mingw* | *cygwin* )
|
|
+ *mingw* | *cygwin* | *msys* )
|
|
# make stdout use "unix" line endings
|
|
echo " setmode(1,_O_BINARY);"
|
|
;;
|
|
@@ -5094,7 +5094,7 @@
|
|
{
|
|
$opt_debug
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
# It is impossible to link a dll without this setting, and
|
|
# we shouldn't force the makefile maintainer to figure out
|
|
# which system we are compiling for in order to pass an extra
|
|
@@ -5581,7 +5581,7 @@
|
|
;;
|
|
esac
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
|
|
case :$dllsearchpath: in
|
|
*":$dir:"*) ;;
|
|
@@ -5601,7 +5601,7 @@
|
|
-l*)
|
|
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
# These systems don't actually have a C or math library (as such)
|
|
continue
|
|
;;
|
|
@@ -5679,7 +5679,7 @@
|
|
|
|
-no-install)
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
|
|
# The PATH hackery in wrapper scripts is required on Windows
|
|
# and Darwin in order for the loader to find any dlls it needs.
|
|
func_warning "\`-no-install' is ignored for $host"
|
|
@@ -6545,7 +6545,7 @@
|
|
fi
|
|
case "$host" in
|
|
# special handling for platforms with PE-DLLs.
|
|
- *cygwin* | *mingw* | *cegcc* )
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
|
# Linker will automatically link against shared library if both
|
|
# static and shared are present. Therefore, ensure we extract
|
|
# symbols from the import library if a shared library is present
|
|
@@ -6689,7 +6689,7 @@
|
|
if test -n "$library_names" &&
|
|
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
|
|
case $host in
|
|
- *cygwin* | *mingw* | *cegcc*)
|
|
+ *cygwin* | *msys* | *mingw* | *cegcc*)
|
|
# No point in relinking DLLs because paths are not encoded
|
|
func_append notinst_deplibs " $lib"
|
|
need_relink=no
|
|
@@ -6759,7 +6759,7 @@
|
|
elif test -n "$soname_spec"; then
|
|
# bleh windows
|
|
case $host in
|
|
- *cygwin* | mingw* | *cegcc*)
|
|
+ *cygwin* | *msys* | mingw* | *cegcc*)
|
|
func_arith $current - $age
|
|
major=$func_arith_result
|
|
versuffix="-$major"
|
|
@@ -7620,7 +7620,7 @@
|
|
if test "$build_libtool_libs" = yes; then
|
|
if test -n "$rpath"; then
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
# these systems don't actually have a c library (as such)!
|
|
;;
|
|
*-*-rhapsody* | *-*-darwin1.[012])
|
|
@@ -8134,7 +8134,7 @@
|
|
|
|
orig_export_symbols=
|
|
case $host_os in
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
|
|
# exporting using user supplied symfile
|
|
if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
|
|
@@ -8690,7 +8690,7 @@
|
|
|
|
prog)
|
|
case $host in
|
|
- *cygwin*) func_stripname '' '.exe' "$output"
|
|
+ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
|
|
output=$func_stripname_result.exe;;
|
|
esac
|
|
test -n "$vinfo" && \
|
|
@@ -8803,7 +8803,7 @@
|
|
esac
|
|
fi
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
|
|
case :$dllsearchpath: in
|
|
*":$libdir:"*) ;;
|
|
@@ -8881,7 +8881,7 @@
|
|
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
|
|
wrappers_required=no
|
|
;;
|
|
- *cygwin* | *mingw* )
|
|
+ *cygwin* | *msys* | *mingw* )
|
|
if test "$build_libtool_libs" != yes; then
|
|
wrappers_required=no
|
|
fi
|
|
@@ -9028,14 +9028,14 @@
|
|
esac
|
|
# test for cygwin because mv fails w/o .exe extensions
|
|
case $host in
|
|
- *cygwin*)
|
|
+ *cygwin* | *msys*)
|
|
exeext=.exe
|
|
func_stripname '' '.exe' "$outputname"
|
|
outputname=$func_stripname_result ;;
|
|
*) exeext= ;;
|
|
esac
|
|
case $host in
|
|
- *cygwin* | *mingw* )
|
|
+ *cygwin* | *msys* | *mingw* )
|
|
func_dirname_and_basename "$output" "" "."
|
|
output_name=$func_basename_result
|
|
output_path=$func_dirname_result
|
|
@@ -9365,7 +9365,7 @@
|
|
# tests/bindir.at for full details.
|
|
tdlname=$dlname
|
|
case $host,$output,$installed,$module,$dlname in
|
|
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
|
|
+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
|
|
# If a -bindir argument was supplied, place the dll there.
|
|
if test "x$bindir" != x ;
|
|
then
|
|
diff -Naur libtool-2.4.2-orig/libltdl/configure libtool-2.4.2/libltdl/configure
|
|
--- libtool-2.4.2-orig/libltdl/configure 2011-10-17 10:19:47.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/configure 2013-06-05 04:48:06.525390600 +0000
|
|
@@ -4526,7 +4526,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -4715,7 +4715,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4723,12 +4723,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4794,7 +4794,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -4949,7 +4949,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -5267,7 +5267,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -5760,7 +5760,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7290,7 +7290,7 @@
|
|
enable_win32_dll=yes
|
|
|
|
case $host in
|
|
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}as; ac_word=$2
|
|
@@ -8147,7 +8147,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -8231,7 +8231,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -8722,7 +8722,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -8837,7 +8837,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -9294,7 +9294,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -10247,7 +10247,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -10279,6 +10279,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -10313,7 +10319,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -10974,7 +10980,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -11891,7 +11897,7 @@
|
|
beos*)
|
|
LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
|
|
;;
|
|
-cygwin* | mingw* | os2* | pw32*)
|
|
+cygwin* | msys* | mingw* | os2* | pw32*)
|
|
ac_fn_c_check_decl "$LINENO" "cygwin_conv_path" "ac_cv_have_decl_cygwin_conv_path" "#include <sys/cygwin.h>
|
|
"
|
|
if test "x$ac_cv_have_decl_cygwin_conv_path" = xyes; then :
|
|
@@ -12310,7 +12316,7 @@
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
case $host_os in #(
|
|
- *cygwin*)
|
|
+ *cygwin* | *msys*)
|
|
lt_cv_sys_argz_works=no
|
|
if test "$cross_compiling" != no; then
|
|
lt_cv_sys_argz_works="guessing no"
|
|
diff -Naur libtool-2.4.2-orig/libltdl/m4/argz.m4 libtool-2.4.2/libltdl/m4/argz.m4
|
|
--- libtool-2.4.2-orig/libltdl/m4/argz.m4 2011-10-17 08:47:14.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/m4/argz.m4 2013-06-05 05:01:44.654296900 +0000
|
|
@@ -42,7 +42,7 @@
|
|
[if argz actually works],
|
|
[lt_cv_sys_argz_works],
|
|
[[case $host_os in #(
|
|
- *cygwin*)
|
|
+ *cygwin* | *msys*)
|
|
lt_cv_sys_argz_works=no
|
|
if test "$cross_compiling" != no; then
|
|
lt_cv_sys_argz_works="guessing no"
|
|
diff -Naur libtool-2.4.2-orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4
|
|
--- libtool-2.4.2-orig/libltdl/m4/libtool.m4 2011-10-17 10:17:05.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/m4/libtool.m4 2013-06-05 05:05:59.029296900 +0000
|
|
@@ -1616,7 +1616,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -1863,7 +1863,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -2334,7 +2334,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -2366,6 +2366,12 @@
|
|
m4_if([$1], [],[
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
|
+m4_if([$1], [],[
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -2400,7 +2406,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -3140,7 +3146,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -3196,7 +3202,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -3506,7 +3512,7 @@
|
|
[lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -3561,7 +3567,7 @@
|
|
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
LIBM=
|
|
case $host in
|
|
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
# These system don't have libm, or don't need it
|
|
;;
|
|
*-ncr-sysv4.3*)
|
|
@@ -3636,7 +3642,7 @@
|
|
aix*)
|
|
symcode='[[BCDT]]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[[ABCDGISTW]]'
|
|
;;
|
|
hpux*)
|
|
@@ -3904,7 +3910,7 @@
|
|
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -3975,7 +3981,7 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
m4_if([$1], [GCJ], [],
|
|
@@ -4222,7 +4228,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -4307,7 +4313,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
m4_if([$1], [GCJ], [],
|
|
@@ -4567,7 +4573,7 @@
|
|
pw32*)
|
|
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
|
|
;;
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
case $cc_basename in
|
|
cl*)
|
|
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
@@ -4625,7 +4631,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -4740,7 +4746,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
@@ -5113,7 +5119,7 @@
|
|
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -6114,7 +6120,7 @@
|
|
esac
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
case $GXX,$cc_basename in
|
|
,cl* | no,cl*)
|
|
# Native MSVC
|
|
@@ -7930,7 +7936,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -7938,12 +7944,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
diff -Naur libtool-2.4.2-orig/libltdl/m4/ltdl.m4 libtool-2.4.2/libltdl/m4/ltdl.m4
|
|
--- libtool-2.4.2-orig/libltdl/m4/ltdl.m4 2011-10-17 10:17:05.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/m4/ltdl.m4 2013-06-05 05:06:30.435546900 +0000
|
|
@@ -703,7 +703,7 @@
|
|
beos*)
|
|
LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
|
|
;;
|
|
-cygwin* | mingw* | os2* | pw32*)
|
|
+cygwin* | msys* | mingw* | os2* | pw32*)
|
|
AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
|
|
LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
|
|
;;
|
|
diff -Naur libtool-2.4.2-orig/libltdl/m4/ltoptions.m4 libtool-2.4.2/libltdl/m4/ltoptions.m4
|
|
--- libtool-2.4.2-orig/libltdl/m4/ltoptions.m4 2011-10-17 10:17:05.000000000 +0000
|
|
+++ libtool-2.4.2/libltdl/m4/ltoptions.m4 2013-06-05 05:06:57.263671900 +0000
|
|
@@ -126,7 +126,7 @@
|
|
[enable_win32_dll=yes
|
|
|
|
case $host in
|
|
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
AC_CHECK_TOOL(AS, as, false)
|
|
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
|
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
|
diff -Naur libtool-2.4.2-orig/tests/bindir.at libtool-2.4.2/tests/bindir.at
|
|
--- libtool-2.4.2-orig/tests/bindir.at 2011-10-17 10:17:05.000000000 +0000
|
|
+++ libtool-2.4.2/tests/bindir.at 2013-06-05 05:07:33.358398400 +0000
|
|
@@ -65,7 +65,7 @@
|
|
|
|
bindirneeded=:
|
|
case "$host_os" in
|
|
- cygwin*|mingw*|cegcc*)
|
|
+ cygwin*|msys*|mingw*|cegcc*)
|
|
;;
|
|
*)
|
|
bindirneeded=false
|
|
@@ -174,7 +174,7 @@
|
|
|
|
bindirneeded=:
|
|
case "$host_os" in
|
|
- cygwin*|mingw*|cegcc*)
|
|
+ cygwin*|msys*|mingw*|cegcc*)
|
|
;;
|
|
*)
|
|
bindirneeded=false
|
|
diff -Naur libtool-2.4.2-orig/tests/cdemo/configure libtool-2.4.2/tests/cdemo/configure
|
|
--- libtool-2.4.2-orig/tests/cdemo/configure 2011-10-17 10:20:07.000000000 +0000
|
|
+++ libtool-2.4.2/tests/cdemo/configure 2013-06-05 05:12:04.146484400 +0000
|
|
@@ -4400,7 +4400,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -4589,7 +4589,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4597,12 +4597,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4668,7 +4668,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -4826,7 +4826,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -5147,7 +5147,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -5640,7 +5640,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7730,7 +7730,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -7814,7 +7814,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -8305,7 +8305,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -8420,7 +8420,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -8877,7 +8877,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -9830,7 +9830,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -9862,6 +9862,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -9896,7 +9902,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -10557,7 +10563,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -11177,7 +11183,7 @@
|
|
## ---------------------------- ##
|
|
LIBM=
|
|
case $host in
|
|
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
# These system don't have libm, or don't need it
|
|
;;
|
|
*-ncr-sysv4.3*)
|
|
diff -Naur libtool-2.4.2-orig/tests/demo/configure libtool-2.4.2/tests/demo/configure
|
|
--- libtool-2.4.2-orig/tests/demo/configure 2011-10-17 10:20:32.000000000 +0000
|
|
+++ libtool-2.4.2/tests/demo/configure 2013-06-05 05:14:43.156250000 +0000
|
|
@@ -4404,7 +4404,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -4593,7 +4593,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4601,12 +4601,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4672,7 +4672,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -4827,7 +4827,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -5145,7 +5145,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -5638,7 +5638,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7168,7 +7168,7 @@
|
|
enable_win32_dll=yes
|
|
|
|
case $host in
|
|
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}as; ac_word=$2
|
|
@@ -8025,7 +8025,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -8109,7 +8109,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -8600,7 +8600,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -8715,7 +8715,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -9172,7 +9172,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -10125,7 +10125,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -10157,6 +10157,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -10191,7 +10197,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -10852,7 +10858,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -11488,7 +11494,7 @@
|
|
## --------------------------- ##
|
|
LIBM=
|
|
case $host in
|
|
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
# These system don't have libm, or don't need it
|
|
;;
|
|
*-ncr-sysv4.3*)
|
|
diff -Naur libtool-2.4.2-orig/tests/depdemo/configure libtool-2.4.2/tests/depdemo/configure
|
|
--- libtool-2.4.2-orig/tests/depdemo/configure 2011-10-17 10:20:57.000000000 +0000
|
|
+++ libtool-2.4.2/tests/depdemo/configure 2013-06-05 05:18:51.713867200 +0000
|
|
@@ -4401,7 +4401,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -4590,7 +4590,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4598,12 +4598,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4669,7 +4669,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -4824,7 +4824,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -5142,7 +5142,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -5635,7 +5635,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7164,7 +7164,7 @@
|
|
enable_win32_dll=yes
|
|
|
|
case $host in
|
|
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}as; ac_word=$2
|
|
@@ -8023,7 +8023,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -8107,7 +8107,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -8598,7 +8598,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -8713,7 +8713,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -9170,7 +9170,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -10123,7 +10123,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -10155,6 +10155,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -10189,7 +10195,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -10850,7 +10856,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -11475,7 +11481,7 @@
|
|
## ------------------------------ ##
|
|
LIBM=
|
|
case $host in
|
|
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
# These system don't have libm, or don't need it
|
|
;;
|
|
*-ncr-sysv4.3*)
|
|
diff -Naur libtool-2.4.2-orig/tests/f77demo/configure libtool-2.4.2/tests/f77demo/configure
|
|
--- libtool-2.4.2-orig/tests/f77demo/configure 2011-10-17 10:21:23.000000000 +0000
|
|
+++ libtool-2.4.2/tests/f77demo/configure 2013-06-05 05:24:07.746093800 +0000
|
|
@@ -5373,7 +5373,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -5562,7 +5562,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -5570,12 +5570,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -5641,7 +5641,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -5799,7 +5799,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -6120,7 +6120,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -6620,7 +6620,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -8734,7 +8734,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -8818,7 +8818,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -9309,7 +9309,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -9424,7 +9424,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -9897,7 +9897,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -10850,7 +10850,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -10882,6 +10882,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -10916,7 +10922,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -11585,7 +11591,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -12403,7 +12409,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -12487,7 +12493,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
|
|
@@ -12963,7 +12969,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -13078,7 +13084,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec_F77='-L$libdir'
|
|
@@ -13523,7 +13529,7 @@
|
|
export_dynamic_flag_spec_F77=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -14275,7 +14281,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -14306,6 +14312,11 @@
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -14340,7 +14351,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
diff -Naur libtool-2.4.2-orig/tests/fcdemo/configure libtool-2.4.2/tests/fcdemo/configure
|
|
--- libtool-2.4.2-orig/tests/fcdemo/configure 2011-10-17 10:21:49.000000000 +0000
|
|
+++ libtool-2.4.2/tests/fcdemo/configure 2013-06-05 05:28:42.501953100 +0000
|
|
@@ -5472,7 +5472,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -5661,7 +5661,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -5669,12 +5669,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -5740,7 +5740,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -5898,7 +5898,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -6219,7 +6219,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -6719,7 +6719,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -8843,7 +8843,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -8927,7 +8927,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -9418,7 +9418,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -9533,7 +9533,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -10006,7 +10006,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -10959,7 +10959,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -10991,6 +10991,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -11025,7 +11031,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -11694,7 +11700,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -12680,7 +12686,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -12764,7 +12770,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic_FC='-DDLL_EXPORT'
|
|
@@ -13240,7 +13246,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -13355,7 +13361,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec_FC='-L$libdir'
|
|
@@ -13800,7 +13806,7 @@
|
|
export_dynamic_flag_spec_FC=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -14552,7 +14558,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -14583,6 +14589,11 @@
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -14617,7 +14628,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
diff -Naur libtool-2.4.2-orig/tests/lt_dladvise.at libtool-2.4.2/tests/lt_dladvise.at
|
|
--- libtool-2.4.2-orig/tests/lt_dladvise.at 2011-10-09 21:45:20.000000000 +0000
|
|
+++ libtool-2.4.2/tests/lt_dladvise.at 2013-06-05 05:08:14.280273400 +0000
|
|
@@ -332,7 +332,7 @@
|
|
$LIBTOOL --features | grep 'enable shared libraries' >/dev/null && have_shared=:
|
|
|
|
case $host_os,$have_shared in
|
|
-cygwin* | mingw* | cegcc* | *,false)
|
|
+cygwin* | msys* | mingw* | cegcc* | *,false)
|
|
# These hosts do not support linking without -no-undefined
|
|
CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=0"
|
|
;;
|
|
diff -Naur libtool-2.4.2-orig/tests/mdemo/configure libtool-2.4.2/tests/mdemo/configure
|
|
--- libtool-2.4.2-orig/tests/mdemo/configure 2011-10-17 10:22:18.000000000 +0000
|
|
+++ libtool-2.4.2/tests/mdemo/configure 2013-06-05 05:33:25.576171900 +0000
|
|
@@ -4433,7 +4433,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -4622,7 +4622,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4630,12 +4630,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4701,7 +4701,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -4856,7 +4856,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -5174,7 +5174,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -5667,7 +5667,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7197,7 +7197,7 @@
|
|
enable_win32_dll=yes
|
|
|
|
case $host in
|
|
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}as; ac_word=$2
|
|
@@ -8054,7 +8054,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -8138,7 +8138,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -8629,7 +8629,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -8744,7 +8744,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -9201,7 +9201,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -10154,7 +10154,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -10186,6 +10186,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -10220,7 +10226,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -10881,7 +10887,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -11505,7 +11511,7 @@
|
|
## ---------------------------- ##
|
|
LIBM=
|
|
case $host in
|
|
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
# These system don't have libm, or don't need it
|
|
;;
|
|
*-ncr-sysv4.3*)
|
|
diff -Naur libtool-2.4.2-orig/tests/mdemo2/configure libtool-2.4.2/tests/mdemo2/configure
|
|
--- libtool-2.4.2-orig/tests/mdemo2/configure 2011-10-17 10:22:42.000000000 +0000
|
|
+++ libtool-2.4.2/tests/mdemo2/configure 2013-06-05 05:35:18.997070300 +0000
|
|
@@ -4400,7 +4400,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -4589,7 +4589,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4597,12 +4597,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4668,7 +4668,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -4826,7 +4826,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -5147,7 +5147,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -5640,7 +5640,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7729,7 +7729,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -7813,7 +7813,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -8304,7 +8304,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -8419,7 +8419,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -8876,7 +8876,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -9829,7 +9829,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -9861,6 +9861,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -9895,7 +9901,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -10556,7 +10562,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
diff -Naur libtool-2.4.2-orig/tests/pdemo/configure libtool-2.4.2/tests/pdemo/configure
|
|
--- libtool-2.4.2-orig/tests/pdemo/configure 2011-10-17 10:23:03.000000000 +0000
|
|
+++ libtool-2.4.2/tests/pdemo/configure 2013-06-05 05:37:28.657226600 +0000
|
|
@@ -4403,7 +4403,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -4592,7 +4592,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4600,12 +4600,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -4671,7 +4671,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -4829,7 +4829,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -5150,7 +5150,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -5643,7 +5643,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7732,7 +7732,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -7816,7 +7816,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -8307,7 +8307,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -8422,7 +8422,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -8879,7 +8879,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -9832,7 +9832,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -9864,6 +9864,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -9898,7 +9904,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -10559,7 +10565,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -11195,7 +11201,7 @@
|
|
## ---------------------------- ##
|
|
LIBM=
|
|
case $host in
|
|
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
# These system don't have libm, or don't need it
|
|
;;
|
|
*-ncr-sysv4.3*)
|
|
diff -Naur libtool-2.4.2-orig/tests/tagdemo/configure libtool-2.4.2/tests/tagdemo/configure
|
|
--- libtool-2.4.2-orig/tests/tagdemo/configure 2011-10-17 10:23:29.000000000 +0000
|
|
+++ libtool-2.4.2/tests/tagdemo/configure 2013-06-05 05:42:31.982421900 +0000
|
|
@@ -5420,7 +5420,7 @@
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
;;
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
@@ -5609,7 +5609,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -5617,12 +5617,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -5688,7 +5688,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -5846,7 +5846,7 @@
|
|
lt_cv_file_magic_test_file=/shlib/libc.so
|
|
;;
|
|
|
|
-cygwin*)
|
|
+cygwin* | msys*)
|
|
# func_win32_libid is a shell function defined in ltmain.sh
|
|
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
@@ -6167,7 +6167,7 @@
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -6659,7 +6659,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -8623,7 +8623,7 @@
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -8707,7 +8707,7 @@
|
|
fi
|
|
;;
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -9198,7 +9198,7 @@
|
|
extract_expsyms_cmds=
|
|
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -9313,7 +9313,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -9770,7 +9770,7 @@
|
|
export_dynamic_flag_spec=-rdynamic
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -10723,7 +10723,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -10755,6 +10755,12 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -10789,7 +10795,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -11450,7 +11456,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -12699,7 +12705,7 @@
|
|
esac
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
case $GXX,$cc_basename in
|
|
,cl* | no,cl*)
|
|
# Native MSVC
|
|
@@ -13732,7 +13738,7 @@
|
|
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
|
# PIC is the default for these OSes.
|
|
;;
|
|
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
@@ -13802,7 +13808,7 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
|
|
# This hack is so that the source file can tell whether it is being
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
|
|
@@ -14287,7 +14293,7 @@
|
|
pw32*)
|
|
export_symbols_cmds_CXX="$ltdll_cmds"
|
|
;;
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
case $cc_basename in
|
|
cl*)
|
|
exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
@@ -14556,7 +14562,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -14587,6 +14593,11 @@
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -14621,7 +14632,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -15257,7 +15268,7 @@
|
|
## ------------------------------ ##
|
|
LIBM=
|
|
case $host in
|
|
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
# These system don't have libm, or don't need it
|
|
;;
|
|
*-ncr-sysv4.3*)
|
|
diff -Naur libtool-2.4.2-orig/tests/testsuite libtool-2.4.2/tests/testsuite
|
|
--- libtool-2.4.2-orig/tests/testsuite 2011-10-17 10:19:52.000000000 +0000
|
|
+++ libtool-2.4.2/tests/testsuite 2013-06-05 05:09:01.795898400 +0000
|
|
@@ -11163,7 +11163,7 @@
|
|
|
|
bindirneeded=:
|
|
case "$host_os" in
|
|
- cygwin*|mingw*|cegcc*)
|
|
+ cygwin*|msys*|mingw*|cegcc*)
|
|
;;
|
|
*)
|
|
bindirneeded=false
|
|
@@ -11421,7 +11421,7 @@
|
|
|
|
bindirneeded=:
|
|
case "$host_os" in
|
|
- cygwin*|mingw*|cegcc*)
|
|
+ cygwin*|msys*|mingw*|cegcc*)
|
|
;;
|
|
*)
|
|
bindirneeded=false
|
|
@@ -16058,7 +16058,7 @@
|
|
$LIBTOOL --features | grep 'enable shared libraries' >/dev/null && have_shared=:
|
|
|
|
case $host_os,$have_shared in
|
|
-cygwin* | mingw* | cegcc* | *,false)
|
|
+cygwin* | msys* | mingw* | cegcc* | *,false)
|
|
# These hosts do not support linking without -no-undefined
|
|
CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=0"
|
|
;;
|