123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444 |
- diff --git a/build-aux/config.guess b/build-aux/config.guess
- index f50dcdb6..cd89e459 100755
- --- a/build-aux/config.guess
- +++ b/build-aux/config.guess
- @@ -883,6 +883,9 @@ EOF
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
- + amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
- + echo x86_64-unknown-msys
- + exit ;;
- prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- exit ;;
- diff -Naur libtool-2.4.2.418-orig/build-aux/ltmain.sh libtool-2.4.2.418/build-aux/ltmain.sh
- --- libtool-2.4.2.418-orig/build-aux/ltmain.sh 2013-10-27 02:53:58.000000000 +0400
- +++ libtool-2.4.2.418/build-aux/ltmain.sh 2014-09-02 10:29:08.840800000 +0400
- @@ -2315,7 +2315,7 @@
- case $host in
- # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
- # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
- - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
- + *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- @@ -3328,7 +3328,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
- @@ -4201,7 +4201,7 @@
- 'exit $?'
- tstripme=$stripme
- case $host_os in
- - cygwin* | mingw* | pw32* | cegcc*)
- + cygwin* | msys* | mingw* | pw32* | cegcc*)
- case $realname in
- *.dll.a)
- tstripme=
- @@ -4307,7 +4307,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
- @@ -4382,7 +4382,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
- @@ -4535,7 +4535,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"'
- ;;
- @@ -4547,7 +4547,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"'
- ;;
- @@ -4561,7 +4561,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"
- @@ -4736,7 +4736,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%"`
- @@ -5629,7 +5629,7 @@
- {
- EOF
- case $host in
- - *mingw* | *cygwin* )
- + *mingw* | *cygwin* | *msys* )
- # make stdout use "unix" line endings
- echo " setmode(1,_O_BINARY);"
- ;;
- @@ -6350,7 +6350,7 @@
- $debug_cmd
-
- 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
- # what system we are compiling for in order to pass an extra
- @@ -6843,7 +6843,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:"*) ;;
- @@ -6863,7 +6863,7 @@
- -l*)
- if test X-lc = "X$arg" || test X-lm = "X$arg"; 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
- ;;
- @@ -6946,7 +6946,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"
- @@ -7812,7 +7812,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
- @@ -7956,7 +7956,7 @@
- if test -n "$library_names" &&
- { test no = "$use_static_libs" || test -z "$old_library"; }; then
- case $host in
- - *cygwin* | *mingw* | *cegcc* | *os2*)
- + *cygwin* | *msys* | *mingw* | *cegcc* | *os2*)
- # No point in relinking DLLs because paths are not encoded
- func_append notinst_deplibs " $lib"
- need_relink=no
- @@ -8026,7 +8026,7 @@
- elif test -n "$soname_spec"; then
- # bleh windows
- case $host in
- - *cygwin* | mingw* | *cegcc* | *os2*)
- + *cygwin* | *msys* | mingw* | *cegcc* | *os2*)
- func_arith $current - $age
- major=$func_arith_result
- versuffix=-$major
- @@ -8899,7 +8899,7 @@
- if test yes = "$build_libtool_libs"; 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])
- @@ -9413,7 +9413,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
- func_dll_def_p "$export_symbols" || {
- @@ -9970,7 +9970,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" && \
- @@ -10081,7 +10081,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:"*) ;;
- @@ -10159,7 +10159,7 @@
- # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=false
- ;;
- - *cygwin* | *mingw* )
- + *cygwin* | *msys* | *mingw* )
- test yes = "$build_libtool_libs" || wrappers_required=false
- ;;
- *)
- @@ -10305,14 +10305,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
- @@ -10644,7 +10644,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 -n "$bindir"; then
- func_relative_path "$install_libdir" "$bindir"
- diff -Naur libtool-2.4.2.418-orig/m4/libtool.m4 libtool-2.4.2.418/m4/libtool.m4
- --- libtool-2.4.2.418-orig/m4/libtool.m4 2013-10-26 03:37:46.000000000 +0400
- +++ libtool-2.4.2.418/m4/libtool.m4 2014-09-02 10:19:40.084800000 +0400
- @@ -1665,7 +1665,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,
- @@ -1913,7 +1913,7 @@
- lt_cv_dlopen_libs=
- ;;
-
- - cygwin*)
- + cygwin* | msys*)
- lt_cv_dlopen=dlopen
- lt_cv_dlopen_libs=
- ;;
- @@ -2399,7 +2399,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
- @@ -2431,6 +2431,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'
- @@ -2465,7 +2471,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...
- @@ -3203,7 +3209,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 yes != "$GCC"; then
- reload_cmds=false
- fi
- @@ -3259,7 +3265,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'
- @@ -3564,7 +3570,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 one to use based on capabilities of $DLLTOOL
- case `$DLLTOOL --help 2>&1` in
- @@ -3634,7 +3640,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*)
- @@ -3709,7 +3715,7 @@
- aix*)
- symcode='[[BCDT]]'
- ;;
- -cygwin* | mingw* | pw32* | cegcc*)
- +cygwin* | msys* | mingw* | pw32* | cegcc*)
- symcode='[[ABCDGISTW]]'
- ;;
- hpux*)
- @@ -4015,7 +4021,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
- @@ -4086,7 +4092,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], [],
- @@ -4334,7 +4340,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
- @@ -4433,7 +4439,7 @@
- esac
- ;;
-
- - 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], [],
- @@ -4699,7 +4705,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_.*'
- @@ -4757,7 +4763,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++.
- @@ -4872,7 +4878,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'
- @@ -5247,7 +5253,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
- @@ -6241,7 +6247,7 @@
- esac
- ;;
-
- - cygwin* | mingw* | pw32* | cegcc*)
- + cygwin* | msys* | mingw* | pw32* | cegcc*)
- case $GXX,$cc_basename in
- ,cl* | no,cl*)
- # Native MSVC
- @@ -7937,7 +7943,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
- @@ -7945,12 +7951,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
|