GraphicsMagick: 2 new changesets
GraphicsMagick Commits <[email protected]> Thu, 26 Sep 2024 11:33:53 -0500
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.24112.1727368450.7833.graphicsmagick-commit@lists.sourceforge.net> |
changeset b24d80f59956 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=b24d80f59956 summary: Use private static myMagickError() rather than from libttkcommon.c changeset 21a6c1ffea4d in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=21a6c1ffea4d summary: m4, TclMagick/unix/m4: Update to libtool 2.5.3 diffstat: .hgignore | 1 + ChangeLog | 4 + TclMagick/Makefile.am | 31 +- TclMagick/Makefile.in | 30 +- TclMagick/README | 10 + TclMagick/configure | 725 +++++++++++------------- TclMagick/generic/libttkcommon.c | 2 + TclMagick/generic/libttkcommon.h | 28 +- TclMagick/unix/config/config.guess | 121 +++- TclMagick/unix/config/config.sub | 952 ++++++++++++++++++++++++-------- TclMagick/unix/config/ltmain.sh | 489 +++++++--------- TclMagick/unix/m4/libtool.m4 | 307 ++++----- TclMagick/unix/m4/ltoptions.m4 | 106 ++- TclMagick/unix/m4/ltsugar.m4 | 2 +- TclMagick/unix/m4/ltversion.m4 | 12 +- TclMagick/unix/m4/lt~obsolete.m4 | 2 +- VisualMagick/installer/inc/version.isx | 4 +- config/ltmain.sh | 489 +++++++--------- configure | 724 ++++++++++++++---------- m4/libtool.m4 | 307 ++++----- m4/ltoptions.m4 | 106 ++- m4/ltsugar.m4 | 2 +- m4/ltversion.m4 | 12 +- m4/lt~obsolete.m4 | 2 +- magick/version.h | 4 +- www/ChangeLog.html | 6 + 26 files changed, 2530 insertions(+), 1948 deletions(-) diffs (truncated from 8938 to 500 lines): diff -r d275416799ad -r 21a6c1ffea4d .hgignore --- a/.hgignore Tue Sep 24 10:48:24 2024 -0500 +++ b/.hgignore Thu Sep 26 11:31:25 2024 -0500 @@ -104,6 +104,7 @@ ^TclMagick/generic/pkgIndex.tcl ^TclMagick/libtool ^TclMagick/tmp/ +^TclMagick/cscope.files ^Makefile ^PerlMagick/PerlMagickCheck\.sh diff -r d275416799ad -r 21a6c1ffea4d ChangeLog --- a/ChangeLog Tue Sep 24 10:48:24 2024 -0500 +++ b/ChangeLog Thu Sep 26 11:31:25 2024 -0500 @@ -1,3 +1,7 @@ +2024-09-26 Bob Friesenhahn <[email protected]> + + * m4, TclMagick/unix/m4: Update to libtool 2.5.3. + 2024-09-24 Bob Friesenhahn <[email protected]> * TclMagick/Makefile.am: 'make test' does something. Not yet what diff -r d275416799ad -r 21a6c1ffea4d TclMagick/Makefile.am --- a/TclMagick/Makefile.am Tue Sep 24 10:48:24 2024 -0500 +++ b/TclMagick/Makefile.am Thu Sep 26 11:31:25 2024 -0500 @@ -22,7 +22,7 @@ generic_libttkcommon_la_SOURCES = generic/libttkcommon.c generic/libttkcommon.h generic_libttkcommon_la_LDFLAGS = @GM_LDFLAGS@ -no-undefined -generic_libttkcommon_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TCL_LIBS@ @TCL_LIBS@ @GM_LIBS@ +generic_libttkcommon_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TCL_LIB_SPEC@ @TCL_LIBS@ @GM_LIBS@ generic_libttkcommon_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ generic_TclMagick_la_SOURCES = generic/TclMagick.c generic/TclMagick.h generic/libttkcommon.h @@ -39,6 +39,29 @@ generic_PGMS = generic/TclMagick generic_TclMagick_SOURCES = generic/TclMagickAppInit.c generic_TclMagick_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ +# +# These sort of definitions come from the TEA tcl.m4 module: +# +# TCL_STUB_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltclstub8.6 +# TK_STUB_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltkstub8.6 +# TCL_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltcl8.6 +# TK_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltk8.6 +# TCL_LIB_FLAG = -ltcl8.6 +# TK_LIB_FLAG = -ltk8.6 +# TCL_LIBS = -ldl -lz -lpthread -lm +# TK_LIBS = -lX11 -lXss -lXext -lXft -lfontconfig -lfreetype -lfontconfig -lpthread -ldl -lz -lpthread -lm +# GM_LIBS = -lGraphicsMagickWand -lGraphicsMagick -ljasper -lheif -lwmflite -ljxl -ljxl_threads -ltiff -ljbig -lzip -lzip -lwebpmux -lwebp -lfreetype -ljpeg -lturbojpeg -lpng16 -llcms2 -lXext -lSM -lICE -lX11 -lxml2 -lzstd -llzma -lbz2 -lz -lm -lpthread -lgomp +# PKG_LIB_FILE = libTclMagick0.46.so +# PKG_LIB_FILE8 = libTclMagick0.46.so +# PKG_LIB_FILE9 = libtcl9TclMagick0.46.so +# PKG_STUB_LIB_FILE = libTclMagickstub0.46.a +# TCL_STUB_LIB_FILE = libtclstub8.6.a +# TCL_STUB_LIB_FLAG = -ltclstub8.6 +# TCL_STUB_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltclstub8.6 +# TK_STUB_LIB_FILE = libtkstub8.6.a +# TK_STUB_LIB_FLAG = -ltkstub8.6 +# TK_STUB_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltkstub8.6 + generic_TclMagick_LDADD = $(generic_lib_magick_LTLIBRARIES) @TCL_STUB_LIB_SPEC@ @TK_STUB_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIB_SPEC@ @TCL_LIB_FLAG@ @TK_LIB_FLAG@ @TCL_LIBS@ @TK_LIBS@ @GM_LIBS@ noinst_PROGRAMS = \ @@ -55,7 +78,11 @@ rm -v $(DESTDIR)@libdir@/TclMagick@VERSION@/pkgIndex.tcl test: - cd $(abs_srcdir)/generic && $(abs_builddir)/generic/TclMagick $(abs_srcdir)/tests/test-wand.tcl + cd $(abs_srcdir)/generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-wand.tcl` + cd $(abs_srcdir)/generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-pixel.tcl` + cd $(abs_srcdir)/generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-draw.tcl` + cd $(abs_srcdir)/generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-bmp-compare.tcl` +# cd $(abs_srcdir)/generic && $(abs_builddir)/generic/TclMagick $(abs_srcdir)/tests/test-wand.tcl #test: # cd generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-wand.tcl` $(TESTFLAGS) \ diff -r d275416799ad -r 21a6c1ffea4d TclMagick/Makefile.in --- a/TclMagick/Makefile.in Tue Sep 24 10:48:24 2024 -0500 +++ b/TclMagick/Makefile.in Thu Sep 26 11:31:25 2024 -0500 @@ -485,7 +485,7 @@ generic_lib_magick_LTLIBRARIES = generic/libttkcommon.la generic/TclMagick.la generic/TkMagick.la generic_libttkcommon_la_SOURCES = generic/libttkcommon.c generic/libttkcommon.h generic_libttkcommon_la_LDFLAGS = @GM_LDFLAGS@ -no-undefined -generic_libttkcommon_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TCL_LIBS@ @TCL_LIBS@ @GM_LIBS@ +generic_libttkcommon_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TCL_LIB_SPEC@ @TCL_LIBS@ @GM_LIBS@ generic_libttkcommon_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ generic_TclMagick_la_SOURCES = generic/TclMagick.c generic/TclMagick.h generic/libttkcommon.h generic_TclMagick_la_LDFLAGS = @GM_LDFLAGS@ -L$(generic_lib_magickdir) -no-undefined -module @@ -500,6 +500,28 @@ generic_PGMS = generic/TclMagick generic_TclMagick_SOURCES = generic/TclMagickAppInit.c generic_TclMagick_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ +# +# These sort of definitions come from the TEA tcl.m4 module: +# +# TCL_STUB_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltclstub8.6 +# TK_STUB_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltkstub8.6 +# TCL_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltcl8.6 +# TK_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltk8.6 +# TCL_LIB_FLAG = -ltcl8.6 +# TK_LIB_FLAG = -ltk8.6 +# TCL_LIBS = -ldl -lz -lpthread -lm +# TK_LIBS = -lX11 -lXss -lXext -lXft -lfontconfig -lfreetype -lfontconfig -lpthread -ldl -lz -lpthread -lm +# GM_LIBS = -lGraphicsMagickWand -lGraphicsMagick -ljasper -lheif -lwmflite -ljxl -ljxl_threads -ltiff -ljbig -lzip -lzip -lwebpmux -lwebp -lfreetype -ljpeg -lturbojpeg -lpng16 -llcms2 -lXext -lSM -lICE -lX11 -lxml2 -lzstd -llzma -lbz2 -lz -lm -lpthread -lgomp +# PKG_LIB_FILE = libTclMagick0.46.so +# PKG_LIB_FILE8 = libTclMagick0.46.so +# PKG_LIB_FILE9 = libtcl9TclMagick0.46.so +# PKG_STUB_LIB_FILE = libTclMagickstub0.46.a +# TCL_STUB_LIB_FILE = libtclstub8.6.a +# TCL_STUB_LIB_FLAG = -ltclstub8.6 +# TCL_STUB_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltclstub8.6 +# TK_STUB_LIB_FILE = libtkstub8.6.a +# TK_STUB_LIB_FLAG = -ltkstub8.6 +# TK_STUB_LIB_SPEC = -L/usr/lib/x86_64-linux-gnu -ltkstub8.6 generic_TclMagick_LDADD = $(generic_lib_magick_LTLIBRARIES) @TCL_STUB_LIB_SPEC@ @TK_STUB_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIB_SPEC@ @TCL_LIB_FLAG@ @TK_LIB_FLAG@ @TCL_LIBS@ @TK_LIBS@ @GM_LIBS@ all: all-am @@ -1098,7 +1120,11 @@ rm -v $(DESTDIR)@libdir@/TclMagick@VERSION@/pkgIndex.tcl test: - cd $(abs_srcdir)/generic && $(abs_builddir)/generic/TclMagick $(abs_srcdir)/tests/test-wand.tcl + cd $(abs_srcdir)/generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-wand.tcl` + cd $(abs_srcdir)/generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-pixel.tcl` + cd $(abs_srcdir)/generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-draw.tcl` + cd $(abs_srcdir)/generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-bmp-compare.tcl` +# cd $(abs_srcdir)/generic && $(abs_builddir)/generic/TclMagick $(abs_srcdir)/tests/test-wand.tcl #test: # cd generic && $(TCLSH) `@CYGPATH@ $(srcdir)/tests/test-wand.tcl` $(TESTFLAGS) \ diff -r d275416799ad -r 21a6c1ffea4d TclMagick/README --- a/TclMagick/README Tue Sep 24 10:48:24 2024 -0500 +++ b/TclMagick/README Thu Sep 26 11:31:25 2024 -0500 @@ -7,3 +7,13 @@ Updates, new commands and Tk connector by David N. Welton <[email protected]> + +Subsequent work has been done by Massimo Manghi +<[email protected]>, and Bob Friesenhahn +<[email protected]>. + +The Unix/Linux build is currently done using Automake+libtool. The +quality of the integration as pertains to Tcl would be improved if the +TclMagick build is changed to a pure Tcl Extension Architecture (TEA) +build and test framework similar to SampleExtension +(https://wiki.tcl-lang.org/page/SampleExtension). diff -r d275416799ad -r 21a6c1ffea4d TclMagick/configure --- a/TclMagick/configure Tue Sep 24 10:48:24 2024 -0500 +++ b/TclMagick/configure Thu Sep 26 11:31:25 2024 -0500 @@ -859,8 +859,10 @@ enable_dependency_tracking enable_shared enable_static +enable_pic with_pic enable_fast_install +enable_aix_soname with_aix_soname with_gnu_ld with_sysroot @@ -1525,8 +1527,13 @@ speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] + --enable-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] + --enable-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --disable-libtool-lock avoid locking (might break parallel builds) --enable-threads build with threads (default: on) --enable-shared build and link with shared libraries (default: on) @@ -1539,11 +1546,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use - both] - --with-aix-soname=aix|svr4|both - shared library versioning (aka "SONAME") variant to - provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). @@ -4649,8 +4651,8 @@ -macro_version='2.4.7' -macro_revision='2.4.7' +macro_version='2.5.3' +macro_revision='2.5.3' @@ -5148,7 +5150,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 printf %s "checking for ld used by $CC... " >&6; } case $host in - *-*-mingw*) + *-*-mingw* | *-*-windows*) # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) @@ -5275,7 +5277,7 @@ # Tru64's nm complains that /dev/null is an invalid object file # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty case $build_os in - mingw*) lt_bad_file=conftest.nm/nofile ;; + mingw* | windows*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in @@ -5504,7 +5506,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw* | cegcc*) + cygwin* | mingw* | windows* | 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, @@ -5526,7 +5528,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) + darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5668,7 +5670,7 @@ case $host in *-*-mingw* ) case $build in - *-*-mingw* ) # actually msys + *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ;; *-*-cygwin* ) @@ -5681,7 +5683,7 @@ ;; *-*-cygwin* ) case $build in - *-*-mingw* ) # actually msys + *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ;; *-*-cygwin* ) @@ -5716,9 +5718,9 @@ #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in - *-*-mingw* ) + *-*-mingw* | *-*-windows* ) case $build in - *-*-mingw* ) # actually msys + *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ;; esac @@ -5752,7 +5754,7 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) if test yes != "$GCC"; then reload_cmds=false fi @@ -5774,9 +5776,8 @@ -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. -set dummy ${ac_tool_prefix}file; ac_word=$2 +# Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_FILECMD+y} @@ -5797,14 +5798,15 @@ esac for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_FILECMD="${ac_tool_prefix}file" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - + ac_cv_prog_FILECMD="file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_FILECMD" && ac_cv_prog_FILECMD=":" fi fi FILECMD=$ac_cv_prog_FILECMD @@ -5817,65 +5819,6 @@ fi -fi -if test -z "$ac_cv_prog_FILECMD"; then - ac_ct_FILECMD=$FILECMD - # Extract the first word of "file", so it can be a program name with args. -set dummy file; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_FILECMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_FILECMD"; then - ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_FILECMD="file" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD -if test -n "$ac_ct_FILECMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 -printf "%s\n" "$ac_ct_FILECMD" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_FILECMD" = x; then - FILECMD=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - FILECMD=$ac_ct_FILECMD - fi -else - FILECMD="$ac_cv_prog_FILECMD" -fi - @@ -6008,7 +5951,6 @@ # 'none' -- dependencies not supported. # 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path # that responds to the $file_magic_cmd with a given extended regex. # If you have 'file' or equivalent on your system and you're not sure @@ -6035,7 +5977,7 @@ lt_cv_file_magic_cmd='func_win32_libid' ;; -mingw* | pw32*) +mingw* | windows* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. @@ -6044,7 +5986,7 @@ lt_cv_file_magic_cmd='func_win32_libid' else # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; @@ -6135,7 +6077,7 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd* | bitrig*) +openbsd*) if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else @@ -6202,7 +6144,7 @@ want_nocaseglob=no if test "$build" = "$host"; then case $host_os in - mingw* | pw32*) + mingw* | windows* | pw32*) if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then want_nocaseglob=yes else @@ -6359,7 +6301,7 @@ lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | mingw* | windows* | 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 @@ -6391,6 +6333,108 @@ if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then