[med-svn] r1553 - trunk/packages/libgenome/trunk/debian/patches
tille at alioth.debian.org
tille at alioth.debian.org
Tue Mar 11 16:04:33 UTC 2008
Author: tille
Date: 2008-03-11 16:04:31 +0000 (Tue, 11 Mar 2008)
New Revision: 1553
Added:
trunk/packages/libgenome/trunk/debian/patches/03_libtool.patch
Modified:
trunk/packages/libgenome/trunk/debian/patches/01_libGenome_Makefile_am.patch
trunk/packages/libgenome/trunk/debian/patches/02_autoreconf.patch
trunk/packages/libgenome/trunk/debian/patches/series
Log:
Finally get download version compiled (needed ltmain.sh from
snapshot.
Modified: trunk/packages/libgenome/trunk/debian/patches/01_libGenome_Makefile_am.patch
===================================================================
--- trunk/packages/libgenome/trunk/debian/patches/01_libGenome_Makefile_am.patch 2008-03-11 12:42:03 UTC (rev 1552)
+++ trunk/packages/libgenome/trunk/debian/patches/01_libGenome_Makefile_am.patch 2008-03-11 16:04:31 UTC (rev 1553)
@@ -1,20 +1,11 @@
--- libGenome-1.3.0.orig/libGenome/Makefile.am
+++ libGenome-1.3.0/libGenome/Makefile.am
-@@ -31,13 +31,13 @@
- gnContigSpec.cpp gnSourceHeader.cpp gnException.cpp \
- gnFastTranslator.cpp gnPosSpecificTranslator.cpp gnDefs.cpp
+@@ -37,7 +37,7 @@
--library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)
-+library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/$(GENERIC_LIBRARY_NAME)
-
- library_include_HEADERS = $(LIBGENOME_H)
-
--lib_LTLIBRARIES = libGenome-1.3.la
--libGenome_1_3_la_SOURCES = $(LIBGENOME_SRC)
+ lib_LTLIBRARIES = libGenome-1.3.la
+ libGenome_1_3_la_SOURCES = $(LIBGENOME_SRC)
-libGenome_1_3_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
-+lib_LTLIBRARIES = libGenome.la
-+libGenome_la_SOURCES = $(LIBGENOME_SRC)
-+libGenome_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
++libGenome_1_3_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION)
Modified: trunk/packages/libgenome/trunk/debian/patches/02_autoreconf.patch
===================================================================
--- trunk/packages/libgenome/trunk/debian/patches/02_autoreconf.patch 2008-03-11 12:42:03 UTC (rev 1552)
+++ trunk/packages/libgenome/trunk/debian/patches/02_autoreconf.patch 2008-03-11 16:04:31 UTC (rev 1553)
@@ -1,34 +1,597 @@
-diff -ubrN libGenome-1.3.0.orig/aclocal.m4 libGenome-1.3.0/aclocal.m4
---- libGenome-1.3.0.orig/aclocal.m4 2007-01-31 06:35:56.000000000 +0100
-+++ libGenome-1.3.0/aclocal.m4 2008-02-20 16:00:49.000000000 +0100
+--- libGenome-1.3.0.orig.orig/Makefile.in
++++ libGenome-1.3.0.orig/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = .
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -34,33 +30,44 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++target_triplet = @target@
++subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/libGenome-1.3.pc.in $(top_srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+ install-sh ltmain.sh missing
+-subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
+-mkinstalldirs = $(mkdir_p)
++ configure.lineno config.status.lineno
++mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = libGenome-1.3.pc
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pkgconfig_DATA)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -76,8 +83,6 @@
+ distuninstallcheck_listfiles = find . -type f -print
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -94,10 +99,9 @@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-DEBUG_FALSE = @DEBUG_FALSE@
+-DEBUG_TRUE = @DEBUG_TRUE@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -112,8 +116,8 @@
+ GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
+ GENERIC_RELEASE = @GENERIC_RELEASE@
+ GENERIC_VERSION = @GENERIC_VERSION@
+-ICC_FALSE = @ICC_FALSE@
+-ICC_TRUE = @ICC_TRUE@
++GREP = @GREP@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -126,6 +130,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -135,56 +141,67 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STATIC_FLAG = @STATIC_FLAG@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-ac_ct_AR = @ac_ct_AR@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = \
+ projects/libGenome.sln \
+ projects/libGenome.vcproj \
+@@ -234,7 +251,7 @@
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+- $(MAKE) stamp-h1; \
++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ else :; fi
+
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+@@ -258,13 +275,12 @@
+
+ distclean-libtool:
+ -rm -f libtool
+-uninstall-info-am:
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
++ f=$(am__strip_dir) \
+ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ done
+@@ -272,7 +288,7 @@
+ uninstall-pkgconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
++ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ done
+@@ -284,7 +300,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -296,15 +318,20 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++$(RECURSIVE_CLEAN_TARGETS):
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -325,7 +352,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -341,8 +368,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -350,14 +377,16 @@
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if (etags --etags-include --version) >/dev/null 2>&1; then \
++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
++ empty_fix=.; \
+ else \
+ include_option=--include; \
++ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -f $$subdir/TAGS && \
++ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+@@ -365,22 +394,23 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(ETAGS_ARGS)$$tags$$unique" \
+- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ test -n "$$unique" || unique=$$empty_fix; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
++ fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -395,24 +425,22 @@
+
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+- mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/projects
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ test -d $(distdir) || mkdir $(distdir)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -423,15 +451,19 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(SUBDIRS)'; for subdir in $$list; do \
++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || mkdir "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
++ distdir=`$(am__cd) $(distdir) && pwd`; \
++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="../$(top_distdir)" \
+- distdir="../$(distdir)/$$subdir" \
++ top_distdir="$$top_distdir" \
++ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -439,18 +471,22 @@
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ dist-bzip2: distdir
+- $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++ $(am__remove_distdir)
++
++dist-lzma: distdir
++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
+ dist-tarZ: distdir
+- $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
++ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+ dist-shar: distdir
+@@ -463,7 +499,7 @@
+ $(am__remove_distdir)
+
+ dist dist-all: distdir
+- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ # This target untars the dist file and tries a VPATH configuration. Then
+@@ -472,13 +508,15 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
++ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ *.tar.lzma*) \
++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.Z*) \
+- uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
++ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+@@ -514,7 +552,7 @@
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -539,7 +577,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -560,7 +598,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -rm -f $(CONFIG_CLEAN_FILES)
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -587,12 +625,20 @@
+
+ install-data-am: install-pkgconfigDATA
+
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+
+ install-man:
+
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -613,25 +659,26 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
++uninstall-am: uninstall-pkgconfigDATA
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+- check-am clean clean-generic clean-libtool clean-recursive \
+- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+- dist-shar dist-tarZ dist-zip distcheck distclean \
+- distclean-generic distclean-hdr distclean-libtool \
+- distclean-recursive distclean-tags distcleancheck distdir \
+- distuninstallcheck dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-pkgconfigDATA install-strip installcheck \
+- installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-generic mostlyclean-libtool \
+- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-info-am \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am am--refresh check check-am clean clean-generic \
++ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
++ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
++ distclean distclean-generic distclean-hdr distclean-libtool \
++ distclean-tags distcleancheck distdir distuninstallcheck dvi \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
++ ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-pkgconfigDATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- libGenome-1.3.0.orig.orig/aclocal.m4
++++ libGenome-1.3.0.orig/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006 Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -11,9 +11,14 @@
+@@ -11,9 +11,17 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-+m4_if(m4_PACKAGE_VERSION, [2.61],,
-+[m4_fatal([this file was generated for autoconf 2.61.
-+You have another version of autoconf. If you want to use that,
-+you should regenerate the build system entirely.], [63])])
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(AC_AUTOCONF_VERSION, [2.61],,
++[m4_warning([this file was generated for autoconf 2.61.
++You have another version of autoconf. It may work, but is not guaranteed to.
++If you have problems, you may need to regenerate the build system entirely.
++To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 47 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -123,7 +128,7 @@
+@@ -101,7 +109,6 @@
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -123,7 +130,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -37,7 +600,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -143,7 +148,7 @@
+@@ -143,7 +150,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -46,7 +609,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -163,6 +168,7 @@
+@@ -163,6 +170,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -54,7 +617,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -175,22 +181,24 @@
+@@ -175,22 +183,24 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -82,7 +645,16 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -231,11 +239,58 @@
+@@ -200,6 +210,8 @@
+ ;;
+ esac
+
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -231,11 +243,129 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -134,14 +706,85 @@
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
++$rm -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
++
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -245,12 +300,20 @@
+@@ -245,12 +375,20 @@
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
@@ -167,7 +810,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -308,15 +371,15 @@
+@@ -308,15 +446,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -186,7 +829,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -481,13 +544,17 @@
+@@ -481,13 +619,17 @@
rm -rf conftest*
;;
@@ -206,7 +849,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -504,6 +571,9 @@
+@@ -504,6 +646,9 @@
;;
*64-bit*)
case $host in
@@ -216,7 +859,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -536,6 +606,22 @@
+@@ -536,6 +681,26 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -228,7 +871,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+ *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
@@ -239,7 +886,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -559,7 +645,7 @@
+@@ -559,7 +724,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -248,7 +895,7 @@
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -567,7 +653,7 @@
+@@ -567,7 +732,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -257,7 +904,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -577,8 +663,10 @@
+@@ -577,8 +742,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -270,7 +917,7 @@
$2=yes
fi
fi
-@@ -598,17 +686,23 @@
+@@ -598,22 +765,28 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -297,7 +944,13 @@
else
$2=yes
fi
-@@ -632,7 +726,7 @@
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+ ])
+
+@@ -632,7 +805,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -306,10 +959,28 @@
case $build_os in
msdosdjgpp*)
-@@ -667,24 +761,71 @@
+@@ -667,24 +840,71 @@
lt_cv_sys_max_cmd_len=8192;
;;
+- *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring=$testring$testring
+- done
+- testring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
@@ -353,13 +1024,7 @@
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-- = "XX$testring") >/dev/null 2>&1 &&
-- new_result=`expr "X$testring" : ".*" 2>&1` &&
++ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
@@ -369,24 +1034,22 @@
+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
-- testring=$testring$testring
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
+ teststring=$teststring$teststring
- done
-- testring=
++ done
+ teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
;;
esac
])
-@@ -697,7 +838,7 @@
+@@ -697,7 +917,7 @@
# _LT_AC_CHECK_DLFCN
@@ -395,7 +1058,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -705,7 +846,7 @@
+@@ -705,7 +925,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -404,7 +1067,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -771,17 +912,19 @@
+@@ -771,17 +991,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -426,7 +1089,7 @@
esac
else :
# compilation failed
-@@ -793,7 +936,7 @@
+@@ -793,7 +1015,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -435,7 +1098,25 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -864,7 +1007,7 @@
+@@ -835,7 +1057,7 @@
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+@@ -843,7 +1065,7 @@
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -864,7 +1086,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -444,7 +1125,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -877,7 +1020,7 @@
+@@ -877,7 +1099,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -453,7 +1134,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -909,7 +1052,8 @@
+@@ -909,7 +1131,8 @@
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -463,7 +1144,7 @@
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -917,7 +1061,7 @@
+@@ -917,7 +1140,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -472,7 +1153,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -925,7 +1069,7 @@
+@@ -925,7 +1148,7 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -481,7 +1162,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -937,11 +1081,13 @@
+@@ -937,11 +1160,13 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -497,7 +1178,7 @@
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
-@@ -1005,8 +1151,8 @@
+@@ -1005,8 +1230,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -508,7 +1189,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -1055,6 +1201,7 @@
+@@ -1055,6 +1280,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -516,7 +1197,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1072,11 +1219,12 @@
+@@ -1072,11 +1298,12 @@
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -531,7 +1212,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -1086,20 +1234,58 @@
+@@ -1086,20 +1313,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -595,7 +1276,16 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1173,7 +1359,7 @@
+@@ -1117,7 +1382,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -1173,7 +1438,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -604,7 +1294,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1189,7 +1375,7 @@
+@@ -1189,7 +1454,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -613,7 +1303,7 @@
need_version=no
need_lib_prefix=no
-@@ -1201,7 +1387,8 @@
+@@ -1201,7 +1466,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -623,7 +1313,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -1231,7 +1418,7 @@
+@@ -1231,7 +1497,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -632,7 +1322,7 @@
;;
esac
;;
-@@ -1254,13 +1441,9 @@
+@@ -1254,13 +1520,9 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -649,7 +1339,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -1277,20 +1460,17 @@
+@@ -1277,20 +1539,17 @@
dynamic_linker=no
;;
@@ -681,7 +1371,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -1308,14 +1488,19 @@
+@@ -1308,14 +1567,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -703,7 +1393,7 @@
esac
;;
-@@ -1335,9 +1520,9 @@
+@@ -1335,9 +1599,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -715,7 +1405,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -1352,7 +1537,7 @@
+@@ -1352,7 +1616,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -724,7 +1414,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1363,7 +1548,7 @@
+@@ -1363,7 +1627,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -733,7 +1423,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1375,6 +1560,18 @@
+@@ -1375,6 +1639,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -752,7 +1442,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -1418,7 +1615,7 @@
+@@ -1418,7 +1694,7 @@
;;
# This must be Linux ELF.
@@ -761,7 +1451,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1434,8 +1631,8 @@
+@@ -1434,8 +1710,8 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -772,7 +1462,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -1447,7 +1644,7 @@
+@@ -1447,7 +1723,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -781,7 +1471,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1456,7 +1653,7 @@
+@@ -1456,7 +1732,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -790,7 +1480,7 @@
;;
netbsd*)
-@@ -1496,8 +1693,13 @@
+@@ -1496,8 +1772,13 @@
openbsd*)
version_type=sunos
@@ -805,7 +1495,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -1517,7 +1719,7 @@
+@@ -1517,7 +1798,7 @@
os2*)
libname_spec='$name'
@@ -814,7 +1504,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -1535,11 +1737,8 @@
+@@ -1535,11 +1816,8 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -828,7 +1518,7 @@
;;
solaris*)
-@@ -1567,7 +1766,7 @@
+@@ -1567,7 +1845,7 @@
need_version=yes
;;
@@ -837,7 +1527,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -1600,6 +1799,29 @@
+@@ -1600,6 +1878,29 @@
fi
;;
@@ -867,11 +1557,18 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1613,13 +1835,19 @@
+@@ -1613,13 +1914,26 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -888,7 +1585,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -1637,6 +1865,9 @@
+@@ -1637,6 +1951,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -898,7 +1595,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -1663,7 +1894,9 @@
+@@ -1663,7 +1980,9 @@
case $tagname in
CXX)
@@ -909,7 +1606,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -1725,7 +1958,7 @@
+@@ -1725,7 +2044,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -918,7 +1615,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -1763,7 +1996,7 @@
+@@ -1763,7 +2082,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -927,7 +1624,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -1875,7 +2108,7 @@
+@@ -1875,7 +2194,7 @@
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -936,7 +1633,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -1899,7 +2132,7 @@
+@@ -1899,7 +2218,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -945,7 +1642,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -1938,7 +2171,7 @@
+@@ -1938,7 +2257,7 @@
# AC_PATH_MAGIC
# -------------
@@ -954,7 +1651,7 @@
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -2009,7 +2242,7 @@
+@@ -2009,7 +2328,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -963,7 +1660,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -2041,7 +2274,7 @@
+@@ -2041,7 +2360,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -972,7 +1669,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -2068,6 +2301,15 @@
+@@ -2068,6 +2387,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -988,7 +1685,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -2076,7 +2318,7 @@
+@@ -2076,7 +2404,7 @@
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -997,10 +1694,19 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2101,36 +2343,42 @@
+@@ -2093,7 +2421,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
+@@ -2101,36 +2429,42 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
-bsdi4*)
+bsdi[[45]]*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
@@ -1019,14 +1725,16 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
- # win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
@@ -1046,7 +1754,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -2146,7 +2394,7 @@
+@@ -2146,7 +2480,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1055,7 +1763,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -2162,6 +2410,11 @@
+@@ -2162,6 +2496,11 @@
esac
;;
@@ -1067,7 +1775,7 @@
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -2173,20 +2426,11 @@
+@@ -2173,20 +2512,11 @@
;;
# This must be Linux ELF.
@@ -1090,7 +1798,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -2205,12 +2449,10 @@
+@@ -2205,12 +2535,10 @@
;;
openbsd*)
@@ -1105,7 +1813,7 @@
fi
;;
-@@ -2218,7 +2460,7 @@
+@@ -2218,7 +2546,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1114,7 +1822,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2226,7 +2468,7 @@
+@@ -2226,7 +2554,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1123,7 +1831,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -2247,10 +2489,13 @@
+@@ -2247,10 +2575,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1138,39 +1846,75 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -2270,11 +2515,16 @@
+@@ -2270,36 +2601,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
+ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
-- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
+ tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-@@ -2296,10 +2546,12 @@
- continue # so that we can try to find one that supports BSD flags
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
+ break
;;
+ *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
+ ;;
esac
-+ ;;
- esac
- fi
+- esac
+- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
done
- IFS="$lt_save_ifs"
-+ done
+- IFS="$lt_save_ifs"
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -2331,13 +2583,13 @@
+@@ -2331,13 +2669,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1191,7 +1935,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -2356,13 +2608,13 @@
+@@ -2356,13 +2694,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1212,7 +1956,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -2400,10 +2652,21 @@
+@@ -2400,10 +2738,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1235,7 +1979,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -2443,7 +2706,7 @@
+@@ -2443,7 +2792,7 @@
# AC_LIBTOOL_RC
@@ -1244,7 +1988,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -2469,43 +2732,16 @@
+@@ -2469,43 +2818,16 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1293,7 +2037,7 @@
AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
AC_LIBTOOL_PROG_COMPILER_PIC($1)
-@@ -2515,9 +2751,9 @@
+@@ -2515,9 +2837,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1305,7 +2049,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -2526,7 +2762,7 @@
+@@ -2526,7 +2848,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1314,16 +2058,16 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -2535,48 +2771,11 @@
+@@ -2535,47 +2857,10 @@
fi
;;
-aix4*)
-+aix4* | aix5*)
++aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
- ;;
+- ;;
- darwin* | rhapsody*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -1360,11 +2104,10 @@
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-- ;;
+ ;;
esac
AC_MSG_RESULT([$enable_shared])
-
-@@ -2601,7 +2800,7 @@
+@@ -2601,7 +2886,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1373,7 +2116,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2613,6 +2812,7 @@
+@@ -2613,6 +2898,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1381,8 +2124,11 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -2630,21 +2830,25 @@
+@@ -2628,23 +2914,28 @@
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
-ac_ext=cc
@@ -1410,7 +2156,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -2655,18 +2859,18 @@
+@@ -2655,18 +2946,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1432,7 +2178,25 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -2755,6 +2959,7 @@
+@@ -2733,7 +3024,7 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -2746,7 +3037,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -2755,6 +3046,7 @@
;;
esac
done
@@ -1440,7 +2204,7 @@
esac
exp_sym_flag='-bexport'
-@@ -2773,7 +2978,7 @@
+@@ -2773,7 +3065,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1449,7 +2213,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -2781,7 +2986,7 @@
+@@ -2781,7 +3073,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1458,7 +2222,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -2792,8 +2997,12 @@
+@@ -2792,8 +3084,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1471,7 +2235,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -2820,12 +3029,12 @@
+@@ -2820,12 +3116,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1486,7 +2250,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -2834,16 +3043,26 @@
+@@ -2834,16 +3130,26 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1500,9 +2264,9 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ fi
fi
-+ ;;
+ fi
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1512,13 +2276,13 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
++ fi
++ ;;
+
chorus*)
case $cc_basename in
*)
-@@ -2862,7 +3081,7 @@
+@@ -2862,7 +3168,7 @@
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
@@ -1527,7 +2291,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -2871,70 +3090,81 @@
+@@ -2871,70 +3177,53 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1538,71 +2302,74 @@
fi
;;
-
- darwin* | rhapsody*)
+- darwin* | rhapsody*)
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
-+ case $host_os in
- rhapsody* | darwin1.[[012]])
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
+- ;;
+- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
+- ;;
+- esac
++ darwin* | rhapsody*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+ if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ else
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
@@ -1613,11 +2380,11 @@
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
- fi
- ;;
++ fi
++ ;;
dgux*)
case $cc_basename in
@@ -1631,7 +2398,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2945,14 +3175,14 @@
+@@ -2945,14 +3234,14 @@
;;
esac
;;
@@ -1648,7 +2415,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -2969,11 +3199,11 @@
+@@ -2969,11 +3258,11 @@
# location of the library.
case $cc_basename in
@@ -1662,7 +2429,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -2983,7 +3213,7 @@
+@@ -2983,7 +3272,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1671,19 +2438,21 @@
;;
*)
if test "$GXX" = yes; then
-@@ -2997,33 +3227,20 @@
+@@ -2997,33 +3286,20 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- ;;
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*) ;;
@@ -1710,7 +2479,7 @@
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -3034,14 +3251,17 @@
+@@ -3034,14 +3310,17 @@
esac
case $cc_basename in
@@ -1733,7 +2502,7 @@
;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -3060,9 +3280,12 @@
+@@ -3060,9 +3339,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1749,7 +2518,7 @@
;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -3076,11 +3299,25 @@
+@@ -3076,11 +3358,25 @@
;;
esac
;;
@@ -1777,7 +2546,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -3091,7 +3328,7 @@
+@@ -3091,7 +3387,7 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1786,7 +2555,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
-@@ -3102,9 +3339,9 @@
+@@ -3102,9 +3398,9 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -1798,7 +2567,7 @@
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
-@@ -3129,17 +3366,41 @@
+@@ -3129,17 +3425,41 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1806,14 +2575,13 @@
+ icpc*)
# Intel C++
with_gnu_ld=yes
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ # version 8.0 and above of icpc choke on multiply defined symbols
+ # if we add $predep_objects and $postdep_objects, however 7.1 and
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
@@ -1824,13 +2592,15 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
-+ pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -1843,7 +2613,7 @@
# Compaq C++
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -3158,6 +3419,29 @@
+@@ -3158,6 +3478,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -1873,7 +2643,7 @@
esac
;;
lynxos*)
-@@ -3170,7 +3454,7 @@
+@@ -3170,7 +3513,7 @@
;;
mvs*)
case $cc_basename in
@@ -1882,7 +2652,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -3180,7 +3464,7 @@
+@@ -3180,7 +3523,7 @@
;;
esac
;;
@@ -1891,7 +2661,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -3191,9 +3475,29 @@
+@@ -3191,9 +3534,29 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -1922,7 +2692,7 @@
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
-@@ -3209,14 +3513,14 @@
+@@ -3209,14 +3572,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1940,7 +2710,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3234,7 +3538,7 @@
+@@ -3234,7 +3597,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1949,7 +2719,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3253,7 +3557,7 @@
+@@ -3253,7 +3616,7 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -1958,7 +2728,7 @@
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
-@@ -3268,17 +3572,17 @@
+@@ -3268,17 +3631,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -1980,7 +2750,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3297,7 +3601,7 @@
+@@ -3297,7 +3660,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1989,7 +2759,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3318,27 +3622,14 @@
+@@ -3318,27 +3681,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2019,7 +2789,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3351,36 +3642,28 @@
+@@ -3351,36 +3701,28 @@
;;
solaris*)
case $cc_basename in
@@ -2065,7 +2835,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -3388,7 +3671,7 @@
+@@ -3388,7 +3730,7 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2074,7 +2844,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-@@ -3422,16 +3705,73 @@
+@@ -3422,16 +3764,73 @@
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -2150,7 +2920,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3464,8 +3804,6 @@
+@@ -3464,8 +3863,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2159,7 +2929,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3483,7 +3821,7 @@
+@@ -3483,12 +3880,13 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2168,7 +2938,14 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -3537,7 +3875,7 @@
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library. It's possible we should let each
+@@ -3537,7 +3935,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -2177,10 +2954,15 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -3613,13 +3951,70 @@
+@@ -3613,13 +4011,74 @@
$rm -f confest.$objext
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
@@ -2237,7 +3019,6 @@
+ ;;
+esac
+])
-+
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -2249,7 +3030,7 @@
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3655,20 +4050,31 @@
+@@ -3655,20 +4114,31 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2284,7 +3065,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -3678,7 +4084,7 @@
+@@ -3678,7 +4148,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2293,19 +3074,20 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -3686,8 +4092,10 @@
+@@ -3686,8 +4156,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
-+aix4* | aix5*)
+- test "$enable_shared" = yes && enable_static=no
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ fi
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -3697,8 +4105,6 @@
+@@ -3697,8 +4169,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2314,7 +3096,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -3708,8 +4114,6 @@
+@@ -3708,8 +4178,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2323,7 +3105,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3735,23 +4139,30 @@
+@@ -3735,23 +4203,30 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2356,7 +3138,7 @@
AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
AC_LIBTOOL_PROG_COMPILER_PIC($1)
AC_LIBTOOL_PROG_CC_C_O($1)
-@@ -3759,8 +4170,6 @@
+@@ -3759,8 +4234,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2365,7 +3147,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3770,7 +4179,7 @@
+@@ -3770,7 +4243,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2374,7 +3156,7 @@
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3786,7 +4195,7 @@
+@@ -3786,7 +4259,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2383,7 +3165,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -3794,11 +4203,16 @@
+@@ -3794,11 +4267,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2400,7 +3182,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -3828,7 +4242,7 @@
+@@ -3828,7 +4306,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -2409,7 +3191,15 @@
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -3870,6 +4284,7 @@
+@@ -3855,6 +4333,7 @@
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -3870,6 +4349,7 @@
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -2417,16 +3207,16 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -3916,7 +4331,7 @@
+@@ -3916,7 +4396,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -3934,7 +4349,7 @@
+@@ -3934,7 +4414,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -2435,7 +3225,7 @@
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
-@@ -3945,11 +4360,11 @@
+@@ -3945,11 +4425,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2449,7 +3239,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -3980,6 +4395,12 @@
+@@ -3980,6 +4460,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2462,7 +3252,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -3991,6 +4412,9 @@
+@@ -3991,6 +4477,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2472,7 +3262,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -4022,7 +4446,7 @@
+@@ -4022,7 +4511,7 @@
OBJDUMP="$OBJDUMP"
# Used on cygwin: assembler.
@@ -2481,7 +3271,7 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-@@ -4041,7 +4465,7 @@
+@@ -4041,7 +4530,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2490,7 +3280,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -4056,7 +4480,7 @@
+@@ -4056,7 +4545,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2499,7 +3289,18 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -4232,7 +4656,7 @@
+@@ -4144,6 +4633,10 @@
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -4232,7 +4725,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -2508,7 +3309,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -4315,6 +4739,7 @@
+@@ -4315,6 +4808,7 @@
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -2516,7 +3317,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -4330,9 +4755,6 @@
+@@ -4330,9 +4824,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2526,7 +3327,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -4354,15 +4776,31 @@
+@@ -4354,15 +4845,31 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2559,7 +3360,7 @@
sysv4)
symcode='[[DFNSTU]]'
;;
-@@ -4385,8 +4823,11 @@
+@@ -4385,8 +4892,11 @@
# Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do
@@ -2572,7 +3373,16 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -4525,12 +4966,14 @@
+@@ -4476,7 +4986,7 @@
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -4525,13 +5035,16 @@
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2584,12 +3394,15 @@
+ mingw* | cygwin* | os2* | pw32*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
-@@ -4542,6 +4985,10 @@
+ # PIC is the default on this platform
+@@ -4542,6 +5055,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2600,7 +3413,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -4550,7 +4997,7 @@
+@@ -4550,7 +5067,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2609,7 +3422,16 @@
hppa*64*|ia64*)
;;
*)
-@@ -4575,18 +5022,28 @@
+@@ -4564,7 +5081,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -4575,18 +5092,28 @@
;;
chorus*)
case $cc_basename in
@@ -2641,7 +3463,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4594,22 +5051,22 @@
+@@ -4594,22 +5121,22 @@
;;
esac
;;
@@ -2670,7 +3492,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4622,9 +5079,13 @@
+@@ -4622,9 +5149,13 @@
;;
esac
;;
@@ -2685,7 +3507,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -4633,20 +5094,26 @@
+@@ -4633,20 +5164,26 @@
;;
esac
;;
@@ -2706,7 +3528,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- cxx)
-+ pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -2716,7 +3538,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -4654,6 +5121,14 @@
+@@ -4654,6 +5191,14 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -2731,7 +3553,7 @@
;;
esac
;;
-@@ -4663,25 +5138,25 @@
+@@ -4663,25 +5208,25 @@
;;
mvs*)
case $cc_basename in
@@ -2762,7 +3584,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -4695,24 +5170,15 @@
+@@ -4695,24 +5240,15 @@
;;
psos*)
;;
@@ -2789,7 +3611,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -4722,12 +5188,12 @@
+@@ -4722,12 +5258,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2804,7 +3626,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4737,7 +5203,7 @@
+@@ -4737,7 +5273,7 @@
;;
tandem*)
case $cc_basename in
@@ -2813,7 +3635,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -4745,7 +5211,14 @@
+@@ -4745,7 +5281,14 @@
;;
esac
;;
@@ -2829,7 +3651,7 @@
;;
vxworks*)
;;
-@@ -4776,13 +5249,15 @@
+@@ -4776,14 +5319,17 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2842,12 +3664,15 @@
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
-@@ -4792,6 +5267,11 @@
+ darwin* | rhapsody*)
+@@ -4792,6 +5338,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2859,7 +3684,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -4808,7 +5288,7 @@
+@@ -4808,7 +5359,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2868,7 +3693,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4834,8 +5314,18 @@
+@@ -4834,18 +5385,29 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2887,8 +3712,12 @@
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-@@ -4845,7 +5335,7 @@
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2897,7 +3726,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4868,18 +5358,41 @@
+@@ -4868,18 +5430,41 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2941,7 +3770,7 @@
esac
;;
-@@ -4889,15 +5402,19 @@
+@@ -4889,15 +5474,19 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -2965,7 +3794,7 @@
;;
sunos4*)
-@@ -4906,7 +5423,7 @@
+@@ -4906,7 +5495,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2974,7 +3803,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4919,6 +5436,17 @@
+@@ -4919,6 +5508,17 @@
fi
;;
@@ -2992,7 +3821,16 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4946,7 +5474,7 @@
+@@ -4937,7 +5537,7 @@
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+@@ -4946,7 +5546,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -3001,7 +3839,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -4955,6 +5483,16 @@
+@@ -4955,6 +5555,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3011,14 +3849,14 @@
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
])
-@@ -4962,7 +5500,8 @@
+@@ -4962,11 +5572,12 @@
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -3028,7 +3866,12 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -4979,7 +5518,10 @@
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -4979,12 +5590,16 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3040,9 +3883,25 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -5022,7 +5564,8 @@
+ ;;
+ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -5015,14 +5630,17 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
-
+ # Just being paranoid about ensuring that cc_basename is set.
@@ -3050,7 +3909,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -5032,6 +5575,10 @@
+@@ -5032,6 +5650,10 @@
with_gnu_ld=no
fi
;;
@@ -3061,7 +3920,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -5042,6 +5589,27 @@
+@@ -5042,9 +5664,30 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3088,8 +3947,12 @@
+
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
-@@ -5092,10 +5660,10 @@
+- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -5092,10 +5735,10 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -3102,19 +3965,17 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -5104,13 +5672,69 @@
+@@ -5104,13 +5747,69 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
-- ld_shlibs=no
++ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3166,16 +4027,18 @@
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ else
+ else
+- ld_shlibs=no
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5120,7 +5744,7 @@
+@@ -5120,7 +5819,7 @@
fi
;;
@@ -3184,10 +4047,12 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -5141,6 +5765,33 @@
+@@ -5141,38 +5840,40 @@
fi
;;
+- sunos4*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
@@ -3215,10 +4080,10 @@
+ esac
+ ;;
+
- sunos4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ sunos4*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -5148,31 +5799,6 @@
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -3250,7 +4115,7 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -5183,17 +5809,12 @@
+@@ -5183,16 +5884,11 @@
;;
esac
@@ -3262,17 +4127,17 @@
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+ runpath_var=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
-- fi
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
-@@ -5204,7 +5825,7 @@
+@@ -5204,14 +5900,14 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3281,7 +4146,23 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5238,6 +5859,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -5231,13 +5927,14 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
break
fi
done
@@ -3289,7 +4170,7 @@
esac
exp_sym_flag='-bexport'
-@@ -5256,7 +5878,7 @@
+@@ -5256,7 +5953,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3298,7 +4179,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -5264,7 +5886,7 @@
+@@ -5264,7 +5961,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -3307,7 +4188,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5275,8 +5897,12 @@
+@@ -5275,8 +5972,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3320,7 +4201,21 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5302,12 +5928,12 @@
+@@ -5284,11 +5985,11 @@
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test "$aix_use_runtimelinking" = yes; then
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+- fi
++ fi
+ fi
+ fi
+
+@@ -5302,12 +6003,12 @@
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -3335,7 +4230,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -5316,13 +5942,11 @@
+@@ -5316,13 +6017,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3352,7 +4247,7 @@
fi
fi
;;
-@@ -5335,7 +5959,7 @@
+@@ -5335,7 +6034,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3361,7 +4256,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -5349,64 +5973,64 @@
+@@ -5349,64 +6048,63 @@
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
@@ -3383,28 +4278,41 @@
- if test "$GXX" = yes ; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+ case $host_os in
- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
++ rhapsody* | darwin1.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
++ ;;
++ 10.*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
@@ -3433,12 +4341,12 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
@@ -3449,13 +4357,13 @@
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
fi
;;
-@@ -5440,7 +6064,7 @@
+@@ -5440,7 +6138,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3464,7 +4372,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -5463,47 +6087,62 @@
+@@ -5463,47 +6161,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3523,13 +4431,14 @@
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -3548,7 +4457,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -5527,7 +6166,7 @@
+@@ -5527,7 +6240,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -3557,30 +4466,52 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -5547,10 +6186,12 @@
+@@ -5547,23 +6260,28 @@
;;
openbsd*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ if test -f /usr/libexec/ld.so; then
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ else
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
else
-@@ -5565,6 +6206,9 @@
- ;;
- esac
+- case $host_os in
+- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- ;;
+- *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- ;;
+- esac
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
;;
- os2*)
-@@ -5596,7 +6240,7 @@
+@@ -5596,7 +6314,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
@@ -3589,7 +4520,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5604,21 +6248,15 @@
+@@ -5604,21 +6322,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3613,7 +4544,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -5627,8 +6265,17 @@
+@@ -5627,8 +6339,17 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3633,7 +4564,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -5685,36 +6332,45 @@
+@@ -5685,36 +6406,45 @@
fi
;;
@@ -3700,7 +4631,7 @@
;;
uts4*)
-@@ -5732,11 +6388,6 @@
+@@ -5732,11 +6462,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3712,7 +4643,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -5756,7 +6407,7 @@
+@@ -5756,7 +6481,7 @@
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -3721,7 +4652,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
-@@ -5764,6 +6415,7 @@
+@@ -5764,6 +6489,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
@@ -3729,7 +4660,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -5858,6 +6510,30 @@
+@@ -5858,6 +6584,30 @@
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -3760,7 +4691,7 @@
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
-@@ -5878,18 +6554,19 @@
+@@ -5878,18 +6628,19 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3782,7 +4713,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -5914,60 +6591,53 @@
+@@ -5914,60 +6665,55 @@
fi
done
done
@@ -3810,7 +4741,7 @@
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
@@ -3826,7 +4757,7 @@
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.10], [],
++m4_if([$1], [1.10.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
@@ -3846,22 +4777,24 @@
- [AM_AUTOMAKE_VERSION([1.8.3])])
-
-# AM_AUX_DIR_EXPAND
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+[AM_AUTOMAKE_VERSION([1.10])dnl
-+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
--
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
+-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -3874,10 +4807,12 @@
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-@@ -6016,24 +6686,14 @@
+@@ -6014,26 +6760,16 @@
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
- # AM_CONDITIONAL -*- Autoconf -*-
-
+-# AM_CONDITIONAL -*- Autoconf -*-
+-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
@@ -3889,7 +4824,8 @@
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
--
++# AM_CONDITIONAL -*- Autoconf -*-
+
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -3906,7 +4842,7 @@
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
-@@ -6042,8 +6702,10 @@
+@@ -6042,8 +6778,10 @@
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
@@ -3919,7 +4855,7 @@
if $2; then
$1_TRUE=
$1_FALSE='#'
-@@ -6053,30 +6715,18 @@
+@@ -6053,30 +6791,18 @@
fi
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
@@ -3958,7 +4894,7 @@
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
-@@ -6085,7 +6735,6 @@
+@@ -6085,7 +6811,6 @@
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
@@ -3966,7 +4902,7 @@
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-@@ -6105,6 +6754,7 @@
+@@ -6105,6 +6830,7 @@
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
@@ -3974,7 +4910,7 @@
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
-@@ -6170,13 +6820,19 @@
+@@ -6170,13 +6896,19 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
@@ -3997,7 +4933,7 @@
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
-@@ -6217,29 +6873,20 @@
+@@ -6217,29 +6949,20 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
@@ -4006,10 +4942,11 @@
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
- # Generate code to set up dependency tracking. -*- Autoconf -*-
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# Generate code to set up dependency tracking. -*- Autoconf -*-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
@@ -4036,7 +4973,7 @@
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
-@@ -6252,33 +6899,28 @@
+@@ -6252,33 +6975,28 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -4044,7 +4981,7 @@
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -4084,7 +5021,7 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
-@@ -6304,54 +6946,31 @@
+@@ -6304,54 +7022,31 @@
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
@@ -4119,11 +5056,12 @@
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
- # Do all the work for Automake. -*- Autoconf -*-
-
+-# Do all the work for Automake. -*- Autoconf -*-
+-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
--
++# Do all the work for Automake. -*- Autoconf -*-
+
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
@@ -4132,7 +5070,7 @@
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006 Free Software Foundation, Inc.
++# 2005, 2006, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
@@ -4142,7 +5080,7 @@
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-+# serial 12
++# serial 13
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
@@ -4155,7 +5093,7 @@
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
-@@ -6365,16 +6984,20 @@
+@@ -6365,16 +7060,20 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
@@ -4169,18 +5107,19 @@
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
fi
# test whether we have cygpath
-@@ -6394,6 +7017,9 @@
+@@ -6394,6 +7093,9 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
@@ -4190,7 +5129,7 @@
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-@@ -6409,7 +7035,6 @@
+@@ -6409,7 +7111,6 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
@@ -4198,7 +5137,7 @@
AM_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-@@ -6418,7 +7043,9 @@
+@@ -6418,7 +7119,9 @@
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -4209,7 +5148,7 @@
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)],
-@@ -6428,6 +7055,10 @@
+@@ -6428,6 +7131,10 @@
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
@@ -4220,16 +5159,30 @@
])
])
-@@ -6452,51 +7083,27 @@
+@@ -6441,62 +7148,39 @@
+ # our stamp files there.
+ AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+ [# Compute $1's index in $config_headers.
++_am_arg=$1
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+- $1 | $1:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
++
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-+
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -4285,10 +5238,12 @@
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
-@@ -6513,24 +7120,13 @@
+@@ -6511,26 +7195,15 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
- # Check to see how 'make' treats includes. -*- Autoconf -*-
-
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
@@ -4300,7 +5255,8 @@
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
--
++# Check to see how 'make' treats includes. -*- Autoconf -*-
+
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -4316,13 +5272,20 @@
# AM_MAKE_INCLUDE()
# -----------------
-@@ -6574,27 +7170,16 @@
+@@ -6574,27 +7247,16 @@
rm -f confinc confmf
])
-# -*- Autoconf -*-
--
--
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
@@ -4334,25 +5297,18 @@
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
+-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
+-
-# serial 3
+# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
-@@ -6610,6 +7195,7 @@
+@@ -6610,6 +7272,7 @@
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -4360,7 +5316,7 @@
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
-@@ -6620,92 +7206,41 @@
+@@ -6620,92 +7283,41 @@
fi
])
@@ -4436,6 +5392,15 @@
- fi
-fi
-AC_SUBST([mkdir_p])])
+-
+-# Helper functions for option handling. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
@@ -4452,20 +5417,12 @@
+esac
+])
- # Helper functions for option handling. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
--
++# Helper functions for option handling. -*- Autoconf -*-
+
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -4481,14 +5438,15 @@
# _AM_MANGLE_OPTION(NAME)
# -----------------------
-@@ -6730,28 +7265,16 @@
+@@ -6730,28 +7342,16 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-#
-# Check to make sure that the build environment is sane.
-#
--
++# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
@@ -4500,8 +5458,7 @@
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
+-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -4518,7 +5475,7 @@
# AM_SANITY_CHECK
# ---------------
-@@ -6794,25 +7317,14 @@
+@@ -6794,25 +7394,14 @@
fi
AC_MSG_RESULT(yes)])
@@ -4551,7 +5508,7 @@
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
-@@ -6830,6 +7342,114 @@
+@@ -6830,6 +7419,114 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
@@ -4567,7 +5524,7 @@
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
-+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
@@ -4667,9 +5624,8 @@
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
-diff -ubrN libGenome-1.3.0.orig/configure libGenome-1.3.0/configure
---- libGenome-1.3.0.orig/configure 2007-01-31 06:36:00.000000000 +0100
-+++ libGenome-1.3.0/configure 2008-02-20 16:00:51.000000000 +0100
+--- libGenome-1.3.0.orig.orig/configure
++++ libGenome-1.3.0.orig/configure
@@ -1,25 +1,54 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -4814,6 +5770,7 @@
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
@@ -4826,7 +5783,7 @@
+ s//\1/
+ q
+ }
- s/.*/./; q'`
++ s/.*/./; q'`
+# CDPATH.
+$as_unset CDPATH
@@ -4952,7 +5909,8 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
+- case $as_dir in
++ case $as_dir in
/*)
- if ("$as_dir/$as_base" -c '
+ for as_base in sh bash ksh sh5; do
@@ -5067,6 +6025,10 @@
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
+- done
+-done
+-;;
+- esac
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
@@ -5076,10 +6038,7 @@
+
+fi
+
- done
--done
--;;
-- esac
++ done
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
@@ -5262,16 +6221,16 @@
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
-- as_ln_s='cp -p'
-- else
- as_ln_s='ln -s'
-- fi
++ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ as_ln_s='cp -p'
+ as_ln_s='cp -p'
+- else
+- as_ln_s='ln -s'
+- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
@@ -5382,7 +6341,7 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -430,42 +735,176 @@
+@@ -430,42 +735,178 @@
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -5421,12 +6380,13 @@
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-+#endif
-+#ifdef HAVE_STDINT_H
- # include <stdint.h>
+-# include <stdint.h>
-# endif
#endif
-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -5538,6 +6498,8 @@
+ECHO
+AR
+RANLIB
++DSYMUTIL
++NMEDIT
+CPP
+CXXCPP
+F77
@@ -5572,7 +6534,7 @@
# Initialize some variables set by options.
ac_init_help=
-@@ -492,34 +931,48 @@
+@@ -492,34 +933,48 @@
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
@@ -5628,7 +6590,7 @@
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -541,33 +994,45 @@
+@@ -541,33 +996,45 @@
--config-cache | -C)
cache_file=config.cache ;;
@@ -5687,7 +6649,7 @@
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -594,6 +1059,12 @@
+@@ -594,6 +1061,12 @@
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -5700,7 +6662,7 @@
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-@@ -618,13 +1089,16 @@
+@@ -618,13 +1091,16 @@
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -5721,7 +6683,7 @@
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -689,6 +1163,16 @@
+@@ -689,6 +1165,16 @@
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -5738,7 +6700,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-@@ -741,24 +1225,20 @@
+@@ -741,24 +1227,20 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -5769,7 +6731,7 @@
--x)
# Obsolete; use --with-x.
-@@ -789,8 +1269,7 @@
+@@ -789,8 +1271,7 @@
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
@@ -5779,15 +6741,21 @@
export $ac_envvar ;;
*)
-@@ -810,27 +1289,19 @@
+@@ -810,27 +1291,19 @@
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
--do
++# Be sure to have absolute directory names.
++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
++ datadir sysconfdir sharedstatedir localstatedir includedir \
++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++ libdir localedir mandir
+ do
- eval ac_val=$`echo $ac_var`
-- case $ac_val in
++ eval ac_val=\$$ac_var
+ case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -5797,15 +6765,9 @@
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+ datadir sysconfdir sharedstatedir localstatedir includedir \
-+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+ libdir localedir mandir
- do
+-do
- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
+- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -5817,7 +6779,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -857,94 +1328,76 @@
+@@ -857,94 +1330,76 @@
test "$silent" = yes && exec 6>/dev/null
@@ -5849,6 +6811,7 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -5865,7 +6828,7 @@
+ s//\1/
+ q
+ }
- s/.*/./; q'`
++ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
@@ -5877,12 +6840,13 @@
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-- { (exit 1); exit 1; }; }
-- else
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
+- else
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+- { (exit 1); exit 1; }; }
- fi
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
@@ -5964,7 +6928,7 @@
#
# Report the --help message.
-@@ -973,9 +1426,6 @@
+@@ -973,9 +1428,6 @@
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
@@ -5974,7 +6938,7 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
-@@ -993,15 +1443,22 @@
+@@ -993,15 +1445,22 @@
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
@@ -6000,7 +6964,7 @@
_ACEOF
cat <<\_ACEOF
-@@ -1027,10 +1484,8 @@
+@@ -1027,10 +1486,8 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
@@ -6013,7 +6977,7 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
-@@ -1043,16 +1498,16 @@
+@@ -1043,16 +1500,16 @@
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
@@ -6034,7 +6998,7 @@
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CPP C preprocessor
-@@ -1064,118 +1519,86 @@
+@@ -1064,118 +1521,86 @@
it to find libraries and programs with nonstandard names/locations.
_ACEOF
@@ -6199,7 +7163,7 @@
{
cat <<_ASUNAME
## --------- ##
-@@ -1194,7 +1617,7 @@
+@@ -1194,7 +1619,7 @@
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -6208,7 +7172,7 @@
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-@@ -1208,6 +1631,7 @@
+@@ -1208,6 +1633,7 @@
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
@@ -6216,7 +7180,7 @@
} >&5
-@@ -1229,7 +1653,6 @@
+@@ -1229,7 +1655,6 @@
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -6224,7 +7188,7 @@
ac_must_keep_next=false
for ac_pass in 1 2
do
-@@ -1240,7 +1663,7 @@
+@@ -1240,7 +1665,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -6233,7 +7197,7 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1262,9 +1685,7 @@
+@@ -1262,9 +1687,7 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -6244,7 +7208,7 @@
;;
esac
done
-@@ -1275,8 +1696,8 @@
+@@ -1275,8 +1698,8 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
@@ -6255,7 +7219,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1289,20 +1710,34 @@
+@@ -1289,20 +1712,34 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -6278,31 +7242,29 @@
(set) 2>&1 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
-- sed -n \
-- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-- ;;
-- *)
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
-- esac;
--}
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
-+ *)
+ *)
+- sed -n \
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+ ;;
+ ;;
+- esac;
+-}
+ esac |
+ sort
+)
echo
cat <<\_ASBOX
-@@ -1313,22 +1748,28 @@
+@@ -1313,22 +1750,28 @@
echo
for ac_var in $ac_subst_vars
do
@@ -6338,7 +7300,7 @@
done | sort
echo
fi
-@@ -1340,26 +1781,24 @@
+@@ -1340,26 +1783,24 @@
## ----------- ##
_ASBOX
echo
@@ -6370,7 +7332,7 @@
# Predefined preprocessor variables.
-@@ -1390,14 +1829,17 @@
+@@ -1390,14 +1831,17 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -6395,7 +7357,7 @@
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1413,8 +1855,8 @@
+@@ -1413,8 +1857,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -6406,7 +7368,7 @@
esac
fi
else
-@@ -1426,12 +1868,11 @@
+@@ -1426,12 +1870,11 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -6422,7 +7384,7 @@
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1456,8 +1897,7 @@
+@@ -1456,8 +1899,7 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -6432,7 +7394,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1474,12 +1914,6 @@
+@@ -1474,12 +1916,6 @@
{ (exit 1); exit 1; }; }
fi
@@ -6445,7 +7407,7 @@
-@@ -1496,108 +1930,163 @@
+@@ -1496,108 +1932,163 @@
@@ -6661,7 +7623,7 @@
# The aliases save the names the user supplied, while $host etc.
-@@ -1652,7 +2141,8 @@
+@@ -1652,7 +2143,8 @@
VERSION=$GENERIC_VERSION
@@ -6671,7 +7633,7 @@
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
-@@ -1666,8 +2156,8 @@
+@@ -1666,8 +2158,8 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -6682,7 +7644,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1689,7 +2179,7 @@
+@@ -1689,7 +2181,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6691,7 +7653,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -1708,21 +2198,22 @@
+@@ -1708,21 +2200,22 @@
;;
esac
done
@@ -6719,7 +7681,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -1732,8 +2223,8 @@
+@@ -1732,8 +2225,8 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -6730,7 +7692,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -1775,20 +2266,20 @@
+@@ -1775,20 +2268,20 @@
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6756,7 +7718,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1803,37 +2294,60 @@
+@@ -1803,37 +2296,60 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -6776,6 +7738,10 @@
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
+- done
+- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+- if test -f "$ac_aux_dir/mkinstalldirs"; then
+- mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
@@ -6798,10 +7764,7 @@
+ break 3;;
+ esac
+ done
- done
-- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-- if test -f "$ac_aux_dir/mkinstalldirs"; then
-- mkdir_p='$(mkinstalldirs)'
++ done
+done
+IFS=$as_save_IFS
+
@@ -6839,7 +7802,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1846,54 +2360,57 @@
+@@ -1846,54 +2362,57 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6918,27 +7881,28 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -1906,12 +2423,16 @@
+@@ -1906,12 +2425,16 @@
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
+- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
-@@ -1945,10 +2466,7 @@
+@@ -1945,10 +2468,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -6950,7 +7914,7 @@
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
-@@ -1958,8 +2476,8 @@
+@@ -1958,8 +2478,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -6961,7 +7925,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1972,32 +2490,34 @@
+@@ -1972,32 +2492,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7003,7 +7967,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2010,36 +2530,57 @@
+@@ -2010,36 +2532,57 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7033,6 +7997,7 @@
+echo "${ECHO_T}no" >&6; }
fi
+- STRIP=$ac_ct_STRIP
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
@@ -7046,7 +8011,7 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
- STRIP=$ac_ct_STRIP
++ STRIP=$ac_ct_STRIP
+ fi
else
STRIP="$ac_cv_prog_STRIP"
@@ -7068,7 +8033,7 @@
-@@ -2056,8 +2597,8 @@
+@@ -2056,8 +2599,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7079,7 +8044,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2070,32 +2611,34 @@
+@@ -2070,32 +2613,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7121,7 +8086,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2108,26 +2651,41 @@
+@@ -2108,36 +2653,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7150,6 +8115,7 @@
+echo "${ECHO_T}no" >&6; }
fi
+- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
@@ -7163,14 +8129,17 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
- CC=$ac_ct_CC
++ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
-@@ -2136,8 +2694,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+
+ if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -7179,7 +8148,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2150,74 +2708,34 @@
+@@ -2150,74 +2710,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7263,7 +8232,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2231,7 +2749,7 @@
+@@ -2231,7 +2751,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7272,7 +8241,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2242,6 +2760,7 @@
+@@ -2242,6 +2762,7 @@
fi
done
done
@@ -7280,7 +8249,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2259,22 +2778,23 @@
+@@ -2259,22 +2780,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7311,7 +8280,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2287,36 +2807,38 @@
+@@ -2287,36 +2809,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7358,7 +8327,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2329,29 +2851,45 @@
+@@ -2329,29 +2853,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7391,6 +8360,7 @@
test -n "$ac_ct_CC" && break
done
+- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
@@ -7404,12 +8374,12 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
- CC=$ac_ct_CC
++ CC=$ac_ct_CC
+ fi
fi
fi
-@@ -2364,21 +2902,35 @@
+@@ -2364,21 +2904,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7453,7 +8423,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2403,47 +2955,77 @@
+@@ -2403,47 +2957,77 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -7522,13 +8492,14 @@
# certainly right.
break;;
*.* )
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ then :; else
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++ then :; else
++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
@@ -7552,7 +8523,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2455,19 +3037,21 @@
+@@ -2455,19 +3039,21 @@
fi
ac_exeext=$ac_cv_exeext
@@ -7581,7 +8552,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2486,22 +3070,27 @@
+@@ -2486,22 +3072,27 @@
fi
fi
fi
@@ -7621,7 +8592,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2512,9 +3101,8 @@
+@@ -2512,9 +3103,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7632,7 +8603,7 @@
break;;
* ) break;;
esac
-@@ -2528,14 +3116,14 @@
+@@ -2528,14 +3118,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -7651,7 +8622,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2555,14 +3143,20 @@
+@@ -2555,14 +3145,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -7676,7 +8647,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2580,12 +3174,12 @@
+@@ -2580,12 +3176,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -7693,7 +8664,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2608,49 +3202,48 @@
+@@ -2608,50 +3204,49 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7758,14 +8729,16 @@
if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
+- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -2667,311 +3260,248 @@
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2667,38 +3262,118 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7788,14 +8761,87 @@
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_prog_cc_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
@@ -7807,85 +8853,64 @@
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
--fi
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
--if test "$ac_test_CFLAGS" = set; then
-- CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
-- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-- else
-- CFLAGS="-g"
-- fi
--else
-- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-- else
-- CFLAGS=
-- fi
--fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -2714,12 +3389,12 @@
+ CFLAGS=
+ fi
+ fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- ac_cv_prog_cc_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
++ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
-- char **p;
-- int i;
--{
-- return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
-- char *s;
-- va_list v;
-- va_start (v,p);
-- s = g (p, va_arg (v,int));
-- va_end (v);
-- return s;
--}
--
--/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-- function prototypes and stuff, but not '\xHH' hex character constants.
-- These don't provoke an error unfortunately, instead are silently treated
+@@ -2753,12 +3428,17 @@
+ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
-- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-- array size at least. It's necessary to write '\x00'==0 to get something
++ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++ that's true only with -std. */
+ int osf4_cc_array ['\x00' == 0 ? 1 : -1];
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
- int
- main ()
- {
--return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
- ;
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -2773,205 +3453,57 @@
return 0;
}
_ACEOF
@@ -7897,12 +8922,13 @@
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
-- CC="$ac_save_CC $ac_arg"
-- rm -f conftest.$ac_objext
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -7935,29 +8961,45 @@
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-+ :
++ ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--fi
++
+ fi
-rm -f conftest.err conftest.$ac_objext
--done
++
++rm -f core conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
-rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
++rm -f conftest.$ac_ext
+ CC=$ac_save_CC
+
+ fi
-
--fi
--
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-- *)
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++ xno)
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
--esac
--
++ CC="$CC $ac_cv_prog_cc_c89"
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
@@ -7997,41 +9039,30 @@
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-exit (42);
-+
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
@@ -8047,133 +9078,36 @@
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-continue
-+
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-g"
-+ fi
-+else
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-$ac_declaration
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
- int
- main ()
- {
+-int
+-main ()
+-{
-exit (42);
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
@@ -8189,45 +9123,20 @@
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
+-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
- fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+ *)
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-
+-fi
+-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -8237,7 +9146,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2979,7 +3509,7 @@
+@@ -2979,7 +3511,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
DEPDIR="${am__leading_dot}deps"
@@ -8246,7 +9155,7 @@
am_make=${MAKE-make}
-@@ -2989,8 +3519,8 @@
+@@ -2989,8 +3521,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -8257,7 +9166,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -3017,22 +3547,20 @@
+@@ -3017,22 +3549,20 @@
fi
@@ -8286,7 +9195,7 @@
AMDEP_TRUE=
AMDEP_FALSE='#'
else
-@@ -3042,11 +3570,10 @@
+@@ -3042,11 +3572,10 @@
@@ -8300,7 +9209,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3110,13 +3637,19 @@
+@@ -3110,13 +3639,19 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
@@ -8323,7 +9232,7 @@
am_cv_CC_dependencies_compiler_type=$depmode
break
fi
-@@ -3130,13 +3663,11 @@
+@@ -3130,13 +3665,11 @@
fi
fi
@@ -8340,7 +9249,7 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
-@@ -3147,18 +3678,22 @@
+@@ -3147,18 +3680,22 @@
fi
@@ -8368,7 +9277,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3171,36 +3706,38 @@
+@@ -3171,36 +3708,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8415,7 +9324,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3213,55 +3750,85 @@
+@@ -3213,55 +3752,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8449,6 +9358,7 @@
done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+- CXX=$ac_ct_CXX
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
@@ -8462,7 +9372,7 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
- CXX=$ac_ct_CXX
++ CXX=$ac_ct_CXX
+ fi
fi
@@ -8518,7 +9428,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3284,49 +3851,48 @@
+@@ -3284,50 +3853,49 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8583,14 +9493,16 @@
if test "${ac_cv_prog_cxx_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
+- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -3343,159 +3909,133 @@
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3343,159 +3911,133 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8660,8 +9572,9 @@
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
+- cat >conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8720,9 +9633,10 @@
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8817,7 +9731,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3504,8 +4044,8 @@
+@@ -3504,8 +4046,8 @@
depcc="$CXX" am_compiler_list=
@@ -8828,7 +9742,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3569,13 +4109,19 @@
+@@ -3569,13 +4111,19 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
@@ -8851,7 +9765,7 @@
am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
-@@ -3589,13 +4135,11 @@
+@@ -3589,13 +4137,11 @@
fi
fi
@@ -8868,7 +9782,7 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
-@@ -3606,10 +4150,9 @@
+@@ -3606,10 +4152,9 @@
fi
@@ -8881,15 +9795,15 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -3628,12 +4171,12 @@
+@@ -3628,12 +4173,12 @@
esac
else
enable_shared=yes
-fi;
+fi
++
-# Check whether --enable-static or --disable-static was given.
-+
+# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then
- enableval="$enable_static"
@@ -8898,15 +9812,15 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -3652,12 +4195,12 @@
+@@ -3652,12 +4197,12 @@
esac
else
enable_static=yes
-fi;
+fi
++
-# Check whether --enable-fast-install or --disable-fast-install was given.
-+
+# Check whether --enable-fast-install was given.
if test "${enable_fast_install+set}" = set; then
- enableval="$enable_fast_install"
@@ -8915,22 +9829,22 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -3676,10 +4219,11 @@
+@@ -3676,10 +4221,11 @@
esac
else
enable_fast_install=yes
-fi;
+fi
++
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3692,18 +4236,19 @@
+@@ -3692,18 +4238,19 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8952,18 +9866,24 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -3728,41 +4273,189 @@
+@@ -3728,61 +4275,209 @@
fi
done
done
+-SED=$lt_cv_path_SED
+
+ fi
+
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
++SED=$lt_cv_path_SED
+
-+fi
-+
- SED=$lt_cv_path_SED
-
+{ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
-+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
@@ -8973,8 +9893,11 @@
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+- then ac_cv_prog_egrep='grep -E'
+- else ac_cv_prog_egrep='egrep'
+ ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9007,7 +9930,7 @@
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
-+ fi
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -9030,32 +9953,58 @@
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
-+fi
-+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+
+else
+ ac_cv_path_GREP=$GREP
+fi
-+
-+
- fi
+
+
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
-
--echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
++
++
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
+- with_gnu_ld=no
+-fi;
+-ac_prog=ld
+-if test "$GCC" = yes; then
+- # Check if gcc -print-prog-name=ld gives a path.
+- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+- case $host in
+- *-*-mingw*)
+- # gcc leaves a trailing carriage return which upsets mingw
+- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+- *)
+- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+- esac
+- case $ac_prog in
+- # Accept absolute paths.
+- [\\/]* | ?:[\\/]*)
+- re_direlt='/[^/][^/]*/\.\./'
+- # Canonicalize the pathname of ld
+- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+- done
+- test -z "$LD" && LD="$ac_prog"
+- ;;
+- "")
+- # If it fails, then pretend we aren't using GCC.
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -9127,40 +10076,51 @@
+fi
+
+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
++ fi
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
-
-
-
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
++
++
++
+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
-- withval="$with_gnu_ld"
-- test "$withval" = no || with_gnu_ld=yes
++if test "${with_gnu_ld+set}" = set; then
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
- with_gnu_ld=no
--fi;
++else
++ with_gnu_ld=no
+fi
+
- ac_prog=ld
- if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
-- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++ac_prog=ld
++if test "$GCC" = yes; then
++ # Check if gcc -print-prog-name=ld gives a path.
+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -3791,11 +4484,11 @@
++ case $host in
++ *-*-mingw*)
++ # gcc leaves a trailing carriage return which upsets mingw
++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++ *)
++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++ esac
++ case $ac_prog in
++ # Accept absolute paths.
++ [\\/]* | ?:[\\/]*)
++ re_direlt='/[^/][^/]*/\.\./'
++ # Canonicalize the pathname of ld
++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++ done
++ test -z "$LD" && LD="$ac_prog"
++ ;;
++ "")
++ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
;;
+ *)
+@@ -3791,11 +4486,11 @@
+ ;;
esac
elif test "$with_gnu_ld" = yes; then
- echo "$as_me:$LINENO: checking for GNU ld" >&5
@@ -9175,7 +10135,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3808,7 +4501,7 @@
+@@ -3808,7 +4503,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -9184,7 +10144,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -3828,21 +4521,21 @@
+@@ -3828,21 +4523,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9213,7 +10173,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -3852,29 +4545,38 @@
+@@ -3852,29 +4547,38 @@
;;
esac
fi
@@ -9260,35 +10220,71 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3882,11 +4584,16 @@
+@@ -3882,56 +4586,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
+ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
-- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
+ tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-@@ -3908,30 +4615,32 @@
- continue # so that we can try to find one that supports BSD flags
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
+ break
;;
+ *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
+ ;;
esac
-+ ;;
- esac
- fi
+- esac
+- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
done
- IFS="$lt_save_ifs"
-+ done
+- IFS="$lt_save_ifs"
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
@@ -9322,10 +10318,19 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3958,36 +4667,42 @@
+@@ -3950,7 +4661,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
lt_cv_deplibs_check_method=pass_all
;;
+@@ -3958,36 +4669,42 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
-bsdi4*)
+bsdi[45]*)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
@@ -9344,14 +10349,16 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
- # win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
@@ -9371,7 +10378,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -4003,7 +4718,7 @@
+@@ -4003,7 +4720,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -9380,7 +10387,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -4019,6 +4734,11 @@
+@@ -4019,6 +4736,11 @@
esac
;;
@@ -9392,7 +10399,7 @@
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -4030,20 +4750,11 @@
+@@ -4030,20 +4752,11 @@
;;
# This must be Linux ELF.
@@ -9415,7 +10422,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -4062,12 +4773,10 @@
+@@ -4062,12 +4775,10 @@
;;
openbsd*)
@@ -9430,7 +10437,7 @@
fi
;;
-@@ -4075,7 +4784,7 @@
+@@ -4075,7 +4786,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -9439,7 +10446,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -4083,7 +4792,7 @@
+@@ -4083,7 +4794,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -9448,7 +10455,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -4104,17 +4813,20 @@
+@@ -4104,17 +4815,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -9472,7 +10479,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -4125,15 +4837,18 @@
+@@ -4125,15 +4839,18 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -9494,16 +10501,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -4160,7 +4875,7 @@
+@@ -4160,7 +4877,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4163 "configure"' > conftest.$ac_ext
-+ echo '#line 4878 "configure"' > conftest.$ac_ext
++ echo '#line 4880 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -4195,7 +4910,8 @@
+@@ -4195,7 +4912,8 @@
rm -rf conftest*
;;
@@ -9513,7 +10520,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -4203,9 +4919,12 @@
+@@ -4203,9 +4921,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -9527,7 +10534,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -4222,6 +4941,9 @@
+@@ -4222,6 +4943,9 @@
;;
*64-bit*)
case $host in
@@ -9537,7 +10544,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -4245,8 +4967,8 @@
+@@ -4245,8 +4969,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -9548,7 +10555,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4272,35 +4994,32 @@
+@@ -4272,35 +4996,32 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9599,7 +10606,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4309,13 +5028,33 @@
+@@ -4309,13 +5030,37 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9624,7 +10631,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+ *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
@@ -9635,7 +10646,7 @@
esac
-@@ -4327,8 +5066,8 @@
+@@ -4327,8 +5072,8 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9646,7 +10657,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -4362,24 +5101,22 @@
+@@ -4362,24 +5107,22 @@
#endif
Syntax error
_ACEOF
@@ -9682,7 +10693,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4388,9 +5125,10 @@
+@@ -4388,9 +5131,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9694,7 +10705,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4400,24 +5138,22 @@
+@@ -4400,24 +5144,22 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -9730,7 +10741,7 @@
# Broken: success on invalid input.
continue
else
-@@ -4428,6 +5164,7 @@
+@@ -4428,6 +5170,7 @@
ac_preproc_ok=:
break
fi
@@ -9738,7 +10749,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -4445,8 +5182,8 @@
+@@ -4445,8 +5188,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -9749,7 +10760,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -4469,24 +5206,22 @@
+@@ -4469,24 +5212,22 @@
#endif
Syntax error
_ACEOF
@@ -9785,7 +10796,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4495,9 +5230,10 @@
+@@ -4495,9 +5236,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9797,7 +10808,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4507,24 +5243,22 @@
+@@ -4507,24 +5249,22 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -9833,7 +10844,7 @@
# Broken: success on invalid input.
continue
else
-@@ -4535,6 +5269,7 @@
+@@ -4535,6 +5275,7 @@
ac_preproc_ok=:
break
fi
@@ -9841,7 +10852,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -4557,8 +5292,8 @@
+@@ -4557,8 +5298,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9852,7 +10863,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4582,35 +5317,31 @@
+@@ -4582,35 +5323,31 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9902,7 +10913,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -4666,6 +5397,7 @@
+@@ -4666,6 +5403,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -9910,7 +10921,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -4685,18 +5417,27 @@
+@@ -4685,18 +5423,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -9944,7 +10955,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4709,12 +5450,14 @@
+@@ -4709,12 +5456,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -9962,7 +10973,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -4737,9 +5480,9 @@
+@@ -4737,9 +5486,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -9975,7 +10986,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -4753,38 +5496,35 @@
+@@ -4753,38 +5502,35 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -10031,7 +11042,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -4799,18 +5539,19 @@
+@@ -4799,18 +5545,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -10059,7 +11070,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4821,41 +5562,37 @@
+@@ -4821,41 +5568,37 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -10119,7 +11130,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4864,24 +5601,22 @@
+@@ -4864,24 +5607,22 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -10155,7 +11166,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4889,9 +5624,10 @@
+@@ -4889,9 +5630,10 @@
ac_header_preproc=no
fi
@@ -10168,7 +11179,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4915,25 +5651,19 @@
+@@ -4915,25 +5657,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -10201,7 +11212,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -4945,13 +5675,18 @@
+@@ -4945,13 +5681,18 @@
done
@@ -10223,7 +11234,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4981,24 +5716,22 @@
+@@ -4981,24 +5722,22 @@
#endif
Syntax error
_ACEOF
@@ -10259,7 +11270,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5007,9 +5740,10 @@
+@@ -5007,9 +5746,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10271,7 +11282,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5019,24 +5753,22 @@
+@@ -5019,24 +5759,22 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10307,7 +11318,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5047,6 +5779,7 @@
+@@ -5047,6 +5785,7 @@
ac_preproc_ok=:
break
fi
@@ -10315,7 +11326,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -5064,8 +5797,8 @@
+@@ -5064,8 +5803,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -10326,7 +11337,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -5088,24 +5821,22 @@
+@@ -5088,24 +5827,22 @@
#endif
Syntax error
_ACEOF
@@ -10362,7 +11373,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5114,9 +5845,10 @@
+@@ -5114,9 +5851,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10374,7 +11385,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5126,24 +5858,22 @@
+@@ -5126,24 +5864,22 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10410,7 +11421,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5154,6 +5884,7 @@
+@@ -5154,6 +5890,7 @@
ac_preproc_ok=:
break
fi
@@ -10418,7 +11429,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -5169,24 +5900,26 @@
+@@ -5169,24 +5906,26 @@
{ (exit 1); exit 1; }; }
fi
@@ -10449,7 +11460,7 @@
if test "${ac_cv_prog_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5199,36 +5932,38 @@
+@@ -5199,36 +5938,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10496,7 +11507,7 @@
if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5241,48 +5976,78 @@
+@@ -5241,48 +5982,78 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10529,6 +11540,7 @@
test -n "$ac_ct_F77" && break
done
+- F77=$ac_ct_F77
+ if test "x$ac_ct_F77" = x; then
+ F77=""
+ else
@@ -10542,7 +11554,7 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
- F77=$ac_ct_F77
++ F77=$ac_ct_F77
+ fi
fi
@@ -10588,7 +11600,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -5292,8 +6057,8 @@
+@@ -5292,8 +6063,8 @@
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
@@ -10599,7 +11611,7 @@
if test "${ac_cv_f77_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5306,46 +6071,42 @@
+@@ -5306,46 +6077,42 @@
end
_ACEOF
rm -f conftest.$ac_objext
@@ -10664,7 +11676,7 @@
if test "${ac_cv_prog_f77_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5356,39 +6117,35 @@
+@@ -5356,39 +6123,35 @@
end
_ACEOF
rm -f conftest.$ac_objext
@@ -10720,9 +11732,11 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -5417,13 +6174,13 @@
+@@ -5415,15 +6178,14 @@
+
+
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
+-
# find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
@@ -10737,10 +11751,28 @@
case $build_os in
msdosdjgpp*)
-@@ -5458,43 +6215,91 @@
+@@ -5458,43 +6220,91 @@
lt_cv_sys_max_cmd_len=8192;
;;
+- *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring=$testring$testring
+- done
+- testring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
@@ -10784,13 +11816,7 @@
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-- = "XX$testring") >/dev/null 2>&1 &&
-- new_result=`expr "X$testring" : ".*" 2>&1` &&
++ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
@@ -10800,19 +11826,17 @@
+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
-- testring=$testring$testring
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
+ teststring=$teststring$teststring
- done
-- testring=
++ done
+ teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
;;
esac
@@ -10843,7 +11867,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5508,9 +6313,6 @@
+@@ -5508,9 +6318,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -10853,7 +11877,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -5532,15 +6334,31 @@
+@@ -5532,15 +6339,31 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -10886,7 +11910,7 @@
sysv4)
symcode='[DFNSTU]'
;;
-@@ -5563,8 +6381,11 @@
+@@ -5563,8 +6386,11 @@
# Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do
@@ -10899,7 +11923,16 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -5682,15 +6503,15 @@
+@@ -5666,7 +6492,7 @@
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -5682,15 +6508,15 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -10921,7 +11954,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5704,8 +6525,8 @@
+@@ -5704,8 +6530,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -10932,7 +11965,7 @@
objdir=$lt_cv_objdir
-@@ -5726,7 +6547,7 @@
+@@ -5726,7 +6552,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -10941,7 +11974,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -5746,7 +6567,7 @@
+@@ -5746,7 +6572,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -10950,7 +11983,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -5756,8 +6577,8 @@
+@@ -5756,8 +6582,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -10961,7 +11994,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5770,32 +6591,34 @@
+@@ -5770,32 +6596,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11003,7 +12036,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5808,27 +6631,41 @@
+@@ -5808,27 +6636,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11033,6 +12066,7 @@
+echo "${ECHO_T}no" >&6; }
fi
+- AR=$ac_ct_AR
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
@@ -11046,12 +12080,12 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
- AR=$ac_ct_AR
++ AR=$ac_ct_AR
+ fi
else
AR="$ac_cv_prog_AR"
fi
-@@ -5836,8 +6673,8 @@
+@@ -5836,8 +6678,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -11062,7 +12096,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5850,32 +6687,34 @@
+@@ -5850,32 +6692,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11104,7 +12138,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5888,27 +6727,41 @@
+@@ -5888,27 +6732,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11134,6 +12168,7 @@
+echo "${ECHO_T}no" >&6; }
fi
+- RANLIB=$ac_ct_RANLIB
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
@@ -11147,12 +12182,12 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
- RANLIB=$ac_ct_RANLIB
++ RANLIB=$ac_ct_RANLIB
+ fi
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -5916,8 +6769,8 @@
+@@ -5916,8 +6774,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -11163,7 +12198,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5930,32 +6783,34 @@
+@@ -5930,32 +6788,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11205,7 +12240,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5968,27 +6823,41 @@
+@@ -5968,27 +6828,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11235,6 +12270,7 @@
+echo "${ECHO_T}no" >&6; }
fi
+- STRIP=$ac_ct_STRIP
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
@@ -11248,12 +12284,12 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
- STRIP=$ac_ct_STRIP
++ STRIP=$ac_ct_STRIP
+ fi
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -6003,6 +6872,7 @@
+@@ -6003,6 +6877,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -11261,7 +12297,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -6015,28 +6885,39 @@
+@@ -6015,28 +6890,39 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -11306,7 +12342,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6056,7 +6937,7 @@
+@@ -6056,7 +6942,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -11315,7 +12351,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -6088,17 +6969,17 @@
+@@ -6088,17 +6974,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11339,7 +12375,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6118,7 +6999,7 @@
+@@ -6118,7 +7004,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -11348,7 +12384,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -6150,11 +7031,11 @@
+@@ -6150,11 +7036,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11364,7 +12400,322 @@
fi
else
-@@ -6169,21 +7050,21 @@
+@@ -6166,24 +7052,336 @@
+ ;;
+ esac
+
++
++ case $host_os in
++ rhapsody* | darwin*)
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$DSYMUTIL"; then
++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++echo "${ECHO_T}$DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_DSYMUTIL"; then
++ ac_ct_DSYMUTIL=$DSYMUTIL
++ # Extract the first word of "dsymutil", so it can be a program name with args.
++set dummy dsymutil; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_DSYMUTIL"; then
++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
++if test -n "$ac_ct_DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_DSYMUTIL" = x; then
++ DSYMUTIL=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ DSYMUTIL=$ac_ct_DSYMUTIL
++ fi
++else
++ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
++fi
++
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
++set dummy ${ac_tool_prefix}nmedit; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$NMEDIT"; then
++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++NMEDIT=$ac_cv_prog_NMEDIT
++if test -n "$NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
++echo "${ECHO_T}$NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_NMEDIT"; then
++ ac_ct_NMEDIT=$NMEDIT
++ # Extract the first word of "nmedit", so it can be a program name with args.
++set dummy nmedit; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_NMEDIT"; then
++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_NMEDIT="nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
++if test -n "$ac_ct_NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_NMEDIT" = x; then
++ NMEDIT=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ NMEDIT=$ac_ct_NMEDIT
++ fi
++else
++ NMEDIT="$ac_cv_prog_NMEDIT"
++fi
++
++
++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ lt_cv_ld_exported_symbols_list=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ lt_cv_ld_exported_symbols_list=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
++ case $host_os in
++ rhapsody* | darwin1.[0123])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[012]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++
++
enable_dlopen=no
enable_win32_dll=no
@@ -11393,7 +12744,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -6204,77 +7085,34 @@
+@@ -6204,77 +7402,34 @@
objext=$objext
# Code to be used in simple compile tests
@@ -11484,11 +12835,11 @@
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
++$rm -r conftest*
-@@ -6284,14 +7122,14 @@
+@@ -6284,14 +7439,14 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -11506,7 +12857,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6299,26 +7137,28 @@
+@@ -6299,26 +7454,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -11515,12 +12866,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6305: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7143: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7460: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6309: \$? = $ac_status" >&5
-+ echo "$as_me:7147: \$? = $ac_status" >&5
++ echo "$as_me:7464: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -11542,7 +12893,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -6332,8 +7172,8 @@
+@@ -6332,8 +7489,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -11553,7 +12904,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -6355,13 +7195,15 @@
+@@ -6355,13 +7512,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -11571,7 +12922,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -6371,6 +7213,11 @@
+@@ -6371,6 +7530,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -11583,7 +12934,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -6387,7 +7234,7 @@
+@@ -6387,7 +7551,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -11592,7 +12943,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -6413,8 +7260,18 @@
+@@ -6413,8 +7577,18 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -11612,7 +12963,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -6424,7 +7281,7 @@
+@@ -6424,7 +7598,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -11621,7 +12972,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -6447,18 +7304,41 @@
+@@ -6447,18 +7621,41 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -11665,7 +13016,7 @@
esac
;;
-@@ -6468,15 +7348,19 @@
+@@ -6468,15 +7665,19 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -11689,7 +13040,7 @@
;;
sunos4*)
-@@ -6485,7 +7369,7 @@
+@@ -6485,7 +7686,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -11698,7 +13049,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -6498,6 +7382,17 @@
+@@ -6498,6 +7699,17 @@
fi
;;
@@ -11716,7 +13067,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -6509,22 +7404,22 @@
+@@ -6509,22 +7721,22 @@
esac
fi
@@ -11732,19 +13083,21 @@
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works+set}" = set; then
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works=no
+- lt_prog_compiler_pic_works=no
++ lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6532,26 +7427,28 @@
+@@ -6532,28 +7744,30 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -11753,21 +13106,22 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6538: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7433: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7750: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6542: \$? = $ac_status" >&5
-+ echo "$as_me:7437: \$? = $ac_status" >&5
++ echo "$as_me:7754: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+- lt_prog_compiler_pic_works=yes
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works=yes
++ lt_cv_prog_compiler_pic_works=yes
fi
fi
$rm conftest*
@@ -11775,12 +13129,15 @@
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
- if test x"$lt_prog_compiler_pic_works" = xyes; then
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -6564,7 +7461,7 @@
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -6564,7 +7778,7 @@
fi
fi
@@ -11789,22 +13146,23 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -6574,8 +7471,50 @@
+@@ -6574,9 +7788,51 @@
;;
esac
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+if test "${lt_prog_compiler_static_works+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
-+ lt_prog_compiler_static_works=no
++ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -11817,20 +13175,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ else
-+ lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ fi
-+ $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+
-+if test x"$lt_prog_compiler_static_works" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+else
+ lt_prog_compiler_static=
@@ -11839,10 +13197,11 @@
+
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6584,7 +7523,7 @@
+ lt_cv_prog_compiler_c_o=no
+@@ -6584,7 +7840,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -11851,7 +13210,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -6592,23 +7531,25 @@
+@@ -6592,23 +7848,25 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -11860,12 +13219,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6598: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7537: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7854: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6602: \$? = $ac_status" >&5
-+ echo "$as_me:7541: \$? = $ac_status" >&5
++ echo "$as_me:7858: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11882,7 +13241,7 @@
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
-@@ -6619,23 +7560,23 @@
+@@ -6619,23 +7877,23 @@
$rm conftest*
fi
@@ -11912,7 +13271,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -6645,8 +7586,8 @@
+@@ -6645,8 +7903,8 @@
need_locks=no
fi
@@ -11923,9 +13282,18 @@
runpath_var=
allow_undefined_flag=
-@@ -6684,6 +7625,16 @@
+@@ -6677,13 +7935,24 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
@@ -11940,7 +13308,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -6694,6 +7645,10 @@
+@@ -6694,6 +7963,10 @@
with_gnu_ld=no
fi
;;
@@ -11951,7 +13319,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -6704,6 +7659,27 @@
+@@ -6704,9 +7977,30 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -11978,8 +13346,12 @@
+
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
-@@ -6754,10 +7730,10 @@
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+@@ -6754,10 +8048,10 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -11992,7 +13364,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -6766,13 +7742,69 @@
+@@ -6766,13 +8060,69 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -12064,7 +13436,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -6782,7 +7814,7 @@
+@@ -6782,7 +8132,7 @@
fi
;;
@@ -12073,7 +13445,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -6803,6 +7835,33 @@
+@@ -6803,6 +8153,33 @@
fi
;;
@@ -12107,7 +13479,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -6810,31 +7869,6 @@
+@@ -6810,31 +8187,6 @@
hardcode_shlibpath_var=no
;;
@@ -12139,7 +13511,7 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6845,17 +7879,12 @@
+@@ -6845,16 +8197,11 @@
;;
esac
@@ -12151,17 +13523,17 @@
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
+- whole_archive_flag_spec=
+- fi
+ if test "$ld_shlibs" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
+ export_dynamic_flag_spec=
- whole_archive_flag_spec=
- fi
-- fi
++ whole_archive_flag_spec=
+ fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
-@@ -6866,7 +7895,7 @@
+@@ -6866,14 +8213,14 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -12170,7 +13542,23 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -6900,6 +7929,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -6893,13 +8240,14 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
break
fi
done
@@ -12178,7 +13566,7 @@
esac
exp_sym_flag='-bexport'
-@@ -6918,7 +7948,7 @@
+@@ -6918,7 +8266,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -12187,7 +13575,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -6926,7 +7956,7 @@
+@@ -6926,7 +8274,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -12196,7 +13584,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -6937,8 +7967,12 @@
+@@ -6937,8 +8285,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -12209,7 +13597,21 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -6978,49 +8012,54 @@
+@@ -6946,11 +8298,11 @@
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test "$aix_use_runtimelinking" = yes; then
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+- fi
++ fi
+ fi
+ fi
+
+@@ -6978,49 +8330,54 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12288,7 +13690,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -7039,39 +8078,44 @@
+@@ -7039,39 +8396,44 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12355,7 +13757,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -7080,13 +8124,11 @@
+@@ -7080,13 +8442,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -12372,7 +13774,7 @@
fi
fi
;;
-@@ -7099,7 +8141,7 @@
+@@ -7099,7 +8459,7 @@
ld_shlibs=no
;;
@@ -12381,7 +13783,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -7113,64 +8155,64 @@
+@@ -7113,64 +8473,63 @@
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
@@ -12402,28 +13804,41 @@
- if test "$GXX" = yes ; then
- archive_cmds_need_lc=no
- case "$host_os" in
+- rhapsody* | darwin1.[012])
+- allow_undefined_flag='-undefined suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag='-flat_namespace -undefined suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- allow_undefined_flag='-flat_namespace -undefined suppress'
+- ;;
+- 10.*)
+- allow_undefined_flag='-undefined dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+ case $host_os in
- rhapsody* | darwin1.[012])
-- allow_undefined_flag='-undefined suppress'
++ rhapsody* | darwin1.[012])
+ allow_undefined_flag='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-flat_namespace -undefined suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-flat_namespace -undefined suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-undefined dynamic_lookup'
++ ;;
++ 10.*)
+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
@@ -12452,12 +13867,12 @@
link_all_deplibs=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
-+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
+- ld_shlibs=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
@@ -12468,13 +13883,13 @@
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
- ld_shlibs=no
++ ld_shlibs=no
+ ;;
+ esac
fi
;;
-@@ -7204,7 +8246,7 @@
+@@ -7204,7 +8563,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12483,7 +13898,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -7227,47 +8269,62 @@
+@@ -7227,47 +8586,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -12542,32 +13957,33 @@
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-- hardcode_libdir_flag_spec_ld='+b $libdir'
- hardcode_libdir_separator=:
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
-+ hardcode_libdir_flag_spec_ld='+b $libdir'
+ hardcode_libdir_flag_spec_ld='+b $libdir'
+- hardcode_libdir_separator=:
+- hardcode_direct=no
+- hardcode_shlibpath_var=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec='-L$libdir'
hardcode_direct=no
hardcode_shlibpath_var=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec='-L$libdir'
-- hardcode_direct=no
-- hardcode_shlibpath_var=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -7291,7 +8348,7 @@
+@@ -7291,7 +8665,7 @@
link_all_deplibs=yes
;;
@@ -12576,30 +13992,52 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -7311,10 +8368,12 @@
+@@ -7311,23 +8685,28 @@
;;
openbsd*)
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec='${wl}-E'
+ if test -f /usr/libexec/ld.so; then
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_direct=yes
++ hardcode_shlibpath_var=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec='-R$libdir'
++ ;;
++ *)
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
else
-@@ -7329,6 +8388,9 @@
- ;;
- esac
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+- ;;
+- *)
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs=no
fi
-+ else
-+ ld_shlibs=no
-+ fi
;;
- os2*)
-@@ -7360,7 +8422,7 @@
+@@ -7360,7 +8739,7 @@
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
@@ -12608,7 +14046,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -7368,21 +8430,15 @@
+@@ -7368,21 +8747,15 @@
hardcode_libdir_separator=:
;;
@@ -12632,7 +14070,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -7391,8 +8447,17 @@
+@@ -7391,8 +8764,17 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -12652,7 +14090,7 @@
esac
link_all_deplibs=yes
;;
-@@ -7449,36 +8514,45 @@
+@@ -7449,36 +8831,45 @@
fi
;;
@@ -12719,7 +14157,7 @@
;;
uts4*)
-@@ -7493,15 +8567,10 @@
+@@ -7493,15 +8884,10 @@
esac
fi
@@ -12737,7 +14175,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -7519,10 +8588,10 @@
+@@ -7519,10 +8905,10 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -12751,7 +14189,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -7534,6 +8603,7 @@
+@@ -7534,6 +8920,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -12759,7 +14197,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -7556,20 +8626,20 @@
+@@ -7556,20 +8943,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -12785,7 +14223,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7579,17 +8649,55 @@
+@@ -7579,17 +8966,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -12808,7 +14246,7 @@
else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
+ fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
@@ -12819,7 +14257,7 @@
+ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
- fi
++ fi
+ done
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
@@ -12845,7 +14283,16 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -7666,7 +8774,7 @@
+@@ -7610,7 +9035,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -7666,7 +9091,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -12854,7 +14301,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7682,7 +8790,7 @@
+@@ -7682,7 +9107,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -12863,7 +14310,7 @@
need_version=no
need_lib_prefix=no
-@@ -7694,7 +8802,8 @@
+@@ -7694,7 +9119,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -12873,7 +14320,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7724,7 +8833,7 @@
+@@ -7724,7 +9150,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -12882,7 +14329,7 @@
;;
esac
;;
-@@ -7747,13 +8856,9 @@
+@@ -7747,13 +9173,9 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -12899,7 +14346,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -7770,20 +8875,17 @@
+@@ -7770,20 +9192,17 @@
dynamic_linker=no
;;
@@ -12931,7 +14378,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7801,14 +8903,19 @@
+@@ -7801,14 +9220,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -12953,7 +14400,7 @@
esac
;;
-@@ -7828,9 +8935,9 @@
+@@ -7828,9 +9252,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -12965,7 +14412,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7845,7 +8952,7 @@
+@@ -7845,7 +9269,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -12974,7 +14421,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7856,7 +8963,7 @@
+@@ -7856,7 +9280,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -12983,7 +14430,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7868,6 +8975,18 @@
+@@ -7868,6 +9292,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -13002,7 +14449,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -7911,7 +9030,7 @@
+@@ -7911,7 +9347,7 @@
;;
# This must be Linux ELF.
@@ -13011,7 +14458,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7927,8 +9046,8 @@
+@@ -7927,8 +9363,8 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -13022,7 +14469,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -7940,7 +9059,7 @@
+@@ -7940,7 +9376,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -13031,7 +14478,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7949,7 +9068,7 @@
+@@ -7949,7 +9385,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -13040,7 +14487,7 @@
;;
netbsd*)
-@@ -7989,8 +9108,13 @@
+@@ -7989,8 +9425,13 @@
openbsd*)
version_type=sunos
@@ -13055,7 +14502,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -8010,7 +9134,7 @@
+@@ -8010,7 +9451,7 @@
os2*)
libname_spec='$name'
@@ -13064,7 +14511,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -8028,11 +9152,8 @@
+@@ -8028,11 +9469,8 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -13078,7 +14525,7 @@
;;
solaris*)
-@@ -8060,7 +9181,7 @@
+@@ -8060,7 +9498,7 @@
need_version=yes
;;
@@ -13087,17 +14534,23 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -8093,6 +9214,29 @@
+@@ -8093,27 +9531,70 @@
fi
;;
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-*)
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -13114,10 +14567,14 @@
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
- uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8104,16 +9248,21 @@
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++*)
dynamic_linker=no
;;
esac
@@ -13129,6 +14586,21 @@
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -13145,7 +14617,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -8133,8 +9282,8 @@
+@@ -8133,8 +9614,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -13156,7 +14628,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -8147,29 +9296,30 @@
+@@ -8147,29 +9628,30 @@
striplib=
old_striplib=
@@ -13197,7 +14669,7 @@
;;
esac
fi
-@@ -8201,8 +9351,8 @@
+@@ -8201,8 +9683,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -13208,7 +14680,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8215,56 +9365,53 @@
+@@ -8215,56 +9697,53 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13286,7 +14758,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -8278,8 +9425,8 @@
+@@ -8278,8 +9757,8 @@
;;
*)
@@ -13297,7 +14769,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8306,73 +9453,64 @@
+@@ -8306,73 +9785,64 @@
#undef shl_load
@@ -13395,7 +14867,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8385,61 +9523,58 @@
+@@ -8385,61 +9855,58 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13471,7 +14943,8 @@
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
- echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
@@ -13480,7 +14953,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8466,73 +9601,64 @@
+@@ -8466,73 +9933,64 @@
#undef dlopen
@@ -13578,7 +15051,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8545,61 +9671,58 @@
+@@ -8545,61 +10003,58 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13663,7 +15136,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8612,61 +9735,58 @@
+@@ -8612,61 +10067,58 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13748,7 +15221,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8679,56 +9799,53 @@
+@@ -8679,58 +10131,55 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13824,9 +15297,12 @@
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -8763,13 +9880,13 @@
+
+
+@@ -8763,13 +10212,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -13843,16 +15319,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8779,7 +9896,7 @@
+@@ -8779,7 +10228,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8782 "configure"
-+#line 9899 "configure"
++#line 10231 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -8836,6 +9953,8 @@
+@@ -8836,6 +10285,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -13861,7 +15337,7 @@
exit (status);
}
-@@ -8845,12 +9964,12 @@
+@@ -8845,12 +10296,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -13876,7 +15352,7 @@
esac
else :
# compilation failed
-@@ -8861,13 +9980,13 @@
+@@ -8861,13 +10312,13 @@
fi
@@ -13895,16 +15371,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8877,7 +9996,7 @@
+@@ -8877,7 +10328,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8880 "configure"
-+#line 9999 "configure"
++#line 10331 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -8934,6 +10053,8 @@
+@@ -8934,6 +10385,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -13913,7 +15389,7 @@
exit (status);
}
-@@ -8943,12 +10064,12 @@
+@@ -8943,12 +10396,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -13928,7 +15404,7 @@
esac
else :
# compilation failed
-@@ -8959,8 +10080,8 @@
+@@ -8959,8 +10412,8 @@
fi
@@ -13939,7 +15415,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -8981,19 +10102,19 @@
+@@ -8981,19 +10434,19 @@
fi
@@ -13967,16 +15443,16 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9002,58 +10123,21 @@
+@@ -9002,58 +10455,21 @@
fi
;;
-aix4*)
-+aix4* | aix5*)
++aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
- ;;
+- ;;
- darwin* | rhapsody*)
- if test "$GCC" = yes; then
- archive_cmds_need_lc=no
@@ -14013,7 +15489,7 @@
- else
- ld_shlibs=no
- fi
-- ;;
+ ;;
esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
@@ -14033,7 +15509,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -9068,7 +10152,7 @@
+@@ -9068,7 +10484,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -14042,7 +15518,15 @@
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -9110,6 +10194,7 @@
+@@ -9095,6 +10511,7 @@
+ predeps \
+ postdeps \
+ compiler_lib_search_path \
++ compiler_lib_search_dirs \
+ archive_cmds \
+ archive_expsym_cmds \
+ postinstall_cmds \
+@@ -9110,6 +10527,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -14050,16 +15534,16 @@
exclude_expsyms \
include_expsyms; do
-@@ -9154,7 +10239,7 @@
+@@ -9154,7 +10572,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -9172,7 +10257,7 @@
+@@ -9172,7 +10590,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -14068,7 +15552,7 @@
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
-@@ -9183,11 +10268,11 @@
+@@ -9183,11 +10601,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -14082,7 +15566,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9217,6 +10302,12 @@
+@@ -9217,6 +10635,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14095,7 +15579,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9228,6 +10319,9 @@
+@@ -9228,6 +10652,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14105,7 +15589,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -9259,7 +10353,7 @@
+@@ -9259,7 +10686,7 @@
OBJDUMP="$OBJDUMP"
# Used on cygwin: assembler.
@@ -14114,7 +15598,7 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-@@ -9278,7 +10372,7 @@
+@@ -9278,7 +10705,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14123,7 +15607,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9293,7 +10387,7 @@
+@@ -9293,7 +10720,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -14132,7 +15616,18 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -9469,7 +10563,7 @@
+@@ -9381,6 +10808,10 @@
+ # shared library.
+ postdeps=$lt_postdeps
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path
+@@ -9469,7 +10900,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -14141,7 +15636,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -9536,11 +10630,11 @@
+@@ -9536,11 +10967,11 @@
CC="$lt_save_CC"
@@ -14157,7 +15652,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -9558,6 +10652,9 @@
+@@ -9558,6 +10989,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -14167,7 +15662,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -9588,8 +10685,10 @@
+@@ -9588,8 +11022,10 @@
case $tagname in
CXX)
@@ -14180,7 +15675,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -9608,6 +10707,7 @@
+@@ -9608,6 +11044,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -14188,8 +15683,11 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -9625,27 +10725,44 @@
+@@ -9623,29 +11060,47 @@
+ predeps_CXX=
+ postdeps_CXX=
compiler_lib_search_path_CXX=
++compiler_lib_search_dirs_CXX=
# Source file extension for C++ test sources.
-ac_ext=cc
@@ -14230,13 +15728,13 @@
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
++$rm -r conftest*
+
+
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -9656,18 +10773,27 @@
+@@ -9656,18 +11111,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -14267,7 +15765,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -9681,18 +10807,18 @@
+@@ -9681,18 +11145,18 @@
# Set up default GNU C++ configuration
@@ -14292,7 +15790,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -9721,11 +10847,11 @@
+@@ -9721,11 +11185,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -14308,7 +15806,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9738,7 +10864,7 @@
+@@ -9738,7 +11202,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -14317,7 +15815,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -9758,21 +10884,21 @@
+@@ -9758,21 +11222,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -14346,7 +15844,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -9782,8 +10908,8 @@
+@@ -9782,8 +11246,8 @@
;;
esac
fi
@@ -14357,7 +15855,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -9833,8 +10959,8 @@
+@@ -9833,15 +11297,15 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -14368,7 +15866,24 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -9863,6 +10989,7 @@
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -9854,7 +11318,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -9863,6 +11327,7 @@
;;
esac
done
@@ -14376,7 +15891,7 @@
esac
exp_sym_flag='-bexport'
-@@ -9881,7 +11008,7 @@
+@@ -9881,7 +11346,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -14385,7 +15900,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -9889,7 +11016,7 @@
+@@ -9889,7 +11354,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -14394,7 +15909,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -9900,8 +11027,12 @@
+@@ -9900,8 +11365,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -14407,7 +15922,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9941,50 +11072,55 @@
+@@ -9941,50 +11410,55 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14487,7 +16002,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10003,39 +11139,44 @@
+@@ -10003,39 +11477,44 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14554,7 +16069,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10044,16 +11185,26 @@
+@@ -10044,16 +11523,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -14586,7 +16101,7 @@
chorus*)
case $cc_basename in
*)
-@@ -10072,7 +11223,7 @@
+@@ -10072,7 +11561,7 @@
enable_shared_with_static_runtimes_CXX=yes
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
@@ -14595,7 +16110,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10081,70 +11232,81 @@
+@@ -10081,70 +11570,53 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14606,71 +16121,44 @@
fi
;;
-
- darwin* | rhapsody*)
+- darwin* | rhapsody*)
- if test "$GXX" = yes; then
- archive_cmds_need_lc_CXX=no
- case "$host_os" in
-+ case $host_os in
- rhapsody* | darwin1.[012])
+- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='-undefined suppress'
-+ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
+- ;;
+- 10.*)
- allow_undefined_flag_CXX='-undefined dynamic_lookup'
-+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
+- ;;
+- esac
++ darwin* | rhapsody*)
+ archive_cmds_need_lc_CXX=no
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
-+
-+ if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
-- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
-- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- hardcode_direct_CXX=no
-- hardcode_automatic_CXX=yes
-- hardcode_shlibpath_var_CXX=unsupported
-- whole_archive_flag_spec_CXX='-all_load $convenience'
-- link_all_deplibs_CXX=yes
- else
++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
++ output_verbose_link_cmd='echo'
++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++ fi
++ else
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
@@ -14681,11 +16169,41 @@
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
- ld_shlibs_CXX=no
++ ld_shlibs_CXX=no
+ ;;
+ esac
- fi
- ;;
+ fi
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
+- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- fi
+- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- hardcode_direct_CXX=no
+- hardcode_automatic_CXX=yes
+- hardcode_shlibpath_var_CXX=unsupported
+- whole_archive_flag_spec_CXX='-all_load $convenience'
+- link_all_deplibs_CXX=yes
+- else
+- ld_shlibs_CXX=no
+- fi
+- ;;
++ ;;
dgux*)
case $cc_basename in
@@ -14699,7 +16217,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -10155,14 +11317,14 @@
+@@ -10155,14 +11627,14 @@
;;
esac
;;
@@ -14716,7 +16234,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -10179,11 +11341,11 @@
+@@ -10179,11 +11651,11 @@
# location of the library.
case $cc_basename in
@@ -14730,7 +16248,7 @@
archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -10193,7 +11355,7 @@
+@@ -10193,7 +11665,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -14739,19 +16257,21 @@
;;
*)
if test "$GXX" = yes; then
-@@ -10207,33 +11369,20 @@
+@@ -10207,33 +11679,20 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
- hardcode_libdir_separator_CXX=:
+- hardcode_libdir_separator_CXX=:
- ;;
- ia64*)
- hardcode_libdir_flag_spec_CXX='-L$libdir'
- ;;
++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_CXX=:
+
+ case $host_cpu in
+ hppa*64*|ia64*) ;;
@@ -14778,7 +16298,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -10244,14 +11393,17 @@
+@@ -10244,14 +11703,17 @@
esac
case $cc_basename in
@@ -14801,7 +16321,7 @@
;;
*)
archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -10270,9 +11422,12 @@
+@@ -10270,9 +11732,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -14817,7 +16337,7 @@
;;
*)
archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -10286,11 +11441,25 @@
+@@ -10286,11 +11751,25 @@
;;
esac
;;
@@ -14845,7 +16365,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -10301,7 +11470,7 @@
+@@ -10301,7 +11780,7 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -14854,7 +16374,7 @@
else
archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
-@@ -10312,9 +11481,9 @@
+@@ -10312,9 +11791,9 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -14866,7 +16386,7 @@
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
-@@ -10339,17 +11508,41 @@
+@@ -10339,17 +11818,41 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -14874,14 +16394,13 @@
+ icpc*)
# Intel C++
with_gnu_ld=yes
-- archive_cmds_need_lc_CXX=no
+ # version 8.0 and above of icpc choke on multiply defined symbols
+ # if we add $predep_objects and $postdep_objects, however 7.1 and
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
@@ -14892,13 +16411,15 @@
+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
-+ archive_cmds_need_lc_CXX=no
+ archive_cmds_need_lc_CXX=no
+- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
-+ pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -14911,7 +16432,7 @@
# Compaq C++
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -10368,6 +11561,29 @@
+@@ -10368,6 +11871,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -14941,7 +16462,7 @@
esac
;;
lynxos*)
-@@ -10380,7 +11596,7 @@
+@@ -10380,7 +11906,7 @@
;;
mvs*)
case $cc_basename in
@@ -14950,7 +16471,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -10390,7 +11606,7 @@
+@@ -10390,7 +11916,7 @@
;;
esac
;;
@@ -14959,7 +16480,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -10401,9 +11617,29 @@
+@@ -10401,9 +11927,29 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -14990,7 +16511,7 @@
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
-@@ -10419,14 +11655,14 @@
+@@ -10419,14 +11965,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -15008,7 +16529,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -10444,7 +11680,7 @@
+@@ -10444,7 +11990,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -15017,7 +16538,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -10463,7 +11699,7 @@
+@@ -10463,7 +12009,7 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -15026,7 +16547,7 @@
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
-@@ -10478,17 +11714,17 @@
+@@ -10478,17 +12024,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -15048,7 +16569,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -10507,7 +11743,7 @@
+@@ -10507,7 +12053,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -15057,7 +16578,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -10528,27 +11764,14 @@
+@@ -10528,27 +12074,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -15087,7 +16608,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -10561,36 +11784,28 @@
+@@ -10561,36 +12094,28 @@
;;
solaris*)
case $cc_basename in
@@ -15133,7 +16654,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -10598,7 +11813,7 @@
+@@ -10598,7 +12123,7 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -15142,7 +16663,7 @@
# Green Hills C++ Compiler
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-@@ -10632,16 +11847,73 @@
+@@ -10632,16 +12157,73 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -15159,11 +16680,14 @@
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_CXX='${wl}-z,text'
-+ archive_cmds_need_lc_CXX=no
+ archive_cmds_need_lc_CXX=no
+- ;;
+- tandem*)
+ hardcode_shlibpath_var_CXX=no
+ runpath_var='LD_RUN_PATH'
+
-+ case $cc_basename in
+ case $cc_basename in
+- NCC)
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -15192,7 +16716,7 @@
+ # names for shared libraries.
+ no_undefined_flag_CXX='${wl}-z,text'
+ allow_undefined_flag_CXX='${wl}-z,nodefs'
- archive_cmds_need_lc_CXX=no
++ archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator_CXX=':'
@@ -15210,15 +16734,14 @@
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
- ;;
- tandem*)
- case $cc_basename in
-- NCC)
++ ;;
++ tandem*)
++ case $cc_basename in
+ NCC*)
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -10661,8 +11933,8 @@
+@@ -10661,14 +12243,13 @@
ld_shlibs_CXX=no
;;
esac
@@ -15229,7 +16752,13 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -10694,7 +11966,7 @@
+ LD_CXX="$LD"
+
+-
+ cat > conftest.$ac_ext <<EOF
+ class Foo
+ {
+@@ -10694,7 +12275,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -15238,10 +16767,15 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -10770,6 +12042,62 @@
+@@ -10770,6 +12351,66 @@
$rm -f confest.$objext
++compiler_lib_search_dirs_CXX=
++if test -n "$compiler_lib_search_path_CXX"; then
++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
@@ -15297,11 +16831,10 @@
+ ;;
+esac
+
-+
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -10778,8 +12106,8 @@
+@@ -10778,8 +12419,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -15312,7 +16845,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -10800,12 +12128,14 @@
+@@ -10800,12 +12441,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -15329,7 +16862,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -10817,6 +12147,10 @@
+@@ -10817,6 +12460,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -15340,7 +16873,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -10825,7 +12159,7 @@
+@@ -10825,7 +12472,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -15349,7 +16882,16 @@
hppa*64*|ia64*)
;;
*)
-@@ -10850,18 +12184,28 @@
+@@ -10839,7 +12486,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -10850,18 +12497,28 @@
;;
chorus*)
case $cc_basename in
@@ -15381,7 +16923,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -10869,22 +12213,22 @@
+@@ -10869,22 +12526,22 @@
;;
esac
;;
@@ -15410,7 +16952,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10897,9 +12241,13 @@
+@@ -10897,9 +12554,13 @@
;;
esac
;;
@@ -15425,7 +16967,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -10908,20 +12256,26 @@
+@@ -10908,20 +12569,26 @@
;;
esac
;;
@@ -15446,7 +16988,7 @@
lt_prog_compiler_static_CXX='-static'
;;
- cxx)
-+ pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-fpic'
@@ -15456,7 +16998,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10929,6 +12283,14 @@
+@@ -10929,6 +12596,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -15471,7 +17013,7 @@
;;
esac
;;
-@@ -10938,25 +12300,25 @@
+@@ -10938,25 +12613,25 @@
;;
mvs*)
case $cc_basename in
@@ -15502,7 +17044,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10970,24 +12332,15 @@
+@@ -10970,24 +12645,15 @@
;;
psos*)
;;
@@ -15529,7 +17071,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -10997,12 +12350,12 @@
+@@ -10997,12 +12663,12 @@
;;
sunos4*)
case $cc_basename in
@@ -15544,7 +17086,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -11012,7 +12365,7 @@
+@@ -11012,7 +12678,7 @@
;;
tandem*)
case $cc_basename in
@@ -15553,7 +17095,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -11020,7 +12373,14 @@
+@@ -11020,7 +12686,14 @@
;;
esac
;;
@@ -15569,7 +17111,7 @@
;;
vxworks*)
;;
-@@ -11030,22 +12390,22 @@
+@@ -11030,22 +12703,22 @@
esac
fi
@@ -15585,19 +17127,21 @@
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_CXX=no
+- lt_prog_compiler_pic_works_CXX=no
++ lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -11053,26 +12413,28 @@
+@@ -11053,28 +12726,30 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -15606,21 +17150,22 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11059: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12419: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12732: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11063: \$? = $ac_status" >&5
-+ echo "$as_me:12423: \$? = $ac_status" >&5
++ echo "$as_me:12736: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+- lt_prog_compiler_pic_works_CXX=yes
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_CXX=yes
++ lt_cv_prog_compiler_pic_works_CXX=yes
fi
fi
$rm conftest*
@@ -15628,12 +17173,15 @@
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
- if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -11085,7 +12447,7 @@
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+@@ -11085,7 +12760,7 @@
fi
fi
@@ -15642,7 +17190,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -11095,8 +12457,50 @@
+@@ -11095,8 +12770,50 @@
;;
esac
@@ -15654,10 +17202,10 @@
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
-+ lt_prog_compiler_static_works_CXX=no
++ lt_cv_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -15670,20 +17218,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ else
-+ lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ fi
-+ $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
-+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+ :
+else
+ lt_prog_compiler_static_CXX=
@@ -15695,7 +17243,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11105,7 +12509,7 @@
+@@ -11105,7 +12822,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -15704,7 +17252,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -11113,23 +12517,25 @@
+@@ -11113,23 +12830,25 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -15713,12 +17261,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11119: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12523: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12836: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11123: \$? = $ac_status" >&5
-+ echo "$as_me:12527: \$? = $ac_status" >&5
++ echo "$as_me:12840: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15735,7 +17283,7 @@
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
-@@ -11140,23 +12546,23 @@
+@@ -11140,23 +12859,23 @@
$rm conftest*
fi
@@ -15765,7 +17313,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -11166,8 +12572,8 @@
+@@ -11166,12 +12885,12 @@
need_locks=no
fi
@@ -15776,7 +17324,12 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -11184,22 +12590,20 @@
+- aix4* | aix5*)
++ aix[4-9]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -11184,22 +12903,21 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -15790,6 +17343,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
@@ -15805,7 +17359,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11217,10 +12621,10 @@
+@@ -11217,10 +12935,10 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -15819,7 +17373,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -11232,6 +12636,7 @@
+@@ -11232,6 +12950,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -15827,7 +17381,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -11254,20 +12659,20 @@
+@@ -11254,20 +12973,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15853,7 +17407,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -11277,20 +12682,7 @@
+@@ -11277,20 +12996,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15875,7 +17429,16 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -11364,7 +12756,7 @@
+@@ -11308,7 +13014,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -11364,7 +13070,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15884,7 +17447,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11380,7 +12772,7 @@
+@@ -11380,7 +13086,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15893,7 +17456,7 @@
need_version=no
need_lib_prefix=no
-@@ -11392,7 +12784,8 @@
+@@ -11392,7 +13098,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15903,7 +17466,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -11422,7 +12815,7 @@
+@@ -11422,7 +13129,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15912,7 +17475,7 @@
;;
esac
;;
-@@ -11445,13 +12838,8 @@
+@@ -11445,13 +13152,8 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15928,7 +17491,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -11468,20 +12856,17 @@
+@@ -11468,20 +13170,17 @@
dynamic_linker=no
;;
@@ -15960,7 +17523,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -11499,14 +12884,19 @@
+@@ -11499,14 +13198,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15982,7 +17545,7 @@
esac
;;
-@@ -11526,9 +12916,9 @@
+@@ -11526,9 +13230,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15994,7 +17557,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -11543,7 +12933,7 @@
+@@ -11543,7 +13247,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -16003,7 +17566,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -11554,7 +12944,7 @@
+@@ -11554,7 +13258,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -16012,7 +17575,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -11566,6 +12956,18 @@
+@@ -11566,6 +13270,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -16031,7 +17594,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -11609,7 +13011,7 @@
+@@ -11609,7 +13325,7 @@
;;
# This must be Linux ELF.
@@ -16040,7 +17603,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11625,8 +13027,8 @@
+@@ -11625,8 +13341,8 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -16051,7 +17614,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11638,7 +13040,7 @@
+@@ -11638,7 +13354,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16060,7 +17623,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11647,7 +13049,7 @@
+@@ -11647,7 +13363,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -16069,7 +17632,7 @@
;;
netbsd*)
-@@ -11687,8 +13089,13 @@
+@@ -11687,8 +13403,13 @@
openbsd*)
version_type=sunos
@@ -16084,7 +17647,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -11708,7 +13115,7 @@
+@@ -11708,7 +13429,7 @@
os2*)
libname_spec='$name'
@@ -16093,7 +17656,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11726,11 +13133,8 @@
+@@ -11726,11 +13447,8 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16107,7 +17670,7 @@
;;
solaris*)
-@@ -11758,7 +13162,7 @@
+@@ -11758,7 +13476,7 @@
need_version=yes
;;
@@ -16116,7 +17679,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11791,6 +13195,29 @@
+@@ -11791,6 +13509,29 @@
fi
;;
@@ -16146,7 +17709,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11802,16 +13229,21 @@
+@@ -11802,16 +13543,36 @@
dynamic_linker=no
;;
esac
@@ -16158,6 +17721,21 @@
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -16174,7 +17752,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -11831,8 +13263,8 @@
+@@ -11831,8 +13592,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -16185,7 +17763,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -11843,1270 +13275,445 @@
+@@ -11843,1123 +13604,303 @@
enable_fast_install=needless
fi
@@ -16242,7 +17820,7 @@
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
+-
- darwin*)
- # if libdl is installed we need to link against it
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -16258,7 +17836,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -16300,6 +17878,18 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
@@ -16340,6 +17930,7 @@
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX \
++ compiler_lib_search_dirs_CXX \
+ archive_cmds_CXX \
+ archive_expsym_cmds_CXX \
+ postinstall_cmds_CXX \
@@ -16359,17 +17950,9 @@
+ exclude_expsyms_CXX \
+ include_expsyms_CXX; do
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
+- lt_cv_dlopen="dyld"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+ case $var in
+ old_archive_cmds_CXX | \
+ old_archive_from_new_cmds_CXX | \
@@ -16392,22 +17975,16 @@
+ esac
+ done
-- lt_cv_dlopen="dyld"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
+-fi
+ case $lt_echo in
+ *'\$0 --fallback-echo"')
+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+ ;;
+ esac
--fi
+- ;;
+cfgfile="$ofile"
-- ;;
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
@@ -16423,27 +18000,27 @@
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++ cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+
+-#undef shl_load
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
--#undef shl_load
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -16463,8 +18040,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
-int
-main ()
@@ -16500,8 +18077,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
-ac_cv_func_shl_load=no
-fi
@@ -16526,8 +18103,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -16570,10 +18147,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
-ac_cv_lib_dld_shl_load=no
-fi
@@ -16600,31 +18175,33 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+
+-#undef dlopen
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
--#undef dlopen
-+# A C compiler.
-+LTCC=$lt_LTCC
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -16644,8 +18221,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# A C compiler.
++LTCC=$lt_LTCC
-int
-main ()
@@ -16681,8 +18258,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
-ac_cv_func_dlopen=no
-fi
@@ -16707,8 +18284,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# A language-specific compiler.
++CC=$lt_compiler_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -16751,8 +18328,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
-ac_cv_lib_dl_dlopen=no
-fi
@@ -16778,8 +18355,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# An ERE matcher.
++EGREP=$lt_EGREP
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -16822,8 +18399,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# The linker used to build libraries.
++LD=$lt_LD_CXX
-ac_cv_lib_svld_dlopen=no
-fi
@@ -16849,8 +18426,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -16893,8 +18470,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# A BSD-compatible nm program.
++NM=$lt_NM
-ac_cv_lib_dld_dld_link=no
-fi
@@ -16907,75 +18484,75 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
++# A symbol stripping program
++STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+-fi
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
--fi
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+-fi
+# Used on cygwin: assembler.
+AS="$AS"
--fi
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+-fi
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
--fi
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+-fi
+# Object file suffix (normally "o").
+objext="$ac_objext"
--fi
+# Old archive suffix (normally "a").
+libext="$libext"
+-fi
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
--fi
+- ;;
+- esac
+# Executable file suffix (normally "").
+exeext="$exeext"
-- ;;
-- esac
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
@@ -16990,19 +18567,19 @@
- cat > conftest.$ac_ext <<EOF
-#line 12480 "configure"
-#include "confdefs.h"
-+# Do we need a version for libraries?
-+need_version=$need_version
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
++# Do we need a version for libraries?
++need_version=$need_version
+
+-#include <stdio.h>
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
--#include <stdio.h>
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -17012,8 +18589,8 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -17036,22 +18613,22 @@
-# endif
-# endif
-#endif
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
- if (self)
- {
@@ -17059,8 +18636,8 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
- exit (status);
-}
@@ -17083,17 +18660,17 @@
- fi
-fi
-rm -fr conftest*
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-+# Library versioning type.
-+version_type=$version_type
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# Library versioning type.
++version_type=$version_type
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
@@ -17110,23 +18687,20 @@
- cat > conftest.$ac_ext <<EOF
-#line 12578 "configure"
-#include "confdefs.h"
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
+-#include <stdio.h>
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
--#include <stdio.h>
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -17136,8 +18710,11 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -17160,26 +18737,25 @@
-# endif
-# endif
-#endif
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
- if (self)
- {
@@ -17187,9 +18763,9 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
- exit (status);
-}
@@ -17212,50 +18788,49 @@
- fi
-fi
-rm -fr conftest*
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_CXX
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
-+# Dependencies to place before the objects being linked to create a
++# Dependencies to place after the objects being linked to create a
+# shared library.
-+predeps=$lt_predeps_CXX
++postdep_objects=$lt_postdep_objects_CXX
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-+# Dependencies to place after the objects being linked to create a
++# Dependencies to place before the objects being linked to create a
+# shared library.
-+postdeps=$lt_postdeps_CXX
++predeps=$lt_predeps_CXX
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-
+-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
@@ -17343,219 +18918,121 @@
- esac
-
-cfgfile="$ofile"
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
+-
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
-
+-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-
+-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-
+-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
+-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
+-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
+-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-
+-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-
+-
-# The host system.
-host_alias=$host_alias
-host=$host
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
+-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_CXX
-
+-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-
+-
-# A C compiler.
-LTCC=$lt_LTCC
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
+-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
+-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
+-
-# An ERE matcher.
-EGREP=$lt_EGREP
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_CXX
-
+-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_CXX
-
+-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
+-
-# A BSD-compatible nm program.
-NM=$lt_NM
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_CXX
-
+-
-# A symbol stripping program
-STRIP=$lt_STRIP
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-
+-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_CXX
-
+-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
+-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
+-
-# Used on cygwin: assembler.
-AS=$lt_AS
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path=$lt_fix_srcfile_path
-
+-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
-
+-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
+-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
+-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
-
+-
-# Old archive suffix (normally "a").
-libext="$libext"
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
-
+-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-+# ### END LIBTOOL TAG CONFIG: $tagname
-
+-
-# Executable file suffix (normally "").
-exeext="$exeext"
-+__EOF__
-
+-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
+-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-
+-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
+-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-+CC=$lt_save_CC
-+LDCXX=$LD
-+LD=$lt_save_LD
-+GCC=$lt_save_GCC
-+with_gnu_ldcxx=$with_gnu_ld
-+with_gnu_ld=$lt_save_with_gnu_ld
-+lt_cv_path_LDCXX=$lt_cv_path_LD
-+lt_cv_path_LD=$lt_save_path_LD
-+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
+-
-# Do we need a version for libraries?
-need_version=$need_version
-+ else
-+ tagname=""
-+ fi
-+ ;;
-
+-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-+ F77)
-+ if test -n "$F77" && test "X$F77" != "Xno"; then
-
+-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
@@ -17635,161 +19112,22 @@
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
--
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
--
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_CXX
--
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_CXX
--
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
--
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
--
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
--
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
--
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_CXX
--
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
--
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
--
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
--
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_CXX
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_CXX
--
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
--
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_CXX
--
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_CXX
--
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--
--# Fix the shell variable \$srcfile for the compiler.
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+@@ -13045,7 +13986,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
--
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_CXX
--
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_CXX
--
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_CXX
--
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_CXX
--
--# ### END LIBTOOL TAG CONFIG: $tagname
--
--__EOF__
--
--
--else
-- # If there is no Makefile yet, we rely on a make rule to execute
-- # `config.status --recheck' to rerun these tests and create the
-- # libtool script then.
-- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-- if test -f "$ltmain_in"; then
-- test -f Makefile && make "$ltmain"
-- fi
--fi
--
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--CC=$lt_save_CC
--LDCXX=$LD
--LD=$lt_save_LD
--GCC=$lt_save_GCC
--with_gnu_ldcxx=$with_gnu_ld
--with_gnu_ld=$lt_save_with_gnu_ld
--lt_cv_path_LDCXX=$lt_cv_path_LD
--lt_cv_path_LD=$lt_save_path_LD
--lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
--lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--
-- else
-- tagname=""
-- fi
-- ;;
--
-- F77)
-- if test -n "$F77" && test "X$F77" != "Xno"; then
--
--ac_ext=f
--ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
--ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-+ac_ext=f
-+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++fix_srcfile_path=$lt_fix_srcfile_path
-
- archive_cmds_need_lc_F77=no
-@@ -13136,39 +13743,72 @@
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+@@ -13136,39 +14077,72 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -17830,7 +19168,7 @@
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
++$rm -r conftest*
+
+
# Allow CC to be a program name with arguments.
@@ -17848,19 +19186,19 @@
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
@@ -17872,14 +19210,15 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -13176,21 +13816,21 @@
+@@ -13176,21 +14150,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
-+aix4* | aix5*)
+- test "$enable_shared" = yes && enable_static=no
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ fi
;;
esac
@@ -17903,7 +19242,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -13199,8 +13839,8 @@
+@@ -13199,8 +14173,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -17914,7 +19253,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -13222,13 +13862,15 @@
+@@ -13222,13 +14196,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -17932,7 +19271,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -13238,6 +13880,11 @@
+@@ -13238,6 +14214,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -17944,7 +19283,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -13254,7 +13901,7 @@
+@@ -13254,7 +14235,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -17953,7 +19292,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13280,8 +13927,18 @@
+@@ -13280,8 +14261,18 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -17973,7 +19312,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -13291,7 +13948,7 @@
+@@ -13291,7 +14282,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -17982,7 +19321,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13314,36 +13971,63 @@
+@@ -13314,18 +14305,41 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -18007,7 +19346,6 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
-- esac
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
@@ -18015,8 +19353,7 @@
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ lt_prog_compiler_wl_F77='-Wl,'
- ;;
--
++ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ lt_prog_compiler_pic_F77='-KPIC'
@@ -18025,12 +19362,10 @@
+ ;;
+ esac
+ ;;
-+ esac
-+ ;;
-+
- osf3* | osf4* | osf5*)
- lt_prog_compiler_wl_F77='-Wl,'
- # All OSF/1 code is PIC.
+ esac
+ ;;
+
+@@ -13335,15 +14349,19 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -18054,7 +19389,7 @@
;;
sunos4*)
-@@ -13352,7 +14036,7 @@
+@@ -13352,7 +14370,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -18063,7 +19398,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -13365,6 +14049,17 @@
+@@ -13365,6 +14383,17 @@
fi
;;
@@ -18081,7 +19416,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -13376,22 +14071,22 @@
+@@ -13376,22 +14405,22 @@
esac
fi
@@ -18097,19 +19432,21 @@
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_F77=no
+- lt_prog_compiler_pic_works_F77=no
++ lt_cv_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -13399,26 +14094,28 @@
+@@ -13399,28 +14428,30 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -18118,21 +19455,22 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13405: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14100: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14434: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13409: \$? = $ac_status" >&5
-+ echo "$as_me:14104: \$? = $ac_status" >&5
++ echo "$as_me:14438: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+- lt_prog_compiler_pic_works_F77=yes
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_F77=yes
++ lt_cv_prog_compiler_pic_works_F77=yes
fi
fi
$rm conftest*
@@ -18140,12 +19478,15 @@
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
- if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -13431,7 +14128,7 @@
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+@@ -13431,7 +14462,7 @@
fi
fi
@@ -18154,7 +19495,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -13441,8 +14138,50 @@
+@@ -13441,8 +14472,50 @@
;;
esac
@@ -18166,10 +19507,10 @@
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
-+ lt_prog_compiler_static_works_F77=no
++ lt_cv_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -18182,20 +19523,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ else
-+ lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ fi
-+ $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+
-+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+ :
+else
+ lt_prog_compiler_static_F77=
@@ -18207,7 +19548,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13451,7 +14190,7 @@
+@@ -13451,7 +14524,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -18216,7 +19557,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -13459,23 +14198,25 @@
+@@ -13459,23 +14532,25 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -18225,12 +19566,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13465: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14204: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14538: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13469: \$? = $ac_status" >&5
-+ echo "$as_me:14208: \$? = $ac_status" >&5
++ echo "$as_me:14542: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18247,7 +19588,7 @@
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
-@@ -13486,23 +14227,23 @@
+@@ -13486,23 +14561,23 @@
$rm conftest*
fi
@@ -18277,7 +19618,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -13512,8 +14253,8 @@
+@@ -13512,8 +14587,8 @@
need_locks=no
fi
@@ -18288,9 +19629,18 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -13551,6 +14292,16 @@
+@@ -13544,13 +14619,24 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
@@ -18305,7 +19655,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -13561,6 +14312,10 @@
+@@ -13561,6 +14647,10 @@
with_gnu_ld=no
fi
;;
@@ -18316,7 +19666,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -13571,6 +14326,27 @@
+@@ -13571,9 +14661,30 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -18343,8 +19693,12 @@
+
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
-@@ -13621,10 +14397,10 @@
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_F77=no
+@@ -13621,10 +14732,10 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -18357,7 +19711,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13633,13 +14409,69 @@
+@@ -13633,13 +14744,69 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -18366,9 +19720,10 @@
else
- ld_shlibs=no
+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ interix[3-9]*)
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
@@ -18422,15 +19777,14 @@
+ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -13649,7 +14481,7 @@
+@@ -13649,7 +14816,7 @@
fi
;;
@@ -18439,7 +19793,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -13670,6 +14502,33 @@
+@@ -13670,6 +14837,33 @@
fi
;;
@@ -18473,7 +19827,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -13677,31 +14536,6 @@
+@@ -13677,31 +14871,6 @@
hardcode_shlibpath_var_F77=no
;;
@@ -18505,7 +19859,7 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -13712,17 +14546,12 @@
+@@ -13712,16 +14881,11 @@
;;
esac
@@ -18517,17 +19871,17 @@
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
+- whole_archive_flag_spec_F77=
+- fi
+ if test "$ld_shlibs_F77" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec_F77=
+ export_dynamic_flag_spec_F77=
- whole_archive_flag_spec_F77=
- fi
-- fi
++ whole_archive_flag_spec_F77=
+ fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
-@@ -13733,7 +14562,7 @@
+@@ -13733,14 +14897,14 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -18536,7 +19890,23 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -13767,6 +14596,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -13760,13 +14924,14 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
break
fi
done
@@ -18544,7 +19914,7 @@
esac
exp_sym_flag='-bexport'
-@@ -13785,7 +14615,7 @@
+@@ -13785,7 +14950,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -18553,7 +19923,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -13793,7 +14623,7 @@
+@@ -13793,7 +14958,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -18562,7 +19932,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -13804,8 +14634,12 @@
+@@ -13804,8 +14969,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -18575,7 +19945,21 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -13835,49 +14669,54 @@
+@@ -13813,11 +14982,11 @@
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test "$aix_use_runtimelinking" = yes; then
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+- fi
++ fi
+ fi
+ fi
+
+@@ -13835,49 +15004,54 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -18654,7 +20038,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13886,39 +14725,44 @@
+@@ -13886,39 +15060,44 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -18721,7 +20105,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13927,13 +14771,11 @@
+@@ -13927,13 +15106,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -18738,7 +20122,7 @@
fi
fi
;;
-@@ -13946,7 +14788,7 @@
+@@ -13946,7 +15123,7 @@
ld_shlibs_F77=no
;;
@@ -18747,7 +20131,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -13960,64 +14802,64 @@
+@@ -13960,64 +15137,63 @@
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
@@ -18769,28 +20153,41 @@
- if test "$GXX" = yes ; then
- archive_cmds_need_lc_F77=no
- case "$host_os" in
+- rhapsody* | darwin1.[012])
+- allow_undefined_flag_F77='-undefined suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
+- ;;
+- 10.*)
+- allow_undefined_flag_F77='-undefined dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+ case $host_os in
- rhapsody* | darwin1.[012])
-- allow_undefined_flag_F77='-undefined suppress'
++ rhapsody* | darwin1.[012])
+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
-- allow_undefined_flag_F77='-undefined dynamic_lookup'
++ ;;
++ 10.*)
+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
@@ -18819,12 +20216,12 @@
link_all_deplibs_F77=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
-+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
+- ld_shlibs_F77=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
@@ -18835,13 +20232,13 @@
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
- ld_shlibs_F77=no
++ ld_shlibs_F77=no
+ ;;
+ esac
fi
;;
-@@ -14051,7 +14893,7 @@
+@@ -14051,7 +15227,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18850,7 +20247,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -14074,47 +14916,62 @@
+@@ -14074,47 +15250,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -18909,32 +20306,33 @@
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-- hardcode_libdir_flag_spec_ld_F77='+b $libdir'
- hardcode_libdir_separator_F77=:
+- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_F77=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
-+ hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+ hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+- hardcode_libdir_separator_F77=:
+- hardcode_direct_F77=no
+- hardcode_shlibpath_var_F77=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_direct_F77=no
-- hardcode_shlibpath_var_F77=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -14138,7 +14995,7 @@
+@@ -14138,7 +15329,7 @@
link_all_deplibs_F77=yes
;;
@@ -18943,30 +20341,52 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -14158,10 +15015,12 @@
+@@ -14158,23 +15349,28 @@
;;
openbsd*)
+- hardcode_direct_F77=yes
+- hardcode_shlibpath_var_F77=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec_F77='${wl}-E'
+ if test -f /usr/libexec/ld.so; then
- hardcode_direct_F77=yes
- hardcode_shlibpath_var_F77=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_direct_F77=yes
++ hardcode_shlibpath_var_F77=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_F77='${wl}-E'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_F77='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_F77='-R$libdir'
++ ;;
++ *)
++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
else
-@@ -14176,6 +15035,9 @@
- ;;
- esac
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec_F77='-R$libdir'
+- ;;
+- *)
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs_F77=no
fi
-+ else
-+ ld_shlibs_F77=no
-+ fi
;;
- os2*)
-@@ -14207,7 +15069,7 @@
+@@ -14207,7 +15403,7 @@
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
@@ -18975,7 +20395,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -14215,21 +15077,15 @@
+@@ -14215,21 +15411,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -18999,17 +20419,12 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -14238,13 +15094,22 @@
+@@ -14238,8 +15428,17 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-- esac
-- link_all_deplibs_F77=yes
-- ;;
--
-- sunos4*)
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
@@ -19021,15 +20436,10 @@
+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
-+ esac
-+ link_all_deplibs_F77=yes
-+ ;;
-+
-+ sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
-@@ -14296,36 +15161,45 @@
+ esac
+ link_all_deplibs_F77=yes
+ ;;
+@@ -14296,36 +15495,45 @@
fi
;;
@@ -19096,7 +20506,7 @@
;;
uts4*)
-@@ -14340,15 +15214,10 @@
+@@ -14340,15 +15548,10 @@
esac
fi
@@ -19114,7 +20524,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14366,10 +15235,10 @@
+@@ -14366,10 +15569,10 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -19128,7 +20538,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -14381,6 +15250,7 @@
+@@ -14381,6 +15584,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -19136,7 +20546,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14403,20 +15273,20 @@
+@@ -14403,20 +15607,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -19162,7 +20572,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14426,20 +15296,7 @@
+@@ -14426,20 +15630,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19184,7 +20594,16 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14513,7 +15370,7 @@
+@@ -14457,7 +15648,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -14513,7 +15704,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -19193,7 +20612,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14529,7 +15386,7 @@
+@@ -14529,7 +15720,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -19202,7 +20621,7 @@
need_version=no
need_lib_prefix=no
-@@ -14541,7 +15398,8 @@
+@@ -14541,7 +15732,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -19212,7 +20631,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14571,7 +15429,7 @@
+@@ -14571,7 +15763,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -19221,7 +20640,7 @@
;;
esac
;;
-@@ -14594,13 +15452,8 @@
+@@ -14594,13 +15786,8 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -19237,7 +20656,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -14617,20 +15470,17 @@
+@@ -14617,20 +15804,17 @@
dynamic_linker=no
;;
@@ -19269,7 +20688,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14648,14 +15498,19 @@
+@@ -14648,14 +15832,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -19291,7 +20710,7 @@
esac
;;
-@@ -14675,9 +15530,9 @@
+@@ -14675,9 +15864,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -19303,7 +20722,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14692,7 +15547,7 @@
+@@ -14692,7 +15881,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -19312,7 +20731,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14703,7 +15558,7 @@
+@@ -14703,7 +15892,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -19321,7 +20740,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14715,6 +15570,18 @@
+@@ -14715,6 +15904,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19340,7 +20759,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14758,7 +15625,7 @@
+@@ -14758,7 +15959,7 @@
;;
# This must be Linux ELF.
@@ -19349,7 +20768,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14774,8 +15641,8 @@
+@@ -14774,8 +15975,8 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -19360,7 +20779,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14787,7 +15654,7 @@
+@@ -14787,7 +15988,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19369,7 +20788,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14796,7 +15663,7 @@
+@@ -14796,7 +15997,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -19378,7 +20797,7 @@
;;
netbsd*)
-@@ -14836,8 +15703,13 @@
+@@ -14836,8 +16037,13 @@
openbsd*)
version_type=sunos
@@ -19393,7 +20812,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14857,7 +15729,7 @@
+@@ -14857,7 +16063,7 @@
os2*)
libname_spec='$name'
@@ -19402,7 +20821,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14875,11 +15747,8 @@
+@@ -14875,11 +16081,8 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19416,7 +20835,7 @@
;;
solaris*)
-@@ -14907,7 +15776,7 @@
+@@ -14907,7 +16110,7 @@
need_version=yes
;;
@@ -19425,7 +20844,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14940,6 +15809,29 @@
+@@ -14940,6 +16143,29 @@
fi
;;
@@ -19455,7 +20874,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14951,16 +15843,21 @@
+@@ -14951,16 +16177,36 @@
dynamic_linker=no
;;
esac
@@ -19467,6 +20886,21 @@
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -19483,7 +20917,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -14980,8 +15877,8 @@
+@@ -14980,8 +16226,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -19494,7 +20928,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -14992,36 +15889,6 @@
+@@ -14992,36 +16238,6 @@
enable_fast_install=needless
fi
@@ -19531,7 +20965,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -15036,7 +15903,7 @@
+@@ -15036,7 +16252,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -19540,7 +20974,15 @@
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -15078,6 +15945,7 @@
+@@ -15063,6 +16279,7 @@
+ predeps_F77 \
+ postdeps_F77 \
+ compiler_lib_search_path_F77 \
++ compiler_lib_search_dirs_F77 \
+ archive_cmds_F77 \
+ archive_expsym_cmds_F77 \
+ postinstall_cmds_F77 \
+@@ -15078,6 +16295,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -19548,7 +20990,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -15137,6 +16005,12 @@
+@@ -15137,6 +16355,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -19561,7 +21003,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15148,6 +16022,9 @@
+@@ -15148,6 +16372,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -19571,7 +21013,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -15179,7 +16056,7 @@
+@@ -15179,7 +16406,7 @@
OBJDUMP="$OBJDUMP"
# Used on cygwin: assembler.
@@ -19580,7 +21022,7 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-@@ -15198,7 +16075,7 @@
+@@ -15198,7 +16425,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -19589,7 +21031,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15213,7 +16090,7 @@
+@@ -15213,7 +16440,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -19598,7 +21040,18 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15389,7 +16266,7 @@
+@@ -15301,6 +16528,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_F77
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+@@ -15389,7 +16620,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -19607,7 +21060,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -15439,7 +16316,6 @@
+@@ -15439,7 +16670,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -19615,7 +21068,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -15448,29 +16324,58 @@
+@@ -15448,29 +16678,58 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -19649,7 +21102,7 @@
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
++$rm -r conftest*
+
+
# Allow CC to be a program name with arguments.
@@ -19676,7 +21129,7 @@
lt_prog_compiler_no_builtin_flag_GCJ=
-@@ -15478,14 +16383,14 @@
+@@ -15478,14 +16737,14 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -19694,7 +21147,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -15493,26 +16398,28 @@
+@@ -15493,26 +16752,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -19703,12 +21156,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15499: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16404: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16758: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15503: \$? = $ac_status" >&5
-+ echo "$as_me:16408: \$? = $ac_status" >&5
++ echo "$as_me:16762: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -19730,7 +21183,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -15526,8 +16433,8 @@
+@@ -15526,8 +16787,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -19741,7 +21194,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -15549,13 +16456,15 @@
+@@ -15549,14 +16810,16 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -19754,12 +21207,14 @@
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
;;
-@@ -15565,6 +16474,11 @@
+ darwin* | rhapsody*)
+@@ -15565,6 +16828,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -19771,7 +21226,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -15581,7 +16495,7 @@
+@@ -15581,7 +16849,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -19780,7 +21235,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -15607,8 +16521,18 @@
+@@ -15607,18 +16875,28 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -19799,8 +21254,11 @@
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-@@ -15618,7 +16542,7 @@
+- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -19809,7 +21267,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -15641,18 +16565,41 @@
+@@ -15641,18 +16919,41 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -19853,7 +21311,7 @@
esac
;;
-@@ -15662,15 +16609,19 @@
+@@ -15662,15 +16963,19 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -19877,7 +21335,7 @@
;;
sunos4*)
-@@ -15679,7 +16630,7 @@
+@@ -15679,7 +16984,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -19886,7 +21344,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -15692,6 +16643,17 @@
+@@ -15692,6 +16997,17 @@
fi
;;
@@ -19904,7 +21362,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -15703,22 +16665,22 @@
+@@ -15703,22 +17019,22 @@
esac
fi
@@ -19920,19 +21378,21 @@
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_GCJ=no
+- lt_prog_compiler_pic_works_GCJ=no
++ lt_cv_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -15726,26 +16688,28 @@
+@@ -15726,28 +17042,30 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -19941,21 +21401,22 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15732: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16694: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17048: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15736: \$? = $ac_status" >&5
-+ echo "$as_me:16698: \$? = $ac_status" >&5
++ echo "$as_me:17052: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+- lt_prog_compiler_pic_works_GCJ=yes
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_GCJ=yes
++ lt_cv_prog_compiler_pic_works_GCJ=yes
fi
fi
$rm conftest*
@@ -19963,12 +21424,15 @@
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
- if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -15758,7 +16722,7 @@
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+@@ -15758,7 +17076,7 @@
fi
fi
@@ -19977,7 +21441,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -15768,8 +16732,50 @@
+@@ -15768,8 +17086,50 @@
;;
esac
@@ -19989,10 +21453,10 @@
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
-+ lt_prog_compiler_static_works_GCJ=no
++ lt_cv_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -20005,20 +21469,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ else
-+ lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ fi
-+ $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+
-+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+ :
+else
+ lt_prog_compiler_static_GCJ=
@@ -20030,7 +21494,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15778,7 +16784,7 @@
+@@ -15778,7 +17138,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -20039,7 +21503,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -15786,23 +16792,25 @@
+@@ -15786,23 +17146,25 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -20048,12 +21512,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15792: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16798: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17152: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15796: \$? = $ac_status" >&5
-+ echo "$as_me:16802: \$? = $ac_status" >&5
++ echo "$as_me:17156: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20070,7 +21534,7 @@
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
-@@ -15813,23 +16821,23 @@
+@@ -15813,23 +17175,23 @@
$rm conftest*
fi
@@ -20100,7 +21564,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -15839,8 +16847,8 @@
+@@ -15839,8 +17201,8 @@
need_locks=no
fi
@@ -20111,9 +21575,18 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -15878,6 +16886,16 @@
+@@ -15871,13 +17233,24 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
@@ -20128,7 +21601,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -15888,6 +16906,10 @@
+@@ -15888,6 +17261,10 @@
with_gnu_ld=no
fi
;;
@@ -20139,7 +21612,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -15898,6 +16920,27 @@
+@@ -15898,9 +17275,30 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20166,8 +21639,12 @@
+
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
-@@ -15948,10 +16991,10 @@
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_GCJ=no
+@@ -15948,10 +17346,10 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -20180,7 +21657,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -15960,27 +17003,83 @@
+@@ -15960,13 +17358,69 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -20189,17 +21666,9 @@
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-- wlarc=
-- else
-- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- fi
++ fi
++ ;;
++
+ interix[3-9]*)
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
@@ -20213,13 +21682,8 @@
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- solaris* | sysv5*)
-- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-- ld_shlibs_GCJ=no
-- cat <<EOF 1>&2
--
++ ;;
++
+ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -20258,28 +21722,24 @@
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ fi
-+ ;;
-+
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -15976,7 +17430,7 @@
+ fi
+ ;;
+
+- solaris* | sysv5*)
+ solaris*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ ld_shlibs_GCJ=no
-+ cat <<EOF 1>&2
-+
- *** Warning: The releases 2.8.* of the GNU linker cannot reliably
- *** create shared libraries on Solaris systems. Therefore, libtool
- *** is disabling shared libraries support. We urge you to upgrade GNU
-@@ -15997,6 +17096,33 @@
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs_GCJ=no
+ cat <<EOF 1>&2
+@@ -15997,6 +17451,33 @@
fi
;;
@@ -20313,7 +21773,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16004,31 +17130,6 @@
+@@ -16004,31 +17485,6 @@
hardcode_shlibpath_var_GCJ=no
;;
@@ -20345,7 +21805,7 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -16039,17 +17140,12 @@
+@@ -16039,16 +17495,11 @@
;;
esac
@@ -20357,17 +21817,17 @@
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
+- whole_archive_flag_spec_GCJ=
+- fi
+ if test "$ld_shlibs_GCJ" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec_GCJ=
+ export_dynamic_flag_spec_GCJ=
- whole_archive_flag_spec_GCJ=
- fi
-- fi
++ whole_archive_flag_spec_GCJ=
+ fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
-@@ -16060,7 +17156,7 @@
+@@ -16060,14 +17511,14 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -20376,7 +21836,23 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -16094,6 +17190,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -16087,13 +17538,14 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
break
fi
done
@@ -20384,7 +21860,7 @@
esac
exp_sym_flag='-bexport'
-@@ -16112,7 +17209,7 @@
+@@ -16112,7 +17564,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -20393,7 +21869,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -16120,7 +17217,7 @@
+@@ -16120,7 +17572,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -20402,7 +21878,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -16131,8 +17228,12 @@
+@@ -16131,8 +17583,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -20415,7 +21891,21 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16172,49 +17273,54 @@
+@@ -16140,11 +17596,11 @@
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test "$aix_use_runtimelinking" = yes; then
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+- fi
++ fi
+ fi
+ fi
+
+@@ -16172,49 +17628,54 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -20494,7 +21984,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16233,39 +17339,44 @@
+@@ -16233,39 +17694,44 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -20561,7 +22051,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16274,13 +17385,11 @@
+@@ -16274,13 +17740,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -20578,7 +22068,7 @@
fi
fi
;;
-@@ -16293,7 +17402,7 @@
+@@ -16293,7 +17757,7 @@
ld_shlibs_GCJ=no
;;
@@ -20587,7 +22077,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -16307,64 +17416,64 @@
+@@ -16307,64 +17771,63 @@
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
@@ -20609,28 +22099,41 @@
- if test "$GXX" = yes ; then
- archive_cmds_need_lc_GCJ=no
- case "$host_os" in
+- rhapsody* | darwin1.[012])
+- allow_undefined_flag_GCJ='-undefined suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
+- ;;
+- 10.*)
+- allow_undefined_flag_GCJ='-undefined dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+ case $host_os in
- rhapsody* | darwin1.[012])
-- allow_undefined_flag_GCJ='-undefined suppress'
++ rhapsody* | darwin1.[012])
+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
-- allow_undefined_flag_GCJ='-undefined dynamic_lookup'
++ ;;
++ 10.*)
+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
@@ -20659,12 +22162,12 @@
link_all_deplibs_GCJ=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
-+ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
+- ld_shlibs_GCJ=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
@@ -20675,13 +22178,13 @@
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
- ld_shlibs_GCJ=no
++ ld_shlibs_GCJ=no
+ ;;
+ esac
fi
;;
-@@ -16398,7 +17507,7 @@
+@@ -16398,7 +17861,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -20690,7 +22193,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -16421,47 +17530,62 @@
+@@ -16421,47 +17884,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -20749,32 +22252,33 @@
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-- hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
- hardcode_libdir_separator_GCJ=:
+- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_GCJ=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
-+ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+- hardcode_libdir_separator_GCJ=:
+- hardcode_direct_GCJ=no
+- hardcode_shlibpath_var_GCJ=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_GCJ='-L$libdir'
-- hardcode_direct_GCJ=no
-- hardcode_shlibpath_var_GCJ=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -16485,7 +17609,7 @@
+@@ -16485,7 +17963,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -20783,30 +22287,52 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16505,10 +17629,12 @@
+@@ -16505,23 +17983,28 @@
;;
openbsd*)
+- hardcode_direct_GCJ=yes
+- hardcode_shlibpath_var_GCJ=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec_GCJ='${wl}-E'
+ if test -f /usr/libexec/ld.so; then
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_direct_GCJ=yes
++ hardcode_shlibpath_var_GCJ=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_GCJ='${wl}-E'
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_GCJ='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_GCJ='-R$libdir'
++ ;;
++ *)
++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
else
-@@ -16523,6 +17649,9 @@
- ;;
- esac
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec_GCJ='-R$libdir'
+- ;;
+- *)
+- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs_GCJ=no
fi
-+ else
-+ ld_shlibs_GCJ=no
-+ fi
;;
- os2*)
-@@ -16554,7 +17683,7 @@
+@@ -16554,7 +18037,7 @@
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
@@ -20815,7 +22341,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -16562,21 +17691,15 @@
+@@ -16562,21 +18045,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -20839,7 +22365,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -16585,8 +17708,17 @@
+@@ -16585,8 +18062,17 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -20859,7 +22385,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -16643,36 +17775,45 @@
+@@ -16643,36 +18129,45 @@
fi
;;
@@ -20926,7 +22452,7 @@
;;
uts4*)
-@@ -16687,15 +17828,10 @@
+@@ -16687,15 +18182,10 @@
esac
fi
@@ -20944,7 +22470,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -16713,10 +17849,10 @@
+@@ -16713,10 +18203,10 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -20958,7 +22484,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -16728,6 +17864,7 @@
+@@ -16728,6 +18218,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -20966,7 +22492,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -16750,20 +17887,20 @@
+@@ -16750,20 +18241,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -20992,7 +22518,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -16773,20 +17910,7 @@
+@@ -16773,20 +18264,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21014,7 +22540,16 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -16860,7 +17984,7 @@
+@@ -16804,7 +18282,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -16860,7 +18338,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21023,7 +22558,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -16876,7 +18000,7 @@
+@@ -16876,7 +18354,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21032,7 +22567,7 @@
need_version=no
need_lib_prefix=no
-@@ -16888,7 +18012,8 @@
+@@ -16888,7 +18366,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21042,7 +22577,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -16918,7 +18043,7 @@
+@@ -16918,7 +18397,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21051,7 +22586,7 @@
;;
esac
;;
-@@ -16941,13 +18066,8 @@
+@@ -16941,13 +18420,8 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21067,7 +22602,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -16964,20 +18084,17 @@
+@@ -16964,20 +18438,17 @@
dynamic_linker=no
;;
@@ -21099,7 +22634,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -16995,14 +18112,19 @@
+@@ -16995,14 +18466,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21121,7 +22656,7 @@
esac
;;
-@@ -17022,9 +18144,9 @@
+@@ -17022,9 +18498,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21133,7 +22668,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17039,7 +18161,7 @@
+@@ -17039,7 +18515,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21142,7 +22677,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17050,7 +18172,7 @@
+@@ -17050,7 +18526,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21151,132 +22686,67 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17062,1116 +18184,323 @@
+@@ -17062,6 +18538,18 @@
postinstall_cmds='chmod 555 $lib'
;;
--irix5* | irix6* | nonstopux*)
-- case $host_os in
-- nonstopux*) version_type=nonstopux ;;
-- *)
-- if test "$lt_cv_prog_gnu_ld" = yes; then
-- version_type=linux
-- else
-- version_type=irix
-- fi ;;
-- esac
-- need_lib_prefix=no
-- need_version=no
-- soname_spec='${libname}${release}${shared_ext}$major'
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-- case $host_os in
-- irix5* | nonstopux*)
-- libsuff= shlibsuff=
-- ;;
-- *)
-- case $LD in # libtool.m4 will add one of these switches to LD
-- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-- libsuff= shlibsuff= libmagic=32-bit;;
-- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-- libsuff=32 shlibsuff=N32 libmagic=N32;;
-- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-- libsuff=64 shlibsuff=64 libmagic=64-bit;;
-- *) libsuff= shlibsuff= libmagic=never-match;;
-- esac
-- ;;
-- esac
-- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-- shlibpath_overrides_runpath=no
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-- hardcode_into_libs=yes
-- ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
-- dynamic_linker=no
-- ;;
--
--# This must be Linux ELF.
++interix[3-9]*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -17105,7 +18593,7 @@
+ ;;
+
+ # This must be Linux ELF.
-linux*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- # This implies no fast_install, which is unacceptable.
-- # Some rework will be needed to allow for fast_install
-- # before this can be enabled.
-- hardcode_into_libs=yes
--
-- # Append ld.so.conf contents to the search path
-- if test -f /etc/ld.so.conf; then
++linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -17121,8 +18609,8 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-- fi
--
-- # We used to test for /lib/ld.so.1 and disable shared libraries on
-- # powerpc, because MkLinux only supported shared libraries with the
-- # GNU dynamic linker. Since this was broken with cross compilers,
-- # most powerpc-linux boxes support dynamic linking these days and
-- # people can always --disable-shared, the test was removed, and we
-- # assume the GNU/Linux dynamic linker is in use.
-- dynamic_linker='GNU/Linux ld.so'
-- ;;
--
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -17134,7 +18622,7 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
-knetbsd*-gnu)
-+interix[3-9]*)
++netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+@@ -17143,7 +18631,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
-- ;;
--
--netbsd*)
-- version_type=sunos
-- need_lib_prefix=no
-- need_version=no
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- dynamic_linker='NetBSD (a.out) ld.so'
-- else
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- dynamic_linker='NetBSD ld.elf_so'
-- fi
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- ;;
--
--newsos6)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- ;;
--
--nto-qnx*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
++ dynamic_linker='NetBSD ld.elf_so'
;;
--openbsd*)
+ netbsd*)
+@@ -17182,996 +18670,206 @@
+ ;;
+
+ openbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=yes
@@ -21284,13 +22754,11 @@
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+irix5* | irix6* | nonstopux*)
- case $host_os in
+- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
-+ nonstopux*) version_type=nonstopux ;;
- *)
+- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
@@ -21352,8 +22820,7 @@
- ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
@@ -21368,12 +22835,8 @@
- need_lib_prefix=no
- ;;
- motorola)
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
- need_lib_prefix=no
- need_version=no
+- need_lib_prefix=no
+- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
@@ -21392,7 +22855,7 @@
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
@@ -21478,8 +22941,7 @@
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
+- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
@@ -22038,99 +23500,22 @@
-
-
-fi
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-
+-
+-
-fi
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-
+-
+-
-fi
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
- ;;
+-
+- ;;
- esac
-
+-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
- else
+- else
- enable_dlopen=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
- fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-
+- fi
+-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
@@ -22203,29 +23588,14 @@
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-
+-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+nto-qnx*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-
+-
- exit (status);
-}
-EOF
@@ -22240,7 +23610,10 @@
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+openbsd*)
+- esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self=no
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
@@ -22248,72 +23621,7 @@
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self=no
-- fi
--fi
--rm -fr conftest*
--
--
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
--
-- if test "x$lt_cv_dlopen_self" = xyes; then
-- LDFLAGS="$LDFLAGS $link_static_flag"
-- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$cross_compiling" = yes; then :
-- lt_cv_dlopen_self_static=cross
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--#line 18074 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
--
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-- find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--# ifdef RTLD_LAZY
--# define LT_DLLAZY_OR_NOW RTLD_LAZY
--# else
--# ifdef DL_LAZY
--# define LT_DLLAZY_OR_NOW DL_LAZY
--# else
--# ifdef RTLD_NOW
--# define LT_DLLAZY_OR_NOW RTLD_NOW
--# else
--# ifdef DL_NOW
--# define LT_DLLAZY_OR_NOW DL_NOW
--# else
--# define LT_DLLAZY_OR_NOW 0
--# endif
--# endif
--# endif
--# endif
--#endif
++ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
@@ -22328,12 +23636,11 @@
+ esac
+ else
+ shlibpath_overrides_runpath=yes
-+ fi
+ fi
+-fi
+-rm -fr conftest*
+ ;;
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
@@ -22343,11 +23650,9 @@
+ shlibpath_var=LIBPATH
+ ;;
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
@@ -22359,34 +23664,28 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
+- if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
+- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self_static=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 18074 "configure"
+-#include "confdefs.h"
+rdos*)
+ dynamic_linker=no
+ ;;
-- exit (status);
--}
--EOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-- lt_status=$?
-- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self_static=no
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
@@ -22399,7 +23698,8 @@
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
-+
+
+-#include <stdio.h>
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -22408,12 +23708,19 @@
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
- fi
--fi
--rm -fr conftest*
++ fi
+ need_version=yes
+ ;;
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -22438,21 +23745,39 @@
+ esac
+ ;;
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
- fi
++ fi
+ ;;
-- CPPFLAGS="$save_CPPFLAGS"
-- LDFLAGS="$save_LDFLAGS"
-- LIBS="$save_LIBS"
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
@@ -22470,16 +23795,17 @@
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
- esac
++ ;;
++ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
-- case $lt_cv_dlopen_self in
-- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-- *) enable_dlopen_self=unknown ;;
-- esac
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -22487,10 +23813,12 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
-- case $lt_cv_dlopen_self_static in
-- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-- *) enable_dlopen_self_static=unknown ;;
-- esac
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
+*)
+ dynamic_linker=no
+ ;;
@@ -22498,19 +23826,66 @@
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+- exit (status);
+-}
+-EOF
+- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+- esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self_static=no
+- fi
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
+
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+ fi
+-rm -fr conftest*
+
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+- fi
+
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+- ;;
+- esac
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+hardcode_action_GCJ=
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ test -n "$runpath_var_GCJ" || \
+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-+
+
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -22531,7 +23906,11 @@
+fi
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-+
+
+- case $lt_cv_dlopen_self_static in
+- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+- *) enable_dlopen_self_static=unknown ;;
+- esac
+if test "$hardcode_action_GCJ" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
@@ -22542,7 +23921,7 @@
fi
-@@ -18188,7 +18517,7 @@
+@@ -18188,7 +18886,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -22551,7 +23930,15 @@
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -18230,6 +18559,7 @@
+@@ -18215,6 +18913,7 @@
+ predeps_GCJ \
+ postdeps_GCJ \
+ compiler_lib_search_path_GCJ \
++ compiler_lib_search_dirs_GCJ \
+ archive_cmds_GCJ \
+ archive_expsym_cmds_GCJ \
+ postinstall_cmds_GCJ \
+@@ -18230,6 +18929,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -22559,7 +23946,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -18289,6 +18619,12 @@
+@@ -18289,6 +18989,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22572,7 +23959,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18300,6 +18636,9 @@
+@@ -18300,6 +19006,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22582,7 +23969,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -18331,7 +18670,7 @@
+@@ -18331,7 +19040,7 @@
OBJDUMP="$OBJDUMP"
# Used on cygwin: assembler.
@@ -22591,7 +23978,7 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-@@ -18350,7 +18689,7 @@
+@@ -18350,7 +19059,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22600,7 +23987,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18365,7 +18704,7 @@
+@@ -18365,7 +19074,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -22609,7 +23996,18 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18541,7 +18880,7 @@
+@@ -18453,6 +19162,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_GCJ
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+@@ -18541,7 +19254,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -22618,7 +24016,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -18590,7 +18929,6 @@
+@@ -18590,7 +19303,6 @@
RC)
@@ -22626,7 +24024,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -18599,7 +18937,7 @@
+@@ -18599,7 +19311,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -22635,7 +24033,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -18609,15 +18947,42 @@
+@@ -18609,15 +19321,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -22657,7 +24055,7 @@
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
++$rm -r conftest*
+
+
# Allow CC to be a program name with arguments.
@@ -22678,7 +24076,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -18633,7 +18998,7 @@
+@@ -18633,7 +19372,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -22687,7 +24085,15 @@
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -18675,6 +19040,7 @@
+@@ -18660,6 +19399,7 @@
+ predeps_RC \
+ postdeps_RC \
+ compiler_lib_search_path_RC \
++ compiler_lib_search_dirs_RC \
+ archive_cmds_RC \
+ archive_expsym_cmds_RC \
+ postinstall_cmds_RC \
+@@ -18675,6 +19415,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -22695,7 +24101,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -18734,6 +19100,12 @@
+@@ -18734,6 +19475,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22708,7 +24114,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18745,6 +19117,9 @@
+@@ -18745,6 +19492,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22718,7 +24124,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -18776,7 +19151,7 @@
+@@ -18776,7 +19526,7 @@
OBJDUMP="$OBJDUMP"
# Used on cygwin: assembler.
@@ -22727,7 +24133,7 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-@@ -18795,7 +19170,7 @@
+@@ -18795,7 +19545,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22736,7 +24142,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18810,7 +19185,7 @@
+@@ -18810,7 +19560,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -22745,7 +24151,18 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18986,7 +19361,7 @@
+@@ -18898,6 +19648,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_RC
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+@@ -18986,7 +19740,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -22754,7 +24171,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -19098,8 +19473,8 @@
+@@ -19098,8 +19852,8 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -22765,7 +24182,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19121,7 +19496,7 @@
+@@ -19121,7 +19875,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22774,7 +24191,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -19140,21 +19515,22 @@
+@@ -19140,21 +19894,22 @@
;;
esac
done
@@ -22802,7 +24219,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -19164,27 +19540,27 @@
+@@ -19164,27 +19919,27 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -22841,12 +24258,25 @@
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19218,83 +19594,76 @@
+@@ -19192,8 +19947,8 @@
+ if test "$GCC" != yes; then
+ ac_save_CC=$CC
+ while :; do
+- # IRIX 6.2 and later do not support large files by default,
+- # so use the C compiler's -n32 option if that helps.
++ # IRIX 6.2 and later do not support large files by default,
++ # so use the C compiler's -n32 option if that helps.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -19217,84 +19972,77 @@
+ return 0;
}
_ACEOF
- rm -f conftest.$ac_objext
+- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
++ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22885,12 +24315,14 @@
+
fi
-rm -f conftest.err conftest.$ac_objext
+- CC="$CC -n32"
+- rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+
+rm -f core conftest.err conftest.$ac_objext
- CC="$CC -n32"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
++ CC="$CC -n32"
++ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22957,7 +24389,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19319,34 +19688,31 @@
+@@ -19319,34 +20067,31 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23007,7 +24439,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19372,54 +19738,53 @@
+@@ -19372,54 +20117,53 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23087,7 +24519,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19444,34 +19809,31 @@
+@@ -19444,34 +20188,31 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23137,7 +24569,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19497,52 +19859,52 @@
+@@ -19497,52 +20238,52 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23215,7 +24647,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19566,35 +19928,31 @@
+@@ -19566,35 +20307,31 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23265,7 +24697,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -19650,6 +20008,7 @@
+@@ -19650,6 +20387,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -23273,7 +24705,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -19669,18 +20028,27 @@
+@@ -19669,18 +20407,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -23307,7 +24739,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19693,12 +20061,14 @@
+@@ -19693,12 +20440,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -23325,7 +24757,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -19708,9 +20078,7 @@
+@@ -19708,9 +20457,7 @@
fi
@@ -23336,7 +24768,7 @@
ICC_TRUE=
ICC_FALSE='#'
else
-@@ -19725,10 +20093,9 @@
+@@ -19725,10 +20472,9 @@
fi
@@ -23349,7 +24781,7 @@
yes) debug=true ;;
no) debug=false ;;
*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
-@@ -19737,10 +20104,9 @@
+@@ -19737,10 +20483,9 @@
esac
else
debug=false
@@ -23362,7 +24794,7 @@
DEBUG_TRUE=
DEBUG_FALSE='#'
else
-@@ -19749,11 +20115,11 @@
+@@ -19749,11 +20494,11 @@
fi
@@ -23377,7 +24809,7 @@
if test "${ac_cv_c_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19771,10 +20137,10 @@
+@@ -19771,10 +20516,10 @@
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -23391,7 +24823,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -19783,16 +20149,17 @@
+@@ -19783,16 +20528,17 @@
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -23413,7 +24845,7 @@
}
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
int x[] = {25, 17};
-@@ -19811,7 +20178,9 @@
+@@ -19811,7 +20557,9 @@
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -23423,7 +24855,7 @@
#endif
;
-@@ -19819,38 +20188,34 @@
+@@ -19819,38 +20567,34 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23478,7 +24910,7 @@
if test $ac_cv_c_const = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -19859,8 +20224,8 @@
+@@ -19859,8 +20603,8 @@
fi
@@ -23489,7 +24921,7 @@
if test "${ac_cv_c_inline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19880,39 +20245,37 @@
+@@ -19880,39 +20624,37 @@
_ACEOF
rm -f conftest.$ac_objext
@@ -23547,7 +24979,7 @@
case $ac_cv_c_inline in
-@@ -19930,8 +20293,8 @@
+@@ -19930,8 +20672,8 @@
;;
esac
@@ -23558,7 +24990,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19955,38 +20318,34 @@
+@@ -19955,38 +20697,34 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23613,7 +25045,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -19997,8 +20356,8 @@
+@@ -19997,8 +20735,8 @@
if test $ac_cv_c_compiler_gnu = yes; then
@@ -23624,7 +25056,7 @@
if test "${ac_cv_prog_gcc_traditional+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20039,8 +20398,8 @@
+@@ -20039,8 +20777,8 @@
fi
fi
@@ -23635,7 +25067,7 @@
if test $ac_cv_prog_gcc_traditional = yes; then
CC="$CC -traditional"
fi
-@@ -20049,7 +20408,8 @@
+@@ -20049,7 +20787,8 @@
@@ -23645,7 +25077,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
-@@ -20068,39 +20428,58 @@
+@@ -20068,39 +20807,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -23720,7 +25152,7 @@
fi
fi
rm -f confcache
-@@ -20109,32 +20488,18 @@
+@@ -20109,32 +20867,18 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -23759,7 +25191,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -20200,17 +20565,45 @@
+@@ -20200,17 +20944,45 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -23809,7 +25241,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -20220,8 +20613,43 @@
+@@ -20220,8 +20992,43 @@
fi
@@ -23854,7 +25286,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -20235,18 +20663,19 @@
+@@ -20235,18 +21042,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -23877,7 +25309,7 @@
as_basename=basename
else
as_basename=false
-@@ -20254,159 +20683,120 @@
+@@ -20254,159 +21062,120 @@
# Name of the executable.
@@ -23892,6 +25324,16 @@
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+-
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
@@ -23904,17 +25346,8 @@
+ s//\1/
+ q
+ }
- s/.*/./; q'`
++ s/.*/./; q'`
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
@@ -24086,16 +25519,16 @@
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
-- as_ln_s='cp -p'
-- else
- as_ln_s='ln -s'
-- fi
++ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ as_ln_s='cp -p'
+ as_ln_s='cp -p'
+- else
+- as_ln_s='ln -s'
+- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
@@ -24107,7 +25540,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -20415,7 +20805,28 @@
+@@ -20415,7 +21184,28 @@
as_mkdir_p=false
fi
@@ -24137,7 +25570,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -20424,31 +20835,14 @@
+@@ -20424,31 +21214,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -24173,7 +25606,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20456,30 +20850,20 @@
+@@ -20456,30 +21229,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -24194,14 +25627,14 @@
-if test -n "$ac_config_headers"; then
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+-
+-if test -n "$ac_config_links"; then
+- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
--if test -n "$ac_config_links"; then
-- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
--
-if test -n "$ac_config_commands"; then
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
@@ -24212,7 +25645,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -20487,7 +20871,7 @@
+@@ -20487,7 +21250,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -24221,7 +25654,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -20506,19 +20890,22 @@
+@@ -20506,19 +21269,22 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -24250,7 +25683,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -20529,39 +20916,24 @@
+@@ -20529,39 +21295,24 @@
do
case $1 in
--*=*)
@@ -24296,7 +25729,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -20571,18 +20943,24 @@
+@@ -20571,18 +21322,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -24326,7 +25759,7 @@
esac
shift
-@@ -20598,40 +20976,52 @@
+@@ -20598,40 +21355,52 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -24393,7 +25826,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -20643,365 +21033,480 @@
+@@ -20643,365 +21412,482 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -24594,6 +26027,10 @@
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_lines`
+- fi
+- done
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds=cat
+if test -n "$CONFIG_FILES"; then
+
+_ACEOF
@@ -24710,10 +26147,8 @@
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
+ fi
+-fi # test -n "$CONFIG_FILES"
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
@@ -24753,6 +26188,8 @@
+ECHO!$ECHO$ac_delim
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
++NMEDIT!$NMEDIT$ac_delim
+CPP!$CPP$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+F77!$F77$ac_delim
@@ -24769,7 +26206,7 @@
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -24777,20 +26214,19 @@
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
--fi # test -n "$CONFIG_FILES"
++ fi
+done
-+
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
-
++
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
- _ACEOF
++_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
@@ -24805,7 +26241,7 @@
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
-+_ACEOF
+ _ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -24912,6 +26348,11 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -24928,11 +26369,7 @@
+ s//\1/
+ q
+ }
- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
++ s/.*/./; q'`
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
@@ -24960,6 +26397,7 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -24976,7 +26414,7 @@
+ s//\1/
+ q
+ }
- s/.*/./; q'`
++ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
@@ -25110,11 +26548,7 @@
- fi
- configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-
+-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
@@ -25142,6 +26576,11 @@
- fi;;
- esac
- done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=; ac_datarootdir_seen=
++
+case `sed -n '/datarootdir/ {
+ p
+ q
@@ -25174,7 +26613,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -21009,248 +21514,131 @@
+@@ -21009,387 +21895,175 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -25204,20 +26643,6 @@
-#
-# CONFIG_HEADER section.
-#
--
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='[ ].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
@@ -25240,6 +26665,20 @@
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+-ac_dB='[ ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
+-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+ rm -f "$tmp/stdin"
@@ -25345,7 +26784,8 @@
+ac_dB='\\)[ (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
-+
+
+-# This sed command replaces #undef with comments. This is necessary, for
+uniq confdefs.h |
+ sed -n '
+ t rset
@@ -25358,8 +26798,7 @@
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
-
--# This sed command replaces #undef with comments. This is necessary, for
++
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments. This is necessary, for
# example, in the case of _POSIX_SOURCE, which is predefined and required
@@ -25522,42 +26961,29 @@
fi
+ rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
++_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -21261,135 +21649,39 @@
+ case $_am_header in
+- $ac_file | $ac_file:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X$ac_file : 'X\(//\)[^/]' \| \
+- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
- echo X$ac_file |
+-echo X$ac_file |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
- s/.*/./; q'`/stamp-h$_am_stamp_count
+- s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
@@ -25630,6 +27056,29 @@
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$_am_arg" : 'X\(//\)[^/]' \| \
++ X"$_am_arg" : 'X\(//\)$' \| \
++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$_am_arg" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
-# Do not use `cd foo && pwd` to compute absolute paths, because
@@ -25685,7 +27134,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -21397,94 +21689,126 @@
+@@ -21397,94 +22071,126 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -25694,7 +27143,7 @@
- dirpart=`(dirname "$mf") 2>/dev/null ||
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
@@ -25707,6 +27156,7 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -25723,7 +27173,7 @@
+ s//\1/
+ q
+ }
- s/.*/./; q'`
++ s/.*/./; q'`
else
continue
fi
@@ -25775,6 +27225,11 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p $dirpart/$fdir
+- else
+- as_dir=$dirpart/$fdir
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -25791,11 +27246,7 @@
+ s//\1/
+ q
+ }
- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p $dirpart/$fdir
-- else
-- as_dir=$dirpart/$fdir
++ s/.*/./; q'`
+ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
@@ -25823,6 +27274,7 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -25839,7 +27291,7 @@
+ s//\1/
+ q
+ }
- s/.*/./; q'`
++ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
@@ -25865,17 +27317,16 @@
{ (exit 0); exit 0; }
_ACEOF
-diff -ubrN libGenome-1.3.0.orig/doc/Makefile.in libGenome-1.3.0/doc/Makefile.in
---- libGenome-1.3.0.orig/doc/Makefile.in 2007-01-31 06:35:59.000000000 +0100
-+++ libGenome-1.3.0/doc/Makefile.in 2008-02-20 16:00:52.000000000 +0100
+--- libGenome-1.3.0.orig.orig/doc/Makefile.in
++++ libGenome-1.3.0.orig/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -25921,7 +27372,7 @@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
-@@ -65,8 +61,6 @@
+@@ -65,10 +61,9 @@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -25929,8 +27380,11 @@
-DEBUG_TRUE = @DEBUG_TRUE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
-@@ -83,8 +77,8 @@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -83,8 +78,8 @@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GENERIC_RELEASE = @GENERIC_RELEASE@
GENERIC_VERSION = @GENERIC_VERSION@
@@ -25941,15 +27395,16 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -97,6 +91,7 @@
+@@ -97,6 +92,8 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -106,56 +101,67 @@
+@@ -106,56 +103,67 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -26024,7 +27479,7 @@
EXTRA_DIST = libGenome.dox html
all: all-am
-@@ -195,10 +201,6 @@
+@@ -195,10 +203,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -26035,7 +27490,7 @@
tags: TAGS
TAGS:
-@@ -207,22 +209,21 @@
+@@ -207,22 +211,21 @@
distdir: $(DISTFILES)
@@ -26045,6 +27500,7 @@
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
@@ -26055,7 +27511,7 @@
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
- esac; \
++ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -26070,7 +27526,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -256,7 +257,7 @@
+@@ -256,7 +259,7 @@
clean-generic:
distclean-generic:
@@ -26079,7 +27535,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -267,7 +268,7 @@
+@@ -267,7 +270,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -26088,7 +27544,7 @@
dvi: dvi-am
-@@ -281,12 +282,20 @@
+@@ -281,12 +284,20 @@
install-data-am:
@@ -26109,7 +27565,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -305,17 +314,20 @@
+@@ -305,17 +316,20 @@
ps-am:
@@ -26135,17 +27591,16 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -ubrN libGenome-1.3.0.orig/libGenome/Makefile.in libGenome-1.3.0/libGenome/Makefile.in
---- libGenome-1.3.0.orig/libGenome/Makefile.in 2007-01-31 06:39:59.000000000 +0100
-+++ libGenome-1.3.0/libGenome/Makefile.in 2008-02-20 16:00:52.000000000 +0100
+--- libGenome-1.3.0.orig.orig/libGenome/Makefile.in
++++ libGenome-1.3.0.orig/libGenome/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -26177,7 +27632,7 @@
check_PROGRAMS = TestRevComp$(EXEEXT)
EXTRA_PROGRAMS = test_o_matic$(EXEEXT) testSource$(EXEEXT) \
testSourceFactory$(EXEEXT) testSourceSeq$(EXEEXT) \
-@@ -50,13 +46,20 @@
+@@ -50,10 +46,17 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -26196,26 +27651,18 @@
+ "$(DESTDIR)$(library_includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
--libGenome_1_3_la_LIBADD =
-+libGenome_la_LIBADD =
- am__objects_1 = gnFilter.lo gnCompare.lo gnTranslator.lo \
- gnSourceFactory.lo gnFeature.lo gnSourceQualifier.lo \
- gnFileContig.lo gnSourceSpec.lo gnFileSource.lo gnFASSource.lo \
-@@ -65,8 +68,11 @@
- gnBaseFeature.lo gnSEQSource.lo gnSequence.lo gnContigSpec.lo \
- gnSourceHeader.lo gnException.lo gnFastTranslator.lo \
+ libGenome_1_3_la_LIBADD =
+@@ -67,6 +70,9 @@
gnPosSpecificTranslator.lo gnDefs.lo
--am_libGenome_1_3_la_OBJECTS = $(am__objects_1)
--libGenome_1_3_la_OBJECTS = $(am_libGenome_1_3_la_OBJECTS)
-+am_libGenome_la_OBJECTS = $(am__objects_1)
-+libGenome_la_OBJECTS = $(am_libGenome_la_OBJECTS)
-+libGenome_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ am_libGenome_1_3_la_OBJECTS = $(am__objects_1)
+ libGenome_1_3_la_OBJECTS = $(am_libGenome_1_3_la_OBJECTS)
++libGenome_1_3_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(libGenome_la_LDFLAGS) $(LDFLAGS) -o $@
++ $(CXXFLAGS) $(libGenome_1_3_la_LDFLAGS) $(LDFLAGS) -o $@
am_TestRevComp_OBJECTS = TestRevComp.$(OBJEXT)
TestRevComp_OBJECTS = $(am_TestRevComp_OBJECTS)
TestRevComp_DEPENDENCIES = $(top_builddir)/src/libGenome.a
-@@ -88,59 +94,30 @@
+@@ -88,53 +94,24 @@
am_test_o_matic_OBJECTS = test-o-matic.$(OBJEXT)
test_o_matic_OBJECTS = $(am_test_o_matic_OBJECTS)
test_o_matic_DEPENDENCIES = $(top_builddir)/src/libGenome.a
@@ -26226,7 +27673,7 @@
testgnSequence_OBJECTS = $(am_testgnSequence_OBJECTS)
testgnSequence_DEPENDENCIES = $(top_builddir)/src/libGenome.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/TestRevComp.Po \
@@ -26273,20 +27720,12 @@
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(libGenome_1_3_la_SOURCES) $(TestRevComp_SOURCES) \
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
-+SOURCES = $(libGenome_la_SOURCES) $(TestRevComp_SOURCES) \
+ SOURCES = $(libGenome_1_3_la_SOURCES) $(TestRevComp_SOURCES) \
$(coordMapper_SOURCES) $(testSource_SOURCES) \
$(testSourceFactory_SOURCES) $(testSourceSeq_SOURCES) \
- $(testTests_SOURCES) $(test_o_matic_SOURCES) \
- $(testgnSequence_SOURCES)
--DIST_SOURCES = $(libGenome_1_3_la_SOURCES) $(TestRevComp_SOURCES) \
-+DIST_SOURCES = $(libGenome_la_SOURCES) $(TestRevComp_SOURCES) \
- $(coordMapper_SOURCES) $(testSource_SOURCES) \
- $(testSourceFactory_SOURCES) $(testSourceSeq_SOURCES) \
- $(testTests_SOURCES) $(test_o_matic_SOURCES) \
@@ -151,8 +128,6 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -26296,7 +27735,7 @@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
-@@ -169,8 +144,6 @@
+@@ -169,10 +144,9 @@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -26304,8 +27743,11 @@
-DEBUG_TRUE = @DEBUG_TRUE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
-@@ -187,8 +160,8 @@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -187,8 +161,8 @@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GENERIC_RELEASE = @GENERIC_RELEASE@
GENERIC_VERSION = @GENERIC_VERSION@
@@ -26316,15 +27758,16 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -201,6 +174,7 @@
+@@ -201,6 +175,8 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -210,56 +184,67 @@
+@@ -210,56 +186,67 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -26399,23 +27842,16 @@
@DEBUG_TRUE at D_CXXFLAGS = -Wall -g -DCOMMAND_LINE -D__GNDEBUG__
AM_CXXFLAGS = $(D_CXXFLAGS)
LIBGENOME_H = \
-@@ -287,11 +272,11 @@
- gnContigSpec.cpp gnSourceHeader.cpp gnException.cpp \
- gnFastTranslator.cpp gnPosSpecificTranslator.cpp gnDefs.cpp
-
--library_includedir = $(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)
-+library_includedir = $(includedir)/$(GENERIC_LIBRARY_NAME)/$(GENERIC_LIBRARY_NAME)
+@@ -291,7 +278,7 @@
library_include_HEADERS = $(LIBGENOME_H)
--lib_LTLIBRARIES = libGenome-1.3.la
--libGenome_1_3_la_SOURCES = $(LIBGENOME_SRC)
+ lib_LTLIBRARIES = libGenome-1.3.la
+ libGenome_1_3_la_SOURCES = $(LIBGENOME_SRC)
-libGenome_1_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
-+lib_LTLIBRARIES = libGenome.la
-+libGenome_la_SOURCES = $(LIBGENOME_SRC)
-+libGenome_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
++libGenome_1_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
INCLUDES = -I$(top_srcdir)
TestRevComp_SOURCES = TestRevComp.cpp
TestRevComp_LDADD = $(top_builddir)/src/libGenome.a
-@@ -345,10 +330,10 @@
+@@ -345,33 +332,33 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -26424,20 +27860,26 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
-@@ -357,7 +342,7 @@
+ done
+
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
-@@ -366,12 +351,12 @@
+
+ clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
@@ -26446,14 +27888,13 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
--libGenome-1.3.la: $(libGenome_1_3_la_OBJECTS) $(libGenome_1_3_la_DEPENDENCIES)
+ libGenome-1.3.la: $(libGenome_1_3_la_OBJECTS) $(libGenome_1_3_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libGenome_1_3_la_LDFLAGS) $(libGenome_1_3_la_OBJECTS) $(libGenome_1_3_la_LIBADD) $(LIBS)
-+libGenome.la: $(libGenome_la_OBJECTS) $(libGenome_la_DEPENDENCIES)
-+ $(libGenome_la_LINK) -rpath $(libdir) $(libGenome_la_OBJECTS) $(libGenome_la_LIBADD) $(LIBS)
++ $(libGenome_1_3_la_LINK) -rpath $(libdir) $(libGenome_1_3_la_OBJECTS) $(libGenome_1_3_la_LIBADD) $(LIBS)
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; for p in $$list; do \
-@@ -381,28 +366,28 @@
+@@ -381,28 +368,28 @@
done
TestRevComp$(EXEEXT): $(TestRevComp_OBJECTS) $(TestRevComp_DEPENDENCIES)
@rm -f TestRevComp$(EXEEXT)
@@ -26490,7 +27931,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -446,27 +431,24 @@
+@@ -446,27 +433,24 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testgnSequence.Po at am__quote@
.cpp.o:
@@ -26527,7 +27968,7 @@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-@@ -474,16 +456,12 @@
+@@ -474,16 +458,12 @@
clean-libtool:
-rm -rf .libs _libs
@@ -26546,7 +27987,7 @@
echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/$$f'"; \
$(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/$$f"; \
done
-@@ -491,7 +469,7 @@
+@@ -491,7 +471,7 @@
uninstall-library_includeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(library_include_HEADERS)'; for p in $$list; do \
@@ -26555,13 +27996,28 @@
echo " rm -f '$(DESTDIR)$(library_includedir)/$$f'"; \
rm -f "$(DESTDIR)$(library_includedir)/$$f"; \
done
-@@ -516,9 +494,11 @@
+@@ -501,8 +481,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -514,22 +494,23 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -26570,7 +28026,20 @@
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -543,22 +523,21 @@
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -543,22 +524,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -26580,6 +28049,7 @@
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
@@ -26590,7 +28060,7 @@
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
- esac; \
++ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -26605,7 +28075,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -575,7 +554,7 @@
+@@ -575,7 +555,7 @@
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(library_includedir)"; do \
@@ -26614,7 +28084,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -596,7 +575,7 @@
+@@ -596,7 +576,7 @@
clean-generic:
distclean-generic:
@@ -26623,7 +28093,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -610,7 +589,7 @@
+@@ -610,7 +590,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -26632,7 +28102,7 @@
dvi: dvi-am
-@@ -624,12 +603,20 @@
+@@ -624,12 +604,20 @@
install-data-am: install-library_includeHEADERS
@@ -26653,7 +28123,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -650,22 +637,26 @@
+@@ -650,22 +638,26 @@
ps-am:
@@ -26685,517 +28155,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -ubrN libGenome-1.3.0.orig/Makefile.in libGenome-1.3.0/Makefile.in
---- libGenome-1.3.0.orig/Makefile.in 2007-01-31 06:35:59.000000000 +0100
-+++ libGenome-1.3.0/Makefile.in 2008-02-20 16:00:52.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = .
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -34,33 +30,44 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
-+target_triplet = @target@
-+subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/libGenome-1.3.pc.in $(top_srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
- install-sh ltmain.sh missing
--subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno configure.status.lineno
--mkinstalldirs = $(mkdir_p)
-+ configure.lineno config.status.lineno
-+mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = libGenome-1.3.pc
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
- pkgconfigDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(pkgconfig_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -76,8 +83,6 @@
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -94,8 +99,6 @@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
--DEBUG_FALSE = @DEBUG_FALSE@
--DEBUG_TRUE = @DEBUG_TRUE@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- ECHO = @ECHO@
-@@ -112,8 +115,8 @@
- GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
- GENERIC_RELEASE = @GENERIC_RELEASE@
- GENERIC_VERSION = @GENERIC_VERSION@
--ICC_FALSE = @ICC_FALSE@
--ICC_TRUE = @ICC_TRUE@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -126,6 +129,7 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -135,56 +139,67 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STATIC_FLAG = @STATIC_FLAG@
- STRIP = @STRIP@
- VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- projects/libGenome.sln \
- projects/libGenome.vcproj \
-@@ -234,7 +249,7 @@
- config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
-- $(MAKE) stamp-h1; \
-+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
-
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -258,13 +273,12 @@
-
- distclean-libtool:
- -rm -f libtool
--uninstall-info-am:
- install-pkgconfigDATA: $(pkgconfig_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-+ f=$(am__strip_dir) \
- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
-@@ -272,7 +286,7 @@
- uninstall-pkgconfigDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-+ f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
-@@ -284,7 +298,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -296,15 +316,20 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+$(RECURSIVE_CLEAN_TARGETS):
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -325,7 +350,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -350,14 +375,16 @@
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -367,9 +394,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -395,24 +424,22 @@
-
- distdir: $(DISTFILES)
- $(am__remove_distdir)
-- mkdir $(distdir)
-- $(mkdir_p) $(distdir)/. $(distdir)/projects
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ test -d $(distdir) || mkdir $(distdir)
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
- esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -423,15 +450,19 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || mkdir "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="../$(top_distdir)" \
-- distdir="../$(distdir)/$$subdir" \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -439,18 +470,18 @@
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- dist-gzip: distdir
-- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
- dist-bzip2: distdir
-- $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
- dist-tarZ: distdir
-- $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
-+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
- dist-shar: distdir
-@@ -463,7 +494,7 @@
- $(am__remove_distdir)
-
- dist dist-all: distdir
-- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
- # This target untars the dist file and tries a VPATH configuration. Then
-@@ -472,13 +503,13 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
-+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.Z*) \
-- uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
-+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-@@ -514,7 +545,7 @@
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -539,7 +570,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -560,7 +591,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -587,12 +618,20 @@
-
- install-data-am: install-pkgconfigDATA
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
-
- install-man:
-
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-@@ -613,25 +652,26 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
-+uninstall-am: uninstall-pkgconfigDATA
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-- check-am clean clean-generic clean-libtool clean-recursive \
-- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-- dist-shar dist-tarZ dist-zip distcheck distclean \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am am--refresh check check-am clean clean-generic \
-+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
-- distclean-recursive distclean-tags distcleancheck distdir \
-- distuninstallcheck dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-pkgconfigDATA install-strip installcheck \
-- installcheck-am installdirs installdirs-am maintainer-clean \
-- maintainer-clean-generic maintainer-clean-recursive \
-- mostlyclean mostlyclean-generic mostlyclean-libtool \
-- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-dvi install-dvi-am \
-+ install-exec install-exec-am install-html install-html-am \
-+ install-info install-info-am install-man install-pdf \
-+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-+ install-strip installcheck installcheck-am installdirs \
-+ installdirs-am maintainer-clean maintainer-clean-generic \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+ ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-pkgconfigDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
Added: trunk/packages/libgenome/trunk/debian/patches/03_libtool.patch
===================================================================
--- trunk/packages/libgenome/trunk/debian/patches/03_libtool.patch (rev 0)
+++ trunk/packages/libgenome/trunk/debian/patches/03_libtool.patch 2008-03-11 16:04:31 UTC (rev 1553)
@@ -0,0 +1,3871 @@
+--- libGenome-1.3.0.orig/ltmain.sh
++++ libGenome-1.3.0/ltmain.sh
+@@ -1,8 +1,8 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007, 2008 Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -17,13 +17,49 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.26 Debian 1.5.26-1"
++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
++
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+@@ -36,7 +72,7 @@
+ :
+ else
+ # Restart under the correct shell, and then maybe $echo will work.
+- exec $SHELL "$0" --no-reexec ${1+"$@"}
++ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +81,9 @@
+ cat <<EOF
+ $*
+ EOF
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5.2
+-TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -70,14 +96,15 @@
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+- SP2NL="tr '\100' '\n'"
+- NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++ SP2NL='tr \040 \012'
++ NL2SP='tr \015\012 \040\040'
+ ;;
+- *) # Assume ASCII based system
+- SP2NL="tr '\040' '\012'"
+- NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++ SP2NL='tr \100 \n'
++ NL2SP='tr \r\n \100\100'
+ ;;
+ esac
+
+@@ -86,21 +113,30 @@
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+- save_LANG="$LANG"; LANG=C; export LANG
++lt_env=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++ eval "if test \"\${$lt_var+set}\" = set; then
++ save_$lt_var=\$$lt_var
++ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
++ $lt_var=C
++ export $lt_var
++ fi"
++done
++
++if test -n "$lt_env"; then
++ lt_env="env $lt_env"
+ fi
+
+ # Make sure IFS has a sensible default
+-: ${IFS="
+-"}
++lt_nl='
++'
++IFS=" $lt_nl"
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ $echo "$modename: not configured to build any kind of library" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Global variables.
+@@ -112,17 +148,62 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+
+ #####################################
+ # Shell function definitions:
+ # This seems to be the best place for them
+
++# func_mktempdir [string]
++# Make a temporary directory that won't clash with other running
++# libtool processes, and avoids race conditions if possible. If
++# given, STRING is the basename for that directory.
++func_mktempdir ()
++{
++ my_template="${TMPDIR-/tmp}/${1-$progname}"
++
++ if test "$run" = ":"; then
++ # Return a directory name, but don't create it in dry-run mode
++ my_tmpdir="${my_template}-$$"
++ else
++
++ # If mktemp works, use that first and foremost
++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++
++ if test ! -d "$my_tmpdir"; then
++ # Failing that, at least try and use $RANDOM to avoid a race
++ my_tmpdir="${my_template}-${RANDOM-0}$$"
++
++ save_mktempdir_umask=`umask`
++ umask 0077
++ $mkdir "$my_tmpdir"
++ umask $save_mktempdir_umask
++ fi
++
++ # If we're not in dry-run mode, bomb out on failure
++ test -d "$my_tmpdir" || {
++ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++ exit $EXIT_FAILURE
++ }
++ fi
++
++ $echo "X$my_tmpdir" | $Xsed
++}
++
++
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid ()
++{
+ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+@@ -131,17 +212,22 @@
+ ;;
+ *ar\ archive*) # could be an import, or static
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 | \
+- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+- if test "X$win32_nmres" = "Ximport" ; then
+- win32_libid_type="x86 archive import"
+- else
+- win32_libid_type="x86 archive static"
+- fi
++ $SED -n -e '1,100{
++ / I /{
++ s,.*,import,
++ p
++ q
++ }
++ }'`
++ case $win32_nmres in
++ import*) win32_libid_type="x86 archive import";;
++ *) win32_libid_type="x86 archive static";;
++ esac
+ fi
+ ;;
+- *DLL*)
++ *DLL*)
+ win32_libid_type="x86 DLL"
+ ;;
+ *executable*) # but shell scripts are "executable" too...
+@@ -155,9 +241,191 @@
+ $echo $win32_libid_type
+ }
+
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++ if test -n "$available_tags" && test -z "$tagname"; then
++ CC_quoted=
++ for arg in $CC; do
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case $@ in
++ # Blanks in the command may have been stripped by the calling shell,
++ # but not from the CC environment variable when configure was run.
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++ # Blanks at the start of $base_compile will cause this to fail
++ # if we don't check for them as well.
++ *)
++ for z in $available_tags; do
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++ # Evaluate the configuration.
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++ CC_quoted=
++ for arg in $CC; do
++ # Double-quote args containing other shell metacharacters.
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case "$@ " in
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++ # The compiler in the base compile command matches
++ # the one in the tagged configuration.
++ # Assume this is the tagged configuration we want.
++ tagname=$z
++ break
++ ;;
++ esac
++ fi
++ done
++ # If $tagname still isn't set, then no tagged configuration
++ # was found and let the user know that the "--tag" command
++ # line option must be used.
++ if test -z "$tagname"; then
++ $echo "$modename: unable to infer tagged configuration"
++ $echo "$modename: specify a tag with \`--tag'" 1>&2
++ exit $EXIT_FAILURE
++# else
++# $echo "$modename: using $tagname tagged configuration"
++ fi
++ ;;
++ esac
++ fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++ f_ex_an_ar_dir="$1"; shift
++ f_ex_an_ar_oldlib="$1"
++
++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++ exit $EXIT_FAILURE
++ fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++ my_gentop="$1"; shift
++ my_oldlibs=${1+"$@"}
++ my_oldobjs=""
++ my_xlib=""
++ my_xabs=""
++ my_xdir=""
++ my_status=""
++
++ $show "${rm}r $my_gentop"
++ $run ${rm}r "$my_gentop"
++ $show "$mkdir $my_gentop"
++ $run $mkdir "$my_gentop"
++ my_status=$?
++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++ exit $my_status
++ fi
++
++ for my_xlib in $my_oldlibs; do
++ # Extract the objects.
++ case $my_xlib in
++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++ *) my_xabs=`pwd`"/$my_xlib" ;;
++ esac
++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++ my_xlib_u=$my_xlib
++ while :; do
++ case " $extracted_archives " in
++ *" $my_xlib_u "*)
++ extracted_serial=`expr $extracted_serial + 1`
++ my_xlib_u=lt$extracted_serial-$my_xlib ;;
++ *) break ;;
++ esac
++ done
++ extracted_archives="$extracted_archives $my_xlib_u"
++ my_xdir="$my_gentop/$my_xlib_u"
++
++ $show "${rm}r $my_xdir"
++ $run ${rm}r "$my_xdir"
++ $show "$mkdir $my_xdir"
++ $run $mkdir "$my_xdir"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++ exit $exit_status
++ fi
++ case $host in
++ *-darwin*)
++ $show "Extracting $my_xabs"
++ # Do not bother doing anything if just a dry run
++ if test -z "$run"; then
++ darwin_orig_dir=`pwd`
++ cd $my_xdir || exit $?
++ darwin_archive=$my_xabs
++ darwin_curdir=`pwd`
++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++ if test -n "$darwin_arches"; then
++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++ darwin_arch=
++ $show "$darwin_base_archive has multiple architectures $darwin_arches"
++ for darwin_arch in $darwin_arches ; do
++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++ cd "$darwin_curdir"
++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++ done # $darwin_arches
++ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++ darwin_file=
++ darwin_files=
++ for darwin_file in $darwin_filelist; do
++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++ lipo -create -output "$darwin_file" $darwin_files
++ done # $darwin_filelist
++ ${rm}r unfat-$$
++ cd "$darwin_orig_dir"
++ else
++ cd "$darwin_orig_dir"
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ fi # $darwin_arches
++ fi # $run
++ ;;
++ *)
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ ;;
++ esac
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++ done
++ func_extract_archives_result="$my_oldobjs"
++}
+ # End of Shell function definitions
+ #####################################
+
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
++disable_libs=no
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -183,7 +451,7 @@
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ $echo "$progname: invalid tag name: $tagname" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -193,10 +461,10 @@
+ # not specially marked.
+ ;;
+ *)
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ taglist="$taglist $tagname"
+ # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ else
+ $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ fi
+@@ -220,21 +488,22 @@
+ ;;
+
+ --version)
+- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+- $echo
+- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
+- $echo "This is free software; see the source for copying conditions. There is NO"
+- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+- exit 0
++ echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2008 Free Software Foundation, Inc.
++This is free software; see the source for copying conditions. There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++ exit $?
+ ;;
+
+ --config)
+- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+ # Now print the configurations for the tags.
+ for tagname in $taglist; do
+- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ done
+- exit 0
++ exit $?
+ ;;
+
+ --debug)
+@@ -259,7 +528,7 @@
+ else
+ $echo "disable static libraries"
+ fi
+- exit 0
++ exit $?
+ ;;
+
+ --finish) mode="finish" ;;
+@@ -274,7 +543,11 @@
+ preserve_args="$preserve_args $arg"
+ ;;
+
+- --tag) prevopt="--tag" prev=tag ;;
++ --tag)
++ prevopt="--tag"
++ prev=tag
++ preserve_args="$preserve_args --tag"
++ ;;
+ --tag=*)
+ set tag "$optarg" ${1+"$@"}
+ shift
+@@ -290,7 +563,7 @@
+ -*)
+ $echo "$modename: unrecognized option \`$arg'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+
+ *)
+@@ -303,9 +576,21 @@
+ if test -n "$prevopt"; then
+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
++case $disable_libs in
++no)
++ ;;
++shared)
++ build_libtool_libs=no
++ build_old_libs=yes
++ ;;
++static)
++ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++ ;;
++esac
++
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end. This prevents here-documents from being
+ # left over by shells.
+@@ -316,7 +601,7 @@
+ # Infer the operation mode.
+ if test -z "$mode"; then
+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+ case $nonopt in
+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+ mode=link
+@@ -359,7 +644,7 @@
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+@@ -382,7 +667,7 @@
+
+ for arg
+ do
+- case "$arg_mode" in
++ case $arg_mode in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+ lastarg="$arg"
+@@ -401,7 +686,7 @@
+ -o)
+ if test -n "$libobj" ; then
+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg_mode=target
+ continue
+@@ -426,7 +711,7 @@
+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ lastarg=
+ save_ifs="$IFS"; IFS=','
+- for arg in $args; do
++ for arg in $args; do
+ IFS="$save_ifs"
+
+ # Double-quote args containing other shell metacharacters.
+@@ -464,7 +749,10 @@
+ case $lastarg in
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
++ # in scan sets, and some SunOS ksh mistreat backslash-escaping
++ # in scan sets (worked around with variable expansion),
++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
++ # at all, so we specify them separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ lastarg="\"$lastarg\""
+ ;;
+@@ -476,11 +764,11 @@
+ case $arg_mode in
+ arg)
+ $echo "$modename: you must specify an argument for -Xcompile"
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ target)
+ $echo "$modename: you must specify a target with \`-o'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *)
+ # Get the name of the library object.
+@@ -502,9 +790,11 @@
+ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+- *.f90) xform=f90 ;;
++ *.[fF][09]?) xform=[fF][09]. ;;
+ *.for) xform=for ;;
+ *.java) xform=java ;;
++ *.obj) xform=obj ;;
++ *.sx) xform=sx ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -513,50 +803,11 @@
+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *)
+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base compile
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case "$base_compile " in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in the base compile command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
+- ;;
+- esac
+- fi
++ func_infer_tag $base_compile
+
+ for arg in $later; do
+ case $arg in
+@@ -577,6 +828,14 @@
+ esac
+ done
+
++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++ case $qlibobj in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qlibobj="\"$qlibobj\"" ;;
++ esac
++ test "X$libobj" != "X$qlibobj" \
++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$obj"; then
+@@ -589,7 +848,7 @@
+ if test -z "$base_compile"; then
+ $echo "$modename: you must specify a compilation command" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Delete any leftover library objects.
+@@ -600,7 +859,7 @@
+ fi
+
+ $run $rm $removelist
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+@@ -619,7 +878,7 @@
+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ removelist="$removelist $output_obj $lockfile"
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ else
+ output_obj=
+ need_locks=no
+@@ -629,7 +888,7 @@
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+ if test "$need_locks" = yes; then
+- until $run ln "$0" "$lockfile" 2>/dev/null; do
++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+@@ -647,14 +906,19 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- $echo $srcfile > "$lockfile"
++ $echo "$srcfile" > "$lockfile"
+ fi
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++ case $qsrcfile in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qsrcfile="\"$qsrcfile\"" ;;
++ esac
+
+ $run $rm "$libobj" "${libobj}T"
+
+@@ -676,18 +940,18 @@
+ fbsd_hideous_sh_bug=$base_compile
+
+ if test "$pic_mode" != no; then
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ else
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ fi
+
+ if test ! -d "${xdir}$objdir"; then
+ $show "$mkdir ${xdir}$objdir"
+ $run $mkdir ${xdir}$objdir
+- status=$?
+- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+- exit $status
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++ exit $exit_status
+ fi
+ fi
+
+@@ -699,10 +963,10 @@
+ $run $rm "$lobj" "$output_obj"
+
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -722,7 +986,7 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed, then go on to compile the next one
+@@ -759,9 +1023,9 @@
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ else
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+@@ -771,10 +1035,10 @@
+ command="$command$suppress_output"
+ $run $rm "$obj" "$output_obj"
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -794,7 +1058,7 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed
+@@ -832,7 +1096,7 @@
+ $run $rm "$lockfile"
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool link mode
+@@ -890,6 +1154,7 @@
+ no_install=no
+ objs=
+ non_pic_objects=
++ notinst_path= # paths that contain not-installed libtool libraries
+ precious_files_regex=
+ prefer_static_libs=no
+ preload=no
+@@ -903,68 +1168,40 @@
+ thread_safe=no
+ vinfo=
+ vinfo_number=no
++ single_module="${wl}-single_module"
+
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base link
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case $base_compile in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in $compile_command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
+- ;;
+- esac
+- fi
++ func_infer_tag $base_compile
+
+ # We need to know -static, to get the right output filenames.
+ for arg
+ do
+ case $arg in
+- -all-static | -static)
+- if test "X$arg" = "X-all-static"; then
++ -all-static | -static | -static-libtool-libs)
++ case $arg in
++ -all-static)
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
+ if test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+- else
++ prefer_static_libs=yes
++ ;;
++ -static)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+- fi
++ prefer_static_libs=built
++ ;;
++ -static-libtool-libs)
++ if test -z "$pic_flag" && test -n "$link_static_flag"; then
++ dlopen_self=$dlopen_self_static
++ fi
++ prefer_static_libs=yes
++ ;;
++ esac
+ build_libtool_libs=no
+ build_old_libs=yes
+- prefer_static_libs=yes
+ break
+ ;;
+ esac
+@@ -1039,7 +1276,7 @@
+ export_symbols="$arg"
+ if test ! -f "$arg"; then
+ $echo "$modename: symbol file \`$arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ prev=
+ continue
+@@ -1091,7 +1328,7 @@
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1139,12 +1376,17 @@
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1165,7 +1407,7 @@
+ done
+ else
+ $echo "$modename: link input file \`$save_arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg=$save_arg
+ prev=
+@@ -1177,7 +1419,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ if test "$prev" = rpath; then
+@@ -1217,6 +1459,18 @@
+ finalize_command="$finalize_command $qarg"
+ continue
+ ;;
++ shrext)
++ shrext_cmds="$arg"
++ prev=
++ continue
++ ;;
++ darwin_framework|darwin_framework_skip)
++ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ prev=
++ continue
++ ;;
+ *)
+ eval "$prev=\"\$arg\""
+ prev=
+@@ -1265,7 +1519,7 @@
+ -export-symbols | -export-symbols-regex)
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: more than one -exported-symbols argument is not allowed"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+@@ -1275,6 +1529,18 @@
+ continue
+ ;;
+
++ -framework|-arch|-isysroot)
++ case " $CC " in
++ *" ${arg} ${1} "* | *" ${arg} ${1} "*)
++ prev=darwin_framework_skip ;;
++ *) compiler_flags="$compiler_flags $arg"
++ prev=darwin_framework ;;
++ esac
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+@@ -1301,7 +1567,8 @@
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+- exit 1
++ absdir="$dir"
++ notinst_path="$notinst_path $dir"
+ fi
+ dir="$absdir"
+ ;;
+@@ -1315,10 +1582,15 @@
+ esac
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$dir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ continue
+@@ -1327,15 +1599,15 @@
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+- *-*-cygwin* | *-*-pw32* | *-*-beos*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+- *-*-mingw* | *-*-os2*)
++ *-*-os2*)
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+@@ -1343,10 +1615,19 @@
+ # Rhapsody C and math libraries are in the System framework
+ deplibs="$deplibs -framework System"
+ continue
++ ;;
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ test "X$arg" = "X-lc" && continue
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
++ test "X$arg" = "X-lc" && continue
++ ;;
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1356,8 +1637,25 @@
+ continue
+ ;;
+
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+- deplibs="$deplibs $arg"
++ # Tru64 UNIX uses -model [arg] to determine the layout of C++
++ # classes, name mangling, and exception handling.
++ -model)
++ compile_command="$compile_command $arg"
++ compiler_flags="$compiler_flags $arg"
++ finalize_command="$finalize_command $arg"
++ prev=xcompiler
++ continue
++ ;;
++
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
++ -multi_module)
++ single_module="${wl}-multi_module"
+ continue
+ ;;
+
+@@ -1366,13 +1664,20 @@
+ continue
+ ;;
+
+- # gcc -m* arguments should be passed to the linker via $compiler_flags
+- # in order to pass architecture information to the linker
+- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
+- # but this is not reliable with gcc because gcc may use -mfoo to
+- # select a different linker, different libraries, etc, while
+- # -Wl,-mfoo simply passes -mfoo to the linker.
+- -m*)
++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++ # -r[0-9][0-9]* specifies the processor on the SGI compiler
++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++ # +DA*, +DD* enable 64-bit mode on the HP compiler
++ # -q* pass through compiler args for the IBM compiler
++ # -m* pass through architecture-specific compiler args for GCC
++ # -m*, -t[45]*, -txscale* pass through architecture-specific
++ # compiler args for GCC
++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++ # -F/path gives path to uninstalled frameworks, gcc on darwin
++ # @file GCC response files
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1383,9 +1688,7 @@
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+- if test "$with_gcc" = "yes" ; then
+- compiler_flags="$compiler_flags $arg"
+- fi
++ compiler_flags="$compiler_flags $arg"
+ continue
+ ;;
+
+@@ -1401,9 +1704,9 @@
+
+ -no-install)
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ # The PATH hackery in wrapper scripts is required on Windows
+- # in order for the loader to find any dlls it needs.
++ # and Darwin in order for the loader to find any dlls it needs.
+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ fast_install=no
+@@ -1452,7 +1755,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ case "$xrpath " in
+@@ -1462,7 +1765,7 @@
+ continue
+ ;;
+
+- -static)
++ -static | -static-libtool-libs)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+@@ -1575,7 +1878,7 @@
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1623,12 +1926,17 @@
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1695,7 +2003,7 @@
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1728,9 +2036,9 @@
+ if test ! -d "$output_objdir"; then
+ $show "$mkdir $output_objdir"
+ $run $mkdir $output_objdir
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+- exit $status
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++ exit $exit_status
+ fi
+ fi
+
+@@ -1739,7 +2047,7 @@
+ "")
+ $echo "$modename: you must specify an output file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *.$libext) linkmode=oldlib ;;
+ *.lo | *.$objext) linkmode=obj ;;
+@@ -1749,7 +2057,7 @@
+
+ case $host in
+ *cygwin* | *mingw* | *pw32*)
+- # don't eliminate duplcations in $postdeps and $predeps
++ # don't eliminate duplications in $postdeps and $predeps
+ duplicate_compiler_generated_deps=yes
+ ;;
+ *)
+@@ -1793,7 +2101,6 @@
+ newlib_search_path=
+ need_relink=no # whether we're linking any uninstalled libtool libraries
+ notinst_deplibs= # not-installed libtool libraries
+- notinst_path= # paths that contain not-installed libtool libraries
+ case $linkmode in
+ lib)
+ passes="conv link"
+@@ -1802,7 +2109,7 @@
+ *.la) ;;
+ *)
+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -1828,7 +2135,10 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+@@ -1840,12 +2150,12 @@
+ lib=
+ found=no
+ case $deplib in
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+- deplibs="$deplib $deplibs"
++ compiler_flags="$compiler_flags $deplib"
+ fi
+ continue
+ ;;
+@@ -1854,13 +2164,14 @@
+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ continue
+ fi
+- if test "$pass" = conv; then
+- deplibs="$deplib $deplibs"
+- continue
+- fi
+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- for search_ext in .la $shrext .so .a; do
++ if test "$linkmode" = lib; then
++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
++ else
++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++ fi
++ for searchdir in $searchdirs; do
++ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+@@ -1936,11 +2247,11 @@
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ *)
+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -1968,7 +2279,22 @@
+ fi
+ case $linkmode in
+ lib)
+- if test "$deplibs_check_method" != pass_all; then
++ valid_a_lib=no
++ case $deplibs_check_method in
++ match_pattern*)
++ set dummy $deplibs_check_method
++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++ if eval $echo \"$deplib\" 2>/dev/null \
++ | $SED 10q \
++ | $EGREP "$match_pattern_regex" > /dev/null; then
++ valid_a_lib=yes
++ fi
++ ;;
++ pass_all)
++ valid_a_lib=yes
++ ;;
++ esac
++ if test "$valid_a_lib" != yes; then
+ $echo
+ $echo "*** Warning: Trying to link with static lib archive $deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+@@ -2018,15 +2344,15 @@
+ esac # case $deplib
+ if test "$found" = yes || test -f "$lib"; then :
+ else
+- $echo "$modename: cannot find the library \`$lib'" 1>&2
+- exit 1
++ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
++ exit $EXIT_FAILURE
+ fi
+
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2042,6 +2368,8 @@
+ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
+ shouldnotlink=no
++ avoidtemprpath=
++
+
+ # Read the .la file
+ case $lib in
+@@ -2062,7 +2390,7 @@
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+@@ -2079,12 +2407,12 @@
+ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ continue
+ fi # $pass = conv
+
+-
++
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+@@ -2092,16 +2420,18 @@
+ done
+ if test -z "$linklib"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # This library was specified with -dlopen.
+ if test "$pass" = dlopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++ if test -z "$dlname" ||
++ test "$dlopen_support" != yes ||
++ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+@@ -2138,11 +2468,19 @@
+ dir="$libdir"
+ absdir="$libdir"
+ fi
++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+- dir="$ladir/$objdir"
+- absdir="$abs_ladir/$objdir"
+- # Remove this search path later
+- notinst_path="$notinst_path $abs_ladir"
++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++ dir="$ladir"
++ absdir="$abs_ladir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ else
++ dir="$ladir/$objdir"
++ absdir="$abs_ladir/$objdir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ fi
+ fi # $installed = yes
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+@@ -2150,7 +2488,7 @@
+ if test "$pass" = dlpreopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+@@ -2177,7 +2515,7 @@
+ continue
+ fi
+
+-
++
+ if test "$linkmode" = prog && test "$pass" != link; then
+ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+@@ -2213,14 +2551,16 @@
+
+ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { { test "$prefer_static_libs" = no ||
++ test "$prefer_static_libs,$installed" = "built,yes"; } ||
++ test -z "$old_library"; }; then
+ # We need to hardcode the library path
+- if test -n "$shlibpath_var"; then
++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *" $absdir "*) ;;
+- *) temp_rpath="$temp_rpath $dir" ;;
++ *) temp_rpath="$temp_rpath $absdir" ;;
+ esac
+ fi
+
+@@ -2257,24 +2597,29 @@
+ fi
+
+ link_static=no # Whether the deplib will be linked statically
++ use_static_libs=$prefer_static_libs
++ if test "$use_static_libs" = built && test "$installed" = yes ; then
++ use_static_libs=no
++ fi
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
+ # This is a shared library
+-
+- # Warn about portability, can't link against -module's on some systems (darwin)
+- if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++ # Warn about portability, can't link against -module's on
++ # some systems (darwin)
++ if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ $echo
+ if test "$linkmode" = prog; then
+ $echo "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $echo "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+- $echo "*** $linklib is not portable!"
+- fi
++ $echo "*** $linklib is not portable!"
++ fi
+ if test "$linkmode" = lib &&
+ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+@@ -2370,11 +2715,15 @@
+ if test "$hardcode_direct" = no; then
+ add="$dir/$linklib"
+ case $host in
+- *-*-sco3.2v5* ) add_dir="-L$dir" ;;
++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++ *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-darwin* )
+- # if the lib is a module then we can not link against it, someone
+- # is ignoring the new warnings I added
+- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++ # if the lib is a module then we can not link against
++ # it, someone is ignoring the new warnings I added
++ if /usr/bin/file -L $add 2> /dev/null |
++ $EGREP ": [^:]* bundle" >/dev/null ; then
+ $echo "** Warning, lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+ $echo
+@@ -2382,7 +2731,7 @@
+ $echo "** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+- fi
++ fi
+ fi
+ esac
+ elif test "$hardcode_minus_L" = no; then
+@@ -2405,7 +2754,7 @@
+ add_dir="-L$dir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+@@ -2424,7 +2773,7 @@
+
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$add_shlibpath"; then
+@@ -2467,7 +2816,8 @@
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++ if test -n "$inst_prefix_dir" &&
++ test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+@@ -2477,7 +2827,7 @@
+ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+@@ -2538,8 +2888,6 @@
+ fi
+ fi
+ else
+- convenience="$convenience $dir/$old_library"
+- old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
+@@ -2547,7 +2895,8 @@
+
+ if test "$linkmode" = lib; then
+ if test -n "$dependency_libs" &&
+- { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
++ { test "$hardcode_into_libs" != yes ||
++ test "$build_old_libs" = yes ||
+ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+@@ -2604,7 +2953,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$absdir" != "$libdir"; then
+ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+@@ -2614,15 +2963,22 @@
+ depdepl=
+ case $host in
+ *-*-darwin*)
+- # we do not want to link against static libs, but need to link against shared
++ # we do not want to link against static libs,
++ # but need to link against shared
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+- if test -f "$path/$depdepl" ; then
++ if test -f "$deplibdir/$depdepl" ; then
++ depdepl="$deplibdir/$depdepl"
++ elif test -f "$path/$depdepl" ; then
+ depdepl="$path/$depdepl"
+- fi
++ else
++ # Can't find it, oh well...
++ depdepl=
++ fi
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+ *" $path "*) ;;
+@@ -2632,36 +2988,35 @@
+ path=""
+ ;;
+ *)
+- path="-L$path"
+- ;;
+- esac
+-
++ path="-L$path"
++ ;;
++ esac
+ ;;
+- -l*)
++ -l*)
+ case $host in
+ *-*-darwin*)
+- # Again, we only want to link against shared libraries
+- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+- for tmp in $newlib_search_path ; do
+- if test -f "$tmp/lib$tmp_libs.dylib" ; then
+- eval depdepl="$tmp/lib$tmp_libs.dylib"
+- break
+- fi
+- done
+- path=""
++ # Again, we only want to link against shared libraries
++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++ for tmp in $newlib_search_path ; do
++ if test -f "$tmp/lib$tmp_libs.dylib" ; then
++ eval depdepl="$tmp/lib$tmp_libs.dylib"
++ break
++ fi
++ done
++ path=""
+ ;;
+ *) continue ;;
+- esac
++ esac
+ ;;
+ *) continue ;;
+ esac
+ case " $deplibs " in
+- *" $depdepl "*) ;;
+- *) deplibs="$deplibs $depdepl" ;;
+- esac
+- case " $deplibs " in
+ *" $path "*) ;;
+- *) deplibs="$deplibs $path" ;;
++ *) deplibs="$path $deplibs" ;;
++ esac
++ case " $deplibs " in
++ *" $depdepl "*) ;;
++ *) deplibs="$depdepl $deplibs" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+@@ -2748,7 +3103,8 @@
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+- # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++ # Last step: remove runtime libs from dependency_libs
++ # (they stay in deplibs)
+ tmp_libs=
+ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2769,9 +3125,10 @@
+
+ case $linkmode in
+ oldlib)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+@@ -2808,19 +3165,19 @@
+ case $outputname in
+ lib*)
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ if test "$module" = no; then
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ else
+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2831,7 +3188,7 @@
+ if test -n "$objs"; then
+ if test "$deplibs_check_method" != pass_all; then
+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ $echo
+ $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2879,13 +3236,13 @@
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+ # to make the code below a bit more comprehensible
+-
++
+ case $vinfo_number in
+ yes)
+ number_major="$2"
+@@ -2899,7 +3256,7 @@
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|none)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+@@ -2910,9 +3267,15 @@
+ age="0"
+ ;;
+ irix|nonstopux)
+- current=`expr $number_major + $number_minor - 1`
++ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_minor"
++ lt_irix_increment=no
++ ;;
++ *)
++ $echo "$modename: unknown library version type \`$version_type'" 1>&2
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ ;;
+@@ -2925,36 +3288,36 @@
+
+ # Check that each of the things are valid numbers.
+ case $current in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $revision in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $age in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Calculate the version variables.
+@@ -2971,6 +3334,7 @@
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+
+@@ -2985,8 +3349,11 @@
+ ;;
+
+ irix | nonstopux)
+- major=`expr $current - $age + 1`
+-
++ if test "X$lt_irix_increment" = "Xno"; then
++ major=`expr $current - $age`
++ else
++ major=`expr $current - $age + 1`
++ fi
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+@@ -3043,7 +3410,7 @@
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -3097,9 +3464,11 @@
+ *.$objext)
+ ;;
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+- if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+- then
+- continue
++ if test "X$precious_files_regex" != "X"; then
++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++ then
++ continue
++ fi
+ fi
+ removelist="$removelist $p"
+ ;;
+@@ -3121,11 +3490,11 @@
+ fi
+
+ # Eliminate all temporary directories.
+- for path in $notinst_path; do
+- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+- done
++ #for path in $notinst_path; do
++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++ #done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+@@ -3175,9 +3544,14 @@
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+- test "X$arg" = "X-lc" && continue
++ ;;
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
+ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+@@ -3221,13 +3595,12 @@
+ int main() { return 0; }
+ EOF
+ $rm conftest
+- $LTCC -o conftest conftest.c $deplibs
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+- if test "$name" != "" && test "$name" -ne "0"; then
++ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+@@ -3262,13 +3635,11 @@
+ # Error occurred in the first compile. Let's try to salvage
+ # the situation: Compile a separate program for each library.
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+- $LTCC -o conftest conftest.c $i
+- # Did it work?
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ ldd_output=`ldd conftest`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+@@ -3300,7 +3671,7 @@
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning! Library $i is needed by this library but I was not able to"
+- $echo "*** make it link in! You will probably need to install it or some"
++ $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** library that it depends on before this library will be fully"
+ $echo "*** functional. Installing it before continuing would be even better."
+ fi
+@@ -3314,7 +3685,7 @@
+ set dummy $deplibs_check_method
+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3383,7 +3754,7 @@
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test -n "$name" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3513,6 +3884,35 @@
+ deplibs=$newdeplibs
+ fi
+
++
++ # move library search paths that coincide with paths to not yet
++ # installed libraries to the beginning of the library search list
++ new_libs=
++ for path in $notinst_path; do
++ case " $new_libs " in
++ *" -L$path/$objdir "*) ;;
++ *)
++ case " $deplibs " in
++ *" -L$path/$objdir "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ deplibs="$new_libs"
++
++
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+ old_library=
+@@ -3557,7 +3957,10 @@
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++ case $archive_cmds in
++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++ esac
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+@@ -3580,7 +3983,7 @@
+ fi
+
+ # Get the real and link names of the library.
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+@@ -3596,6 +3999,7 @@
+ fi
+
+ lib="$output_objdir/$realname"
++ linknames=
+ for link
+ do
+ linknames="$linknames $link"
+@@ -3624,6 +4028,9 @@
+ # The command line is too long to execute in one step.
+ $show "using reloadable object file for export list..."
+ skipped_export=:
++ # Break out early, otherwise skipped_export may be
++ # set to false by a later but shorter cmd.
++ break
+ fi
+ done
+ IFS="$save_ifs"
+@@ -3644,12 +4051,12 @@
+ for test_deplib in $deplibs; do
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+- *)
++ *)
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+- deplibs="$tmp_deplibs"
++ deplibs="$tmp_deplibs"
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+@@ -3657,67 +4064,13 @@
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ libobjs="$libobjs $func_extract_archives_result"
+ fi
+ fi
+-
++
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linker_flags="$linker_flags $flag"
+@@ -3747,7 +4100,8 @@
+ fi
+ fi
+
+- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
++ if test "X$skipped_export" != "X:" &&
++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ :
+ else
+@@ -3766,6 +4120,7 @@
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
++ output_la=`$echo "X$output" | $Xsed -e "$basename"`
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+@@ -3775,13 +4130,13 @@
+ delfiles=
+ last_robj=
+ k=1
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ if test "X$objlist" = X ||
+- { len=`expr "X$test_cmds" : ".*"` &&
++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; }; then
+ objlist="$objlist $obj"
+ else
+@@ -3795,9 +4150,9 @@
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ fi
+- last_robj=$output_objdir/$save_output-${k}.$objext
++ last_robj=$output_objdir/$output_la-${k}.$objext
+ k=`expr $k + 1`
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ objlist=$obj
+ len=1
+ fi
+@@ -3817,13 +4172,13 @@
+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+ fi
+
+- # Set up a command to remove the reloadale object files
++ # Set up a command to remove the reloadable object files
+ # after they are used.
+ i=0
+ while test "$i" -lt "$k"
+ do
+ i=`expr $i + 1`
+- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ done
+
+ $echo "creating a temporary reloadable object file: $output"
+@@ -3832,7 +4187,6 @@
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $concat_cmds; do
+ IFS="$save_ifs"
+- eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -3872,14 +4226,31 @@
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+- exit 0
++
++ if test -n "$convenience"; then
++ if test -z "$whole_archive_flag_spec"; then
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ fi
++ fi
++
++ exit $EXIT_SUCCESS
+ fi
+
+ # Create links to the real library.
+@@ -3899,9 +4270,10 @@
+ ;;
+
+ obj)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+@@ -3927,7 +4299,7 @@
+ *.lo)
+ if test -n "$objs$old_deplibs"; then
+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ libobj="$output"
+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3948,72 +4320,20 @@
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+- # -Wl from whole_archive_flag_spec
++ # -Wl from whole_archive_flag_spec and hope we can get by with
++ # turning comma into space..
+ wl=
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ else
+ gentop="$output_objdir/${obj}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
+ fi
+
+@@ -4038,7 +4358,7 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$build_libtool_libs" != yes; then
+@@ -4051,7 +4371,7 @@
+ # accidentally link it into a program.
+ # $show "echo timestamp > $libobj"
+ # $run eval "echo timestamp > $libobj" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test -n "$pic_flag" || test "$pic_mode" != default; then
+@@ -4074,7 +4394,7 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ prog)
+@@ -4114,6 +4434,35 @@
+ ;;
+ esac
+
++
++ # move library search paths that coincide with paths to not yet
++ # installed libraries to the beginning of the library search list
++ new_libs=
++ for path in $notinst_path; do
++ case " $new_libs " in
++ *" -L$path/$objdir "*) ;;
++ *)
++ case " $compile_deplibs " in
++ *" -L$path/$objdir "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $compile_deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ compile_deplibs="$new_libs"
++
++
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
+
+@@ -4158,10 +4507,15 @@
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ done
+@@ -4275,13 +4629,25 @@
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- export_symbols="$output_objdir/$output.exp"
++ export_symbols="$output_objdir/$outputname.exp"
+ $run $rm $export_symbols
+- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ else
+- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ fi
+ fi
+
+@@ -4332,7 +4698,26 @@
+ #endif
+
+ /* The mapping between symbol names and symbols. */
++"
++
++ case $host in
++ *cygwin* | *mingw* )
++ $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++ runtime relocations are performed -- see ld's documentation
++ on pseudo-relocs */
++struct {
++"
++ ;;
++ * )
++ $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++ ;;
++ esac
++
++
++ $echo >> "$output_objdir/$dlsyms" "\
+ const char *name;
+ lt_ptr address;
+ }
+@@ -4379,20 +4764,33 @@
+ esac
+
+ # Now compile the dynamic symbol file.
+- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+ # Clean up the generated files.
+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+ # Transform the symbol file into the correct name.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ case $host in
++ *cygwin* | *mingw* )
++ if test -f "$output_objdir/${outputname}.def" ; then
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ else
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ fi
++ ;;
++ * )
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ ;;
++ esac
+ ;;
+ *)
+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ else
+@@ -4401,19 +4799,19 @@
+ # really was required.
+
+ # Nullify the symbol file.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ fi
+
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ $show "$link_command"
+ $run eval "$link_command"
+- status=$?
++ exit_status=$?
+
+ # Delete the generated files.
+ if test -n "$dlsyms"; then
+@@ -4421,7 +4819,7 @@
+ $run $rm "$output_objdir/${outputname}S.${objext}"
+ fi
+
+- exit $status
++ exit $exit_status
+ fi
+
+ if test -n "$shlibpath_var"; then
+@@ -4480,7 +4878,7 @@
+ # Link the executable and exit
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$hardcode_action" = relink; then
+@@ -4494,7 +4892,7 @@
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ else
+ # fast_install is set to needless
+ relink_command=
+@@ -4531,14 +4929,14 @@
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ fi
+
+ # Quote $echo for shipping.
+- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+- case $0 in
+- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+- *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++ case $progpath in
++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+@@ -4561,10 +4959,12 @@
+ esac
+ case $host in
+ *cygwin* | *mingw* )
+- cwrappersource=`$echo ${objdir}/lt-${output}.c`
+- cwrapper=`$echo ${output}.exe`
+- $rm $cwrappersource $cwrapper
+- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++ output_name=`basename $output`
++ output_path=`dirname $output`
++ cwrappersource="$output_path/$objdir/lt-$output_name.c"
++ cwrapper="$output_path/$output_name.exe"
++ $rm $cwrappersource $cwrapper
++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+ cat > $cwrappersource <<EOF
+
+@@ -4573,7 +4973,7 @@
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+-
++
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
+
+@@ -4589,6 +4989,9 @@
+ #include <malloc.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <sys/stat.h>
+
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+@@ -4599,15 +5002,19 @@
+ #endif
+
+ #ifndef DIR_SEPARATOR
+-#define DIR_SEPARATOR '/'
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
+ #endif
+
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+ defined (__OS2__)
+-#define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2
+-#define DIR_SEPARATOR_2 '\\'
+-#endif
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# ifndef DIR_SEPARATOR_2
++# define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++# define PATH_SEPARATOR_2 ';'
++# endif
+ #endif
+
+ #ifndef DIR_SEPARATOR_2
+@@ -4617,17 +5024,32 @@
+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
++
+ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+ if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+
++/* -DDEBUG is fairly common in CFLAGS. */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
++
+ const char *program_name = NULL;
+
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+-char * basename (const char *name);
+-char * fnqualify(const char *path);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int check_executable(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+
+@@ -4636,30 +5058,52 @@
+ {
+ char **newargz;
+ int i;
+-
+- program_name = (char *) xstrdup ((char *) basename (argv[0]));
++
++ program_name = (char *) xstrdup (base_name (argv[0]));
++ DEBUG("(main) argv[0] : %s\n",argv[0]);
++ DEBUG("(main) program_name : %s\n",program_name);
+ newargz = XMALLOC(char *, argc+2);
+ EOF
+
+- cat >> $cwrappersource <<EOF
+- newargz[0] = "$SHELL";
++ cat >> $cwrappersource <<EOF
++ newargz[0] = (char *) xstrdup("$SHELL");
+ EOF
+
+- cat >> $cwrappersource <<"EOF"
+- newargz[1] = fnqualify(argv[0]);
++ cat >> $cwrappersource <<"EOF"
++ newargz[1] = find_executable(argv[0]);
++ if (newargz[1] == NULL)
++ lt_fatal("Couldn't find %s", argv[0]);
++ DEBUG("(main) found exe at : %s\n",newargz[1]);
+ /* we know the script has the same name, without the .exe */
+ /* so make sure newargz[1] doesn't end in .exe */
+- strendzap(newargz[1],".exe");
++ strendzap(newargz[1],".exe");
+ for (i = 1; i < argc; i++)
+ newargz[i+1] = xstrdup(argv[i]);
+ newargz[argc+1] = NULL;
++
++ for (i=0; i<argc+1; i++)
++ {
++ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
++ ;
++ }
++
+ EOF
+
+- cat >> $cwrappersource <<EOF
++ case $host_os in
++ mingw*)
++ cat >> $cwrappersource <<EOF
++ execv("$SHELL",(char const **)newargz);
++EOF
++ ;;
++ *)
++ cat >> $cwrappersource <<EOF
+ execv("$SHELL",newargz);
+ EOF
++ ;;
++ esac
+
+- cat >> $cwrappersource <<"EOF"
++ cat >> $cwrappersource <<"EOF"
++ return 127;
+ }
+
+ void *
+@@ -4672,59 +5116,159 @@
+ return p;
+ }
+
+-char *
++char *
+ xstrdup (const char *string)
+ {
+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+ ;
+ }
+
+-char *
+-basename (const char *name)
++const char *
++base_name (const char *name)
+ {
+ const char *base;
+
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+- if (isalpha (name[0]) && name[1] == ':')
++ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+ name += 2;
+ #endif
+
+ for (base = name; *name; name++)
+ if (IS_DIR_SEPARATOR (*name))
+ base = name + 1;
+- return (char *) base;
++ return base;
+ }
+
+-char *
+-fnqualify(const char *path)
++int
++check_executable(const char * path)
+ {
+- size_t size;
+- char *p;
++ struct stat st;
++
++ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
++ if ((!path) || (!*path))
++ return 0;
++
++ if ((stat (path, &st) >= 0) &&
++ (
++ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
++#if defined (S_IXOTH)
++ ((st.st_mode & S_IXOTH) == S_IXOTH) ||
++#endif
++#if defined (S_IXGRP)
++ ((st.st_mode & S_IXGRP) == S_IXGRP) ||
++#endif
++ ((st.st_mode & S_IXUSR) == S_IXUSR))
++ )
++ return 1;
++ else
++ return 0;
++}
++
++/* Searches for the full path of the wrapper. Returns
++ newly allocated full path name if found, NULL otherwise */
++char *
++find_executable (const char* wrapper)
++{
++ int has_slash = 0;
++ const char* p;
++ const char* p_next;
++ /* static buffer for getcwd */
+ char tmp[LT_PATHMAX + 1];
++ int tmp_len;
++ char* concat_name;
+
+- assert(path != NULL);
++ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+
+- /* Is it qualified already? */
++ if ((wrapper == NULL) || (*wrapper == '\0'))
++ return NULL;
++
++ /* Absolute path? */
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+- if (isalpha (path[0]) && path[1] == ':')
+- return xstrdup (path);
++ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ else
++ {
++#endif
++ if (IS_DIR_SEPARATOR (wrapper[0]))
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++ }
+ #endif
+- if (IS_DIR_SEPARATOR (path[0]))
+- return xstrdup (path);
+
+- /* prepend the current directory */
+- /* doesn't handle '~' */
++ for (p = wrapper; *p; p++)
++ if (*p == '/')
++ {
++ has_slash = 1;
++ break;
++ }
++ if (!has_slash)
++ {
++ /* no slashes; search PATH */
++ const char* path = getenv ("PATH");
++ if (path != NULL)
++ {
++ for (p = path; *p; p = p_next)
++ {
++ const char* q;
++ size_t p_len;
++ for (q = p; *q; q++)
++ if (IS_PATH_SEPARATOR(*q))
++ break;
++ p_len = q - p;
++ p_next = (*q == '\0' ? q : q + 1);
++ if (p_len == 0)
++ {
++ /* empty path: current directory */
++ if (getcwd (tmp, LT_PATHMAX) == NULL)
++ lt_fatal ("getcwd failed");
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++ }
++ else
++ {
++ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, p, p_len);
++ concat_name[p_len] = '/';
++ strcpy (concat_name + p_len + 1, wrapper);
++ }
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ }
++ /* not found in PATH; assume curdir */
++ }
++ /* Relative path | not found in path: prepend cwd */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+- p = XMALLOC(char, size);
+- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+- return p;
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ return NULL;
+ }
+
+ char *
+-strendzap(char *str, const char *pat)
++strendzap(char *str, const char *pat)
+ {
+ size_t len, patlen;
+
+@@ -4744,7 +5288,7 @@
+ }
+
+ static void
+-lt_error_core (int exit_status, const char * mode,
++lt_error_core (int exit_status, const char * mode,
+ const char * message, va_list ap)
+ {
+ fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4764,16 +5308,16 @@
+ va_end (ap);
+ }
+ EOF
+- # we should really use a build-platform specific compiler
+- # here, but OTOH, the wrappers (shell script and this C one)
+- # are only useful if you want to execute the "real" binary.
+- # Since the "real" binary is built for $host, then this
+- # wrapper might as well be built for $host, too.
+- $run $LTCC -s -o $cwrapper $cwrappersource
+- ;;
+- esac
+- $rm $output
+- trap "$rm $output; exit 1" 1 2 15
++ # we should really use a build-platform specific compiler
++ # here, but OTOH, the wrappers (shell script and this C one)
++ # are only useful if you want to execute the "real" binary.
++ # Since the "real" binary is built for $host, then this
++ # wrapper might as well be built for $host, too.
++ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
++ ;;
++ esac
++ $rm $output
++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+ $echo > $output "\
+ #! $SHELL
+@@ -4792,9 +5336,23 @@
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
++else
++ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ relink_command=\"$relink_command\"
+
+@@ -4873,7 +5431,7 @@
+ else
+ $echo \"\$relink_command_output\" >&2
+ $rm \"\$progdir/\$file\"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -4923,32 +5481,32 @@
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $echo >> $output "\
+- exec \$progdir\\\\\$program \${1+\"\$@\"}
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ ;;
+
+ *)
+ $echo >> $output "\
+- exec \$progdir/\$program \${1+\"\$@\"}
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ ;;
+ esac
+ $echo >> $output "\
+- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+- exit 1
++ \$echo \"\$0: cannot exec \$program \$*\"
++ exit $EXIT_FAILURE
+ fi
+ else
+ # The program doesn't exist.
+- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi\
+ "
+ chmod +x $output
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+ esac
+
+@@ -4971,71 +5529,73 @@
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- # Add in members from convenience archives.
+- for xlib in $addlibs; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $addlibs
++ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
+
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ cmds=$old_archive_from_new_cmds
+ else
++ # POSIX demands no paths to be encoded in archives. We have
++ # to avoid creating archives with duplicate basenames if we
++ # might have to extract them afterwards, e.g., when creating a
++ # static archive out of a convenience library, or when linking
++ # the entirety of a libtool archive into another (currently
++ # not supported by libtool).
++ if (for obj in $oldobjs
++ do
++ $echo "X$obj" | $Xsed -e 's%^.*/%%'
++ done | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "copying selected object files to avoid basename conflicts..."
++
++ if test -z "$gentop"; then
++ gentop="$output_objdir/${outputname}x"
++ generated="$generated $gentop"
++
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ $show "$mkdir $gentop"
++ $run $mkdir "$gentop"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++ exit $exit_status
++ fi
++ fi
++
++ save_oldobjs=$oldobjs
++ oldobjs=
++ counter=1
++ for obj in $save_oldobjs
++ do
++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++ case " $oldobjs " in
++ " ") oldobjs=$obj ;;
++ *[\ /]"$objbase "*)
++ while :; do
++ # Make sure we don't pick an alternate name that also
++ # overlaps.
++ newobj=lt$counter-$objbase
++ counter=`expr $counter + 1`
++ case " $oldobjs " in
++ *[\ /]"$newobj "*) ;;
++ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
++ esac
++ done
++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++ $run ln "$obj" "$gentop/$newobj" ||
++ $run cp "$obj" "$gentop/$newobj"
++ oldobjs="$oldobjs $gentop/$newobj"
++ ;;
++ *) oldobjs="$oldobjs $obj" ;;
++ esac
++ done
++ fi
++
+ eval cmds=\"$old_archive_cmds\"
+
+ if len=`expr "X$cmds" : ".*"` &&
+@@ -5049,31 +5609,18 @@
+ objlist=
+ concat_cmds=
+ save_oldobjs=$oldobjs
+- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+- # encoded into archives. This makes 'ar r' malfunction in
+- # this piecewise linking case whenever conflicting object
+- # names appear in distinct ar calls; check, warn and compensate.
+- if (for obj in $save_oldobjs
+- do
+- $echo "X$obj" | $Xsed -e 's%^.*/%%'
+- done | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+- AR_FLAGS=cq
+- fi
++
+ # Is there a better way of finding the last object in the list?
+ for obj in $save_oldobjs
+ do
+ last_oldobj=$obj
+- done
++ done
+ for obj in $save_oldobjs
+ do
+ oldobjs="$objlist $obj"
+ objlist="$objlist $obj"
+ eval test_cmds=\"$old_archive_cmds\"
+- if len=`expr "X$test_cmds" : ".*"` &&
++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; then
+ :
+ else
+@@ -5081,7 +5628,7 @@
+ oldobjs=$objlist
+ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+- fi
++ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+@@ -5130,11 +5677,13 @@
+ fi
+ done
+ # Quote the link command for shipping.
+- relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ if test "$hardcode_automatic" = yes ; then
+- relink_command=
+- fi
++ relink_command=
++ fi
++
++
+ # Only create the output if not a dry run.
+ if test -z "$run"; then
+ for installed in no yes; do
+@@ -5152,7 +5701,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
+@@ -5166,7 +5715,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlfiles="$newdlfiles $libdir/$name"
+ done
+@@ -5177,7 +5726,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ done
+@@ -5185,7 +5734,7 @@
+ else
+ newdlfiles=
+ for lib in $dlfiles; do
+- case $lib in
++ case $lib in
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+@@ -5194,7 +5743,7 @@
+ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+- case $lib in
++ case $lib in
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+@@ -5257,7 +5806,7 @@
+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ ;;
+ esac
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool install mode
+@@ -5268,11 +5817,11 @@
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++ $echo "X$nonopt" | grep shtool > /dev/null; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5281,14 +5830,14 @@
+ shift
+ else
+ install_prog=
+- arg="$nonopt"
++ arg=$nonopt
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5306,28 +5855,31 @@
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+- -f) prev="-f" ;;
+- -g) prev="-g" ;;
+- -m) prev="-m" ;;
+- -o) prev="-o" ;;
++ -f)
++ case " $install_prog " in
++ *[\\\ /]cp\ *) ;;
++ *) prev=$arg ;;
++ esac
++ ;;
++ -g | -m | -o) prev=$arg ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+- -*) ;;
+-
++ -*)
++ ;;
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+ ;;
+@@ -5336,7 +5888,7 @@
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5346,13 +5898,13 @@
+ if test -z "$install_prog"; then
+ $echo "$modename: you must specify an install program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -z "$files"; then
+@@ -5362,7 +5914,7 @@
+ $echo "$modename: you must specify a destination" 1>&2
+ fi
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Strip any trailing slash from the destination.
+@@ -5383,7 +5935,7 @@
+ if test "$#" -gt 2; then
+ $echo "$modename: \`$dest' is not a directory" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+ case $destdir in
+@@ -5395,7 +5947,7 @@
+ *)
+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -5424,7 +5976,7 @@
+ else
+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ library_names=
+@@ -5466,14 +6018,14 @@
+ # but it's something to keep an eye on.
+ if test "$inst_prefix_dir" = "$destdir"; then
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ else
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -5481,7 +6033,7 @@
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -5505,11 +6057,14 @@
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
++ # Try `ln -sf' first, because the `ln' binary might depend on
++ # the symlink we replace! Solaris /bin/ln does not understand -f,
++ # so we also need to try rm && ln -s.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ fi
+ done
+ fi
+@@ -5522,7 +6077,16 @@
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+ fi
+@@ -5560,7 +6124,7 @@
+ *)
+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -5578,7 +6142,7 @@
+ $show "$install_prog $staticobj $staticdest"
+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ *)
+@@ -5616,23 +6180,21 @@
+ notinst_deplibs=
+ relink_command=
+
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ # Check the variables that should have been set.
+ if test -z "$notinst_deplibs"; then
+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ finalize=yes
+@@ -5654,37 +6216,25 @@
+ done
+
+ relink_command=
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ if test "$finalize" = yes && test -z "$run"; then
+- tmpdir="/tmp"
+- test -n "$TMPDIR" && tmpdir="$TMPDIR"
+- if tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`; then :
+- else
+- tmpdir="$tmpdir/libtool-$$"
+- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
+- else
+- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+- continue
+- fi
+- fi
++ tmpdir=`func_mktempdir`
+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+@@ -5704,7 +6254,7 @@
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+- # one anyways
++ # one anyway
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+@@ -5760,9 +6310,9 @@
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ test -n "$run" && current_libdirs=" -n$current_libdirs"
+- exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -5802,9 +6352,9 @@
+ fi
+
+ # Exit here if they wanted silent mode.
+- test "$show" = : && exit 0
++ test "$show" = : && exit $EXIT_SUCCESS
+
+- $echo "----------------------------------------------------------------------"
++ $echo "X----------------------------------------------------------------------" | $Xsed
+ $echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $echo " $libdir"
+@@ -5837,8 +6387,8 @@
+ $echo
+ $echo "See any operating system documentation about shared libraries for"
+ $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+- $echo "----------------------------------------------------------------------"
+- exit 0
++ $echo "X----------------------------------------------------------------------" | $Xsed
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool execute mode
+@@ -5850,7 +6400,7 @@
+ if test -z "$cmd"; then
+ $echo "$modename: you must specify a COMMAND" 1>&2
+ $echo "$help"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Handle -dlopen flags immediately.
+@@ -5858,7 +6408,7 @@
+ if test ! -f "$file"; then
+ $echo "$modename: \`$file' is not a file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ dir=
+@@ -5869,7 +6419,7 @@
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Read the libtool library.
+@@ -5895,8 +6445,10 @@
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+- exit 1
++ if test ! -f "$dir/$dlname"; then
++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++ exit $EXIT_FAILURE
++ fi
+ fi
+ ;;
+
+@@ -5960,23 +6512,23 @@
+ fi
+
+ # Restore saved environment variables
+- if test "${save_LC_ALL+set}" = set; then
+- LC_ALL="$save_LC_ALL"; export LC_ALL
+- fi
+- if test "${save_LANG+set}" = set; then
+- LANG="$save_LANG"; export LANG
+- fi
++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ do
++ eval "if test \"\${save_$lt_var+set}\" = set; then
++ $lt_var=\$save_$lt_var; export $lt_var
++ fi"
++ done
+
+ # Now prepare to actually exec the command.
+- exec_cmd="\"\$cmd\"$args"
++ exec_cmd="\$cmd$args"
+ else
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+ $echo "export $shlibpath_var"
+ fi
+- eval \$echo \"\$cmd\"$args
+- exit 0
++ $echo "$cmd$args"
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -6004,7 +6556,7 @@
+ if test -z "$rm"; then
+ $echo "$modename: you must specify an RM program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ rmdirs=
+@@ -6054,9 +6606,17 @@
+ rmfiles="$rmfiles $objdir/$n"
+ done
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+- if test "$mode" = uninstall; then
++ case "$mode" in
++ clean)
++ case " $library_names " in
++ # " " in the beginning catches empty $dlname
++ *" $dlname "*) ;;
++ *) rmfiles="$rmfiles $objdir/$dlname" ;;
++ esac
++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++ ;;
++ uninstall)
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+ cmds=$postuninstall_cmds
+@@ -6089,7 +6649,8 @@
+ IFS="$save_ifs"
+ fi
+ # FIXME: should reinstall the best remaining shared library.
+- fi
++ ;;
++ esac
+ fi
+ ;;
+
+@@ -6118,7 +6679,7 @@
+ if test "$mode" = clean ; then
+ noexename=$name
+ case $file in
+- *.exe)
++ *.exe)
+ file=`$echo $file|${SED} 's,.exe$,,'`
+ noexename=`$echo $name|${SED} 's,.exe$,,'`
+ # $file with .exe has already been added to rmfiles,
+@@ -6163,20 +6724,20 @@
+ "")
+ $echo "$modename: you must specify a MODE" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test -z "$exec_cmd"; then
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi # test -z "$show_help"
+
+ if test -n "$exec_cmd"; then
+ eval exec $exec_cmd
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # We need to display help for each of the modes.
+@@ -6212,7 +6773,7 @@
+ a more detailed description of MODE.
+
+ Report bugs to <bug-libtool at gnu.org>."
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ clean)
+@@ -6313,9 +6874,9 @@
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+- try to export only the symbols listed in SYMFILE
++ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+- try to export only the symbols matching REGEX
++ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+@@ -6329,9 +6890,11 @@
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+- -static do not do any dynamic linking of libtool libraries
++ -static do not do any dynamic linking of uninstalled libtool libraries
++ -static-libtool-libs
++ do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+- specify library version info [each variable defaults to 0]
++ specify library version info [each variable defaults to 0]
+
+ All other options (arguments beginning with \`-') are ignored.
+
+@@ -6367,14 +6930,14 @@
+ *)
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+
+-exit 0
++exit $?
+
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries. Given conflicting
+@@ -6388,12 +6951,11 @@
+ # configuration. But we'll never go from static-only to shared-only.
+
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
++disable_libs=shared
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
++disable_libs=static
+ # ### END LIBTOOL TAG CONFIG: disable-static
+
+ # Local Variables:
Modified: trunk/packages/libgenome/trunk/debian/patches/series
===================================================================
--- trunk/packages/libgenome/trunk/debian/patches/series 2008-03-11 12:42:03 UTC (rev 1552)
+++ trunk/packages/libgenome/trunk/debian/patches/series 2008-03-11 16:04:31 UTC (rev 1553)
@@ -0,0 +1,3 @@
+01_libGenome_Makefile_am.patch
+02_autoreconf.patch
+03_libtool.patch
More information about the debian-med-commit
mailing list