Changeset 617
- Timestamp:
- 11/19/09 05:54:29 (4 months ago)
- Location:
- ImageMagick/trunk
- Files:
-
- 98 modified
-
Makefile.in (modified) (13 diffs)
-
config/configure.xml (modified) (1 diff)
-
config/ltmain.sh (modified) (139 diffs)
-
index.html (modified) (1 diff)
-
libtool (modified) (140 diffs)
-
ltdl/loaders/loadlibrary.c (modified) (1 diff)
-
ltdl/ltdl.c (modified) (3 diffs)
-
m4/libtool.m4 (modified) (130 diffs)
-
m4/ltdl.m4 (modified) (2 diffs)
-
m4/ltoptions.m4 (modified) (3 diffs)
-
m4/ltversion.m4 (modified) (1 diff)
-
m4/lt~obsolete.m4 (modified) (3 diffs)
-
magick/version.h (modified) (1 diff)
-
www/ImageMagickObject.html (modified) (1 diff)
-
www/advanced-unix-installation.html (modified) (2 diffs)
-
www/advanced-windows-installation.html (modified) (2 diffs)
-
www/animate.html (modified) (2 diffs)
-
www/api.html (modified) (15 diffs)
-
www/api/animate.html (modified) (1 diff)
-
www/api/annotate.html (modified) (2 diffs)
-
www/api/attribute.html (modified) (1 diff)
-
www/api/blob.html (modified) (2 diffs)
-
www/api/cache.html (modified) (2 diffs)
-
www/api/cipher.html (modified) (1 diff)
-
www/api/color.html (modified) (1 diff)
-
www/api/compare.html (modified) (2 diffs)
-
www/api/composite.html (modified) (2 diffs)
-
www/api/decorate.html (modified) (1 diff)
-
www/api/deprecate.html (modified) (1 diff)
-
www/api/display.html (modified) (2 diffs)
-
www/api/distort.html (modified) (2 diffs)
-
www/api/draw.html (modified) (1 diff)
-
www/api/drawing-wand.html (modified) (1 diff)
-
www/api/effect.html (modified) (1 diff)
-
www/api/exception.html (modified) (1 diff)
-
www/api/histogram.html (modified) (1 diff)
-
www/api/image.html (modified) (1 diff)
-
www/api/layer.html (modified) (1 diff)
-
www/api/magick-deprecate.html (modified) (2 diffs)
-
www/api/magick-wand.html (modified) (2 diffs)
-
www/api/magick.html (modified) (1 diff)
-
www/api/memory.html (modified) (2 diffs)
-
www/api/monitor.html (modified) (1 diff)
-
www/api/montage.html (modified) (1 diff)
-
www/api/paint.html (modified) (1 diff)
-
www/api/pixel-iterator.html (modified) (2 diffs)
-
www/api/pixel-wand.html (modified) (2 diffs)
-
www/api/property.html (modified) (2 diffs)
-
www/api/quantize.html (modified) (2 diffs)
-
www/api/registry.html (modified) (1 diff)
-
www/api/resize.html (modified) (1 diff)
-
www/api/resource.html (modified) (1 diff)
-
www/api/segment.html (modified) (2 diffs)
-
www/api/shear.html (modified) (1 diff)
-
www/api/signature.html (modified) (1 diff)
-
www/api/stream.html (modified) (2 diffs)
-
www/api/transform.html (modified) (1 diff)
-
www/api/version.html (modified) (2 diffs)
-
www/architecture.html (modified) (1 diff)
-
www/binary-releases.html (modified) (1 diff)
-
www/changelog.html (modified) (2 diffs)
-
www/cipher.html (modified) (2 diffs)
-
www/color.html (modified) (1 diff)
-
www/command-line-processing.html (modified) (1 diff)
-
www/command-line-tools.html (modified) (1 diff)
-
www/compare.html (modified) (1 diff)
-
www/conjure.html (modified) (2 diffs)
-
www/contact.html (modified) (2 diffs)
-
www/convert.html (modified) (1 diff)
-
www/display.html (modified) (1 diff)
-
www/download.html (modified) (1 diff)
-
www/examples.html (modified) (2 diffs)
-
www/exception.html (modified) (1 diff)
-
www/fx.html (modified) (1 diff)
-
www/high-dynamic-range.html (modified) (1 diff)
-
www/history.html (modified) (2 diffs)
-
www/identify.html (modified) (2 diffs)
-
www/import.html (modified) (2 diffs)
-
www/index.html (modified) (1 diff)
-
www/install-source.html (modified) (2 diffs)
-
www/jp2.html (modified) (2 diffs)
-
www/license.html (modified) (1 diff)
-
www/links.html (modified) (11 diffs)
-
www/magick-vector-graphics.html (modified) (1 diff)
-
www/magick-wand.html (modified) (1 diff)
-
www/mailing-list.html (modified) (6 diffs)
-
www/miff.html (modified) (1 diff)
-
www/mirrors.html (modified) (3 diffs)
-
www/mogrify.html (modified) (2 diffs)
-
www/motion-picture.html (modified) (2 diffs)
-
www/quantize.html (modified) (2 diffs)
-
www/resources.html (modified) (2 diffs)
-
www/search.html (modified) (2 diffs)
-
www/sitemap.html (modified) (8 diffs)
-
www/sponsors.html (modified) (2 diffs)
-
www/stream.html (modified) (2 diffs)
-
www/subversion.html (modified) (1 diff)
-
www/t-shirt.html (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ImageMagick/trunk/Makefile.in
r603 r617 1269 1269 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 1270 1270 $(ltdl_dyld_la_LDFLAGS) $(LDFLAGS) -o $@ 1271 ltdl_libltdl_la_LIBADD = 1272 ltdl_libltdl_la_SOURCES = ltdl/libltdl.c 1273 ltdl_libltdl_la_OBJECTS = ltdl/libltdl.lo 1271 am_ltdl_libltdl_la_OBJECTS = ltdl/loaders/ltdl_libltdl_la-preopen.lo \ 1272 ltdl/ltdl_libltdl_la-lt__alloc.lo \ 1273 ltdl/ltdl_libltdl_la-lt_dlloader.lo \ 1274 ltdl/ltdl_libltdl_la-lt_error.lo ltdl/ltdl_libltdl_la-ltdl.lo \ 1275 ltdl/ltdl_libltdl_la-slist.lo 1276 ltdl_libltdl_la_OBJECTS = $(am_ltdl_libltdl_la_OBJECTS) 1277 ltdl_libltdl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ 1278 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ 1279 $(AM_CFLAGS) $(CFLAGS) $(ltdl_libltdl_la_LDFLAGS) $(LDFLAGS) \ 1280 -o $@ 1274 1281 @INSTALL_LTDL_TRUE@am_ltdl_libltdl_la_rpath = -rpath $(libdir) 1275 1282 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) … … 1965 1972 $(filters_analyze_la_SOURCES) $(filters_boost_la_SOURCES) \ 1966 1973 $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \ 1967 $(ltdl_dyld_la_SOURCES) ltdl/libltdl.c\1974 $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \ 1968 1975 $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \ 1969 1976 $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \ … … 2053 2060 $(filters_analyze_la_SOURCES) $(filters_boost_la_SOURCES) \ 2054 2061 $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \ 2055 $(ltdl_dyld_la_SOURCES) ltdl/libltdl.c\2062 $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \ 2056 2063 $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \ 2057 2064 $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \ … … 2089 2096 $(pkgconfig_DATA) 2090 2097 am__include_HEADERS_DIST = ltdl/ltdl.h 2091 am__ltdlinclude_HEADERS_DIST = ltdl/l tdl/lt_system.h \2092 ltdl/l tdl/lt_error.h ltdl/ltdl/lt_dlloader.h2098 am__ltdlinclude_HEADERS_DIST = ltdl/libltdl/lt_system.h \ 2099 ltdl/libltdl/lt_error.h ltdl/libltdl/lt_dlloader.h 2093 2100 am__magickppinc_HEADERS_DIST = Magick++/lib/Magick++/Blob.h \ 2094 2101 Magick++/lib/Magick++/CoderInfo.h \ … … 2502 2509 localedir = @localedir@ 2503 2510 localstatedir = @localstatedir@ 2504 lt_ECHO = @lt_ECHO@2505 2511 ltdl_LIBOBJS = @ltdl_LIBOBJS@ 2506 2512 ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ … … 2698 2704 LTDL_VERSION_INFO = -version-info 9:1:2 2699 2705 @INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl 2700 @INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = ltdl/l tdl/lt_system.h \2701 @INSTALL_LTDL_TRUE@ ltdl/l tdl/lt_error.h \2702 @INSTALL_LTDL_TRUE@ ltdl/l tdl/lt_dlloader.h2703 2704 ltdl_l tdl_la_SOURCES = ltdl/ltdl/lt__alloc.h \2705 ltdl/l tdl/lt__dirent.h \2706 ltdl/l tdl/lt__glibc.h \2707 ltdl/l tdl/lt__private.h \2708 ltdl/l tdl/lt__strl.h \2709 ltdl/l tdl/lt_dlloader.h \2710 ltdl/l tdl/lt_error.h \2711 ltdl/l tdl/lt_system.h \2712 ltdl/l tdl/slist.h \2706 @INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = ltdl/libltdl/lt_system.h \ 2707 @INSTALL_LTDL_TRUE@ ltdl/libltdl/lt_error.h \ 2708 @INSTALL_LTDL_TRUE@ ltdl/libltdl/lt_dlloader.h 2709 2710 ltdl_libltdl_la_SOURCES = ltdl/libltdl/lt__alloc.h \ 2711 ltdl/libltdl/lt__dirent.h \ 2712 ltdl/libltdl/lt__glibc.h \ 2713 ltdl/libltdl/lt__private.h \ 2714 ltdl/libltdl/lt__strl.h \ 2715 ltdl/libltdl/lt_dlloader.h \ 2716 ltdl/libltdl/lt_error.h \ 2717 ltdl/libltdl/lt_system.h \ 2718 ltdl/libltdl/slist.h \ 2713 2719 ltdl/loaders/preopen.c \ 2714 2720 ltdl/lt__alloc.c \ … … 2719 2725 ltdl/slist.c 2720 2726 2721 ltdl_l tdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS)2722 ltdl_l tdl_la_LDFLAGS = $(AM_LDFLAGS) $(LTDL_VERSION_INFO) $(LT_DLPREOPEN)2723 ltdl_l tdl_la_LIBADD = $(ltdl_LTLIBOBJS)2724 ltdl_l tdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(ltdl_LTLIBOBJS)2725 ltdl_libltdlc_la_SOURCES = $(ltdl_l tdl_la_SOURCES)2727 ltdl_libltdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS) 2728 ltdl_libltdl_la_LDFLAGS = $(AM_LDFLAGS) $(LTDL_VERSION_INFO) $(LT_DLPREOPEN) 2729 ltdl_libltdl_la_LIBADD = $(ltdl_LTLIBOBJS) 2730 ltdl_libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(ltdl_LTLIBOBJS) 2731 ltdl_libltdlc_la_SOURCES = $(ltdl_libltdl_la_SOURCES) 2726 2732 ltdl_libltdlc_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN)c $(AM_CPPFLAGS) 2727 2733 ltdl_libltdlc_la_LDFLAGS = $(AM_LDFLAGS) $(LT_DLPREOPEN) 2728 ltdl_libltdlc_la_LIBADD = $(ltdl_l tdl_la_LIBADD)2729 ltdl_libltdlc_la_DEPENDENCIES = $(ltdl_l tdl_la_DEPENDENCIES)2734 ltdl_libltdlc_la_LIBADD = $(ltdl_libltdl_la_LIBADD) 2735 ltdl_libltdlc_la_DEPENDENCIES = $(ltdl_libltdl_la_DEPENDENCIES) 2730 2736 ltdl_dlopen_la_SOURCES = ltdl/loaders/dlopen.c 2731 2737 ltdl_dlopen_la_LDFLAGS = -module -avoid-version … … 5344 5350 ltdl/dyld.la: $(ltdl_dyld_la_OBJECTS) $(ltdl_dyld_la_DEPENDENCIES) ltdl/$(am__dirstamp) 5345 5351 $(AM_V_CCLD)$(ltdl_dyld_la_LINK) $(ltdl_dyld_la_OBJECTS) $(ltdl_dyld_la_LIBADD) $(LIBS) 5352 ltdl/loaders/ltdl_libltdl_la-preopen.lo: ltdl/loaders/$(am__dirstamp) \ 5353 ltdl/loaders/$(DEPDIR)/$(am__dirstamp) 5346 5354 ltdl/$(DEPDIR)/$(am__dirstamp): 5347 5355 @$(MKDIR_P) ltdl/$(DEPDIR) 5348 5356 @: > ltdl/$(DEPDIR)/$(am__dirstamp) 5349 ltdl/libltdl.lo: ltdl/$(am__dirstamp) ltdl/$(DEPDIR)/$(am__dirstamp) 5357 ltdl/ltdl_libltdl_la-lt__alloc.lo: ltdl/$(am__dirstamp) \ 5358 ltdl/$(DEPDIR)/$(am__dirstamp) 5359 ltdl/ltdl_libltdl_la-lt_dlloader.lo: ltdl/$(am__dirstamp) \ 5360 ltdl/$(DEPDIR)/$(am__dirstamp) 5361 ltdl/ltdl_libltdl_la-lt_error.lo: ltdl/$(am__dirstamp) \ 5362 ltdl/$(DEPDIR)/$(am__dirstamp) 5363 ltdl/ltdl_libltdl_la-ltdl.lo: ltdl/$(am__dirstamp) \ 5364 ltdl/$(DEPDIR)/$(am__dirstamp) 5365 ltdl/ltdl_libltdl_la-slist.lo: ltdl/$(am__dirstamp) \ 5366 ltdl/$(DEPDIR)/$(am__dirstamp) 5350 5367 ltdl/libltdl.la: $(ltdl_libltdl_la_OBJECTS) $(ltdl_libltdl_la_DEPENDENCIES) ltdl/$(am__dirstamp) 5351 $(AM_V_CCLD)$( LINK) $(am_ltdl_libltdl_la_rpath) $(ltdl_libltdl_la_OBJECTS) $(ltdl_libltdl_la_LIBADD) $(LIBS)5368 $(AM_V_CCLD)$(ltdl_libltdl_la_LINK) $(am_ltdl_libltdl_la_rpath) $(ltdl_libltdl_la_OBJECTS) $(ltdl_libltdl_la_LIBADD) $(LIBS) 5352 5369 ltdl/loaders/ltdl_libltdlc_la-preopen.lo: \ 5353 5370 ltdl/loaders/$(am__dirstamp) \ … … 6624 6641 -rm -f filters/magick_libMagickCore_la-boost.$(OBJEXT) 6625 6642 -rm -f filters/magick_libMagickCore_la-boost.lo 6626 -rm -f ltdl/libltdl.$(OBJEXT)6627 -rm -f ltdl/libltdl.lo6628 6643 -rm -f ltdl/loaders/dld_link.$(OBJEXT) 6629 6644 -rm -f ltdl/loaders/dld_link.lo … … 6636 6651 -rm -f ltdl/loaders/loadlibrary.$(OBJEXT) 6637 6652 -rm -f ltdl/loaders/loadlibrary.lo 6653 -rm -f ltdl/loaders/ltdl_libltdl_la-preopen.$(OBJEXT) 6654 -rm -f ltdl/loaders/ltdl_libltdl_la-preopen.lo 6638 6655 -rm -f ltdl/loaders/ltdl_libltdlc_la-preopen.$(OBJEXT) 6639 6656 -rm -f ltdl/loaders/ltdl_libltdlc_la-preopen.lo 6640 6657 -rm -f ltdl/loaders/shl_load.$(OBJEXT) 6641 6658 -rm -f ltdl/loaders/shl_load.lo 6659 -rm -f ltdl/ltdl_libltdl_la-lt__alloc.$(OBJEXT) 6660 -rm -f ltdl/ltdl_libltdl_la-lt__alloc.lo 6661 -rm -f ltdl/ltdl_libltdl_la-lt_dlloader.$(OBJEXT) 6662 -rm -f ltdl/ltdl_libltdl_la-lt_dlloader.lo 6663 -rm -f ltdl/ltdl_libltdl_la-lt_error.$(OBJEXT) 6664 -rm -f ltdl/ltdl_libltdl_la-lt_error.lo 6665 -rm -f ltdl/ltdl_libltdl_la-ltdl.$(OBJEXT) 6666 -rm -f ltdl/ltdl_libltdl_la-ltdl.lo 6667 -rm -f ltdl/ltdl_libltdl_la-slist.$(OBJEXT) 6668 -rm -f ltdl/ltdl_libltdl_la-slist.lo 6642 6669 -rm -f ltdl/ltdl_libltdlc_la-lt__alloc.$(OBJEXT) 6643 6670 -rm -f ltdl/ltdl_libltdlc_la-lt__alloc.lo … … 7141 7168 @AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/magick_libMagickCore_la-analyze.Plo@am__quote@ 7142 7169 @AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/magick_libMagickCore_la-boost.Plo@am__quote@ 7143 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/libltdl.Plo@am__quote@ 7170 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Plo@am__quote@ 7171 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Plo@am__quote@ 7172 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_error.Plo@am__quote@ 7173 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-ltdl.Plo@am__quote@ 7174 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-slist.Plo@am__quote@ 7144 7175 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdlc_la-lt__alloc.Plo@am__quote@ 7145 7176 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdlc_la-lt_dlloader.Plo@am__quote@ … … 7152 7183 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/load_add_on.Plo@am__quote@ 7153 7184 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/loadlibrary.Plo@am__quote@ 7185 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Plo@am__quote@ 7154 7186 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdlc_la-preopen.Plo@am__quote@ 7155 7187 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/shl_load.Plo@am__quote@ … … 8198 8230 @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filters_boost_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o filters/filters_boost_la-boost.lo `test -f 'filters/boost.c' || echo '$(srcdir)/'`filters/boost.c 8199 8231 8232 ltdl/loaders/ltdl_libltdl_la-preopen.lo: ltdl/loaders/preopen.c 8233 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/loaders/ltdl_libltdl_la-preopen.lo -MD -MP -MF ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Tpo -c -o ltdl/loaders/ltdl_libltdl_la-preopen.lo `test -f 'ltdl/loaders/preopen.c' || echo '$(srcdir)/'`ltdl/loaders/preopen.c 8234 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Tpo ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Plo 8235 @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ 8236 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/loaders/preopen.c' object='ltdl/loaders/ltdl_libltdl_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@ 8237 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 8238 @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/loaders/ltdl_libltdl_la-preopen.lo `test -f 'ltdl/loaders/preopen.c' || echo '$(srcdir)/'`ltdl/loaders/preopen.c 8239 8240 ltdl/ltdl_libltdl_la-lt__alloc.lo: ltdl/lt__alloc.c 8241 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-lt__alloc.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Tpo -c -o ltdl/ltdl_libltdl_la-lt__alloc.lo `test -f 'ltdl/lt__alloc.c' || echo '$(srcdir)/'`ltdl/lt__alloc.c 8242 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Plo 8243 @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ 8244 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/lt__alloc.c' object='ltdl/ltdl_libltdl_la-lt__alloc.lo' libtool=yes @AMDEPBACKSLASH@ 8245 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 8246 @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-lt__alloc.lo `test -f 'ltdl/lt__alloc.c' || echo '$(srcdir)/'`ltdl/lt__alloc.c 8247 8248 ltdl/ltdl_libltdl_la-lt_dlloader.lo: ltdl/lt_dlloader.c 8249 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-lt_dlloader.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Tpo -c -o ltdl/ltdl_libltdl_la-lt_dlloader.lo `test -f 'ltdl/lt_dlloader.c' || echo '$(srcdir)/'`ltdl/lt_dlloader.c 8250 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Plo 8251 @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ 8252 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/lt_dlloader.c' object='ltdl/ltdl_libltdl_la-lt_dlloader.lo' libtool=yes @AMDEPBACKSLASH@ 8253 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 8254 @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-lt_dlloader.lo `test -f 'ltdl/lt_dlloader.c' || echo '$(srcdir)/'`ltdl/lt_dlloader.c 8255 8256 ltdl/ltdl_libltdl_la-lt_error.lo: ltdl/lt_error.c 8257 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-lt_error.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_error.Tpo -c -o ltdl/ltdl_libltdl_la-lt_error.lo `test -f 'ltdl/lt_error.c' || echo '$(srcdir)/'`ltdl/lt_error.c 8258 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_error.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_error.Plo 8259 @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ 8260 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/lt_error.c' object='ltdl/ltdl_libltdl_la-lt_error.lo' libtool=yes @AMDEPBACKSLASH@ 8261 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 8262 @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-lt_error.lo `test -f 'ltdl/lt_error.c' || echo '$(srcdir)/'`ltdl/lt_error.c 8263 8264 ltdl/ltdl_libltdl_la-ltdl.lo: ltdl/ltdl.c 8265 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-ltdl.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-ltdl.Tpo -c -o ltdl/ltdl_libltdl_la-ltdl.lo `test -f 'ltdl/ltdl.c' || echo '$(srcdir)/'`ltdl/ltdl.c 8266 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-ltdl.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-ltdl.Plo 8267 @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ 8268 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/ltdl.c' object='ltdl/ltdl_libltdl_la-ltdl.lo' libtool=yes @AMDEPBACKSLASH@ 8269 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 8270 @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-ltdl.lo `test -f 'ltdl/ltdl.c' || echo '$(srcdir)/'`ltdl/ltdl.c 8271 8272 ltdl/ltdl_libltdl_la-slist.lo: ltdl/slist.c 8273 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-slist.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-slist.Tpo -c -o ltdl/ltdl_libltdl_la-slist.lo `test -f 'ltdl/slist.c' || echo '$(srcdir)/'`ltdl/slist.c 8274 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-slist.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-slist.Plo 8275 @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ 8276 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/slist.c' object='ltdl/ltdl_libltdl_la-slist.lo' libtool=yes @AMDEPBACKSLASH@ 8277 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 8278 @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-slist.lo `test -f 'ltdl/slist.c' || echo '$(srcdir)/'`ltdl/slist.c 8279 8200 8280 ltdl/loaders/ltdl_libltdlc_la-preopen.lo: ltdl/loaders/preopen.c 8201 8281 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/loaders/ltdl_libltdlc_la-preopen.lo -MD -MP -MF ltdl/loaders/$(DEPDIR)/ltdl_libltdlc_la-preopen.Tpo -c -o ltdl/loaders/ltdl_libltdlc_la-preopen.lo `test -f 'ltdl/loaders/preopen.c' || echo '$(srcdir)/'`ltdl/loaders/preopen.c -
ImageMagick/trunk/config/configure.xml
r603 r617 10 10 <configure name="LIB_VERSION" value="0x657"/> 11 11 <configure name="LIB_VERSION_NUMBER" value="6,5,7,9"/> 12 <configure name="RELEASE_DATE" value="2009-11-1 7"/>12 <configure name="RELEASE_DATE" value="2009-11-19"/> 13 13 <configure name="CONFIGURE" value="./configure "/> 14 14 <configure name="PREFIX" value="/usr/local"/> -
ImageMagick/trunk/config/ltmain.sh
r603 r617 1 1 # Generated from ltmain.m4sh. 2 2 3 # l tmain.sh (GNU libtool) 2.2.6b3 # libtool (GNU libtool 1.3130 2009-11-16) 2.2.7a 4 4 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 5 5 6 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. 6 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 7 # 2007, 2008, 2009 Free Software Foundation, Inc. 7 8 # This is free software; see the source for copying conditions. There is NO 8 9 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. … … 33 34 # Provide generalized library-building support services. 34 35 # 35 # --config show all configuration variables 36 # --debug enable verbose shell tracing 37 # -n, --dry-run display commands without modifying any files 38 # --features display basic configuration information and exit 39 # --mode=MODE use operation mode MODE 40 # --preserve-dup-deps don't remove duplicate dependency libraries 41 # --quiet, --silent don't print informational messages 42 # --tag=TAG use configuration variables from tag TAG 43 # -v, --verbose print informational messages (default) 44 # --version print version information 45 # -h, --help print short or long help message 36 # --config show all configuration variables 37 # --debug enable verbose shell tracing 38 # -n, --dry-run display commands without modifying any files 39 # --features display basic configuration information and exit 40 # --mode=MODE use operation mode MODE 41 # --preserve-dup-deps don't remove duplicate dependency libraries 42 # --quiet, --silent don't print informational messages 43 # --no-quiet, --no-silent 44 # print informational messages (default) 45 # --tag=TAG use configuration variables from tag TAG 46 # -v, --verbose print more informational messages than default 47 # --no-verbose don't print the extra informational messages 48 # --version print version information 49 # -h, --help, --help-all print short, long, or detailed help message 46 50 # 47 51 # MODE must be one of the following: 48 52 # 49 # clean remove files from the build directory50 # compile compile a source file into a libtool object51 # execute automatically set library path, then run a program52 # finish complete the installation of libtool libraries53 # install install libraries or executables54 # link create a library or an executable55 # uninstall remove libraries from an installed directory53 # clean remove files from the build directory 54 # compile compile a source file into a libtool object 55 # execute automatically set library path, then run a program 56 # finish complete the installation of libtool libraries 57 # install install libraries or executables 58 # link create a library or an executable 59 # uninstall remove libraries from an installed directory 56 60 # 57 # MODE-ARGS vary depending on the MODE. 61 # MODE-ARGS vary depending on the MODE. When passed as first option, 62 # `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. 58 63 # Try `$progname --help --mode=MODE' for a more detailed description of MODE. 59 64 # … … 61 66 # include the following information: 62 67 # 63 # host-triplet: $host64 # shell: $SHELL65 # compiler: $LTCC66 # compiler flags: $LTCFLAGS67 # linker: $LD (gnu? $with_gnu_ld)68 # $progname: (GNU libtool) 2.2.6b69 # automake:$automake_version70 # autoconf:$autoconf_version68 # host-triplet: $host 69 # shell: $SHELL 70 # compiler: $LTCC 71 # compiler flags: $LTCFLAGS 72 # linker: $LD (gnu? $with_gnu_ld) 73 # $progname: (GNU libtool 1.3130 2009-11-16) 2.2.7a 74 # automake: $automake_version 75 # autoconf: $autoconf_version 71 76 # 72 77 # Report bugs to <bug-libtool@gnu.org>. 73 78 74 PROGRAM=l tmain.sh79 PROGRAM=libtool 75 80 PACKAGE=libtool 76 VERSION=2.2. 6b77 TIMESTAMP=" "78 package_revision=1.3 01781 VERSION=2.2.7a 82 TIMESTAMP=" 1.3130 2009-11-16" 83 package_revision=1.3130 79 84 80 85 # Be Bourne compatible … … 91 96 BIN_SH=xpg4; export BIN_SH # for Tru64 92 97 DUALCASE=1; export DUALCASE # for MKS sh 98 99 # A function that is used when there is no print builtin or printf. 100 func_fallback_echo () 101 { 102 eval 'cat <<_LTECHO_EOF 103 $1 104 _LTECHO_EOF' 105 } 93 106 94 107 # NLS nuisances: We save the old values to restore during execute mode. … … 115 128 116 129 130 131 132 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh 133 # is ksh but when the shell is invoked as "sh" and the current value of 134 # the _XPG environment variable is not equal to 1 (one), the special 135 # positional parameter $0, within a function call, is the name of the 136 # function. 137 progpath="$0" 138 139 140 117 141 : ${CP="cp -f"} 118 : ${ECHO= "echo"}119 : ${EGREP=" /bin/grep -E"}120 : ${FGREP=" /bin/grep -F"}121 : ${GREP=" /bin/grep"}142 : ${ECHO=$as_echo} 143 : ${EGREP="egrep"} 144 : ${FGREP="fgrep"} 145 : ${GREP="grep"} 122 146 : ${LN_S="ln -s"} 123 147 : ${MAKE="make"} … … 125 149 : ${MV="mv -f"} 126 150 : ${RM="rm -f"} 127 : ${SED=" /bin/sed"}151 : ${SED="sed"} 128 152 : ${SHELL="${CONFIG_SHELL-/bin/sh}"} 129 153 : ${Xsed="$SED -e 1s/^X//"} … … 160 184 { 161 185 # Extract subdirectory from the argument. 162 func_dirname_result=`$ECHO " X${1}" | $Xsed-e "$dirname"`186 func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` 163 187 if test "X$func_dirname_result" = "X${1}"; then 164 188 func_dirname_result="${3}" … … 166 190 func_dirname_result="$func_dirname_result${2}" 167 191 fi 168 func_basename_result=`$ECHO " X${1}" | $Xsed-e "$basename"`192 func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` 169 193 } 170 194 171 195 # Generated shell functions inserted here. 172 196 173 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh 174 # is ksh but when the shell is invoked as "sh" and the current value of 175 # the _XPG environment variable is not equal to 1 (one), the special 176 # positional parameter $0, within a function call, is the name of the 177 # function. 178 progpath="$0" 197 # These SED scripts presuppose an absolute path with a trailing slash. 198 pathcar='s,^/\([^/]*\).*$,\1,' 199 pathcdr='s,^/[^/]*,,' 200 removedotparts=':dotsl 201 s@/\./@/@g 202 t dotsl 203 s,/\.$,/,' 204 collapseslashes='s@/\{1,\}@/@g' 205 finalslash='s,/*$,/,' 206 207 # func_normal_abspath PATH 208 # Remove doubled-up and trailing slashes, "." path components, 209 # and cancel out any ".." path components in PATH after making 210 # it an absolute path. 211 # value returned in "$func_normal_abspath_result" 212 func_normal_abspath () 213 { 214 # Start from root dir and reassemble the path. 215 func_normal_abspath_result= 216 func_normal_abspath_tpath=$1 217 func_normal_abspath_altnamespace= 218 case $func_normal_abspath_tpath in 219 "") 220 # Empty path, that just means $cwd. 221 func_stripname '' '/' "`pwd`" 222 func_normal_abspath_result=$func_stripname_result 223 return 224 ;; 225 # The next three entries are used to spot a run of precisely 226 # two leading slashes without using negated character classes; 227 # we take advantage of case's first-match behaviour. 228 ///*) 229 # Unusual form of absolute path, do nothing. 230 ;; 231 //*) 232 # Not necessarily an ordinary path; POSIX reserves leading '//' 233 # and for example Cygwin uses it to access remote file shares 234 # over CIFS/SMB, so we conserve a leading double slash if found. 235 func_normal_abspath_altnamespace=/ 236 ;; 237 /*) 238 # Absolute path, do nothing. 239 ;; 240 *) 241 # Relative path, prepend $cwd. 242 func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath 243 ;; 244 esac 245 # Cancel out all the simple stuff to save iterations. We also want 246 # the path to end with a slash for ease of parsing, so make sure 247 # there is one (and only one) here. 248 func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ 249 -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` 250 while :; do 251 # Processed it all yet? 252 if test "$func_normal_abspath_tpath" = / ; then 253 # If we ascended to the root using ".." the result may be empty now. 254 if test -z "$func_normal_abspath_result" ; then 255 func_normal_abspath_result=/ 256 fi 257 break 258 fi 259 func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ 260 -e "$pathcar"` 261 func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ 262 -e "$pathcdr"` 263 # Figure out what to do with it 264 case $func_normal_abspath_tcomponent in 265 "") 266 # Trailing empty path component, ignore it. 267 ;; 268 ..) 269 # Parent dir; strip last assembled component from result. 270 func_dirname "$func_normal_abspath_result" 271 func_normal_abspath_result=$func_dirname_result 272 ;; 273 *) 274 # Actual path component, append it. 275 func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent 276 ;; 277 esac 278 done 279 # Restore leading double-slash if one was found on entry. 280 func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result 281 } 282 283 # func_relative_path SRCDIR DSTDIR 284 # generates a relative path from SRCDIR to DSTDIR, with a trailing 285 # slash if non-empty, suitable for immediately appending a filename 286 # without needing to append a separator. 287 # value returned in "$func_relative_path_result" 288 func_relative_path () 289 { 290 func_relative_path_result= 291 func_normal_abspath "$1" 292 func_relative_path_tlibdir=$func_normal_abspath_result 293 func_normal_abspath "$2" 294 func_relative_path_tbindir=$func_normal_abspath_result 295 296 # Ascend the tree starting from libdir 297 while :; do 298 # check if we have found a prefix of bindir 299 case $func_relative_path_tbindir in 300 $func_relative_path_tlibdir) 301 # found an exact match 302 func_relative_path_tcancelled= 303 break 304 ;; 305 $func_relative_path_tlibdir*) 306 # found a matching prefix 307 func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" 308 func_relative_path_tcancelled=$func_stripname_result 309 if test -z "$func_relative_path_result"; then 310 func_relative_path_result=. 311 fi 312 break 313 ;; 314 *) 315 func_dirname $func_relative_path_tlibdir 316 func_relative_path_tlibdir=${func_dirname_result} 317 if test "x$func_relative_path_tlibdir" = x ; then 318 # Have to descend all the way to the root! 319 func_relative_path_result=../$func_relative_path_result 320 func_relative_path_tcancelled=$func_relative_path_tbindir 321 break 322 fi 323 func_relative_path_result=../$func_relative_path_result 324 ;; 325 esac 326 done 327 328 # Now calculate path; take care to avoid doubling-up slashes. 329 func_stripname '' '/' "$func_relative_path_result" 330 func_relative_path_result=$func_stripname_result 331 func_stripname '/' '/' "$func_relative_path_tcancelled" 332 if test "x$func_stripname_result" != x ; then 333 func_relative_path_result=${func_relative_path_result}/${func_stripname_result} 334 fi 335 336 # Normalisation. If bindir is libdir, return empty string, 337 # else relative path ending with a slash; either way, target 338 # file name can be directly appended. 339 if test ! -z "$func_relative_path_result"; then 340 func_stripname './' '' "$func_relative_path_result/" 341 func_relative_path_result=$func_stripname_result 342 fi 343 } 179 344 180 345 # The name of this program: 181 # In the unlikely event $progname began with a '-', it would play havoc with182 # func_echo (imagine progname=-n), so we prepend ./ in that case:183 346 func_dirname_and_basename "$progpath" 184 347 progname=$func_basename_result 185 case $progname in186 -*) progname=./$progname ;;187 esac188 348 189 349 # Make sure we have an absolute path for reexecution: … … 259 419 } 260 420 421 # func_echo_all arg... 422 # Invoke $ECHO with all args, space-separated. 423 func_echo_all () 424 { 425 $ECHO "$*" 426 } 427 261 428 # func_error arg... 262 429 # Echo program name prefixed message to standard error. … … 327 494 328 495 # ...otherwise throw away the child directory and loop 329 my_directory_path=`$ECHO " X$my_directory_path" | $Xsed-e "$dirname"`496 my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` 330 497 done 331 my_dir_list=`$ECHO " X$my_dir_list" | $Xsed -e's,:*$,,'`498 my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` 332 499 333 500 save_mkdir_p_IFS="$IFS"; IFS=':' … … 379 546 fi 380 547 381 $ECHO " X$my_tmpdir" | $Xsed548 $ECHO "$my_tmpdir" 382 549 } 383 550 … … 393 560 case $1 in 394 561 *[\\\`\"\$]*) 395 func_quote_for_eval_unquoted_result=`$ECHO " X$1" | $Xsed -e"$sed_quote_subst"` ;;562 func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; 396 563 *) 397 564 func_quote_for_eval_unquoted_result="$1" ;; … … 420 587 case $1 in 421 588 *[\\\`\"]*) 422 my_arg=`$ECHO " X$1" | $Xsed\589 my_arg=`$ECHO "$1" | $SED \ 423 590 -e "$double_quote_subst" -e "$sed_double_backslash"` ;; 424 591 *) … … 497 664 func_version () 498 665 { 499 $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { 666 $SED -n '/(C)/!b go 667 :more 668 /\./!{ 669 N 670 s/\n# // 671 b more 672 } 673 :go 674 /^# '$PROGRAM' (GNU /,/# warranty; / { 500 675 s/^# // 501 676 s/^# *$// … … 510 685 func_usage () 511 686 { 512 $SED -n '/^# Usage:/,/ #-h/ {687 $SED -n '/^# Usage:/,/^# *-h/ { 513 688 s/^# // 514 689 s/^# *$// … … 516 691 p 517 692 }' < "$progpath" 518 $ECHO693 echo 519 694 $ECHO "run \`$progname --help | more' for full usage" 520 695 exit $? 521 696 } 522 697 523 # func_help 524 # Echo long help message to standard output and exit. 698 # func_help [NOEXIT] 699 # Echo long help message to standard output and exit, 700 # unless 'noexit' is passed as argument. 525 701 func_help () 526 702 { … … 539 715 p 540 716 }' < "$progpath" 541 exit $? 717 ret=$? 718 if test -z "$1"; then 719 exit $ret 720 fi 542 721 } 543 722 … … 557 736 558 737 559 # Check that we have a working $ECHO.560 if test "X$1" = X--no-reexec; then561 # Discard the --no-reexec flag, and continue.562 shift563 elif test "X$1" = X--fallback-echo; then564 # Avoid inline document here, it may be left over565 :566 elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then567 # Yippee, $ECHO works!568 :569 else570 # Restart under the correct shell, and then maybe $ECHO will work.571 exec $SHELL "$progpath" --no-reexec ${1+"$@"}572 fi573 574 if test "X$1" = X--fallback-echo; then575 # used as fallback echo576 shift577 cat <<EOF578 $*579 EOF580 exit $EXIT_SUCCESS581 fi582 738 583 739 magic="%%%MAGIC variable%%%" … … 637 793 func_features () 638 794 { 639 $ECHO"host: $host"795 echo "host: $host" 640 796 if test "$build_libtool_libs" = yes; then 641 $ECHO"enable shared libraries"797 echo "enable shared libraries" 642 798 else 643 $ECHO"disable shared libraries"799 echo "disable shared libraries" 644 800 fi 645 801 if test "$build_old_libs" = yes; then 646 $ECHO"enable static libraries"802 echo "enable static libraries" 647 803 else 648 $ECHO"disable static libraries"804 echo "disable static libraries" 649 805 fi 650 806 … … 773 929 --quiet|--silent) preserve_args="$preserve_args $opt" 774 930 opt_silent=: 931 opt_verbose=false 932 ;; 933 934 --no-quiet|--no-silent) 935 preserve_args="$preserve_args $opt" 936 opt_silent=false 775 937 ;; 776 938 777 939 --verbose| -v) preserve_args="$preserve_args $opt" 778 940 opt_silent=false 941 opt_verbose=: 942 ;; 943 944 --no-verbose) preserve_args="$preserve_args $opt" 945 opt_verbose=false 779 946 ;; 780 947 … … 794 961 -\?|-h) func_usage ;; 795 962 --help) opt_help=: ;; 963 --help-all) opt_help=': help-all' ;; 796 964 --version) func_version ;; 797 965 … … 1017 1185 CC_quoted="$CC_quoted $func_quote_for_eval_result" 1018 1186 done 1187 CC_expanded=`func_echo_all $CC` 1188 CC_quoted_expanded=`func_echo_all $CC_quoted` 1019 1189 case $@ in 1020 1190 # Blanks in the command may have been stripped by the calling shell, 1021 1191 # but not from the CC environment variable when configure was run. 1022 " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; 1192 " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ 1193 " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; 1023 1194 # Blanks at the start of $base_compile will cause this to fail 1024 1195 # if we don't check for them as well. … … 1034 1205 CC_quoted="$CC_quoted $func_quote_for_eval_result" 1035 1206 done 1207 CC_expanded=`func_echo_all $CC` 1208 CC_quoted_expanded=`func_echo_all $CC_quoted` 1036 1209 case "$@ " in 1037 " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) 1210 " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ 1211 " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) 1038 1212 # The compiler in the base compile command matches 1039 1213 # the one in the tagged configuration. … … 1214 1388 *.ada | *.adb | *.ads | *.asm | \ 1215 1389 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ 1216 *.[fF][09]? | *.for | *.java | *.obj | *.sx )1390 *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) 1217 1391 func_xform "$libobj" 1218 1392 libobj=$func_xform_result … … 1289 1463 # not support -o with -c 1290 1464 if test "$compiler_c_o" = no; then 1291 output_obj=`$ECHO " X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}1465 output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} 1292 1466 lockfile="$output_obj.lock" 1293 1467 else … … 1446 1620 1447 1621 $opt_help || { 1448 test "$mode" = compile && func_mode_compile ${1+"$@"}1622 test "$mode" = compile && func_mode_compile ${1+"$@"} 1449 1623 } 1450 1624 … … 1487 1661 -shared do not build a \`.o' file suitable for static linking 1488 1662 -static only build a \`.o' file suitable for static linking 1663 -Wc,FLAG pass FLAG directly to the compiler 1489 1664 1490 1665 COMPILE-COMMAND is a command to be used in creating a \`standard' object file … … 1539 1714 The following components of INSTALL-COMMAND are treated specially: 1540 1715 1541 -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation1716 -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation 1542 1717 1543 1718 The rest of the components are interpreted as arguments to that command (only … … 1559 1734 -all-static do not do any dynamic linking at all 1560 1735 -avoid-version do not add a version suffix if possible 1736 -bindir BINDIR specify path to binaries directory (for systems where 1737 libraries must be found in the PATH setting at runtime) 1561 1738 -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime 1562 1739 -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols … … 1587 1764 specify library version info [each variable defaults to 0] 1588 1765 -weak LIBNAME declare that the target provides the LIBNAME interface 1766 -Wc,FLAG 1767 -Xcompiler FLAG pass linker-specific FLAG directly to the compiler 1768 -Wl,FLAG 1769 -Xlinker FLAG pass linker-specific FLAG directly to the linker 1770 -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) 1589 1771 1590 1772 All other options (arguments beginning with \`-') are ignored. … … 1624 1806 esac 1625 1807 1626 $ECHO1808 echo 1627 1809 $ECHO "Try \`$progname --help' for more information about other modes." 1628 1629 exit $?1630 1810 } 1631 1811 1632 # Now that we've collected a possible --mode arg, show help if necessary 1633 $opt_help && func_mode_help 1812 # Now that we've collected a possible --mode arg, show help if necessary 1813 if $opt_help; then 1814 if test "$opt_help" = :; then 1815 func_mode_help 1816 else 1817 { 1818 func_help noexit 1819 for mode in compile link execute install finish uninstall clean; do 1820 func_mode_help 1821 done 1822 } | sed -n '1p; 2,$s/^Usage:/ or: /p' 1823 { 1824 func_help noexit 1825 for mode in compile link execute install finish uninstall clean; do 1826 echo 1827 func_mode_help 1828 done 1829 } | 1830 sed '1d 1831 /^When reporting/,/^Report/{ 1832 H 1833 d 1834 } 1835 $x 1836 /information about other modes/d 1837 /more detailed .*MODE/d 1838 s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' 1839 fi 1840 exit $? 1841 fi 1634 1842 1635 1843 … … 1713 1921 do 1714 1922 case $file in 1715 -* ) ;;1923 -* | *.la | *.lo ) ;; 1716 1924 *) 1717 1925 # Do a test to see if this is really a libtool program. … … 1755 1963 if test -n "$shlibpath_var"; then 1756 1964 eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" 1757 $ECHO"export $shlibpath_var"1965 echo "export $shlibpath_var" 1758 1966 fi 1759 1967 $ECHO "$cmd$args" … … 1796 2004 $opt_silent && exit $EXIT_SUCCESS 1797 2005 1798 $ECHO "X----------------------------------------------------------------------" | $Xsed1799 $ECHO"Libraries have been installed in:"2006 echo "----------------------------------------------------------------------" 2007 echo "Libraries have been installed in:" 1800 2008 for libdir in $libdirs; do 1801 2009 $ECHO " $libdir" 1802 2010 done 1803 $ECHO1804 $ECHO"If you ever happen to want to link against installed libraries"1805 $ECHO"in a given directory, LIBDIR, you must either use libtool, and"1806 $ECHO"specify the full pathname of the library, or use the \`-LLIBDIR'"1807 $ECHO"flag during linking and do at least one of the following:"2011 echo 2012 echo "If you ever happen to want to link against installed libraries" 2013 echo "in a given directory, LIBDIR, you must either use libtool, and" 2014 echo "specify the full pathname of the library, or use the \`-LLIBDIR'" 2015 echo "flag during linking and do at least one of the following:" 1808 2016 if test -n "$shlibpath_var"; then 1809 $ECHO" - add LIBDIR to the \`$shlibpath_var' environment variable"1810 $ECHO" during execution"2017 echo " - add LIBDIR to the \`$shlibpath_var' environment variable" 2018 echo " during execution" 1811 2019 fi 1812 2020 if test -n "$runpath_var"; then 1813 $ECHO" - add LIBDIR to the \`$runpath_var' environment variable"1814 $ECHO" during linking"2021 echo " - add LIBDIR to the \`$runpath_var' environment variable" 2022 echo " during linking" 1815 2023 fi 1816 2024 if test -n "$hardcode_libdir_flag_spec"; then … … 1824 2032 fi 1825 2033 if test -f /etc/ld.so.conf; then 1826 $ECHO" - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"2034 echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" 1827 2035 fi 1828 $ECHO1829 1830 $ECHO"See any operating system documentation about shared libraries for"2036 echo 2037 2038 echo "See any operating system documentation about shared libraries for" 1831 2039 case $host in 1832 2040 solaris2.[6789]|solaris2.1[0-9]) 1833 $ECHO"more information, such as the ld(1), crle(1) and ld.so(8) manual"1834 $ECHO"pages."2041 echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" 2042 echo "pages." 1835 2043 ;; 1836 2044 *) 1837 $ECHO"more information, such as the ld(1) and ld.so(8) manual pages."2045 echo "more information, such as the ld(1) and ld.so(8) manual pages." 1838 2046 ;; 1839 2047 esac 1840 $ECHO "X----------------------------------------------------------------------" | $Xsed2048 echo "----------------------------------------------------------------------" 1841 2049 exit $EXIT_SUCCESS 1842 2050 } … … 1853 2061 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || 1854 2062 # Allow the use of GNU shtool's install command. 1855 $ECHO "X$nonopt" | $GREP shtool >/dev/null; then2063 case $nonopt in *shtool*) :;; *) false;; esac; then 1856 2064 # Aesthetically quote it. 1857 2065 func_quote_for_eval "$nonopt" … … 1868 2076 func_quote_for_eval "$arg" 1869 2077 install_prog="$install_prog$func_quote_for_eval_result" 2078 install_shared_prog=$install_prog 2079 case " $install_prog " in 2080 *[\\\ /]cp\ *) install_cp=: ;; 2081 *) install_cp=false ;; 2082 esac 1870 2083 1871 2084 # We need to accept at least all the BSD install flags. … … 1877 2090 isdir=no 1878 2091 stripme= 2092 no_mode=: 1879 2093 for arg 1880 2094 do 2095 arg2= 1881 2096 if test -n "$dest"; then 1882 2097 files="$files $dest" … … 1888 2103 -d) isdir=yes ;; 1889 2104 -f) 1890 case " $install_prog " in 1891 *[\\\ /]cp\ *) ;; 1892 *) prev=$arg ;; 1893 esac 2105 if $install_cp; then :; else 2106 prev=$arg 2107 fi 1894 2108 ;; 1895 2109 -g | -m | -o) … … 1905 2119 # If the previous option needed an argument, then skip it. 1906 2120 if test -n "$prev"; then 2121 if test "x$prev" = x-m && test -n "$install_override_mode"; then 2122 arg2=$install_override_mode 2123 no_mode=false 2124 fi 1907 2125 prev= 1908 2126 else … … 1916 2134 func_quote_for_eval "$arg" 1917 2135 install_prog="$install_prog $func_quote_for_eval_result" 2136 if test -n "$arg2"; then 2137 func_quote_for_eval "$arg2" 2138 fi 2139 install_shared_prog="$install_shared_prog $func_quote_for_eval_result" 1918 2140 done 1919 2141 … … 1923 2145 test -n "$prev" && \ 1924 2146 func_fatal_help "the \`$prev' option requires an argument" 2147 2148 if test -n "$install_override_mode" && $no_mode; then 2149 if $install_cp; then :; else 2150 func_quote_for_eval "$install_override_mode" 2151 install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" 2152 fi 2153 fi 1925 2154 1926 2155 if test -z "$files"; then … … 2011 2240 if test -n "$relink_command"; then 2012 2241 # Determine the prefix the user has applied to our future dir. 2013 inst_prefix_dir=`$ECHO " X$destdir" | $Xsed-e "s%$libdir\$%%"`2242 inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` 2014 2243 2015 2244 # Don't allow the user to place us outside of our expected … … 2024 2253 if test -n "$inst_prefix_dir"; then 2025 2254 # Stick the inst_prefix_dir data into the link command. 2026 relink_command=`$ECHO " X$relink_command" | $Xsed -e"s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`2255 relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` 2027 2256 else 2028 relink_command=`$ECHO " X$relink_command" | $Xsed -e"s%@inst_prefix_dir@%%"`2257 relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` 2029 2258 fi 2030 2259 … … 2044 2273 2045 2274 # Install the shared library and build the symlinks. 2046 func_show_eval "$install_ prog $dir/$srcname $destdir/$realname" \2275 func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 2047 2276 'exit $?' 2048 2277 tstripme="$stripme" … … 2184 2413 func_source "$lib" 2185 2414 fi 2186 libfile="$libdir/"`$ECHO " X$lib" | $Xsed -e's%^.*/%%g'` ### testsuite: skip nested quoting test2415 libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test 2187 2416 if test -n "$libdir" && test ! -f "$libfile"; then 2188 2417 func_warning "\`$lib' has not been installed in \`$libdir'" … … 2203 2432 outputname="$tmpdir/$file" 2204 2433 # Replace the output file specification. 2205 relink_command=`$ECHO " X$relink_command" | $Xsed -e's%@OUTPUT@%'"$outputname"'%g'`2434 relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` 2206 2435 2207 2436 $opt_silent || { … … 2222 2451 else 2223 2452 # Install the binary that we compiled earlier. 2224 file=`$ECHO " X$file$stripped_ext" | $Xsed -e"s%\([^/]*\)$%$objdir/\1%"`2453 file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` 2225 2454 fi 2226 2455 fi … … 2324 2553 #endif 2325 2554 2555 #if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) 2556 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" 2557 #endif 2558 2326 2559 /* External symbol declarations for the compiler. */\ 2327 2560 " … … 2333 2566 2334 2567 # Add our own program objects to the symbol list. 2335 progfiles=`$ECHO " X$objs$old_deplibs" | $SP2NL | $Xsed -e"$lo2o" | $NL2SP`2568 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` 2336 2569 for progfile in $progfiles; do 2337 2570 func_verbose "extracting global C symbols from \`$progfile'" … … 2372 2605 eval '$MV "$nlist"T "$nlist"' 2373 2606 case $host in 2374 *cygwin | *mingw* | *cegcc* )2607 *cygwin* | *mingw* | *cegcc* ) 2375 2608 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 2376 2609 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' … … 2416 2649 eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' 2417 2650 else 2418 $ECHO'/* NONE */' >> "$output_objdir/$my_dlsyms"2651 echo '/* NONE */' >> "$output_objdir/$my_dlsyms" 2419 2652 fi 2420 2653 2421 $ECHO>> "$output_objdir/$my_dlsyms" "\2654 echo >> "$output_objdir/$my_dlsyms" "\ 2422 2655 2423 2656 /* The mapping between symbol names and symbols. */ … … 2429 2662 case $host in 2430 2663 *cygwin* | *mingw* | *cegcc* ) 2431 $ECHO>> "$output_objdir/$my_dlsyms" "\2664 echo >> "$output_objdir/$my_dlsyms" "\ 2432 2665 /* DATA imports from DLLs on WIN32 con't be const, because 2433 2666 runtime relocations are performed -- see ld's documentation … … 2442 2675 esac 2443 2676 2444 $ECHO>> "$output_objdir/$my_dlsyms" "\2677 echo >> "$output_objdir/$my_dlsyms" "\ 2445 2678 extern $lt_dlsym_const lt_dlsymlist 2446 2679 lt_${my_prefix}_LTX_preloaded_symbols[]; … … 2458 2691 ;; 2459 2692 esac 2460 $ECHO>> "$output_objdir/$my_dlsyms" "\2693 echo >> "$output_objdir/$my_dlsyms" "\ 2461 2694 {0, (void *) 0} 2462 2695 }; … … 2516 2749 *cygwin* | *mingw* | *cegcc* ) 2517 2750 if test -f "$output_objdir/$my_outputname.def"; then 2518 compile_command=`$ECHO " X$compile_command" | $Xsed -e"s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`2519 finalize_command=`$ECHO " X$finalize_command" | $Xsed -e"s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`2751 compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` 2752 finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` 2520 2753 else 2521 compile_command=`$ECHO " X$compile_command" | $Xsed -e"s%@SYMFILE@%$symfileobj%"`2522 finalize_command=`$ECHO " X$finalize_command" | $Xsed -e"s%@SYMFILE@%$symfileobj%"`2754 compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` 2755 finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` 2523 2756 fi 2524 2757 ;; 2525 2758 *) 2526 compile_command=`$ECHO " X$compile_command" | $Xsed -e"s%@SYMFILE@%$symfileobj%"`2527 finalize_command=`$ECHO " X$finalize_command" | $Xsed -e"s%@SYMFILE@%$symfileobj%"`2759 compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` 2760 finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` 2528 2761 ;; 2529 2762 esac … … 2539 2772 2540 2773 # Nullify the symbol file. 2541 compile_command=`$ECHO " X$compile_command" | $Xsed -e"s% @SYMFILE@%%"`2542 finalize_command=`$ECHO " X$finalize_command" | $Xsed -e"s% @SYMFILE@%%"`2774 compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` 2775 finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` 2543 2776 fi 2544 2777 } … … 2550 2783 # Has to be a shell function in order to 'eat' the argument 2551 2784 # that is supplied when $file_magic_command is called. 2785 # Despite the name, also deal with 64 bit binaries. 2552 2786 func_win32_libid () 2553 2787 { … … 2561 2795 *ar\ archive*) # could be an import, or static 2562 2796 if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | 2563 $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null; then2797 $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then 2564 2798 win32_nmres=`eval $NM -f posix -A $1 | 2565 2799 $SED -n -e ' … … 2599 2833 f_ex_an_ar_dir="$1"; shift 2600 2834 f_ex_an_ar_oldlib="$1" 2601 func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' 2835 if test "$lock_old_archive_extraction" = yes; then 2836 lockfile=$f_ex_an_ar_oldlib.lock 2837 until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do 2838 func_echo "Waiting for $lockfile to be removed" 2839 sleep 2 2840 done 2841 fi 2842 func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 2843 'stat=$?; rm -f "$lockfile"; exit $stat' 2844 if test "$lock_old_archive_extraction" = yes; then 2845 $opt_dry_run || rm -f "$lockfile" 2846 fi 2602 2847 if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then 2603 2848 : … … 2692 2937 2693 2938 2694 2695 # func_emit_wrapper_part1 [arg=no]2696 #2697 # Emit the first part of a libtool wrapper script on stdout.2698 # For more information, see the description associated with2699 # func_emit_wrapper(), below.2700 func_emit_wrapper_part1 ()2701 {2702 func_emit_wrapper_part1_arg1=no2703 if test -n "$1" ; then2704 func_emit_wrapper_part1_arg1=$12705 fi2706 2707 $ECHO "\2708 #! $SHELL2709 2710 # $output - temporary wrapper script for $objdir/$outputname2711 # Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION2712 #2713 # The $output program cannot be directly executed until all the libtool2714 # libraries that it depends on are installed.2715 #2716 # This wrapper script should never be moved out of the build directory.2717 # If it is, it will not operate correctly.2718 2719 # Sed substitution that helps us do robust quoting. It backslashifies2720 # metacharacters that are still active within double-quoted strings.2721 Xsed='${SED} -e 1s/^X//'2722 sed_quote_subst='$sed_quote_subst'2723 2724 # Be Bourne compatible2725 if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then2726 emulate sh2727 NULLCMD=:2728 # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which2729 # is contrary to our usage. Disable this feature.2730 alias -g '\${1+\"\$@\"}'='\"\$@\"'2731 setopt NO_GLOB_SUBST2732 else2733 case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac2734 fi2735 BIN_SH=xpg4; export BIN_SH # for Tru642736 DUALCASE=1; export DUALCASE # for MKS sh2737 2738 # The HP-UX ksh and POSIX shell print the target directory to stdout2739 # if CDPATH is set.2740 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH2741 2742 relink_command=\"$relink_command\"2743 2744 # This environment variable determines our operation mode.2745 if test \"\$libtool_install_magic\" = \"$magic\"; then2746 # install mode needs the following variables:2747 generated_by_libtool_version='$macro_version'2748 notinst_deplibs='$notinst_deplibs'2749 else2750 # When we are sourced in execute mode, \$file and \$ECHO are already set.2751 if test \"\$libtool_execute_magic\" != \"$magic\"; then2752 ECHO=\"$qecho\"2753 file=\"\$0\"2754 # Make sure echo works.2755 if test \"X\$1\" = X--no-reexec; then2756 # Discard the --no-reexec flag, and continue.2757 shift2758 elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then2759 # Yippee, \$ECHO works!2760 :2761 else2762 # Restart under the correct shell, and then maybe \$ECHO will work.2763 exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}2764 fi2765 fi\2766 "2767 $ECHO "\2768 2769 # Find the directory that this script lives in.2770 thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`2771 test \"x\$thisdir\" = \"x\$file\" && thisdir=.2772 2773 # Follow symbolic links until we get to the real thisdir.2774 file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`2775 while test -n \"\$file\"; do2776 destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`2777 2778 # If there was a directory component, then change thisdir.2779 if test \"x\$destdir\" != \"x\$file\"; then2780 case \"\$destdir\" in2781 [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;2782 *) thisdir=\"\$thisdir/\$destdir\" ;;2783 esac2784 fi2785 2786 file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`2787 file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`2788 done2789 "2790 }2791 # end: func_emit_wrapper_part12792 2793 # func_emit_wrapper_part2 [arg=no]2794 #2795 # Emit the second part of a libtool wrapper script on stdout.2796 # For more information, see the description associated with2797 # func_emit_wrapper(), below.2798 func_emit_wrapper_part2 ()2799 {2800 func_emit_wrapper_part2_arg1=no2801 if test -n "$1" ; then2802 func_emit_wrapper_part2_arg1=$12803 fi2804 2805 $ECHO "\2806 2807 # Usually 'no', except on cygwin/mingw when embedded into2808 # the cwrapper.2809 WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg12810 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then2811 # special case for '.'2812 if test \"\$thisdir\" = \".\"; then2813 thisdir=\`pwd\`2814 fi2815 # remove .libs from thisdir2816 case \"\$thisdir\" in2817 *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;2818 $objdir ) thisdir=. ;;2819 esac2820 fi2821 2822 # Try to get the absolute directory name.2823 absdir=\`cd \"\$thisdir\" && pwd\`2824 test -n \"\$absdir\" && thisdir=\"\$absdir\"2825 "2826 2827 if test "$fast_install" = yes; then2828 $ECHO "\2829 program=lt-'$outputname'$exeext2830 progdir=\"\$thisdir/$objdir\"2831 2832 if test ! -f \"\$progdir/\$program\" ||2833 { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\2834 test \"X\$file\" != \"X\$progdir/\$program\"; }; then2835 2836 file=\"\$\$-\$program\"2837 2838 if test ! -d \"\$progdir\"; then2839 $MKDIR \"\$progdir\"2840 else2841 $RM \"\$progdir/\$file\"2842 fi"2843 2844 $ECHO "\2845 2846 # relink executable if necessary2847 if test -n \"\$relink_command\"; then2848 if relink_command_output=\`eval \$relink_command 2>&1\`; then :2849 else2850 $ECHO \"\$relink_command_output\" >&22851 $RM \"\$progdir/\$file\"2852 exit 12853 fi2854 fi2855 2856 $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||2857 { $RM \"\$progdir/\$program\";2858 $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }2859 $RM \"\$progdir/\$file\"2860 fi"2861 else2862 $ECHO "\2863 program='$outputname'2864 progdir=\"\$thisdir/$objdir\"2865 "2866 fi2867 2868 $ECHO "\2869 2870 if test -f \"\$progdir/\$program\"; then"2871 2872 # Export our shlibpath_var if we have one.2873 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then2874 $ECHO "\2875 # Add our own library path to $shlibpath_var2876 $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"2877 2878 # Some systems cannot cope with colon-terminated $shlibpath_var2879 # The second colon is a workaround for a bug in BeOS R4 sed2880 $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`2881 2882 export $shlibpath_var2883 "2884 fi2885 2886 # fixup the dll searchpath if we need to.2887 if test -n "$dllsearchpath"; then2888 $ECHO "\2889 # Add the dll search path components to the executable PATH2890 PATH=$dllsearchpath:\$PATH2891 "2892 fi2893 2894 $ECHO "\2895 if test \"\$libtool_execute_magic\" != \"$magic\"; then2896 # Run the actual program with our arguments.2897 "2898 case $host in2899 # Backslashes separate directories on plain windows2900 *-*-mingw | *-*-os2* | *-cegcc*)2901 $ECHO "\2902 exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}2903 "2904 ;;2905 2906 *)2907 $ECHO "\2908 exec \"\$progdir/\$program\" \${1+\"\$@\"}2909 "2910 ;;2911 esac2912 $ECHO "\2913 \$ECHO \"\$0: cannot exec \$program \$*\" 1>&22914 exit 12915 fi2916 else2917 # The program doesn't exist.2918 \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&22919 \$ECHO \"This script is just a wrapper for \$program.\" 1>&22920 $ECHO \"See the $PACKAGE documentation for more information.\" 1>&22921 exit 12922 fi2923 fi\2924 "2925 }2926 # end: func_emit_wrapper_part22927 2928 2929 2939 # func_emit_wrapper [arg=no] 2930 2940 # … … 2943 2953 func_emit_wrapper () 2944 2954 { 2945 func_emit_wrapper_arg1=no 2946 if test -n "$1" ; then 2947 func_emit_wrapper_arg1=$1 2955 func_emit_wrapper_arg1=${1-no} 2956 2957 $ECHO "\ 2958 #! $SHELL 2959 2960 # $output - temporary wrapper script for $objdir/$outputname 2961 # Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION 2962 # 2963 # The $output program cannot be directly executed until all the libtool 2964 # libraries that it depends on are installed. 2965 # 2966 # This wrapper script should never be moved out of the build directory. 2967 # If it is, it will not operate correctly. 2968 2969 # Sed substitution that helps us do robust quoting. It backslashifies 2970 # metacharacters that are still active within double-quoted strings. 2971 sed_quote_subst='$sed_quote_subst' 2972 2973 # Be Bourne compatible 2974 if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then 2975 emulate sh 2976 NULLCMD=: 2977 # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which 2978 # is contrary to our usage. Disable this feature. 2979 alias -g '\${1+\"\$@\"}'='\"\$@\"' 2980 setopt NO_GLOB_SUBST 2981 else 2982 case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac 2983 fi 2984 BIN_SH=xpg4; export BIN_SH # for Tru64 2985 DUALCASE=1; export DUALCASE # for MKS sh 2986 2987 # The HP-UX ksh and POSIX shell print the target directory to stdout 2988 # if CDPATH is set. 2989 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 2990 2991 relink_command=\"$relink_command\" 2992 2993 # This environment variable determines our operation mode. 2994 if test \"\$libtool_install_magic\" = \"$magic\"; then 2995 # install mode needs the following variables: 2996 generated_by_libtool_version='$macro_version' 2997 notinst_deplibs='$notinst_deplibs' 2998 else 2999 # When we are sourced in execute mode, \$file and \$ECHO are already set. 3000 if test \"\$libtool_execute_magic\" != \"$magic\"; then 3001 file=\"\$0\"" 3002 3003 qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` 3004 $ECHO "\ 3005 3006 # A function that is used when there is no print builtin or printf. 3007 func_fallback_echo () 3008 { 3009 eval 'cat <<_LTECHO_EOF 3010 \$1 3011 _LTECHO_EOF' 3012 } 3013 ECHO=\"$qECHO\" 3014 fi\ 3015 3016 # Find the directory that this script lives in. 3017 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` 3018 test \"x\$thisdir\" = \"x\$file\" && thisdir=. 3019 3020 # Follow symbolic links until we get to the real thisdir. 3021 file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` 3022 while test -n \"\$file\"; do 3023 destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` 3024 3025 # If there was a directory component, then change thisdir. 3026 if test \"x\$destdir\" != \"x\$file\"; then 3027 case \"\$destdir\" in 3028 [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; 3029 *) thisdir=\"\$thisdir/\$destdir\" ;; 3030 esac 3031 fi 3032 3033 file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` 3034 file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` 3035 done 3036 3037 # Usually 'no', except on cygwin/mingw when embedded into 3038 # the cwrapper. 3039 WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 3040 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then 3041 # special case for '.' 3042 if test \"\$thisdir\" = \".\"; then 3043 thisdir=\`pwd\` 3044 fi 3045 # remove .libs from thisdir 3046 case \"\$thisdir\" in 3047 *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; 3048 $objdir ) thisdir=. ;; 3049 esac 3050 fi 3051 3052 # Try to get the absolute directory name. 3053 absdir=\`cd \"\$thisdir\" && pwd\` 3054 test -n \"\$absdir\" && thisdir=\"\$absdir\" 3055 " 3056 3057 if test "$fast_install" = yes; then 3058 $ECHO "\ 3059 program=lt-'$outputname'$exeext 3060 progdir=\"\$thisdir/$objdir\" 3061 3062 if test ! -f \"\$progdir/\$program\" || 3063 { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ 3064 test \"X\$file\" != \"X\$progdir/\$program\"; }; then 3065 3066 file=\"\$\$-\$program\" 3067 3068 if test ! -d \"\$progdir\"; then 3069 $MKDIR \"\$progdir\" 3070 else 3071 $RM \"\$progdir/\$file\" 3072 fi" 3073 3074 $ECHO "\ 3075 3076 # relink executable if necessary 3077 if test -n \"\$relink_command\"; then 3078 if relink_command_output=\`eval \$relink_command 2>&1\`; then : 3079 else 3080 $ECHO \"\$relink_command_output\" >&2 3081 $RM \"\$progdir/\$file\" 3082 exit 1 3083 fi 3084 fi 3085 3086 $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || 3087 { $RM \"\$progdir/\$program\"; 3088 $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } 3089 $RM \"\$progdir/\$file\" 3090 fi" 3091 else 3092 $ECHO "\ 3093 program='$outputname' 3094 progdir=\"\$thisdir/$objdir\" 3095 " 2948 3096 fi 2949 3097 2950 # split this up so that func_emit_cwrapperexe_src 2951 # can call each part independently. 2952 func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" 2953 func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" 3098 $ECHO "\ 3099 3100 if test -f \"\$progdir/\$program\"; then" 3101 3102 # Export our shlibpath_var if we have one. 3103 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then 3104 $ECHO "\ 3105 # Add our own library path to $shlibpath_var 3106 $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" 3107 3108 # Some systems cannot cope with colon-terminated $shlibpath_var 3109 # The second colon is a workaround for a bug in BeOS R4 sed 3110 $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` 3111 3112 export $shlibpath_var 3113 " 3114 fi 3115 3116 # fixup the dll searchpath if we need to. 3117 if test -n "$dllsearchpath"; then 3118 $ECHO "\ 3119 # Add the dll search path components to the executable PATH 3120 PATH=$dllsearchpath:\$PATH 3121 " 3122 fi 3123 3124 $ECHO "\ 3125 if test \"\$libtool_execute_magic\" != \"$magic\"; then 3126 # Run the actual program with our arguments. 3127 " 3128 case $host in 3129 # Backslashes separate directories on plain windows 3130 *-*-mingw | *-*-os2* | *-cegcc*) 3131 $ECHO "\ 3132 exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} 3133 " 3134 ;; 3135 3136 *) 3137 $ECHO "\ 3138 exec \"\$progdir/\$program\" \${1+\"\$@\"} 3139 " 3140 ;; 3141 esac 3142 $ECHO "\ 3143 \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 3144 exit 1 3145 fi 3146 else 3147 # The program doesn't exist. 3148 \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 3149 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 3150 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 3151 exit 1 3152 fi 3153 fi\ 3154 " 2954 3155 } 2955 3156 … … 2979 3180 { 2980 3181 func_to_host_path_result="$1" 2981 if test -n "$1" ; then3182 if test -n "$1"; then 2982 3183 case $host in 2983 3184 *mingw* ) … … 2986 3187 *mingw* ) # actually, msys 2987 3188 # awkward: cmd appends spaces to result 2988 lt_sed_strip_trailing_spaces="s/[ ]*\$//" 2989 func_to_host_path_tmp1=`( cmd //c echo "$1" |\ 2990 $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` 2991 func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ 2992 $SED -e "$lt_sed_naive_backslashify"` 3189 func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | 3190 $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` 2993 3191 ;; 2994 3192 *cygwin* ) 2995 func_to_host_path_tmp1=`cygpath -w "$1"` 2996 func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ 2997 $SED -e "$lt_sed_naive_backslashify"` 3193 func_to_host_path_result=`cygpath -w "$1" | 3194 $SED -e "$lt_sed_naive_backslashify"` 2998 3195 ;; 2999 3196 * ) … … 3007 3204 func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` 3008 3205 if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then 3009 func_to_host_path_result=` echo "$func_to_host_path_tmp1" |\3206 func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | 3010 3207 $SED -e "$lt_sed_naive_backslashify"` 3011 3208 else 3012 3209 # Allow warning below. 3013 func_to_host_path_result= ""3210 func_to_host_path_result= 3014 3211 fi 3015 3212 ;; … … 3017 3214 if test -z "$func_to_host_path_result" ; then 3018 3215 func_error "Could not determine host path corresponding to" 3019 func_error " '$1'"3216 func_error " \`$1'" 3020 3217 func_error "Continuing, but uninstalled executables may not work." 3021 3218 # Fallback: … … 3050 3247 { 3051 3248 func_to_host_pathlist_result="$1" 3052 if test -n "$1" ; then3249 if test -n "$1"; then 3053 3250 case $host in 3054 3251 *mingw* ) … … 3057 3254 # ARG. msys behavior is inconsistent here, cygpath turns them 3058 3255 # into '.;' and ';.', and winepath ignores them completely. 3059 func_to_host_pathlist_tmp2="$1" 3060 # Once set for this call, this variable should not be 3061 # reassigned. It is used in tha fallback case. 3062 func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ 3063 $SED -e 's|^:*||' -e 's|:*$||'` 3256 func_stripname : : "$1" 3257 func_to_host_pathlist_tmp1=$func_stripname_result 3064 3258 case $build in 3065 3259 *mingw* ) # Actually, msys. 3066 3260 # Awkward: cmd appends spaces to result. 3067 lt_sed_strip_trailing_spaces="s/[ ]*\$//" 3068 func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ 3069 $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` 3070 func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ 3071 $SED -e "$lt_sed_naive_backslashify"` 3261 func_to_host_pathlist_result=` 3262 ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | 3263 $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` 3072 3264 ;; 3073 3265 *cygwin* ) 3074 func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` 3075 func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ 3266 func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | 3076 3267 $SED -e "$lt_sed_naive_backslashify"` 3077 3268 ;; … … 3089 3280 func_to_host_pathlist_result="$func_to_host_path_result" 3090 3281 else 3091 func_ to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"3282 func_append func_to_host_pathlist_result ";$func_to_host_path_result" 3092 3283 fi 3093 3284 fi 3094 3285 fi 3095 IFS=:3096 3286 done 3097 3287 IFS=$func_to_host_pathlist_oldIFS 3098 3288 ;; 3099 3289 esac 3100 if test -z "$func_to_host_pathlist_result" ; then3290 if test -z "$func_to_host_pathlist_result"; then 3101 3291 func_error "Could not determine the host path(s) corresponding to" 3102 func_error " '$1'"3292 func_error " \`$1'" 3103 3293 func_error "Continuing, but uninstalled executables may not work." 3104 3294 # Fallback. This may break if $1 contains DOS-style drive … … 3117 3307 esac 3118 3308 case "$1" in 3119 *: ) func_ to_host_pathlist_result="$func_to_host_pathlist_result;"3309 *: ) func_append func_to_host_pathlist_result ";" 3120 3310 ;; 3121 3311 esac … … 3149 3339 EOF 3150 3340 cat <<"EOF" 3341 #ifdef _MSC_VER 3342 # define _CRT_SECURE_NO_DEPRECATE 1 3343 #endif 3151 3344 #include <stdio.h> 3152 3345 #include <stdlib.h> … … 3155 3348 # include <process.h> 3156 3349 # include <io.h> 3157 # define setmode _setmode3158 3350 #else 3159 3351 # include <unistd.h> … … 3161 3353 # ifdef __CYGWIN__ 3162 3354 # include <io.h> 3163 # define HAVE_SETENV3164 # ifdef __STRICT_ANSI__3165 char *realpath (const char *, char *);3166 int putenv (char *);3167 int setenv (const char *, const char *, int);3168 # endif3169 3355 # endif 3170 3356 #endif … … 3178 3364 #include <sys/stat.h> 3179 3365 3366 /* declarations of non-ANSI functions */ 3367 #if defined(__MINGW32__) 3368 # ifdef __STRICT_ANSI__ 3369 int _putenv (const char *); 3370 # endif 3371 #elif defined(__CYGWIN__) 3372 # ifdef __STRICT_ANSI__ 3373 char *realpath (const char *, char *); 3374 int putenv (char *); 3375 int setenv (const char *, const char *, int); 3376 # endif 3377 /* #elif defined (other platforms) ... */ 3378 #endif 3379 3380 /* portability defines, excluding path handling macros */ 3381 #if defined(_MSC_VER) 3382 # define setmode _setmode 3383 # define stat _stat 3384 # define chmod _chmod 3385 # define getcwd _getcwd 3386 # define putenv _putenv 3387 # define S_IXUSR _S_IEXEC 3388 # ifndef _INTPTR_T_DEFINED 3389 # define _INTPTR_T_DEFINED 3390 # define intptr_t int 3391 # endif 3392 #elif defined(__MINGW32__) 3393 # define setmode _setmode 3394 # define stat _stat 3395 # define chmod _chmod 3396 # define getcwd _getcwd 3397 # define putenv _putenv 3398 #elif defined(__CYGWIN__) 3399 # define HAVE_SETENV 3400 # define FOPEN_WB "wb" 3401 /* #elif defined (other platforms) ... */ 3402 #endif 3403 3180 3404 #if defined(PATH_MAX) 3181 3405 # define LT_PATHMAX PATH_MAX … … 3193 3417 #endif 3194 3418 3195 #ifdef _MSC_VER 3196 # define S_IXUSR _S_IEXEC 3197 # define stat _stat 3198 # ifndef _INTPTR_T_DEFINED 3199 # define intptr_t int 3200 # endif 3201 #endif 3202 3419 /* path handling portability macros */ 3203 3420 #ifndef DIR_SEPARATOR 3204 3421 # define DIR_SEPARATOR '/' … … 3231 3448 #endif /* PATH_SEPARATOR_2 */ 3232 3449 3233 #ifdef __CYGWIN__3234 # define FOPEN_WB "wb"3235 #endif3236 3237 3450 #ifndef FOPEN_WB 3238 3451 # define FOPEN_WB "w" … … 3248 3461 3249 3462 #undef LTWRAPPER_DEBUGPRINTF 3250 #if defined DEBUGWRAPPER3463 #if defined LT_DEBUGWRAPPER 3251 3464 # define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args 3252 3465 static void … … 3275 3488 void lt_setenv (const char *name, const char *value); 3276 3489 char *lt_extend_str (const char *orig_value, const char *add, int to_end); 3277 void lt_opt_process_env_set (const char *arg);3278 void lt_opt_process_env_prepend (const char *arg);3279 void lt_opt_process_env_append (const char *arg);3280 int lt_split_name_value (const char *arg, char** name, char** value);3281 3490 void lt_update_exe_path (const char *name, const char *value); 3282 3491 void lt_update_lib_path (const char *name, const char *value); 3283 3284 static const char *script_text_part1 = 3492 char **prepare_spawn (char **argv); 3493 void lt_dump_script (FILE *f); 3285 3494 EOF 3286 3287 func_emit_wrapper_part1 yes |3288 $SED -e 's/\([\\"]\)/\\\1/g' \3289 -e 's/^/ "/' -e 's/$/\\n"/'3290 echo ";"3291 cat <<EOF3292 3293 static const char *script_text_part2 =3294 EOF3295 func_emit_wrapper_part2 yes |3296 $SED -e 's/\([\\"]\)/\\\1/g' \3297 -e 's/^/ "/' -e 's/$/\\n"/'3298 echo ";"3299 3495 3300 3496 cat <<EOF … … 3348 3544 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; 3349 3545 3350 static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;3351 static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";3352 /* argument is putenv-style "foo=bar", value of foo is set to bar */3353 3354 static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;3355 static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";3356 /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */3357 3358 static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;3359 static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";3360 /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */3361 3362 3546 int 3363 3547 main (int argc, char *argv[]) … … 3392 3576 3393 3577 cat <<"EOF" 3394 printf ("%s", script_text_part1); 3395 printf ("%s", script_text_part2); 3578 lt_dump_script (stdout); 3396 3579 return 0; 3397 3580 } … … 3485 3668 for (i = 1; i < argc; i++) 3486 3669 { 3487 if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)3488 {3489 if (argv[i][env_set_opt_len] == '=')3490 {3491 const char *p = argv[i] + env_set_opt_len + 1;3492 lt_opt_process_env_set (p);3493 }3494 else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)3495 {3496 lt_opt_process_env_set (argv[++i]); /* don't copy */3497 }3498 else3499 lt_fatal ("%s missing required argument", env_set_opt);3500 continue;3501 }3502 if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)3503 {3504 if (argv[i][env_prepend_opt_len] == '=')3505 {3506 const char *p = argv[i] + env_prepend_opt_len + 1;3507 lt_opt_process_env_prepend (p);3508 }3509 else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)3510 {3511 lt_opt_process_env_prepend (argv[++i]); /* don't copy */3512 }3513 else3514 lt_fatal ("%s missing required argument", env_prepend_opt);3515 continue;3516 }3517 if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)3518 {3519 if (argv[i][env_append_opt_len] == '=')3520 {3521 const char *p = argv[i] + env_append_opt_len + 1;3522 lt_opt_process_env_append (p);3523 }3524 else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)3525 {3526 lt_opt_process_env_append (argv[++i]); /* don't copy */3527 }3528 else3529 lt_fatal ("%s missing required argument", env_append_opt);3530 continue;3531 }3532 3670 if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) 3533 3671 { … … 3561 3699 cat <<"EOF" 3562 3700 /* execv doesn't actually work on mingw as expected on unix */ 3701 newargz = prepare_spawn (newargz); 3563 3702 rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); 3564 3703 if (rval == -1) … … 3905 4044 } 3906 4045 3907 int3908 lt_split_name_value (const char *arg, char** name, char** value)3909 {3910 const char *p;3911 int len;3912 if (!arg || !*arg)3913 return 1;3914 3915 p = strchr (arg, (int)'=');3916 3917 if (!p)3918 return 1;3919 3920 *value = xstrdup (++p);3921 3922 len = strlen (arg) - strlen (*value);3923 *name = XMALLOC (char, len);3924 strncpy (*name, arg, len-1);3925 (*name)[len - 1] = '\0';3926 3927 return 0;3928 }3929 3930 void3931 lt_opt_process_env_set (const char *arg)3932 {3933 char *name = NULL;3934 char *value = NULL;3935 3936 if (lt_split_name_value (arg, &name, &value) != 0)3937 {3938 XFREE (name);3939 XFREE (value);3940 lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);3941 }3942 3943 lt_setenv (name, value);3944 XFREE (name);3945 XFREE (value);3946 }3947 3948 void3949 lt_opt_process_env_prepend (const char *arg)3950 {3951 char *name = NULL;3952 char *value = NULL;3953 char *new_value = NULL;3954 3955 if (lt_split_name_value (arg, &name, &value) != 0)3956 {3957 XFREE (name);3958 XFREE (value);3959 lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);3960 }3961 3962 new_value = lt_extend_str (getenv (name), value, 0);3963 lt_setenv (name, new_value);3964 XFREE (new_value);3965 XFREE (name);3966 XFREE (value);3967 }3968 3969 void3970 lt_opt_process_env_append (const char *arg)3971 {3972 char *name = NULL;3973 char *value = NULL;3974 char *new_value = NULL;3975 3976 if (lt_split_name_value (arg, &name, &value) != 0)3977 {3978 XFREE (name);3979 XFREE (value);3980 lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);3981 }3982 3983 new_value = lt_extend_str (getenv (name), value, 1);3984 lt_setenv (name, new_value);3985 XFREE (new_value);3986 XFREE (name);3987 XFREE (value);3988 }3989 3990 4046 void 3991 4047 lt_update_exe_path (const char *name, const char *value) … … 4024 4080 } 4025 4081 4026 4082 EOF 4083 case $host_os in 4084 mingw*) 4085 cat <<"EOF" 4086 4087 /* Prepares an argument vector before calling spawn(). 4088 Note that spawn() does not by itself call the command interpreter 4089 (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : 4090 ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); 4091 GetVersionEx(&v); 4092 v.dwPlatformId == VER_PLATFORM_WIN32_NT; 4093 }) ? "cmd.exe" : "command.com"). 4094 Instead it simply concatenates the arguments, separated by ' ', and calls 4095 CreateProcess(). We must quote the arguments since Win32 CreateProcess() 4096 interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a 4097 special way: 4098 - Space and tab are interpreted as delimiters. They are not treated as 4099 delimiters if they are surrounded by double quotes: "...". 4100 - Unescaped double quotes are removed from the input. Their only effect is 4101 that within double quotes, space and tab are treated like normal 4102 characters. 4103 - Backslashes not followed by double quotes are not special. 4104 - But 2*n+1 backslashes followed by a double quote become 4105 n backslashes followed by a double quote (n >= 0): 4106 \" -> " 4107 \\\" -> \" 4108 \\\\\" -> \\" 4109 */ 4110 #define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" 4111 #define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" 4112 char ** 4113 prepare_spawn (char **argv) 4114 { 4115 size_t argc; 4116 char **new_argv; 4117 size_t i; 4118 4119 /* Count number of arguments. */ 4120 for (argc = 0; argv[argc] != NULL; argc++) 4121 ; 4122 4123 /* Allocate new argument vector. */ 4124 new_argv = XMALLOC (char *, argc + 1); 4125 4126 /* Put quoted arguments into the new argument vector. */ 4127 for (i = 0; i < argc; i++) 4128 { 4129 const char *string = argv[i]; 4130 4131 if (string[0] == '\0') 4132 new_argv[i] = xstrdup ("\"\""); 4133 else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) 4134 { 4135 int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); 4136 size_t length; 4137 unsigned int backslashes; 4138 const char *s; 4139 char *quoted_string; 4140 char *p; 4141 4142 length = 0; 4143 backslashes = 0; 4144 if (quote_around) 4145 length++; 4146 for (s = string; *s != '\0'; s++) 4147 { 4148 char c = *s; 4149 if (c == '"') 4150 length += backslashes + 1; 4151 length++; 4152 if (c == '\\') 4153 backslashes++; 4154 else 4155 backslashes = 0; 4156 } 4157 if (quote_around) 4158 length += backslashes + 1; 4159 4160 quoted_string = XMALLOC (char, length + 1); 4161 4162 p = quoted_string; 4163 backslashes = 0; 4164 if (quote_around) 4165 *p++ = '"'; 4166 for (s = string; *s != '\0'; s++) 4167 { 4168 char c = *s; 4169 if (c == '"') 4170 { 4171 unsigned int j; 4172 for (j = backslashes + 1; j > 0; j--) 4173 *p++ = '\\'; 4174 } 4175 *p++ = c; 4176 if (c == '\\') 4177 backslashes++; 4178 else 4179 backslashes = 0; 4180 } 4181 if (quote_around) 4182 { 4183 unsigned int j; 4184 for (j = backslashes; j > 0; j--) 4185 *p++ = '\\'; 4186 *p++ = '"'; 4187 } 4188 *p = '\0'; 4189 4190 new_argv[i] = quoted_string; 4191 } 4192 else 4193 new_argv[i] = (char *) string; 4194 } 4195 new_argv[argc] = NULL; 4196 4197 return new_argv; 4198 } 4199 EOF 4200 ;; 4201 esac 4202 4203 cat <<"EOF" 4204 void lt_dump_script (FILE* f) 4205 { 4206 EOF 4207 func_emit_wrapper yes | 4208 $SED -e 's/\([\\"]\)/\\\1/g' \ 4209 -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' 4210 4211 cat <<"EOF" 4212 } 4027 4213 EOF 4028 4214 } 4029 4215 # end: func_emit_cwrapperexe_src 4216 4217 # func_win32_import_lib_p ARG 4218 # True if ARG is an import lib, as indicated by $file_magic_cmd 4219 func_win32_import_lib_p () 4220 { 4221 $opt_debug 4222 case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in 4223 *import*) : ;; 4224 *) false ;; 4225 esac 4226 } 4030 4227 4031 4228 # func_mode_link arg... … … 4073 4270 4074 4271 avoid_version=no 4272 bindir= 4075 4273 dlfiles= 4076 4274 dlprefiles= … … 4165 4363 4166 4364 case $prev in 4365 bindir) 4366 bindir="$arg" 4367 prev= 4368 continue 4369 ;; 4167 4370 dlfiles|dlprefiles) 4168 4371 if test "$preload" = no; then … … 4426 4629 ;; 4427 4630 4631 -bindir) 4632 prev=bindir 4633 continue 4634 ;; 4635 4428 4636 -dlopen) 4429 4637 prev=dlfiles … … 4504 4712 case $host in 4505 4713 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 4506 testbindir=`$ECHO " X$dir" | $Xsed -e's*/lib$*/bin*'`4714 testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` 4507 4715 case :$dllsearchpath: in 4508 4716 *":$dir:"*) ;; … … 4523 4731 if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then 4524 4732 case $host in 4525 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* )4733 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) 4526 4734 # These systems don't actually have a C or math library (as such) 4527 4735 continue … … 4709 4917 IFS="$save_ifs" 4710 4918 func_quote_for_eval "$flag" 4711 arg="$arg $ wl$func_quote_for_eval_result"4919 arg="$arg $func_quote_for_eval_result" 4712 4920 compiler_flags="$compiler_flags $func_quote_for_eval_result" 4713 4921 done … … 4765 4973 # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC 4766 4974 # @file GCC response files 4975 # -tp=* Portland pgcc target processor selection 4767 4976 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ 4768 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@* )4977 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) 4769 4978 func_quote_for_eval "$arg" 4770 4979 arg="$func_quote_for_eval_result" … … 4926 5135 if test -n "$shlibpath_var"; then 4927 5136 # get the directories listed in $shlibpath_var 4928 eval shlib_search_path=\`\$ECHO \" X\${$shlibpath_var}\" \| \$Xsed -e\'s/:/ /g\'\`5137 eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` 4929 5138 else 4930 5139 shlib_search_path= … … 5049 5258 # has declared as weak libs 5050 5259 for deplib in $dependency_libs; do 5051 deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` 5260 func_basename "$deplib" 5261 deplib_base=$func_basename_result 5052 5262 case " $weak_libs " in 5053 5263 *" $deplib_base "*) ;; … … 5228 5438 set dummy $deplibs_check_method; shift 5229 5439 match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` 5230 if eval "\$ECHO \" X$deplib\"" 2>/dev/null | $Xsed -e10q \5440 if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ 5231 5441 | $EGREP "$match_pattern_regex" > /dev/null; then 5232 5442 valid_a_lib=yes … … 5238 5448 esac 5239 5449 if test "$valid_a_lib" != yes; then 5240 $ECHO5450 echo 5241 5451 $ECHO "*** Warning: Trying to link with static lib archive $deplib." 5242 $ECHO"*** I have the capability to make that library automatically link in when"5243 $ECHO"*** you link to this library. But I can only do this if you have a"5244 $ECHO"*** shared version of the library, which you do not appear to have"5245 $ECHO"*** because the file extensions .$libext of this argument makes me believe"5246 $ECHO"*** that it is just a static archive that I should not use here."5452 echo "*** I have the capability to make that library automatically link in when" 5453 echo "*** you link to this library. But I can only do this if you have a" 5454 echo "*** shared version of the library, which you do not appear to have" 5455 echo "*** because the file extensions .$libext of this argument makes me believe" 5456 echo "*** that it is just a static archive that I should not use here." 5247 5457 else 5248 $ECHO5458 echo 5249 5459 $ECHO "*** Warning: Linking the shared library $output against the" 5250 5460 $ECHO "*** static library $deplib is not portable!" … … 5319 5529 # Convert "-framework foo" to "foo.ltframework" 5320 5530 if test -n "$inherited_linker_flags"; then 5321 tmp_inherited_linker_flags=`$ECHO " X$inherited_linker_flags" | $Xsed -e's/-framework \([^ $]*\)/\1.ltframework/g'`5531 tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` 5322 5532 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do 5323 5533 case " $new_inherited_linker_flags " in … … 5327 5537 done 5328 5538 fi 5329 dependency_libs=`$ECHO " X $dependency_libs" | $Xsed -e's% \([^ $]*\).ltframework% -framework \1%g'`5539 dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` 5330 5540 if test "$linkmode,$pass" = "lib,link" || 5331 5541 test "$linkmode,$pass" = "prog,scan" || … … 5581 5791 done 5582 5792 if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then 5583 $ECHO5793 echo 5584 5794 if test "$linkmode" = prog; then 5585 5795 $ECHO "*** Warning: Linking the executable $output against the loadable module" … … 5684 5894 $ECHO "*** Warning: lib $linklib is a module, not a shared library" 5685 5895 if test -z "$old_library" ; then 5686 $ECHO5687 $ECHO"*** And there doesn't seem to be a static archive available"5688 $ECHO"*** The link will probably fail, sorry"5896 echo 5897 echo "*** And there doesn't seem to be a static archive available" 5898 echo "*** The link will probably fail, sorry" 5689 5899 else 5690 5900 add="$dir/$old_library" … … 5826 6036 # Just print a warning and add the library to dependency_libs so 5827 6037 # that the program can be linked against the static library. 5828 $ECHO6038 echo 5829 6039 $ECHO "*** Warning: This system can not link to static lib archive $lib." 5830 $ECHO"*** I have the capability to make that library automatically link in when"5831 $ECHO"*** you link to this library. But I can only do this if you have a"5832 $ECHO"*** shared version of the library, which you do not appear to have."6040 echo "*** I have the capability to make that library automatically link in when" 6041 echo "*** you link to this library. But I can only do this if you have a" 6042 echo "*** shared version of the library, which you do not appear to have." 5833 6043 if test "$module" = yes; then 5834 $ECHO"*** But as you try to build a module library, libtool will still create "5835 $ECHO"*** a static module, that should work as long as the dlopening application"5836 $ECHO"*** is linked with the -dlopen flag to resolve symbols at runtime."6044 echo "*** But as you try to build a module library, libtool will still create " 6045 echo "*** a static module, that should work as long as the dlopening application" 6046 echo "*** is linked with the -dlopen flag to resolve symbols at runtime." 5837 6047 if test -z "$global_symbol_pipe"; then 5838 $ECHO5839 $ECHO"*** However, this would only work if libtool was able to extract symbol"5840 $ECHO"*** lists from a program, using \`nm' or equivalent, but libtool could"5841 $ECHO"*** not find such a program. So, this module is probably useless."5842 $ECHO"*** \`nm' from GNU binutils and a full rebuild may help."6048 echo 6049 echo "*** However, this would only work if libtool was able to extract symbol" 6050 echo "*** lists from a program, using \`nm' or equivalent, but libtool could" 6051 echo "*** not find such a program. So, this module is probably useless." 6052 echo "*** \`nm' from GNU binutils and a full rebuild may help." 5843 6053 fi 5844 6054 if test "$build_old_libs" = no; then … … 5894 6104 # Add the search paths of all dependency libraries 5895 6105 for deplib in $dependency_libs; do 6106 path= 5896 6107 case $deplib in 5897 6108 -L*) path="$deplib" ;; … … 5959 6170 finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" 5960 6171 else 5961 compiler_flags="$compiler_flags "`$ECHO " X $new_inherited_linker_flags" | $Xsed -e's% \([^ $]*\).ltframework% -framework \1%g'`6172 compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` 5962 6173 fi 5963 6174 fi … … 6127 6338 func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 6128 6339 else 6129 $ECHO6340 echo 6130 6341 $ECHO "*** Warning: Linking the shared library $output against the non-libtool" 6131 6342 $ECHO "*** objects $objs is not portable!" … … 6195 6406 revision="$number_revision" 6196 6407 ;; 6197 freebsd-aout|freebsd-elf| sunos)6408 freebsd-aout|freebsd-elf|qnx|sunos) 6198 6409 current="$number_major" 6199 6410 revision="$number_minor" … … 6429 6640 6430 6641 # Transform .lo files to .o files. 6431 oldobjs="$objs "`$ECHO " X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`6642 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` 6432 6643 fi 6433 6644 6434 6645 # Eliminate all temporary directories. 6435 6646 #for path in $notinst_path; do 6436 # lib_search_path=`$ECHO " X$lib_search_path " | $Xsed -e"s% $path % %g"`6437 # deplibs=`$ECHO " X$deplibs " | $Xsed -e"s% -L$path % %g"`6438 # dependency_libs=`$ECHO " X$dependency_libs " | $Xsed -e"s% -L$path % %g"`6647 # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` 6648 # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` 6649 # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` 6439 6650 #done 6440 6651 … … 6477 6688 if test -n "$rpath"; then 6478 6689 case $host in 6479 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* )6690 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) 6480 6691 # these systems don't actually have a c library (as such)! 6481 6692 ;; … … 6562 6773 else 6563 6774 droppeddeps=yes 6564 $ECHO6775 echo 6565 6776 $ECHO "*** Warning: dynamic linker does not accept needed library $i." 6566 $ECHO"*** I have the capability to make that library automatically link in when"6567 $ECHO"*** you link to this library. But I can only do this if you have a"6568 $ECHO"*** shared version of the library, which I believe you do not have"6569 $ECHO"*** because a test_compile did reveal that the linker did not use it for"6570 $ECHO"*** its dynamic dependency list that programs get resolved with at runtime."6777 echo "*** I have the capability to make that library automatically link in when" 6778 echo "*** you link to this library. But I can only do this if you have a" 6779 echo "*** shared version of the library, which I believe you do not have" 6780 echo "*** because a test_compile did reveal that the linker did not use it for" 6781 echo "*** its dynamic dependency list that programs get resolved with at runtime." 6571 6782 fi 6572 6783 fi … … 6605 6816 else 6606 6817 droppeddeps=yes 6607 $ECHO6818 echo 6608 6819 $ECHO "*** Warning: dynamic linker does not accept needed library $i." 6609 $ECHO"*** I have the capability to make that library automatically link in when"6610 $ECHO"*** you link to this library. But I can only do this if you have a"6611 $ECHO"*** shared version of the library, which you do not appear to have"6612 $ECHO"*** because a test_compile did reveal that the linker did not use this one"6613 $ECHO"*** as a dynamic dependency that programs can get resolved with at runtime."6820 echo "*** I have the capability to make that library automatically link in when" 6821 echo "*** you link to this library. But I can only do this if you have a" 6822 echo "*** shared version of the library, which you do not appear to have" 6823 echo "*** because a test_compile did reveal that the linker did not use this one" 6824 echo "*** as a dynamic dependency that programs can get resolved with at runtime." 6614 6825 fi 6615 6826 fi 6616 6827 else 6617 6828 droppeddeps=yes 6618 $ECHO6829 echo 6619 6830 $ECHO "*** Warning! Library $i is needed by this library but I was not able to" 6620 $ECHO"*** make it link in! You will probably need to install it or some"6621 $ECHO"*** library that it depends on before this library will be fully"6622 $ECHO"*** functional. Installing it before continuing would be even better."6831 echo "*** make it link in! You will probably need to install it or some" 6832 echo "*** library that it depends on before this library will be fully" 6833 echo "*** functional. Installing it before continuing would be even better." 6623 6834 fi 6624 6835 ;; … … 6666 6877 case $potliblink in 6667 6878 [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; 6668 *) potlib=`$ECHO " X$potlib" | $Xsed -e's,[^/]*$,,'`"$potliblink";;6879 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; 6669 6880 esac 6670 6881 done … … 6681 6892 if test -n "$a_deplib" ; then 6682 6893 droppeddeps=yes 6683 $ECHO6894 echo 6684 6895 $ECHO "*** Warning: linker path does not have real file for library $a_deplib." 6685 $ECHO"*** I have the capability to make that library automatically link in when"6686 $ECHO"*** you link to this library. But I can only do this if you have a"6687 $ECHO"*** shared version of the library, which you do not appear to have"6688 $ECHO"*** because I did check the linker path looking for a file starting"6896 echo "*** I have the capability to make that library automatically link in when" 6897 echo "*** you link to this library. But I can only do this if you have a" 6898 echo "*** shared version of the library, which you do not appear to have" 6899 echo "*** because I did check the linker path looking for a file starting" 6689 6900 if test -z "$potlib" ; then 6690 6901 $ECHO "*** with $libname but no candidates were found. (...for file magic test)" … … 6724 6935 for potent_lib in $potential_libs; do 6725 6936 potlib="$potent_lib" # see symlink-check above in file_magic test 6726 if eval "\$ECHO \" X$potent_lib\"" 2>/dev/null | $Xsed -e10q | \6937 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ 6727 6938 $EGREP "$match_pattern_regex" > /dev/null; then 6728 6939 newdeplibs="$newdeplibs $a_deplib" … … 6735 6946 if test -n "$a_deplib" ; then 6736 6947 droppeddeps=yes 6737 $ECHO6948 echo 6738 6949 $ECHO "*** Warning: linker path does not have real file for library $a_deplib." 6739 $ECHO"*** I have the capability to make that library automatically link in when"6740 $ECHO"*** you link to this library. But I can only do this if you have a"6741 $ECHO"*** shared version of the library, which you do not appear to have"6742 $ECHO"*** because I did check the linker path looking for a file starting"6950 echo "*** I have the capability to make that library automatically link in when" 6951 echo "*** you link to this library. But I can only do this if you have a" 6952 echo "*** shared version of the library, which you do not appear to have" 6953 echo "*** because I did check the linker path looking for a file starting" 6743 6954 if test -z "$potlib" ; then 6744 6955 &
