|
|
@@ -0,0 +1,19349 @@
|
|
|
+diff -Nur opensc-0.11.13.orig/Makefile.in opensc-0.11.13/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/Makefile.in 2010-02-16 10:32:19.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -180,6 +180,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -220,6 +221,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -244,6 +247,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -277,7 +281,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+@@ -313,7 +316,7 @@
|
|
|
+ $(srcdir)/packaged
|
|
|
+
|
|
|
+ EXTRA_DIST = Makefile.mak svnignore
|
|
|
+-SUBDIRS = etc src win32 doc
|
|
|
++SUBDIRS = etc src win32
|
|
|
+ dist_noinst_SCRIPTS = bootstrap
|
|
|
+ dist_noinst_DATA = README \
|
|
|
+ solaris/Makefile solaris/README solaris/checkinstall.in \
|
|
|
+@@ -412,7 +415,7 @@
|
|
|
+ # (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):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+@@ -437,7 +440,7 @@
|
|
|
+ fi; test -z "$$fail"
|
|
|
+
|
|
|
+ $(RECURSIVE_CLEAN_TARGETS):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+@@ -604,7 +607,8 @@
|
|
|
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
|
|
+ dist-hook
|
|
|
+ -test -n "$(am__skip_mode_fix)" \
|
|
|
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
|
|
++ || find "$(distdir)" -type d ! -perm -755 \
|
|
|
++ -exec chmod u+rwx,go+rx {} \; -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 $(install_sh) -c -m a+r {} {} \; \
|
|
|
+@@ -648,17 +652,17 @@
|
|
|
+ distcheck: dist
|
|
|
+ case '$(DIST_ARCHIVES)' in \
|
|
|
+ *.tar.gz*) \
|
|
|
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
|
|
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
|
|
+ *.tar.bz2*) \
|
|
|
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
|
|
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
|
|
+ *.tar.lzma*) \
|
|
|
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
|
|
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
|
|
|
+ *.tar.xz*) \
|
|
|
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
|
|
+ *.tar.Z*) \
|
|
|
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
|
|
+ *.shar.gz*) \
|
|
|
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
|
|
|
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
|
|
+ *.zip*) \
|
|
|
+ unzip $(distdir).zip ;;\
|
|
|
+ esac
|
|
|
+diff -Nur opensc-0.11.13.orig/aclocal.m4 opensc-0.11.13/aclocal.m4
|
|
|
+--- opensc-0.11.13.orig/aclocal.m4 2010-02-16 10:32:15.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
|
|
|
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
|
|
|
+
|
|
|
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
|
|
+@@ -13,13 +13,14 @@
|
|
|
+
|
|
|
+ m4_ifndef([AC_AUTOCONF_VERSION],
|
|
|
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
|
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
|
|
|
+-[m4_warning([this file was generated for autoconf 2.64.
|
|
|
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
|
|
|
++[m4_warning([this file was generated for autoconf 2.68.
|
|
|
+ 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'.])])
|
|
|
+
|
|
|
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
|
|
++# serial 1 (pkg-config-0.24)
|
|
|
+ #
|
|
|
+ # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
|
|
+ #
|
|
|
+@@ -47,7 +48,10 @@
|
|
|
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
|
|
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
|
|
+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
|
|
|
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
|
|
|
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
|
|
|
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
|
|
|
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
|
|
|
++
|
|
|
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
|
|
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
|
|
+ fi
|
|
|
+@@ -60,7 +64,6 @@
|
|
|
+ AC_MSG_RESULT([no])
|
|
|
+ PKG_CONFIG=""
|
|
|
+ fi
|
|
|
+-
|
|
|
+ fi[]dnl
|
|
|
+ ])# PKG_PROG_PKG_CONFIG
|
|
|
+
|
|
|
+@@ -69,34 +72,31 @@
|
|
|
+ # Check to see whether a particular set of modules exists. Similar
|
|
|
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
|
|
+ #
|
|
|
+-#
|
|
|
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
|
|
|
+-# this or PKG_CHECK_MODULES is called, or make sure to call
|
|
|
+-# PKG_CHECK_EXISTS manually
|
|
|
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
|
++# only at the first occurence in configure.ac, so if the first place
|
|
|
++# it's called might be skipped (such as if it is within an "if", you
|
|
|
++# have to call PKG_CHECK_EXISTS manually
|
|
|
+ # --------------------------------------------------------------
|
|
|
+ AC_DEFUN([PKG_CHECK_EXISTS],
|
|
|
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
|
|
+ if test -n "$PKG_CONFIG" && \
|
|
|
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
|
|
+- m4_ifval([$2], [$2], [:])
|
|
|
++ m4_default([$2], [:])
|
|
|
+ m4_ifvaln([$3], [else
|
|
|
+ $3])dnl
|
|
|
+ fi])
|
|
|
+
|
|
|
+-
|
|
|
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
|
|
+ # ---------------------------------------------
|
|
|
+ m4_define([_PKG_CONFIG],
|
|
|
+-[if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$$1"; then
|
|
|
+- pkg_cv_[]$1="$$1"
|
|
|
+- else
|
|
|
+- PKG_CHECK_EXISTS([$3],
|
|
|
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
|
|
+- [pkg_failed=yes])
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++[if test -n "$$1"; then
|
|
|
++ pkg_cv_[]$1="$$1"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ PKG_CHECK_EXISTS([$3],
|
|
|
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
|
|
++ [pkg_failed=yes])
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi[]dnl
|
|
|
+ ])# _PKG_CONFIG
|
|
|
+
|
|
|
+@@ -138,16 +138,17 @@
|
|
|
+ See the pkg-config man page for more details.])
|
|
|
+
|
|
|
+ if test $pkg_failed = yes; then
|
|
|
++ AC_MSG_RESULT([no])
|
|
|
+ _PKG_SHORT_ERRORS_SUPPORTED
|
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
|
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
|
|
|
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
|
|
|
+ else
|
|
|
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
|
|
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
|
|
|
+ fi
|
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
|
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
|
|
+
|
|
|
+- ifelse([$4], , [AC_MSG_ERROR(dnl
|
|
|
++ m4_default([$4], [AC_MSG_ERROR(
|
|
|
+ [Package requirements ($2) were not met:
|
|
|
+
|
|
|
+ $$1_PKG_ERRORS
|
|
|
+@@ -155,25 +156,24 @@
|
|
|
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
|
|
+ installed software in a non-standard prefix.
|
|
|
+
|
|
|
+-_PKG_TEXT
|
|
|
+-])],
|
|
|
+- [AC_MSG_RESULT([no])
|
|
|
+- $4])
|
|
|
++_PKG_TEXT])[]dnl
|
|
|
++ ])
|
|
|
+ elif test $pkg_failed = untried; then
|
|
|
+- ifelse([$4], , [AC_MSG_FAILURE(dnl
|
|
|
++ AC_MSG_RESULT([no])
|
|
|
++ m4_default([$4], [AC_MSG_FAILURE(
|
|
|
+ [The pkg-config script could not be found or is too old. Make sure it
|
|
|
+ is in your PATH or set the PKG_CONFIG environment variable to the full
|
|
|
+ path to pkg-config.
|
|
|
+
|
|
|
+ _PKG_TEXT
|
|
|
+
|
|
|
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
|
|
|
+- [$4])
|
|
|
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
|
|
|
++ ])
|
|
|
+ else
|
|
|
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
|
|
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
|
|
+ AC_MSG_RESULT([yes])
|
|
|
+- ifelse([$3], , :, [$3])
|
|
|
++ $3
|
|
|
+ fi[]dnl
|
|
|
+ ])# PKG_CHECK_MODULES
|
|
|
+
|
|
|
+@@ -192,7 +192,7 @@
|
|
|
+ [am__api_version='1.11'
|
|
|
+ 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.11], [],
|
|
|
++m4_if([$1], [1.11.1], [],
|
|
|
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
|
|
+ ])
|
|
|
+
|
|
|
+@@ -208,7 +208,7 @@
|
|
|
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
|
|
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
|
|
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
|
|
+-[AM_AUTOMAKE_VERSION([1.11])dnl
|
|
|
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
|
|
|
+ m4_ifndef([AC_AUTOCONF_VERSION],
|
|
|
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
|
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
|
|
+diff -Nur opensc-0.11.13.orig/config.guess opensc-0.11.13/config.guess
|
|
|
+--- opensc-0.11.13.orig/config.guess 2010-02-16 10:32:17.000000000 +0100
|
|
|
|
|
|
+@@ -1,10 +1,10 @@
|
|
|
+ #! /bin/sh
|
|
|
+ # Attempt to guess a canonical system name.
|
|
|
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
|
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
|
|
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
|
|
+ # Free Software Foundation, Inc.
|
|
|
+
|
|
|
+-timestamp='2009-04-27'
|
|
|
++timestamp='2009-11-20'
|
|
|
+
|
|
|
+ # This file is free software; you can redistribute it and/or modify it
|
|
|
+ # under the terms of the GNU General Public License as published by
|
|
|
+@@ -27,16 +27,16 @@
|
|
|
+ # the same distribution terms that you use for the rest of that program.
|
|
|
+
|
|
|
+
|
|
|
+-# Originally written by Per Bothner <per@bothner.com>.
|
|
|
+-# Please send patches to <config-patches@gnu.org>. Submit a context
|
|
|
+-# diff and a properly formatted ChangeLog entry.
|
|
|
++# Originally written by Per Bothner. Please send patches (context
|
|
|
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
|
|
|
++# entry.
|
|
|
+ #
|
|
|
+ # This script attempts to guess a canonical system name similar to
|
|
|
+ # config.sub. If it succeeds, it prints the system name on stdout, and
|
|
|
+ # exits with 0. Otherwise, it exits with 1.
|
|
|
+ #
|
|
|
+-# The plan is that this can be called by configure scripts if you
|
|
|
+-# don't specify an explicit build system type.
|
|
|
++# You can get the latest version of this script from:
|
|
|
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
|
|
+
|
|
|
+ me=`echo "$0" | sed -e 's,.*/,,'`
|
|
|
+
|
|
|
+@@ -170,7 +170,7 @@
|
|
|
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
|
|
+ eval $set_cc_for_build
|
|
|
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
|
|
+- | grep __ELF__ >/dev/null
|
|
|
++ | grep -q __ELF__
|
|
|
+ then
|
|
|
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
|
|
|
+ # Return netbsd for either. FIX?
|
|
|
+@@ -333,6 +333,9 @@
|
|
|
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
|
|
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
|
|
+ exit ;;
|
|
|
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
|
|
|
++ echo i386-pc-auroraux${UNAME_RELEASE}
|
|
|
++ exit ;;
|
|
|
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
|
|
+ eval $set_cc_for_build
|
|
|
+ SUN_ARCH="i386"
|
|
|
+@@ -656,7 +659,7 @@
|
|
|
+ # => hppa64-hp-hpux11.23
|
|
|
+
|
|
|
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
|
|
|
+- grep __LP64__ >/dev/null
|
|
|
++ grep -q __LP64__
|
|
|
+ then
|
|
|
+ HP_ARCH="hppa2.0w"
|
|
|
+ else
|
|
|
+@@ -807,12 +810,12 @@
|
|
|
+ i*:PW*:*)
|
|
|
+ echo ${UNAME_MACHINE}-pc-pw32
|
|
|
+ exit ;;
|
|
|
+- *:Interix*:[3456]*)
|
|
|
++ *:Interix*:*)
|
|
|
+ case ${UNAME_MACHINE} in
|
|
|
+ x86)
|
|
|
+ echo i586-pc-interix${UNAME_RELEASE}
|
|
|
+ exit ;;
|
|
|
+- EM64T | authenticamd | genuineintel)
|
|
|
++ authenticamd | genuineintel | EM64T)
|
|
|
+ echo x86_64-unknown-interix${UNAME_RELEASE}
|
|
|
+ exit ;;
|
|
|
+ IA64)
|
|
|
+@@ -822,6 +825,9 @@
|
|
|
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
|
|
+ echo i${UNAME_MACHINE}-pc-mks
|
|
|
+ exit ;;
|
|
|
++ 8664:Windows_NT:*)
|
|
|
++ echo x86_64-pc-mks
|
|
|
++ exit ;;
|
|
|
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
|
|
|
+ # How do we know it's Interix rather than the generic POSIX subsystem?
|
|
|
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
|
|
|
+@@ -851,6 +857,20 @@
|
|
|
+ i*86:Minix:*:*)
|
|
|
+ echo ${UNAME_MACHINE}-pc-minix
|
|
|
+ exit ;;
|
|
|
++ alpha:Linux:*:*)
|
|
|
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
|
++ EV5) UNAME_MACHINE=alphaev5 ;;
|
|
|
++ EV56) UNAME_MACHINE=alphaev56 ;;
|
|
|
++ PCA56) UNAME_MACHINE=alphapca56 ;;
|
|
|
++ PCA57) UNAME_MACHINE=alphapca56 ;;
|
|
|
++ EV6) UNAME_MACHINE=alphaev6 ;;
|
|
|
++ EV67) UNAME_MACHINE=alphaev67 ;;
|
|
|
++ EV68*) UNAME_MACHINE=alphaev68 ;;
|
|
|
++ esac
|
|
|
++ objdump --private-headers /bin/sh | grep -q ld.so.1
|
|
|
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
|
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
|
|
++ exit ;;
|
|
|
+ arm*:Linux:*:*)
|
|
|
+ eval $set_cc_for_build
|
|
|
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
|
|
+@@ -873,6 +893,17 @@
|
|
|
+ frv:Linux:*:*)
|
|
|
+ echo frv-unknown-linux-gnu
|
|
|
+ exit ;;
|
|
|
++ i*86:Linux:*:*)
|
|
|
++ LIBC=gnu
|
|
|
++ eval $set_cc_for_build
|
|
|
++ sed 's/^ //' << EOF >$dummy.c
|
|
|
++ #ifdef __dietlibc__
|
|
|
++ LIBC=dietlibc
|
|
|
++ #endif
|
|
|
++EOF
|
|
|
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
|
|
|
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
|
++ exit ;;
|
|
|
+ ia64:Linux:*:*)
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
+ exit ;;
|
|
|
+@@ -882,78 +913,34 @@
|
|
|
+ m68*:Linux:*:*)
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
+ exit ;;
|
|
|
+- mips:Linux:*:*)
|
|
|
+- eval $set_cc_for_build
|
|
|
+- sed 's/^ //' << EOF >$dummy.c
|
|
|
+- #undef CPU
|
|
|
+- #undef mips
|
|
|
+- #undef mipsel
|
|
|
+- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
|
|
+- CPU=mipsel
|
|
|
+- #else
|
|
|
+- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
|
|
+- CPU=mips
|
|
|
+- #else
|
|
|
+- CPU=
|
|
|
+- #endif
|
|
|
+- #endif
|
|
|
+-EOF
|
|
|
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
|
+- /^CPU/{
|
|
|
+- s: ::g
|
|
|
+- p
|
|
|
+- }'`"
|
|
|
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
|
+- ;;
|
|
|
+- mips64:Linux:*:*)
|
|
|
++ mips:Linux:*:* | mips64:Linux:*:*)
|
|
|
+ eval $set_cc_for_build
|
|
|
+ sed 's/^ //' << EOF >$dummy.c
|
|
|
+ #undef CPU
|
|
|
+- #undef mips64
|
|
|
+- #undef mips64el
|
|
|
++ #undef ${UNAME_MACHINE}
|
|
|
++ #undef ${UNAME_MACHINE}el
|
|
|
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
|
|
+- CPU=mips64el
|
|
|
++ CPU=${UNAME_MACHINE}el
|
|
|
+ #else
|
|
|
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
|
|
+- CPU=mips64
|
|
|
++ CPU=${UNAME_MACHINE}
|
|
|
+ #else
|
|
|
+ CPU=
|
|
|
+ #endif
|
|
|
+ #endif
|
|
|
+ EOF
|
|
|
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
|
+- /^CPU/{
|
|
|
+- s: ::g
|
|
|
+- p
|
|
|
+- }'`"
|
|
|
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
|
|
|
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
|
+ ;;
|
|
|
+ or32:Linux:*:*)
|
|
|
+ echo or32-unknown-linux-gnu
|
|
|
+ exit ;;
|
|
|
+- ppc:Linux:*:*)
|
|
|
+- echo powerpc-unknown-linux-gnu
|
|
|
+- exit ;;
|
|
|
+- ppc64:Linux:*:*)
|
|
|
+- echo powerpc64-unknown-linux-gnu
|
|
|
+- exit ;;
|
|
|
+- alpha:Linux:*:*)
|
|
|
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
|
+- EV5) UNAME_MACHINE=alphaev5 ;;
|
|
|
+- EV56) UNAME_MACHINE=alphaev56 ;;
|
|
|
+- PCA56) UNAME_MACHINE=alphapca56 ;;
|
|
|
+- PCA57) UNAME_MACHINE=alphapca56 ;;
|
|
|
+- EV6) UNAME_MACHINE=alphaev6 ;;
|
|
|
+- EV67) UNAME_MACHINE=alphaev67 ;;
|
|
|
+- EV68*) UNAME_MACHINE=alphaev68 ;;
|
|
|
+- esac
|
|
|
+- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
|
|
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
|
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
|
|
+- exit ;;
|
|
|
+ padre:Linux:*:*)
|
|
|
+ echo sparc-unknown-linux-gnu
|
|
|
+ exit ;;
|
|
|
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
|
|
|
++ echo hppa64-unknown-linux-gnu
|
|
|
++ exit ;;
|
|
|
+ parisc:Linux:*:* | hppa:Linux:*:*)
|
|
|
+ # Look for CPU level
|
|
|
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
|
|
+@@ -962,8 +949,11 @@
|
|
|
+ *) echo hppa-unknown-linux-gnu ;;
|
|
|
+ esac
|
|
|
+ exit ;;
|
|
|
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
|
|
|
+- echo hppa64-unknown-linux-gnu
|
|
|
++ ppc64:Linux:*:*)
|
|
|
++ echo powerpc64-unknown-linux-gnu
|
|
|
++ exit ;;
|
|
|
++ ppc:Linux:*:*)
|
|
|
++ echo powerpc-unknown-linux-gnu
|
|
|
+ exit ;;
|
|
|
+ s390:Linux:*:* | s390x:Linux:*:*)
|
|
|
+ echo ${UNAME_MACHINE}-ibm-linux
|
|
|
+@@ -986,66 +976,6 @@
|
|
|
+ xtensa*:Linux:*:*)
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
+ exit ;;
|
|
|
+- i*86:Linux:*:*)
|
|
|
+- # The BFD linker knows what the default object file format is, so
|
|
|
+- # first see if it will tell us. cd to the root directory to prevent
|
|
|
+- # problems with other programs or directories called `ld' in the path.
|
|
|
+- # Set LC_ALL=C to ensure ld outputs messages in English.
|
|
|
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
|
|
|
+- | sed -ne '/supported targets:/!d
|
|
|
+- s/[ ][ ]*/ /g
|
|
|
+- s/.*supported targets: *//
|
|
|
+- s/ .*//
|
|
|
+- p'`
|
|
|
+- case "$ld_supported_targets" in
|
|
|
+- elf32-i386)
|
|
|
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
|
|
+- ;;
|
|
|
+- a.out-i386-linux)
|
|
|
+- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
|
|
+- exit ;;
|
|
|
+- "")
|
|
|
+- # Either a pre-BFD a.out linker (linux-gnuoldld) or
|
|
|
+- # one that does not give us useful --help.
|
|
|
+- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
|
|
|
+- exit ;;
|
|
|
+- esac
|
|
|
+- # Determine whether the default compiler is a.out or elf
|
|
|
+- eval $set_cc_for_build
|
|
|
+- sed 's/^ //' << EOF >$dummy.c
|
|
|
+- #include <features.h>
|
|
|
+- #ifdef __ELF__
|
|
|
+- # ifdef __GLIBC__
|
|
|
+- # if __GLIBC__ >= 2
|
|
|
+- LIBC=gnu
|
|
|
+- # else
|
|
|
+- LIBC=gnulibc1
|
|
|
+- # endif
|
|
|
+- # else
|
|
|
+- LIBC=gnulibc1
|
|
|
+- # endif
|
|
|
+- #else
|
|
|
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
|
|
+- LIBC=gnu
|
|
|
+- #else
|
|
|
+- LIBC=gnuaout
|
|
|
+- #endif
|
|
|
+- #endif
|
|
|
+- #ifdef __dietlibc__
|
|
|
+- LIBC=dietlibc
|
|
|
+- #endif
|
|
|
+-EOF
|
|
|
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
|
+- /^LIBC/{
|
|
|
+- s: ::g
|
|
|
+- p
|
|
|
+- }'`"
|
|
|
+- test x"${LIBC}" != x && {
|
|
|
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
|
+- exit
|
|
|
+- }
|
|
|
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
|
|
|
+- ;;
|
|
|
+ i*86:DYNIX/ptx:4*:*)
|
|
|
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
|
|
+ # earlier versions are messed up and put the nodename in both
|
|
|
+@@ -1074,7 +1004,7 @@
|
|
|
+ i*86:syllable:*:*)
|
|
|
+ echo ${UNAME_MACHINE}-pc-syllable
|
|
|
+ exit ;;
|
|
|
+- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
|
|
|
++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
|
|
|
+ echo i386-unknown-lynxos${UNAME_RELEASE}
|
|
|
+ exit ;;
|
|
|
+ i*86:*DOS:*:*)
|
|
|
+@@ -1182,7 +1112,7 @@
|
|
|
+ rs6000:LynxOS:2.*:*)
|
|
|
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
|
|
|
+ exit ;;
|
|
|
+- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
|
|
|
++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
|
|
|
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
|
|
|
+ exit ;;
|
|
|
+ SM[BE]S:UNIX_SV:*:*)
|
|
|
+@@ -1275,6 +1205,16 @@
|
|
|
+ *:Darwin:*:*)
|
|
|
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
|
|
+ case $UNAME_PROCESSOR in
|
|
|
++ i386)
|
|
|
++ eval $set_cc_for_build
|
|
|
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
|
|
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
|
|
|
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
|
|
++ grep IS_64BIT_ARCH >/dev/null
|
|
|
++ then
|
|
|
++ UNAME_PROCESSOR="x86_64"
|
|
|
++ fi
|
|
|
++ fi ;;
|
|
|
+ unknown) UNAME_PROCESSOR=powerpc ;;
|
|
|
+ esac
|
|
|
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
|
|
+diff -Nur opensc-0.11.13.orig/config.h.in~ opensc-0.11.13/config.h.in~
|
|
|
+--- opensc-0.11.13.orig/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
|
|
+@@ -0,0 +1,224 @@
|
|
|
++/* config.h.in. Generated from configure.ac by autoheader. */
|
|
|
++
|
|
|
++/* Define if building universal (internal helper macro) */
|
|
|
++#undef AC_APPLE_UNIVERSAL_BUILD
|
|
|
++
|
|
|
++/* Default PC/SC provider */
|
|
|
++#undef DEFAULT_PCSC_PROVIDER
|
|
|
++
|
|
|
++/* Use iconv libraries and header files */
|
|
|
++#undef ENABLE_ICONV
|
|
|
++
|
|
|
++/* Have OpenCT libraries and header files */
|
|
|
++#undef ENABLE_OPENCT
|
|
|
++
|
|
|
++/* Have OpenSSL libraries and header files */
|
|
|
++#undef ENABLE_OPENSSL
|
|
|
++
|
|
|
++/* Define if PC/SC is to be enabled */
|
|
|
++#undef ENABLE_PCSC
|
|
|
++
|
|
|
++/* Use readline libraries and header files */
|
|
|
++#undef ENABLE_READLINE
|
|
|
++
|
|
|
++/* Use zlib libraries and header files */
|
|
|
++#undef ENABLE_ZLIB
|
|
|
++
|
|
|
++/* Define to 1 if you have the <dlfcn.h> header file. */
|
|
|
++#undef HAVE_DLFCN_H
|
|
|
++
|
|
|
++/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
|
|
|
++#undef HAVE_DOPRNT
|
|
|
++
|
|
|
++/* Define to 1 if you have the <errno.h> header file. */
|
|
|
++#undef HAVE_ERRNO_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <fcntl.h> header file. */
|
|
|
++#undef HAVE_FCNTL_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <getopt.h> header file. */
|
|
|
++#undef HAVE_GETOPT_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the `getopt_long' function. */
|
|
|
++#undef HAVE_GETOPT_LONG
|
|
|
++
|
|
|
++/* Define to 1 if you have the `getpass' function. */
|
|
|
++#undef HAVE_GETPASS
|
|
|
++
|
|
|
++/* Define to 1 if you have the `gettimeofday' function. */
|
|
|
++#undef HAVE_GETTIMEOFDAY
|
|
|
++
|
|
|
++/* Define to 1 if you have the <iconv.h> header file. */
|
|
|
++#undef HAVE_ICONV_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <inttypes.h> header file. */
|
|
|
++#undef HAVE_INTTYPES_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <locale.h> header file. */
|
|
|
++#undef HAVE_LOCALE_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <malloc.h> header file. */
|
|
|
++#undef HAVE_MALLOC_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <memory.h> header file. */
|
|
|
++#undef HAVE_MEMORY_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the `memset' function. */
|
|
|
++#undef HAVE_MEMSET
|
|
|
++
|
|
|
++/* Define to 1 if you have the `mkdir' function. */
|
|
|
++#undef HAVE_MKDIR
|
|
|
++
|
|
|
++/* Define if you have POSIX threads libraries and header files. */
|
|
|
++#undef HAVE_PTHREAD
|
|
|
++
|
|
|
++/* Define to 1 if you have the <readline/readline.h> header file. */
|
|
|
++#undef HAVE_READLINE_READLINE_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the `setlocale' function. */
|
|
|
++#undef HAVE_SETLOCALE
|
|
|
++
|
|
|
++/* Define to 1 if you have the `setutent' function. */
|
|
|
++#undef HAVE_SETUTENT
|
|
|
++
|
|
|
++/* Define to 1 if `stat' has the bug that it succeeds when given the
|
|
|
++ zero-length file name argument. */
|
|
|
++#undef HAVE_STAT_EMPTY_STRING_BUG
|
|
|
++
|
|
|
++/* Define to 1 if you have the <stdint.h> header file. */
|
|
|
++#undef HAVE_STDINT_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <stdlib.h> header file. */
|
|
|
++#undef HAVE_STDLIB_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the `strdup' function. */
|
|
|
++#undef HAVE_STRDUP
|
|
|
++
|
|
|
++/* Define to 1 if you have the `strerror' function. */
|
|
|
++#undef HAVE_STRERROR
|
|
|
++
|
|
|
++/* Define to 1 if you have the <strings.h> header file. */
|
|
|
++#undef HAVE_STRINGS_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <string.h> header file. */
|
|
|
++#undef HAVE_STRING_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the `strlcpy' function. */
|
|
|
++#undef HAVE_STRLCPY
|
|
|
++
|
|
|
++/* Define to 1 if you have the <sys/stat.h> header file. */
|
|
|
++#undef HAVE_SYS_STAT_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <sys/time.h> header file. */
|
|
|
++#undef HAVE_SYS_TIME_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <sys/types.h> header file. */
|
|
|
++#undef HAVE_SYS_TYPES_H
|
|
|
++
|
|
|
++/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
|
|
|
++#undef HAVE_SYS_WAIT_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <unistd.h> header file. */
|
|
|
++#undef HAVE_UNISTD_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the `vprintf' function. */
|
|
|
++#undef HAVE_VPRINTF
|
|
|
++
|
|
|
++/* Define to 1 if you have the `vsyslog' function. */
|
|
|
++#undef HAVE_VSYSLOG
|
|
|
++
|
|
|
++/* Define to 1 if you have the <winscard.h> header file. */
|
|
|
++#undef HAVE_WINSCARD_H
|
|
|
++
|
|
|
++/* Define to 1 if you have the <zlib.h> header file. */
|
|
|
++#undef HAVE_ZLIB_H
|
|
|
++
|
|
|
++/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
|
|
|
++ slash. */
|
|
|
++#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
|
|
|
++
|
|
|
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
|
|
|
++ */
|
|
|
++#undef LT_OBJDIR
|
|
|
++
|
|
|
++/* Enabled OpenSC features */
|
|
|
++#undef OPENSC_FEATURES
|
|
|
++
|
|
|
++/* OpenSC version fix component */
|
|
|
++#undef OPENSC_VERSION_FIX
|
|
|
++
|
|
|
++/* OpenSC version major component */
|
|
|
++#undef OPENSC_VERSION_MAJOR
|
|
|
++
|
|
|
++/* OpenSC version minor component */
|
|
|
++#undef OPENSC_VERSION_MINOR
|
|
|
++
|
|
|
++/* Name of package */
|
|
|
++#undef PACKAGE
|
|
|
++
|
|
|
++/* Define to the address where bug reports for this package should be sent. */
|
|
|
++#undef PACKAGE_BUGREPORT
|
|
|
++
|
|
|
++/* Define to the full name of this package. */
|
|
|
++#undef PACKAGE_NAME
|
|
|
++
|
|
|
++/* Define to the full name and version of this package. */
|
|
|
++#undef PACKAGE_STRING
|
|
|
++
|
|
|
++/* Define to the one symbol short name of this package. */
|
|
|
++#undef PACKAGE_TARNAME
|
|
|
++
|
|
|
++/* Define to the home page for this package. */
|
|
|
++#undef PACKAGE_URL
|
|
|
++
|
|
|
++/* Define to the version of this package. */
|
|
|
++#undef PACKAGE_VERSION
|
|
|
++
|
|
|
++/* PIN-entry program for OpenSC Signer */
|
|
|
++#undef PIN_ENTRY
|
|
|
++
|
|
|
++/* Define to necessary symbol if this constant uses a non-standard name on
|
|
|
++ your system. */
|
|
|
++#undef PTHREAD_CREATE_JOINABLE
|
|
|
++
|
|
|
++/* Define to 1 if you have the ANSI C header files. */
|
|
|
++#undef STDC_HEADERS
|
|
|
++
|
|
|
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
|
|
|
++#undef TIME_WITH_SYS_TIME
|
|
|
++
|
|
|
++/* Define if you are on Cygwin */
|
|
|
++#undef USE_CYGWIN
|
|
|
++
|
|
|
++/* Version number of package */
|
|
|
++#undef VERSION
|
|
|
++
|
|
|
++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
|
|
++ significant byte first (like Motorola and SPARC, unlike Intel). */
|
|
|
++#if defined AC_APPLE_UNIVERSAL_BUILD
|
|
|
++# if defined __BIG_ENDIAN__
|
|
|
++# define WORDS_BIGENDIAN 1
|
|
|
++# endif
|
|
|
++#else
|
|
|
++# ifndef WORDS_BIGENDIAN
|
|
|
++# undef WORDS_BIGENDIAN
|
|
|
++# endif
|
|
|
++#endif
|
|
|
++
|
|
|
++/* Define to empty if `const' does not conform to ANSI C. */
|
|
|
++#undef const
|
|
|
++
|
|
|
++/* Define to `int' if <sys/types.h> doesn't define. */
|
|
|
++#undef gid_t
|
|
|
++
|
|
|
++/* Define to `__inline__' or `__inline' if that's what the C compiler
|
|
|
++ calls it, or to nothing if 'inline' is not supported under any name. */
|
|
|
++#ifndef __cplusplus
|
|
|
++#undef inline
|
|
|
++#endif
|
|
|
++
|
|
|
++/* Define to `unsigned int' if <sys/types.h> does not define. */
|
|
|
++#undef size_t
|
|
|
++
|
|
|
++/* Define to `int' if <sys/types.h> doesn't define. */
|
|
|
++#undef uid_t
|
|
|
+diff -Nur opensc-0.11.13.orig/config.sub opensc-0.11.13/config.sub
|
|
|
+--- opensc-0.11.13.orig/config.sub 2010-02-16 10:32:17.000000000 +0100
|
|
|
|
|
|
+@@ -1,10 +1,10 @@
|
|
|
+ #! /bin/sh
|
|
|
+ # Configuration validation subroutine script.
|
|
|
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
|
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
|
|
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
|
|
+ # Free Software Foundation, Inc.
|
|
|
+
|
|
|
+-timestamp='2009-04-17'
|
|
|
++timestamp='2009-11-20'
|
|
|
+
|
|
|
+ # This file is (in principle) common to ALL GNU software.
|
|
|
+ # The presence of a machine in this file suggests that SOME GNU software
|
|
|
+@@ -32,13 +32,16 @@
|
|
|
+
|
|
|
+
|
|
|
+ # Please send patches to <config-patches@gnu.org>. Submit a context
|
|
|
+-# diff and a properly formatted ChangeLog entry.
|
|
|
++# diff and a properly formatted GNU ChangeLog entry.
|
|
|
+ #
|
|
|
+ # Configuration subroutine to validate and canonicalize a configuration type.
|
|
|
+ # Supply the specified configuration type as an argument.
|
|
|
+ # If it is invalid, we print an error message on stderr and exit with code 1.
|
|
|
+ # Otherwise, we print the canonical config type on stdout and succeed.
|
|
|
+
|
|
|
++# You can get the latest version of this script from:
|
|
|
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
|
|
|
++
|
|
|
+ # This file is supposed to be the same for all GNU packages
|
|
|
+ # and recognize all the CPU types, system types and aliases
|
|
|
+ # that are meaningful with *any* GNU software.
|
|
|
+@@ -149,10 +152,13 @@
|
|
|
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
|
|
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
|
|
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
|
|
+- -apple | -axis | -knuth | -cray)
|
|
|
++ -apple | -axis | -knuth | -cray | -microblaze)
|
|
|
+ os=
|
|
|
+ basic_machine=$1
|
|
|
+ ;;
|
|
|
++ -bluegene*)
|
|
|
++ os=-cnk
|
|
|
++ ;;
|
|
|
+ -sim | -cisco | -oki | -wec | -winbond)
|
|
|
+ os=
|
|
|
+ basic_machine=$1
|
|
|
+@@ -281,6 +287,7 @@
|
|
|
+ | pdp10 | pdp11 | pj | pjl \
|
|
|
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
|
|
+ | pyramid \
|
|
|
++ | rx \
|
|
|
+ | score \
|
|
|
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
|
|
+ | sh64 | sh64le \
|
|
|
+@@ -288,13 +295,14 @@
|
|
|
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
|
|
+ | spu | strongarm \
|
|
|
+ | tahoe | thumb | tic4x | tic80 | tron \
|
|
|
++ | ubicom32 \
|
|
|
+ | v850 | v850e \
|
|
|
+ | we32k \
|
|
|
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
|
|
+ | z8k | z80)
|
|
|
+ basic_machine=$basic_machine-unknown
|
|
|
+ ;;
|
|
|
+- m6811 | m68hc11 | m6812 | m68hc12)
|
|
|
++ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
|
|
|
+ # Motorola 68HC11/12.
|
|
|
+ basic_machine=$basic_machine-unknown
|
|
|
+ os=-none
|
|
|
+@@ -337,7 +345,7 @@
|
|
|
+ | lm32-* \
|
|
|
+ | m32c-* | m32r-* | m32rle-* \
|
|
|
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
|
|
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
|
|
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
|
|
|
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
|
|
+ | mips16-* \
|
|
|
+ | mips64-* | mips64el-* \
|
|
|
+@@ -365,7 +373,7 @@
|
|
|
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
|
|
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
|
|
+ | pyramid-* \
|
|
|
+- | romp-* | rs6000-* \
|
|
|
++ | romp-* | rs6000-* | rx-* \
|
|
|
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
|
|
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
|
|
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
|
|
+@@ -374,6 +382,7 @@
|
|
|
+ | tahoe-* | thumb-* \
|
|
|
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
|
|
|
+ | tron-* \
|
|
|
++ | ubicom32-* \
|
|
|
+ | v850-* | v850e-* | vax-* \
|
|
|
+ | we32k-* \
|
|
|
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
|
|
+@@ -467,6 +476,10 @@
|
|
|
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
|
+ os=-linux
|
|
|
+ ;;
|
|
|
++ bluegene*)
|
|
|
++ basic_machine=powerpc-ibm
|
|
|
++ os=-cnk
|
|
|
++ ;;
|
|
|
+ c90)
|
|
|
+ basic_machine=c90-cray
|
|
|
+ os=-unicos
|
|
|
+@@ -719,6 +732,9 @@
|
|
|
+ basic_machine=ns32k-utek
|
|
|
+ os=-sysv
|
|
|
+ ;;
|
|
|
++ microblaze)
|
|
|
++ basic_machine=microblaze-xilinx
|
|
|
++ ;;
|
|
|
+ mingw32)
|
|
|
+ basic_machine=i386-pc
|
|
|
+ os=-mingw32
|
|
|
+@@ -1240,6 +1256,9 @@
|
|
|
+ # First match some system type aliases
|
|
|
+ # that might get confused with valid system types.
|
|
|
+ # -solaris* is a basic system type, with this one exception.
|
|
|
++ -auroraux)
|
|
|
++ os=-auroraux
|
|
|
++ ;;
|
|
|
+ -solaris1 | -solaris1.*)
|
|
|
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
|
|
|
+ ;;
|
|
|
+@@ -1260,9 +1279,9 @@
|
|
|
+ # Each alternative MUST END IN A *, to match a version number.
|
|
|
+ # -sysv* is not here because it comes later, after sysvr4.
|
|
|
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
|
|
+- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
|
|
|
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
|
|
|
+- | -kopensolaris* \
|
|
|
++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
|
|
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
|
|
++ | -sym* | -kopensolaris* \
|
|
|
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
|
|
+ | -aos* | -aros* \
|
|
|
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
|
|
+@@ -1283,7 +1302,7 @@
|
|
|
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
|
|
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
|
|
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
|
|
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
|
|
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
|
|
|
+ # Remember, each alternative MUST END IN *, to match a version number.
|
|
|
+ ;;
|
|
|
+ -qnx*)
|
|
|
+@@ -1613,7 +1632,7 @@
|
|
|
+ -sunos*)
|
|
|
+ vendor=sun
|
|
|
+ ;;
|
|
|
+- -aix*)
|
|
|
++ -cnk*|-aix*)
|
|
|
+ vendor=ibm
|
|
|
+ ;;
|
|
|
+ -beos*)
|
|
|
+diff -Nur opensc-0.11.13.orig/configure opensc-0.11.13/configure
|
|
|
+--- opensc-0.11.13.orig/configure 2010-02-16 10:32:16.000000000 +0100
|
|
|
|
|
|
+@@ -1,11 +1,13 @@
|
|
|
+ #! /bin/sh
|
|
|
+ # Guess values for system-dependent variables and create Makefiles.
|
|
|
+-# Generated by GNU Autoconf 2.64 for opensc 0.11.13.
|
|
|
++# Generated by GNU Autoconf 2.68 for opensc 0.11.13.
|
|
|
++#
|
|
|
+ #
|
|
|
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
|
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
|
|
|
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
|
|
|
+ # Foundation, Inc.
|
|
|
+ #
|
|
|
++#
|
|
|
+ # This configure script is free software; the Free Software Foundation
|
|
|
+ # gives unlimited permission to copy, distribute and modify it.
|
|
|
+ ## -------------------- ##
|
|
|
+@@ -87,6 +89,7 @@
|
|
|
+ IFS=" "" $as_nl"
|
|
|
+
|
|
|
+ # Find who we are. Look in the path if we contain no directory separator.
|
|
|
++as_myself=
|
|
|
+ case $0 in #((
|
|
|
+ *[\\/]* ) as_myself=$0 ;;
|
|
|
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
+@@ -169,7 +172,15 @@
|
|
|
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
|
|
|
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
|
|
|
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
|
|
|
+-test \$(( 1 + 1 )) = 2 || exit 1"
|
|
|
++test \$(( 1 + 1 )) = 2 || exit 1
|
|
|
++
|
|
|
++ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
|
|
|
++ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
|
|
++ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
|
|
|
++ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
|
|
|
++ PATH=/empty FPATH=/empty; export PATH FPATH
|
|
|
++ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
|
|
|
++ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
|
|
|
+ if (eval "$as_required") 2>/dev/null; then :
|
|
|
+ as_have_required=yes
|
|
|
+ else
|
|
|
+@@ -212,11 +223,18 @@
|
|
|
+ # We cannot yet assume a decent shell, so we have to provide a
|
|
|
+ # neutralization value for shells without unset; and this also
|
|
|
+ # works around shells that cannot unset nonexistent variables.
|
|
|
++ # Preserve -v and -x to the replacement shell.
|
|
|
+ BASH_ENV=/dev/null
|
|
|
+ ENV=/dev/null
|
|
|
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
|
|
+ export CONFIG_SHELL
|
|
|
+- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
|
|
++ case $- in # ((((
|
|
|
++ *v*x* | *x*v* ) as_opts=-vx ;;
|
|
|
++ *v* ) as_opts=-v ;;
|
|
|
++ *x* ) as_opts=-x ;;
|
|
|
++ * ) as_opts= ;;
|
|
|
++ esac
|
|
|
++ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test x$as_have_required = xno; then :
|
|
|
+@@ -314,7 +332,7 @@
|
|
|
+ test -d "$as_dir" && break
|
|
|
+ done
|
|
|
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
|
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
|
|
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
|
|
+
|
|
|
+
|
|
|
+ } # as_fn_mkdir_p
|
|
|
+@@ -354,19 +372,19 @@
|
|
|
+ fi # as_fn_arith
|
|
|
+
|
|
|
+
|
|
|
+-# as_fn_error ERROR [LINENO LOG_FD]
|
|
|
+-# ---------------------------------
|
|
|
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
|
|
++# ----------------------------------------
|
|
|
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
|
|
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
|
|
+-# script with status $?, using 1 if that was 0.
|
|
|
++# script with STATUS, using 1 if that was 0.
|
|
|
+ as_fn_error ()
|
|
|
+ {
|
|
|
+- as_status=$?; test $as_status -eq 0 && as_status=1
|
|
|
+- if test "$3"; then
|
|
|
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
|
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
|
|
++ as_status=$1; test $as_status -eq 0 && as_status=1
|
|
|
++ if test "$4"; then
|
|
|
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
|
|
+ fi
|
|
|
+- $as_echo "$as_me: error: $1" >&2
|
|
|
++ $as_echo "$as_me: error: $2" >&2
|
|
|
+ as_fn_exit $as_status
|
|
|
+ } # as_fn_error
|
|
|
+
|
|
|
+@@ -523,160 +541,14 @@
|
|
|
+ # Sed expression to map a string onto a valid variable name.
|
|
|
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
|
+
|
|
|
+-
|
|
|
+-
|
|
|
+-# Check that we are running under the correct shell.
|
|
|
+ SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
+
|
|
|
+-case X$lt_ECHO in
|
|
|
+-X*--fallback-echo)
|
|
|
+- # Remove one level of quotation (which was required for Make).
|
|
|
+- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
|
|
|
+- ;;
|
|
|
+-esac
|
|
|
+-
|
|
|
+-ECHO=${lt_ECHO-echo}
|
|
|
+-if test "X$1" = X--no-reexec; then
|
|
|
+- # Discard the --no-reexec flag, and continue.
|
|
|
+- shift
|
|
|
+-elif test "X$1" = X--fallback-echo; then
|
|
|
+- # Avoid inline document here, it may be left over
|
|
|
+- :
|
|
|
+-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
|
|
|
+- # Yippee, $ECHO works!
|
|
|
+- :
|
|
|
+-else
|
|
|
+- # Restart under the correct shell.
|
|
|
+- exec $SHELL "$0" --no-reexec ${1+"$@"}
|
|
|
+-fi
|
|
|
+-
|
|
|
+-if test "X$1" = X--fallback-echo; then
|
|
|
+- # used as fallback echo
|
|
|
+- shift
|
|
|
+- cat <<_LT_EOF
|
|
|
+-$*
|
|
|
+-_LT_EOF
|
|
|
+- exit 0
|
|
|
+-fi
|
|
|
+-
|
|
|
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
|
|
|
+-# if CDPATH is set.
|
|
|
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
+-
|
|
|
+-if test -z "$lt_ECHO"; then
|
|
|
+- if test "X${echo_test_string+set}" != Xset; then
|
|
|
+- # find a string as large as possible, as long as the shell can cope with it
|
|
|
+- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
|
|
|
+- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
|
|
|
+- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
|
|
|
+- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
|
|
|
+- then
|
|
|
+- break
|
|
|
+- fi
|
|
|
+- done
|
|
|
+- fi
|
|
|
+-
|
|
|
+- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
|
|
|
+- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- :
|
|
|
+- else
|
|
|
+- # The Solaris, AIX, and Digital Unix default echo programs unquote
|
|
|
+- # backslashes. This makes it impossible to quote backslashes using
|
|
|
+- # echo "$something" | sed 's/\\/\\\\/g'
|
|
|
+- #
|
|
|
+- # So, first we look for a working echo in the user's PATH.
|
|
|
+-
|
|
|
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
|
|
+- for dir in $PATH /usr/ucb; do
|
|
|
+- IFS="$lt_save_ifs"
|
|
|
+- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
|
|
|
+- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
|
|
|
+- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- ECHO="$dir/echo"
|
|
|
+- break
|
|
|
+- fi
|
|
|
+- done
|
|
|
+- IFS="$lt_save_ifs"
|
|
|
+-
|
|
|
+- if test "X$ECHO" = Xecho; then
|
|
|
+- # We didn't find a better echo, so look for alternatives.
|
|
|
+- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
|
|
|
+- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- # This shell has a builtin print -r that does the trick.
|
|
|
+- ECHO='print -r'
|
|
|
+- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
|
|
|
+- test "X$CONFIG_SHELL" != X/bin/ksh; then
|
|
|
+- # If we have ksh, try running configure again with it.
|
|
|
+- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
+- export ORIGINAL_CONFIG_SHELL
|
|
|
+- CONFIG_SHELL=/bin/ksh
|
|
|
+- export CONFIG_SHELL
|
|
|
+- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
|
|
|
+- else
|
|
|
+- # Try using printf.
|
|
|
+- ECHO='printf %s\n'
|
|
|
+- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
|
|
|
+- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- # Cool, printf works
|
|
|
+- :
|
|
|
+- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = 'X\t' &&
|
|
|
+- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
|
|
|
+- export CONFIG_SHELL
|
|
|
+- SHELL="$CONFIG_SHELL"
|
|
|
+- export SHELL
|
|
|
+- ECHO="$CONFIG_SHELL $0 --fallback-echo"
|
|
|
+- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = 'X\t' &&
|
|
|
+- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- ECHO="$CONFIG_SHELL $0 --fallback-echo"
|
|
|
+- else
|
|
|
+- # maybe with a smaller string...
|
|
|
+- prev=:
|
|
|
+-
|
|
|
+- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
|
|
|
+- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
|
|
|
+- then
|
|
|
+- break
|
|
|
+- fi
|
|
|
+- prev="$cmd"
|
|
|
+- done
|
|
|
+-
|
|
|
+- if test "$prev" != 'sed 50q "$0"'; then
|
|
|
+- echo_test_string=`eval $prev`
|
|
|
+- export echo_test_string
|
|
|
+- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
|
|
|
+- else
|
|
|
+- # Oops. We lost completely, so just stick with echo.
|
|
|
+- ECHO=echo
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+-fi
|
|
|
+-
|
|
|
+-# Copy echo and quote the copy suitably for passing to libtool from
|
|
|
+-# the Makefile, instead of quoting the original, which is used later.
|
|
|
+-lt_ECHO=$ECHO
|
|
|
+-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
|
|
|
+- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
|
|
|
+-fi
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+
|
|
|
+-exec 7<&0 </dev/null 6>&1
|
|
|
++test -n "$DJDIR" || exec 7<&0 </dev/null
|
|
|
++exec 6>&1
|
|
|
+
|
|
|
+ # Name of the host.
|
|
|
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
|
|
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
|
|
|
+ # so uname gets run too.
|
|
|
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
|
|
|
+
|
|
|
+@@ -820,8 +692,9 @@
|
|
|
+ LIPO
|
|
|
+ NMEDIT
|
|
|
+ DSYMUTIL
|
|
|
+-lt_ECHO
|
|
|
++MANIFEST_TOOL
|
|
|
+ RANLIB
|
|
|
++ac_ct_AR
|
|
|
+ AR
|
|
|
+ NM
|
|
|
+ ac_ct_DUMPBIN
|
|
|
+@@ -837,6 +710,8 @@
|
|
|
+ EGREP
|
|
|
+ GREP
|
|
|
+ CPP
|
|
|
++PKG_CONFIG_LIBDIR
|
|
|
++PKG_CONFIG_PATH
|
|
|
+ PKG_CONFIG
|
|
|
+ am__fastdepCC_FALSE
|
|
|
+ am__fastdepCC_TRUE
|
|
|
+@@ -948,6 +823,7 @@
|
|
|
+ with_pic
|
|
|
+ enable_fast_install
|
|
|
+ with_gnu_ld
|
|
|
++with_sysroot
|
|
|
+ enable_libtool_lock
|
|
|
+ with_libassuan_prefix
|
|
|
+ '
|
|
|
+@@ -960,6 +836,10 @@
|
|
|
+ LIBS
|
|
|
+ CPPFLAGS
|
|
|
+ PKG_CONFIG
|
|
|
++PKG_CONFIG_PATH
|
|
|
++PKG_CONFIG_LIBDIR
|
|
|
++CPP
|
|
|
++CPPFLAGS
|
|
|
+ CPP
|
|
|
+ XSLTPROC
|
|
|
+ SVN
|
|
|
+@@ -976,6 +856,7 @@
|
|
|
+ ICONV_LIBS
|
|
|
+ OPENSSL_CFLAGS
|
|
|
+ OPENSSL_LIBS
|
|
|
++OPENSSL_LIBS
|
|
|
+ OPENCT_CFLAGS
|
|
|
+ OPENCT_LIBS
|
|
|
+ PCSC_CFLAGS
|
|
|
+@@ -1042,8 +923,9 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ case $ac_option in
|
|
|
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
|
|
+- *) ac_optarg=yes ;;
|
|
|
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
|
|
++ *=) ac_optarg= ;;
|
|
|
++ *) ac_optarg=yes ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+ # Accept the important Cygnus configure options, so we can diagnose typos.
|
|
|
+@@ -1088,7 +970,7 @@
|
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
|
|
+ # Reject names that are not valid shell variable names.
|
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
|
+- as_fn_error "invalid feature name: $ac_useropt"
|
|
|
++ as_fn_error $? "invalid feature name: $ac_useropt"
|
|
|
+ ac_useropt_orig=$ac_useropt
|
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
|
+ case $ac_user_opts in
|
|
|
+@@ -1114,7 +996,7 @@
|
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
|
|
+ # Reject names that are not valid shell variable names.
|
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
|
+- as_fn_error "invalid feature name: $ac_useropt"
|
|
|
++ as_fn_error $? "invalid feature name: $ac_useropt"
|
|
|
+ ac_useropt_orig=$ac_useropt
|
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
|
+ case $ac_user_opts in
|
|
|
+@@ -1318,7 +1200,7 @@
|
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
|
|
+ # Reject names that are not valid shell variable names.
|
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
|
+- as_fn_error "invalid package name: $ac_useropt"
|
|
|
++ as_fn_error $? "invalid package name: $ac_useropt"
|
|
|
+ ac_useropt_orig=$ac_useropt
|
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
|
+ case $ac_user_opts in
|
|
|
+@@ -1334,7 +1216,7 @@
|
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
|
|
+ # Reject names that are not valid shell variable names.
|
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
|
+- as_fn_error "invalid package name: $ac_useropt"
|
|
|
++ as_fn_error $? "invalid package name: $ac_useropt"
|
|
|
+ ac_useropt_orig=$ac_useropt
|
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
|
+ case $ac_user_opts in
|
|
|
+@@ -1364,8 +1246,8 @@
|
|
|
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
|
|
+ x_libraries=$ac_optarg ;;
|
|
|
+
|
|
|
+- -*) as_fn_error "unrecognized option: \`$ac_option'
|
|
|
+-Try \`$0 --help' for more information."
|
|
|
++ -*) as_fn_error $? "unrecognized option: \`$ac_option'
|
|
|
++Try \`$0 --help' for more information"
|
|
|
+ ;;
|
|
|
+
|
|
|
+ *=*)
|
|
|
+@@ -1373,7 +1255,7 @@
|
|
|
+ # Reject names that are not valid shell variable names.
|
|
|
+ case $ac_envvar in #(
|
|
|
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
|
|
|
+- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
|
|
|
++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
|
|
|
+ esac
|
|
|
+ eval $ac_envvar=\$ac_optarg
|
|
|
+ export $ac_envvar ;;
|
|
|
+@@ -1383,7 +1265,7 @@
|
|
|
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
|
|
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
|
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
|
|
+- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
|
|
|
++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
|
|
|
+ ;;
|
|
|
+
|
|
|
+ esac
|
|
|
+@@ -1391,13 +1273,13 @@
|
|
|
+
|
|
|
+ if test -n "$ac_prev"; then
|
|
|
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
|
|
+- as_fn_error "missing argument to $ac_option"
|
|
|
++ as_fn_error $? "missing argument to $ac_option"
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test -n "$ac_unrecognized_opts"; then
|
|
|
+ case $enable_option_checking in
|
|
|
+ no) ;;
|
|
|
+- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
|
|
|
++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
|
|
|
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+@@ -1420,7 +1302,7 @@
|
|
|
+ [\\/$]* | ?:[\\/]* ) continue;;
|
|
|
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
|
|
+ esac
|
|
|
+- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
|
|
|
++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
|
|
|
+ done
|
|
|
+
|
|
|
+ # There might be people who depend on the old broken behavior: `$host'
|
|
|
+@@ -1434,8 +1316,8 @@
|
|
|
+ if test "x$host_alias" != x; then
|
|
|
+ if test "x$build_alias" = x; then
|
|
|
+ cross_compiling=maybe
|
|
|
+- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
|
|
+- If a cross compiler is detected then cross compile mode will be used." >&2
|
|
|
++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
|
|
|
++ If a cross compiler is detected then cross compile mode will be used" >&2
|
|
|
+ elif test "x$build_alias" != "x$host_alias"; then
|
|
|
+ cross_compiling=yes
|
|
|
+ fi
|
|
|
+@@ -1450,9 +1332,9 @@
|
|
|
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
|
|
+ ac_ls_di=`ls -di .` &&
|
|
|
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
|
|
+- as_fn_error "working directory cannot be determined"
|
|
|
++ as_fn_error $? "working directory cannot be determined"
|
|
|
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
|
|
+- as_fn_error "pwd does not report name of working directory"
|
|
|
++ as_fn_error $? "pwd does not report name of working directory"
|
|
|
+
|
|
|
+
|
|
|
+ # Find the source files, if location was not specified.
|
|
|
+@@ -1491,11 +1373,11 @@
|
|
|
+ fi
|
|
|
+ if test ! -r "$srcdir/$ac_unique_file"; then
|
|
|
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
|
|
+- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
|
|
|
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
|
|
|
+ fi
|
|
|
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
|
|
+ ac_abs_confdir=`(
|
|
|
+- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
|
|
|
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
|
|
|
+ pwd)`
|
|
|
+ # When building in place, set srcdir=.
|
|
|
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
|
|
|
+@@ -1535,7 +1417,7 @@
|
|
|
+ --help=short display options specific to this package
|
|
|
+ --help=recursive display the short help of all the included packages
|
|
|
+ -V, --version display version information and exit
|
|
|
+- -q, --quiet, --silent do not print \`checking...' messages
|
|
|
++ -q, --quiet, --silent do not print \`checking ...' messages
|
|
|
+ --cache-file=FILE cache test results in FILE [disabled]
|
|
|
+ -C, --config-cache alias for \`--cache-file=config.cache'
|
|
|
+ -n, --no-create do not create output files
|
|
|
+@@ -1634,6 +1516,8 @@
|
|
|
+ --with-pic try to use only PIC/non-PIC objects [default=use
|
|
|
+ both]
|
|
|
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
|
|
++ --with-sysroot=DIR Search for dependent libraries within DIR
|
|
|
++ (or the compiler's sysroot if not specified).
|
|
|
+ --with-libassuan-prefix=PFX
|
|
|
+ prefix where LIBASSUAN is installed (optional)
|
|
|
+
|
|
|
+@@ -1643,9 +1527,13 @@
|
|
|
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
|
|
+ nonstandard directory <lib dir>
|
|
|
+ LIBS libraries to pass to the linker, e.g. -l<library>
|
|
|
+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
|
|
|
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
|
|
|
+ you have headers in a nonstandard directory <include dir>
|
|
|
+ PKG_CONFIG path to pkg-config utility
|
|
|
++ PKG_CONFIG_PATH
|
|
|
++ directories to add to pkg-config's search path
|
|
|
++ PKG_CONFIG_LIBDIR
|
|
|
++ path overriding pkg-config's built-in search path
|
|
|
+ CPP C preprocessor
|
|
|
+ XSLTPROC xsltproc utility
|
|
|
+ SVN subversion utility
|
|
|
+@@ -1741,9 +1629,9 @@
|
|
|
+ if $ac_init_version; then
|
|
|
+ cat <<\_ACEOF
|
|
|
+ opensc configure 0.11.13
|
|
|
+-generated by GNU Autoconf 2.64
|
|
|
++generated by GNU Autoconf 2.68
|
|
|
+
|
|
|
+-Copyright (C) 2009 Free Software Foundation, Inc.
|
|
|
++Copyright (C) 2010 Free Software Foundation, Inc.
|
|
|
+ This configure script is free software; the Free Software Foundation
|
|
|
+ gives unlimited permission to copy, distribute and modify it.
|
|
|
+ _ACEOF
|
|
|
+@@ -1787,8 +1675,8 @@
|
|
|
+
|
|
|
+ ac_retval=1
|
|
|
+ fi
|
|
|
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
|
+- return $ac_retval
|
|
|
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
++ as_fn_set_status $ac_retval
|
|
|
+
|
|
|
+ } # ac_fn_c_try_compile
|
|
|
+
|
|
|
+@@ -1829,8 +1717,8 @@
|
|
|
+ ac_retval=$ac_status
|
|
|
+ fi
|
|
|
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
|
|
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
|
+- return $ac_retval
|
|
|
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
++ as_fn_set_status $ac_retval
|
|
|
+
|
|
|
+ } # ac_fn_c_try_run
|
|
|
+
|
|
|
+@@ -1855,7 +1743,7 @@
|
|
|
+ mv -f conftest.er1 conftest.err
|
|
|
+ fi
|
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
+- test $ac_status = 0; } >/dev/null && {
|
|
|
++ test $ac_status = 0; } > conftest.i && {
|
|
|
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
|
+ test ! -s conftest.err
|
|
|
+ }; then :
|
|
|
+@@ -1866,8 +1754,8 @@
|
|
|
+
|
|
|
+ ac_retval=1
|
|
|
+ fi
|
|
|
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
|
+- return $ac_retval
|
|
|
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
++ as_fn_set_status $ac_retval
|
|
|
+
|
|
|
+ } # ac_fn_c_try_cpp
|
|
|
+
|
|
|
+@@ -1880,7 +1768,7 @@
|
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
|
+ $as_echo_n "checking for $2... " >&6; }
|
|
|
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
|
++if eval \${$3+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -1898,7 +1786,7 @@
|
|
|
+ eval ac_res=\$$3
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
|
+ $as_echo "$ac_res" >&6; }
|
|
|
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
|
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
+
|
|
|
+ } # ac_fn_c_check_header_compile
|
|
|
+
|
|
|
+@@ -1943,8 +1831,8 @@
|
|
|
+ # interfere with the next link command; also delete a directory that is
|
|
|
+ # left behind by Apple's compiler. We do this before executing the actions.
|
|
|
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
|
|
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
|
+- return $ac_retval
|
|
|
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
++ as_fn_set_status $ac_retval
|
|
|
+
|
|
|
+ } # ac_fn_c_try_link
|
|
|
+
|
|
|
+@@ -1956,7 +1844,7 @@
|
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
|
+ $as_echo_n "checking for $2... " >&6; }
|
|
|
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
|
++if eval \${$3+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -2011,7 +1899,7 @@
|
|
|
+ eval ac_res=\$$3
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
|
+ $as_echo "$ac_res" >&6; }
|
|
|
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
|
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
+
|
|
|
+ } # ac_fn_c_check_func
|
|
|
+
|
|
|
+@@ -2023,10 +1911,10 @@
|
|
|
+ ac_fn_c_check_header_mongrel ()
|
|
|
+ {
|
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
|
+- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
|
++ if eval \${$3+:} false; then :
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
|
+ $as_echo_n "checking for $2... " >&6; }
|
|
|
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
|
++if eval \${$3+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ fi
|
|
|
+ eval ac_res=\$$3
|
|
|
+@@ -2062,7 +1950,7 @@
|
|
|
+ else
|
|
|
+ ac_header_preproc=no
|
|
|
+ fi
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.err conftest.i conftest.$ac_ext
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
|
|
+ $as_echo "$ac_header_preproc" >&6; }
|
|
|
+
|
|
|
+@@ -2089,7 +1977,7 @@
|
|
|
+ esac
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
|
+ $as_echo_n "checking for $2... " >&6; }
|
|
|
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
|
++if eval \${$3+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ eval "$3=\$ac_header_compiler"
|
|
|
+@@ -2098,7 +1986,7 @@
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
|
+ $as_echo "$ac_res" >&6; }
|
|
|
+ fi
|
|
|
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
|
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
+
|
|
|
+ } # ac_fn_c_check_header_mongrel
|
|
|
+
|
|
|
+@@ -2111,7 +1999,7 @@
|
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
|
+ $as_echo_n "checking for $2... " >&6; }
|
|
|
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
|
++if eval \${$3+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ eval "$3=no"
|
|
|
+@@ -2152,7 +2040,7 @@
|
|
|
+ eval ac_res=\$$3
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
|
+ $as_echo "$ac_res" >&6; }
|
|
|
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
|
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
+
|
|
|
+ } # ac_fn_c_check_type
|
|
|
+ cat >config.log <<_ACEOF
|
|
|
+@@ -2160,7 +2048,7 @@
|
|
|
+ running configure, to aid debugging if configure makes a mistake.
|
|
|
+
|
|
|
+ It was created by opensc $as_me 0.11.13, which was
|
|
|
+-generated by GNU Autoconf 2.64. Invocation command line was
|
|
|
++generated by GNU Autoconf 2.68. Invocation command line was
|
|
|
+
|
|
|
+ $ $0 $@
|
|
|
+
|
|
|
+@@ -2270,11 +2158,9 @@
|
|
|
+ {
|
|
|
+ echo
|
|
|
+
|
|
|
+- cat <<\_ASBOX
|
|
|
+-## ---------------- ##
|
|
|
++ $as_echo "## ---------------- ##
|
|
|
+ ## Cache variables. ##
|
|
|
+-## ---------------- ##
|
|
|
+-_ASBOX
|
|
|
++## ---------------- ##"
|
|
|
+ echo
|
|
|
+ # The following way of writing the cache mishandles newlines in values,
|
|
|
+ (
|
|
|
+@@ -2308,11 +2194,9 @@
|
|
|
+ )
|
|
|
+ echo
|
|
|
+
|
|
|
+- cat <<\_ASBOX
|
|
|
+-## ----------------- ##
|
|
|
++ $as_echo "## ----------------- ##
|
|
|
+ ## Output variables. ##
|
|
|
+-## ----------------- ##
|
|
|
+-_ASBOX
|
|
|
++## ----------------- ##"
|
|
|
+ echo
|
|
|
+ for ac_var in $ac_subst_vars
|
|
|
+ do
|
|
|
+@@ -2325,11 +2209,9 @@
|
|
|
+ echo
|
|
|
+
|
|
|
+ if test -n "$ac_subst_files"; then
|
|
|
+- cat <<\_ASBOX
|
|
|
+-## ------------------- ##
|
|
|
++ $as_echo "## ------------------- ##
|
|
|
+ ## File substitutions. ##
|
|
|
+-## ------------------- ##
|
|
|
+-_ASBOX
|
|
|
++## ------------------- ##"
|
|
|
+ echo
|
|
|
+ for ac_var in $ac_subst_files
|
|
|
+ do
|
|
|
+@@ -2343,11 +2225,9 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test -s confdefs.h; then
|
|
|
+- cat <<\_ASBOX
|
|
|
+-## ----------- ##
|
|
|
++ $as_echo "## ----------- ##
|
|
|
+ ## confdefs.h. ##
|
|
|
+-## ----------- ##
|
|
|
+-_ASBOX
|
|
|
++## ----------- ##"
|
|
|
+ echo
|
|
|
+ cat confdefs.h
|
|
|
+ echo
|
|
|
+@@ -2402,7 +2282,12 @@
|
|
|
+ ac_site_file1=NONE
|
|
|
+ ac_site_file2=NONE
|
|
|
+ if test -n "$CONFIG_SITE"; then
|
|
|
+- ac_site_file1=$CONFIG_SITE
|
|
|
++ # We do not want a PATH search for config.site.
|
|
|
++ case $CONFIG_SITE in #((
|
|
|
++ -*) ac_site_file1=./$CONFIG_SITE;;
|
|
|
++ */*) ac_site_file1=$CONFIG_SITE;;
|
|
|
++ *) ac_site_file1=./$CONFIG_SITE;;
|
|
|
++ esac
|
|
|
+ elif test "x$prefix" != xNONE; then
|
|
|
+ ac_site_file1=$prefix/share/config.site
|
|
|
+ ac_site_file2=$prefix/etc/config.site
|
|
|
+@@ -2413,18 +2298,22 @@
|
|
|
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
|
|
|
+ do
|
|
|
+ test "x$ac_site_file" = xNONE && continue
|
|
|
+- if test -r "$ac_site_file"; then
|
|
|
++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
|
|
|
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
|
|
+ sed 's/^/| /' "$ac_site_file" >&5
|
|
|
+- . "$ac_site_file"
|
|
|
++ . "$ac_site_file" \
|
|
|
++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
++as_fn_error $? "failed to load site script $ac_site_file
|
|
|
++See \`config.log' for more details" "$LINENO" 5; }
|
|
|
+ fi
|
|
|
+ done
|
|
|
+
|
|
|
+ if test -r "$cache_file"; then
|
|
|
+- # Some versions of bash will fail to source /dev/null (special
|
|
|
+- # files actually), so we avoid doing that.
|
|
|
+- if test -f "$cache_file"; then
|
|
|
++ # Some versions of bash will fail to source /dev/null (special files
|
|
|
++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
|
|
|
++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
|
|
|
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
|
|
|
+ case $cache_file in
|
|
|
+@@ -2493,7 +2382,7 @@
|
|
|
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
|
|
|
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
|
|
+- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
|
|
++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ ## -------------------- ##
|
|
|
+ ## Main body of script. ##
|
|
|
+@@ -2508,16 +2397,22 @@
|
|
|
+
|
|
|
+ ac_aux_dir=
|
|
|
+ for ac_dir in . "$srcdir"/.; do
|
|
|
+- for ac_t in install-sh install.sh shtool; do
|
|
|
+- if test -f "$ac_dir/$ac_t"; then
|
|
|
+- ac_aux_dir=$ac_dir
|
|
|
+- ac_install_sh="$ac_aux_dir/$ac_t -c"
|
|
|
+- break 2
|
|
|
+- fi
|
|
|
+- done
|
|
|
++ if test -f "$ac_dir/install-sh"; then
|
|
|
++ ac_aux_dir=$ac_dir
|
|
|
++ ac_install_sh="$ac_aux_dir/install-sh -c"
|
|
|
++ break
|
|
|
++ elif test -f "$ac_dir/install.sh"; then
|
|
|
++ ac_aux_dir=$ac_dir
|
|
|
++ ac_install_sh="$ac_aux_dir/install.sh -c"
|
|
|
++ break
|
|
|
++ elif test -f "$ac_dir/shtool"; then
|
|
|
++ ac_aux_dir=$ac_dir
|
|
|
++ ac_install_sh="$ac_aux_dir/shtool install -c"
|
|
|
++ break
|
|
|
++ fi
|
|
|
+ done
|
|
|
+ if test -z "$ac_aux_dir"; then
|
|
|
+- as_fn_error "cannot find install-sh, install.sh, or shtool in . \"$srcdir\"/." "$LINENO" 5
|
|
|
++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in . \"$srcdir\"/." "$LINENO" 5
|
|
|
+ fi
|
|
|
+
|
|
|
+ # These three variables are undocumented and unsupported,
|
|
|
+@@ -2551,7 +2446,7 @@
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
|
|
|
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
|
|
|
+ if test -z "$INSTALL"; then
|
|
|
+-if test "${ac_cv_path_install+set}" = set; then :
|
|
|
++if ${ac_cv_path_install+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
+@@ -2638,11 +2533,11 @@
|
|
|
+ '
|
|
|
+ case `pwd` in
|
|
|
+ *[\\\"\#\$\&\'\`$am_lf]*)
|
|
|
+- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
|
|
|
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
|
|
|
+ esac
|
|
|
+ case $srcdir in
|
|
|
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
|
|
|
+- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
|
|
|
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
|
|
|
+ esac
|
|
|
+
|
|
|
+ # Do `set' in a subshell so we don't clobber the current shell's
|
|
|
+@@ -2664,7 +2559,7 @@
|
|
|
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
|
|
|
+ # broken ls alias from the environment. This has actually
|
|
|
+ # happened. Such a system could not be considered "sane".
|
|
|
+- as_fn_error "ls -t appears to fail. Make sure there is not a broken
|
|
|
++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
|
|
|
+ alias in your environment" "$LINENO" 5
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -2674,7 +2569,7 @@
|
|
|
+ # Ok.
|
|
|
+ :
|
|
|
+ else
|
|
|
+- as_fn_error "newly created file is older than distributed files!
|
|
|
++ as_fn_error $? "newly created file is older than distributed files!
|
|
|
+ Check your system clock" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
+@@ -2728,7 +2623,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
|
|
|
++if ${ac_cv_prog_STRIP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$STRIP"; then
|
|
|
+@@ -2768,7 +2663,7 @@
|
|
|
+ set dummy strip; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_STRIP"; then
|
|
|
+@@ -2821,7 +2716,7 @@
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
|
|
|
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
|
|
|
+ if test -z "$MKDIR_P"; then
|
|
|
+- if test "${ac_cv_path_mkdir+set}" = set; then :
|
|
|
++ if ${ac_cv_path_mkdir+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
+@@ -2846,6 +2741,7 @@
|
|
|
+
|
|
|
+ fi
|
|
|
+
|
|
|
++ test -d ./--version && rmdir ./--version
|
|
|
+ if test "${ac_cv_path_mkdir+set}" = set; then
|
|
|
+ MKDIR_P="$ac_cv_path_mkdir -p"
|
|
|
+ else
|
|
|
+@@ -2853,7 +2749,6 @@
|
|
|
+ # value for MKDIR_P within a source directory, because that will
|
|
|
+ # break other packages using the cache if that directory is
|
|
|
+ # removed, or if the value is a relative name.
|
|
|
+- test -d ./--version && rmdir ./--version
|
|
|
+ MKDIR_P="$ac_install_sh -d"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+@@ -2872,7 +2767,7 @@
|
|
|
+ set dummy $ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_AWK+set}" = set; then :
|
|
|
++if ${ac_cv_prog_AWK+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$AWK"; then
|
|
|
+@@ -2912,7 +2807,7 @@
|
|
|
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
|
|
+ set x ${MAKE-make}
|
|
|
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
|
|
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
|
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat >conftest.make <<\_ACEOF
|
|
|
+@@ -2920,7 +2815,7 @@
|
|
|
+ all:
|
|
|
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
|
|
|
+ _ACEOF
|
|
|
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
|
|
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
|
|
|
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
|
|
|
+ *@@@%%%=?*=@@@%%%*)
|
|
|
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
|
|
|
+@@ -2954,7 +2849,7 @@
|
|
|
+ am__isrc=' -I$(srcdir)'
|
|
|
+ # test to see if srcdir already configured
|
|
|
+ if test -f $srcdir/config.status; then
|
|
|
+- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
|
|
|
++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -3029,27 +2924,27 @@
|
|
|
+
|
|
|
+ # Make sure we can run config.sub.
|
|
|
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
|
|
+- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
|
|
++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
|
|
|
+ $as_echo_n "checking build system type... " >&6; }
|
|
|
+-if test "${ac_cv_build+set}" = set; then :
|
|
|
++if ${ac_cv_build+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_build_alias=$build_alias
|
|
|
+ test "x$ac_build_alias" = x &&
|
|
|
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
|
|
+ test "x$ac_build_alias" = x &&
|
|
|
+- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
|
|
|
++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
|
|
|
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
|
|
+- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
|
|
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
|
|
+
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
|
|
+ $as_echo "$ac_cv_build" >&6; }
|
|
|
+ case $ac_cv_build in
|
|
|
+ *-*-*) ;;
|
|
|
+-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
|
|
|
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
|
|
|
+ esac
|
|
|
+ build=$ac_cv_build
|
|
|
+ ac_save_IFS=$IFS; IFS='-'
|
|
|
+@@ -3067,14 +2962,14 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
|
|
|
+ $as_echo_n "checking host system type... " >&6; }
|
|
|
+-if test "${ac_cv_host+set}" = set; then :
|
|
|
++if ${ac_cv_host+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test "x$host_alias" = x; then
|
|
|
+ ac_cv_host=$ac_cv_build
|
|
|
+ else
|
|
|
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
|
|
+- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
|
|
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
|
|
+ fi
|
|
|
+
|
|
|
+ fi
|
|
|
+@@ -3082,7 +2977,7 @@
|
|
|
+ $as_echo "$ac_cv_host" >&6; }
|
|
|
+ case $ac_cv_host in
|
|
|
+ *-*-*) ;;
|
|
|
+-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
|
|
|
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
|
|
|
+ esac
|
|
|
+ host=$ac_cv_host
|
|
|
+ ac_save_IFS=$IFS; IFS='-'
|
|
|
+@@ -3108,7 +3003,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_CC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_CC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$CC"; then
|
|
|
+@@ -3148,7 +3043,7 @@
|
|
|
+ set dummy gcc; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_CC"; then
|
|
|
+@@ -3201,7 +3096,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_CC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_CC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$CC"; then
|
|
|
+@@ -3241,7 +3136,7 @@
|
|
|
+ set dummy cc; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_CC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_CC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$CC"; then
|
|
|
+@@ -3300,7 +3195,7 @@
|
|
|
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_CC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_CC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$CC"; then
|
|
|
+@@ -3344,7 +3239,7 @@
|
|
|
+ set dummy $ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_CC"; then
|
|
|
+@@ -3398,8 +3293,8 @@
|
|
|
+
|
|
|
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
+-as_fn_error "no acceptable C compiler found in \$PATH
|
|
|
+-See \`config.log' for more details." "$LINENO" 5; }
|
|
|
++as_fn_error $? "no acceptable C compiler found in \$PATH
|
|
|
++See \`config.log' for more details" "$LINENO" 5; }
|
|
|
+
|
|
|
+ # Provide some information about the compiler.
|
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
|
|
+@@ -3420,32 +3315,30 @@
|
|
|
+ ... rest of stderr output deleted ...
|
|
|
+ 10q' conftest.err >conftest.er1
|
|
|
+ cat conftest.er1 >&5
|
|
|
+- rm -f conftest.er1 conftest.err
|
|
|
+ fi
|
|
|
++ rm -f conftest.er1 conftest.err
|
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
+ test $ac_status = 0; }
|
|
|
+ done
|
|
|
+
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+ /* end confdefs.h. */
|
|
|
+-#include <stdio.h>
|
|
|
++
|
|
|
+ int
|
|
|
+ main ()
|
|
|
+ {
|
|
|
+-FILE *f = fopen ("conftest.out", "w");
|
|
|
+- return ferror (f) || fclose (f) != 0;
|
|
|
+
|
|
|
+ ;
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ _ACEOF
|
|
|
+ ac_clean_files_save=$ac_clean_files
|
|
|
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
|
|
|
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
|
|
|
+ # 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.
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
|
|
|
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
|
|
|
++$as_echo_n "checking whether the C compiler works... " >&6; }
|
|
|
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
|
|
+
|
|
|
+ # The possible output files:
|
|
|
+@@ -3507,62 +3400,28 @@
|
|
|
+ else
|
|
|
+ ac_file=''
|
|
|
+ fi
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
|
|
|
+-$as_echo "$ac_file" >&6; }
|
|
|
+ if test -z "$ac_file"; then :
|
|
|
+- $as_echo "$as_me: failed program was:" >&5
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
++$as_echo "$as_me: failed program was:" >&5
|
|
|
+ sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
+
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
+-{ as_fn_set_status 77
|
|
|
+-as_fn_error "C compiler cannot create executables
|
|
|
+-See \`config.log' for more details." "$LINENO" 5; }; }
|
|
|
++as_fn_error 77 "C compiler cannot create executables
|
|
|
++See \`config.log' for more details" "$LINENO" 5; }
|
|
|
++else
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
++$as_echo "yes" >&6; }
|
|
|
+ fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
|
|
|
++$as_echo_n "checking for C compiler default output file name... " >&6; }
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
|
|
|
++$as_echo "$ac_file" >&6; }
|
|
|
+ ac_exeext=$ac_cv_exeext
|
|
|
+
|
|
|
+-# Check that the compiler produces executables we can run. If not, either
|
|
|
+-# the compiler is broken, or we cross compile.
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
|
|
|
+-$as_echo_n "checking whether the C compiler works... " >&6; }
|
|
|
+-# If not cross compiling, check that we can run a simple program.
|
|
|
+-if test "$cross_compiling" != yes; then
|
|
|
+- if { ac_try='./$ac_file'
|
|
|
+- { { case "(($ac_try" in
|
|
|
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
+- *) ac_try_echo=$ac_try;;
|
|
|
+-esac
|
|
|
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
|
+-$as_echo "$ac_try_echo"; } >&5
|
|
|
+- (eval "$ac_try") 2>&5
|
|
|
+- ac_status=$?
|
|
|
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
+- test $ac_status = 0; }; }; then
|
|
|
+- cross_compiling=no
|
|
|
+- else
|
|
|
+- if test "$cross_compiling" = maybe; then
|
|
|
+- cross_compiling=yes
|
|
|
+- else
|
|
|
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
+-as_fn_error "cannot run C compiled programs.
|
|
|
+-If you meant to cross compile, use \`--host'.
|
|
|
+-See \`config.log' for more details." "$LINENO" 5; }
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+-fi
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
+-$as_echo "yes" >&6; }
|
|
|
+-
|
|
|
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
|
|
|
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
|
|
|
+ ac_clean_files=$ac_clean_files_save
|
|
|
+-# Check that the compiler produces executables we can run. If not, either
|
|
|
+-# the compiler is broken, or we cross compile.
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
|
|
|
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
|
|
|
+-$as_echo "$cross_compiling" >&6; }
|
|
|
+-
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
|
|
|
+ $as_echo_n "checking for suffix of executables... " >&6; }
|
|
|
+ if { { ac_try="$ac_link"
|
|
|
+@@ -3592,19 +3451,78 @@
|
|
|
+ else
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
+-as_fn_error "cannot compute suffix of executables: cannot compile and link
|
|
|
+-See \`config.log' for more details." "$LINENO" 5; }
|
|
|
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
|
|
|
++See \`config.log' for more details" "$LINENO" 5; }
|
|
|
+ fi
|
|
|
+-rm -f conftest$ac_cv_exeext
|
|
|
++rm -f conftest conftest$ac_cv_exeext
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
|
|
|
+ $as_echo "$ac_cv_exeext" >&6; }
|
|
|
+
|
|
|
+ rm -f conftest.$ac_ext
|
|
|
+ EXEEXT=$ac_cv_exeext
|
|
|
+ ac_exeext=$EXEEXT
|
|
|
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
++/* end confdefs.h. */
|
|
|
++#include <stdio.h>
|
|
|
++int
|
|
|
++main ()
|
|
|
++{
|
|
|
++FILE *f = fopen ("conftest.out", "w");
|
|
|
++ return ferror (f) || fclose (f) != 0;
|
|
|
++
|
|
|
++ ;
|
|
|
++ return 0;
|
|
|
++}
|
|
|
++_ACEOF
|
|
|
++ac_clean_files="$ac_clean_files conftest.out"
|
|
|
++# Check that the compiler produces executables we can run. If not, either
|
|
|
++# the compiler is broken, or we cross compile.
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
|
|
|
++$as_echo_n "checking whether we are cross compiling... " >&6; }
|
|
|
++if test "$cross_compiling" != yes; then
|
|
|
++ { { ac_try="$ac_link"
|
|
|
++case "(($ac_try" in
|
|
|
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
++ *) ac_try_echo=$ac_try;;
|
|
|
++esac
|
|
|
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
|
++$as_echo "$ac_try_echo"; } >&5
|
|
|
++ (eval "$ac_link") 2>&5
|
|
|
++ ac_status=$?
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
++ test $ac_status = 0; }
|
|
|
++ if { ac_try='./conftest$ac_cv_exeext'
|
|
|
++ { { case "(($ac_try" in
|
|
|
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
++ *) ac_try_echo=$ac_try;;
|
|
|
++esac
|
|
|
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
|
++$as_echo "$ac_try_echo"; } >&5
|
|
|
++ (eval "$ac_try") 2>&5
|
|
|
++ ac_status=$?
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
++ test $ac_status = 0; }; }; then
|
|
|
++ cross_compiling=no
|
|
|
++ else
|
|
|
++ if test "$cross_compiling" = maybe; then
|
|
|
++ cross_compiling=yes
|
|
|
++ else
|
|
|
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
++as_fn_error $? "cannot run C compiled programs.
|
|
|
++If you meant to cross compile, use \`--host'.
|
|
|
++See \`config.log' for more details" "$LINENO" 5; }
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
|
|
|
++$as_echo "$cross_compiling" >&6; }
|
|
|
++
|
|
|
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
|
|
|
++ac_clean_files=$ac_clean_files_save
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
|
|
|
+ $as_echo_n "checking for suffix of object files... " >&6; }
|
|
|
+-if test "${ac_cv_objext+set}" = set; then :
|
|
|
++if ${ac_cv_objext+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -3644,8 +3562,8 @@
|
|
|
+
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
+-as_fn_error "cannot compute suffix of object files: cannot compile
|
|
|
+-See \`config.log' for more details." "$LINENO" 5; }
|
|
|
++as_fn_error $? "cannot compute suffix of object files: cannot compile
|
|
|
++See \`config.log' for more details" "$LINENO" 5; }
|
|
|
+ fi
|
|
|
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
|
|
+ fi
|
|
|
+@@ -3655,7 +3573,7 @@
|
|
|
+ ac_objext=$OBJEXT
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
|
|
|
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
|
|
|
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
|
|
|
++if ${ac_cv_c_compiler_gnu+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -3692,7 +3610,7 @@
|
|
|
+ ac_save_CFLAGS=$CFLAGS
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
|
|
|
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
|
|
|
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
|
|
|
++if ${ac_cv_prog_cc_g+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_save_c_werror_flag=$ac_c_werror_flag
|
|
|
+@@ -3770,7 +3688,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
|
|
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
|
|
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
|
|
++if ${ac_cv_prog_cc_c89+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_cv_prog_cc_c89=no
|
|
|
+@@ -3931,7 +3849,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
|
|
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
|
|
|
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
|
|
|
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
|
|
+@@ -4056,13 +3974,17 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
|
|
+ if test -n "$ac_tool_prefix"; then
|
|
|
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
|
|
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
|
|
|
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ case $PKG_CONFIG in
|
|
|
+@@ -4105,7 +4027,7 @@
|
|
|
+ set dummy pkg-config; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
|
|
|
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ case $ac_pt_PKG_CONFIG in
|
|
|
+@@ -4168,7 +4090,6 @@
|
|
|
+ $as_echo "no" >&6; }
|
|
|
+ PKG_CONFIG=""
|
|
|
+ fi
|
|
|
+-
|
|
|
+ fi
|
|
|
+
|
|
|
+ ac_ext=c
|
|
|
+@@ -4183,7 +4104,7 @@
|
|
|
+ CPP=
|
|
|
+ fi
|
|
|
+ if test -z "$CPP"; then
|
|
|
+- if test "${ac_cv_prog_CPP+set}" = set; then :
|
|
|
++ if ${ac_cv_prog_CPP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ # Double quotes because CPP needs to be expanded
|
|
|
+@@ -4213,7 +4134,7 @@
|
|
|
+ # Broken: fails on valid input.
|
|
|
+ continue
|
|
|
+ fi
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.err conftest.i conftest.$ac_ext
|
|
|
+
|
|
|
+ # OK, works on sane cases. Now check whether nonexistent headers
|
|
|
+ # can be detected and how.
|
|
|
+@@ -4229,11 +4150,11 @@
|
|
|
+ ac_preproc_ok=:
|
|
|
+ break
|
|
|
+ fi
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.err conftest.i conftest.$ac_ext
|
|
|
+
|
|
|
+ done
|
|
|
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.i conftest.err conftest.$ac_ext
|
|
|
+ if $ac_preproc_ok; then :
|
|
|
+ break
|
|
|
+ fi
|
|
|
+@@ -4272,7 +4193,7 @@
|
|
|
+ # Broken: fails on valid input.
|
|
|
+ continue
|
|
|
+ fi
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.err conftest.i conftest.$ac_ext
|
|
|
+
|
|
|
+ # OK, works on sane cases. Now check whether nonexistent headers
|
|
|
+ # can be detected and how.
|
|
|
+@@ -4288,18 +4209,18 @@
|
|
|
+ ac_preproc_ok=:
|
|
|
+ break
|
|
|
+ fi
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.err conftest.i conftest.$ac_ext
|
|
|
+
|
|
|
+ done
|
|
|
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.i conftest.err conftest.$ac_ext
|
|
|
+ if $ac_preproc_ok; then :
|
|
|
+
|
|
|
+ else
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
|
|
|
+-See \`config.log' for more details." "$LINENO" 5; }
|
|
|
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
|
|
++See \`config.log' for more details" "$LINENO" 5; }
|
|
|
+ fi
|
|
|
+
|
|
|
+ ac_ext=c
|
|
|
+@@ -4311,7 +4232,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
|
|
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
|
|
+-if test "${ac_cv_path_GREP+set}" = set; then :
|
|
|
++if ${ac_cv_path_GREP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -z "$GREP"; then
|
|
|
+@@ -4360,7 +4281,7 @@
|
|
|
+ done
|
|
|
+ IFS=$as_save_IFS
|
|
|
+ if test -z "$ac_cv_path_GREP"; then
|
|
|
+- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
|
++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ ac_cv_path_GREP=$GREP
|
|
|
+@@ -4374,7 +4295,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
|
|
+ $as_echo_n "checking for egrep... " >&6; }
|
|
|
+-if test "${ac_cv_path_EGREP+set}" = set; then :
|
|
|
++if ${ac_cv_path_EGREP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
|
|
+@@ -4426,7 +4347,7 @@
|
|
|
+ done
|
|
|
+ IFS=$as_save_IFS
|
|
|
+ if test -z "$ac_cv_path_EGREP"; then
|
|
|
+- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
|
++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ ac_cv_path_EGREP=$EGREP
|
|
|
+@@ -4441,7 +4362,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
|
|
+ $as_echo_n "checking for ANSI C header files... " >&6; }
|
|
|
+-if test "${ac_cv_header_stdc+set}" = set; then :
|
|
|
++if ${ac_cv_header_stdc+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -4558,8 +4479,7 @@
|
|
|
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
|
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
|
|
+ "
|
|
|
+-eval as_val=\$$as_ac_Header
|
|
|
+- if test "x$as_val" = x""yes; then :
|
|
|
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
|
+ _ACEOF
|
|
|
+@@ -4571,7 +4491,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
|
|
|
+ $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
|
|
|
+-if test "${ac_cv_c_bigendian+set}" = set; then :
|
|
|
++if ${ac_cv_c_bigendian+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_cv_c_bigendian=unknown
|
|
|
+@@ -4789,7 +4709,7 @@
|
|
|
+
|
|
|
+ ;; #(
|
|
|
+ *)
|
|
|
+- as_fn_error "unknown endianness
|
|
|
++ as_fn_error $? "unknown endianness
|
|
|
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+@@ -5028,7 +4948,7 @@
|
|
|
+ CPP=
|
|
|
+ fi
|
|
|
+ if test -z "$CPP"; then
|
|
|
+- if test "${ac_cv_prog_CPP+set}" = set; then :
|
|
|
++ if ${ac_cv_prog_CPP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ # Double quotes because CPP needs to be expanded
|
|
|
+@@ -5058,7 +4978,7 @@
|
|
|
+ # Broken: fails on valid input.
|
|
|
+ continue
|
|
|
+ fi
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.err conftest.i conftest.$ac_ext
|
|
|
+
|
|
|
+ # OK, works on sane cases. Now check whether nonexistent headers
|
|
|
+ # can be detected and how.
|
|
|
+@@ -5074,11 +4994,11 @@
|
|
|
+ ac_preproc_ok=:
|
|
|
+ break
|
|
|
+ fi
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.err conftest.i conftest.$ac_ext
|
|
|
+
|
|
|
+ done
|
|
|
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.i conftest.err conftest.$ac_ext
|
|
|
+ if $ac_preproc_ok; then :
|
|
|
+ break
|
|
|
+ fi
|
|
|
+@@ -5117,7 +5037,7 @@
|
|
|
+ # Broken: fails on valid input.
|
|
|
+ continue
|
|
|
+ fi
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.err conftest.i conftest.$ac_ext
|
|
|
+
|
|
|
+ # OK, works on sane cases. Now check whether nonexistent headers
|
|
|
+ # can be detected and how.
|
|
|
+@@ -5133,18 +5053,18 @@
|
|
|
+ ac_preproc_ok=:
|
|
|
+ break
|
|
|
+ fi
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.err conftest.i conftest.$ac_ext
|
|
|
+
|
|
|
+ done
|
|
|
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
|
+-rm -f conftest.err conftest.$ac_ext
|
|
|
++rm -f conftest.i conftest.err conftest.$ac_ext
|
|
|
+ if $ac_preproc_ok; then :
|
|
|
+
|
|
|
+ else
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
|
|
|
+-See \`config.log' for more details." "$LINENO" 5; }
|
|
|
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
|
|
++See \`config.log' for more details" "$LINENO" 5; }
|
|
|
+ fi
|
|
|
+
|
|
|
+ ac_ext=c
|
|
|
+@@ -5168,7 +5088,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
|
|
|
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
|
|
|
+-if test "${ac_cv_path_SED+set}" = set; then :
|
|
|
++if ${ac_cv_path_SED+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
|
|
+@@ -5223,7 +5143,7 @@
|
|
|
+ done
|
|
|
+ IFS=$as_save_IFS
|
|
|
+ if test -z "$ac_cv_path_SED"; then
|
|
|
+- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
|
|
|
++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ ac_cv_path_SED=$SED
|
|
|
+@@ -5239,7 +5159,7 @@
|
|
|
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
|
|
+ set x ${MAKE-make}
|
|
|
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
|
|
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
|
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat >conftest.make <<\_ACEOF
|
|
|
+@@ -5247,7 +5167,7 @@
|
|
|
+ all:
|
|
|
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
|
|
|
+ _ACEOF
|
|
|
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
|
|
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
|
|
|
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
|
|
|
+ *@@@%%%=?*=@@@%%%*)
|
|
|
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
|
|
|
+@@ -5276,8 +5196,8 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+-macro_version='2.2.6'
|
|
|
+-macro_revision='1.3012'
|
|
|
++macro_version='2.4'
|
|
|
++macro_revision='1.3293'
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+@@ -5293,9 +5213,78 @@
|
|
|
+
|
|
|
+ ltmain="$ac_aux_dir/ltmain.sh"
|
|
|
+
|
|
|
++# Backslashify metacharacters that are still active within
|
|
|
++# double-quoted strings.
|
|
|
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
|
|
|
++
|
|
|
++# Same as above, but do not quote variable references.
|
|
|
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
|
|
|
++
|
|
|
++# Sed substitution to delay expansion of an escaped shell variable in a
|
|
|
++# double_quote_subst'ed string.
|
|
|
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
|
|
|
++
|
|
|
++# Sed substitution to delay expansion of an escaped single quote.
|
|
|
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
|
|
|
++
|
|
|
++# Sed substitution to avoid accidental globbing in evaled expressions
|
|
|
++no_glob_subst='s/\*/\\\*/g'
|
|
|
++
|
|
|
++ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
|
|
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
|
|
|
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
|
|
|
++
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
|
|
|
++$as_echo_n "checking how to print strings... " >&6; }
|
|
|
++# Test print first, because it will be a builtin if present.
|
|
|
++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
|
|
|
++ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
|
|
|
++ ECHO='print -r --'
|
|
|
++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
|
|
|
++ ECHO='printf %s\n'
|
|
|
++else
|
|
|
++ # Use this function as a fallback that always works.
|
|
|
++ func_fallback_echo ()
|
|
|
++ {
|
|
|
++ eval 'cat <<_LTECHO_EOF
|
|
|
++$1
|
|
|
++_LTECHO_EOF'
|
|
|
++ }
|
|
|
++ ECHO='func_fallback_echo'
|
|
|
++fi
|
|
|
++
|
|
|
++# func_echo_all arg...
|
|
|
++# Invoke $ECHO with all args, space-separated.
|
|
|
++func_echo_all ()
|
|
|
++{
|
|
|
++ $ECHO ""
|
|
|
++}
|
|
|
++
|
|
|
++case "$ECHO" in
|
|
|
++ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
|
|
|
++$as_echo "printf" >&6; } ;;
|
|
|
++ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
|
|
|
++$as_echo "print -r" >&6; } ;;
|
|
|
++ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
|
|
|
++$as_echo "cat" >&6; } ;;
|
|
|
++esac
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
|
|
|
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
|
|
|
+-if test "${ac_cv_path_SED+set}" = set; then :
|
|
|
++if ${ac_cv_path_SED+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
|
|
+@@ -5350,7 +5339,7 @@
|
|
|
+ done
|
|
|
+ IFS=$as_save_IFS
|
|
|
+ if test -z "$ac_cv_path_SED"; then
|
|
|
+- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
|
|
|
++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ ac_cv_path_SED=$SED
|
|
|
+@@ -5377,7 +5366,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
|
|
|
+ $as_echo_n "checking for fgrep... " >&6; }
|
|
|
+-if test "${ac_cv_path_FGREP+set}" = set; then :
|
|
|
++if ${ac_cv_path_FGREP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
|
|
|
+@@ -5429,7 +5418,7 @@
|
|
|
+ done
|
|
|
+ IFS=$as_save_IFS
|
|
|
+ if test -z "$ac_cv_path_FGREP"; then
|
|
|
+- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
|
++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ ac_cv_path_FGREP=$FGREP
|
|
|
+@@ -5508,7 +5497,7 @@
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
|
|
|
+ $as_echo_n "checking for non-GNU ld... " >&6; }
|
|
|
+ fi
|
|
|
+-if test "${lt_cv_path_LD+set}" = set; then :
|
|
|
++if ${lt_cv_path_LD+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -z "$LD"; then
|
|
|
+@@ -5545,10 +5534,10 @@
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
+ $as_echo "no" >&6; }
|
|
|
+ fi
|
|
|
+-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
|
|
|
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
|
|
|
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
|
|
|
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
|
|
|
++if ${lt_cv_prog_gnu_ld+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
|
|
|
+@@ -5575,7 +5564,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
|
|
|
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
|
|
|
+-if test "${lt_cv_path_NM+set}" = set; then :
|
|
|
++if ${lt_cv_path_NM+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$NM"; then
|
|
|
+@@ -5628,14 +5617,17 @@
|
|
|
+ NM="$lt_cv_path_NM"
|
|
|
+ else
|
|
|
+ # Didn't find any BSD compatible name lister, look for dumpbin.
|
|
|
+- if test -n "$ac_tool_prefix"; then
|
|
|
+- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
|
|
|
++ if test -n "$DUMPBIN"; then :
|
|
|
++ # Let the user override the test.
|
|
|
++ else
|
|
|
++ if test -n "$ac_tool_prefix"; then
|
|
|
++ for ac_prog in dumpbin "link -dump"
|
|
|
+ do
|
|
|
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
|
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
|
|
|
++if ${ac_cv_prog_DUMPBIN+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$DUMPBIN"; then
|
|
|
+@@ -5673,13 +5665,13 @@
|
|
|
+ fi
|
|
|
+ if test -z "$DUMPBIN"; then
|
|
|
+ ac_ct_DUMPBIN=$DUMPBIN
|
|
|
+- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
|
|
|
++ for ac_prog in dumpbin "link -dump"
|
|
|
+ do
|
|
|
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
|
+ set dummy $ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_DUMPBIN"; then
|
|
|
+@@ -5728,6 +5720,15 @@
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
|
|
|
++ *COFF*)
|
|
|
++ DUMPBIN="$DUMPBIN -symbols"
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ DUMPBIN=:
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ fi
|
|
|
+
|
|
|
+ if test "$DUMPBIN" != ":"; then
|
|
|
+ NM="$DUMPBIN"
|
|
|
+@@ -5742,18 +5743,18 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
|
|
|
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
|
|
|
+-if test "${lt_cv_nm_interface+set}" = set; then :
|
|
|
++if ${lt_cv_nm_interface+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ lt_cv_nm_interface="BSD nm"
|
|
|
+ echo "int some_variable = 0;" > conftest.$ac_ext
|
|
|
+- (eval echo "\"\$as_me:5750: $ac_compile\"" >&5)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
|
|
|
+ (eval "$ac_compile" 2>conftest.err)
|
|
|
+ cat conftest.err >&5
|
|
|
+- (eval echo "\"\$as_me:5753: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
|
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
|
|
+ cat conftest.err >&5
|
|
|
+- (eval echo "\"\$as_me:5756: output\"" >&5)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
|
|
|
+ cat conftest.out >&5
|
|
|
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
|
|
+ lt_cv_nm_interface="MS dumpbin"
|
|
|
+@@ -5766,7 +5767,7 @@
|
|
|
+ # find the maximum length of command line arguments
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
|
|
|
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
|
|
|
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
|
|
|
++if ${lt_cv_sys_max_cmd_len+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ i=0
|
|
|
+@@ -5799,6 +5800,11 @@
|
|
|
+ lt_cv_sys_max_cmd_len=8192;
|
|
|
+ ;;
|
|
|
+
|
|
|
++ mint*)
|
|
|
++ # On MiNT this can take a long time and run out of memory.
|
|
|
++ lt_cv_sys_max_cmd_len=8192;
|
|
|
++ ;;
|
|
|
++
|
|
|
+ amigaos*)
|
|
|
+ # On AmigaOS with pdksh, this test takes hours, literally.
|
|
|
+ # So we just punt and use a minimum line length of 8192.
|
|
|
+@@ -5863,8 +5869,8 @@
|
|
|
+ # 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"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
|
|
|
+- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
|
|
|
++ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
|
|
|
++ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
|
|
|
+ test $i != 17 # 1/2 MB should be enough
|
|
|
+ do
|
|
|
+ i=`expr $i + 1`
|
|
|
+@@ -5906,8 +5912,8 @@
|
|
|
+ # Try some XSI features
|
|
|
+ xsi_shell=no
|
|
|
+ ( _lt_dummy="a/b/c"
|
|
|
+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
|
|
|
+- = c,a/b,, \
|
|
|
++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
|
|
|
++ = c,a/b,b/c, \
|
|
|
+ && eval 'test $(( 1 + 1 )) -eq 2 \
|
|
|
+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
|
|
|
+ && xsi_shell=yes
|
|
|
+@@ -5956,24 +5962,103 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
|
|
|
+-$as_echo_n "checking for $LD option to reload object files... " >&6; }
|
|
|
+-if test "${lt_cv_ld_reload_flag+set}" = set; then :
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
|
|
|
++$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
|
|
|
++if ${lt_cv_to_host_file_cmd+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+- lt_cv_ld_reload_flag='-r'
|
|
|
+-fi
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
|
|
|
+-$as_echo "$lt_cv_ld_reload_flag" >&6; }
|
|
|
+-reload_flag=$lt_cv_ld_reload_flag
|
|
|
+-case $reload_flag in
|
|
|
+-"" | " "*) ;;
|
|
|
+-*) reload_flag=" $reload_flag" ;;
|
|
|
+-esac
|
|
|
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
|
+-case $host_os in
|
|
|
+- darwin*)
|
|
|
+- if test "$GCC" = yes; then
|
|
|
++ case $host in
|
|
|
++ *-*-mingw* )
|
|
|
++ case $build in
|
|
|
++ *-*-mingw* ) # actually msys
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
|
++ ;;
|
|
|
++ *-*-cygwin* )
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
|
++ ;;
|
|
|
++ * ) # otherwise, assume *nix
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ ;;
|
|
|
++ *-*-cygwin* )
|
|
|
++ case $build in
|
|
|
++ *-*-mingw* ) # actually msys
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
|
++ ;;
|
|
|
++ *-*-cygwin* )
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
|
++ ;;
|
|
|
++ * ) # otherwise, assume *nix
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ ;;
|
|
|
++ * ) # unhandled hosts (and "normal" native builds)
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++
|
|
|
++fi
|
|
|
++
|
|
|
++to_host_file_cmd=$lt_cv_to_host_file_cmd
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
|
|
|
++$as_echo "$lt_cv_to_host_file_cmd" >&6; }
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
|
|
|
++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
|
|
|
++if ${lt_cv_to_tool_file_cmd+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ #assume ordinary cross tools, or native build.
|
|
|
++lt_cv_to_tool_file_cmd=func_convert_file_noop
|
|
|
++case $host in
|
|
|
++ *-*-mingw* )
|
|
|
++ case $build in
|
|
|
++ *-*-mingw* ) # actually msys
|
|
|
++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++
|
|
|
++fi
|
|
|
++
|
|
|
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
|
|
|
++$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
|
|
|
++$as_echo_n "checking for $LD option to reload object files... " >&6; }
|
|
|
++if ${lt_cv_ld_reload_flag+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ lt_cv_ld_reload_flag='-r'
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
|
|
|
++$as_echo "$lt_cv_ld_reload_flag" >&6; }
|
|
|
++reload_flag=$lt_cv_ld_reload_flag
|
|
|
++case $reload_flag in
|
|
|
++"" | " "*) ;;
|
|
|
++*) reload_flag=" $reload_flag" ;;
|
|
|
++esac
|
|
|
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
|
++case $host_os in
|
|
|
++ cygwin* | mingw* | pw32* | cegcc*)
|
|
|
++ if test "$GCC" != yes; then
|
|
|
++ reload_cmds=false
|
|
|
++ fi
|
|
|
++ ;;
|
|
|
++ darwin*)
|
|
|
++ if test "$GCC" = yes; then
|
|
|
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
|
|
|
+ else
|
|
|
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
|
+@@ -5994,7 +6079,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
|
|
|
++if ${ac_cv_prog_OBJDUMP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$OBJDUMP"; then
|
|
|
+@@ -6034,7 +6119,7 @@
|
|
|
+ set dummy objdump; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_OBJDUMP"; then
|
|
|
+@@ -6090,7 +6175,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
|
|
|
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
|
|
|
+-if test "${lt_cv_deplibs_check_method+set}" = set; then :
|
|
|
++if ${lt_cv_deplibs_check_method+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
|
|
|
+@@ -6132,16 +6217,18 @@
|
|
|
+ # Base MSYS/MinGW do not provide the 'file' command needed by
|
|
|
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
|
|
|
+ # unless we find 'file', for example because we are cross-compiling.
|
|
|
+- if ( file / ) >/dev/null 2>&1; then
|
|
|
++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
|
|
|
++ if ( test "$lt_cv_nm_interface" = "BSD nm" && 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)?'
|
|
|
++ # Keep this pattern in sync with the one in func_win32_libid.
|
|
|
++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
|
|
|
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+
|
|
|
+-cegcc)
|
|
|
++cegcc*)
|
|
|
+ # use the weaker test based on 'objdump'. See mingw*.
|
|
|
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
|
|
|
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
|
|
|
+@@ -6171,6 +6258,10 @@
|
|
|
+ lt_cv_deplibs_check_method=pass_all
|
|
|
+ ;;
|
|
|
+
|
|
|
++haiku*)
|
|
|
++ lt_cv_deplibs_check_method=pass_all
|
|
|
++ ;;
|
|
|
++
|
|
|
+ hpux10.20* | hpux11*)
|
|
|
+ lt_cv_file_magic_cmd=/usr/bin/file
|
|
|
+ case $host_cpu in
|
|
|
+@@ -6179,11 +6270,11 @@
|
|
|
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
|
|
|
+ ;;
|
|
|
+ hppa*64*)
|
|
|
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
|
|
|
++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
|
|
|
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
|
|
|
++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
|
|
|
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -6205,11 +6296,11 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ # This must be Linux ELF.
|
|
|
+-linux* | k*bsd*-gnu)
|
|
|
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ lt_cv_deplibs_check_method=pass_all
|
|
|
+ ;;
|
|
|
+
|
|
|
+-netbsd* | netbsdelf*-gnu)
|
|
|
++netbsd*)
|
|
|
+ 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
|
|
|
+@@ -6286,6 +6377,21 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
|
|
|
+ $as_echo "$lt_cv_deplibs_check_method" >&6; }
|
|
|
++
|
|
|
++file_magic_glob=
|
|
|
++want_nocaseglob=no
|
|
|
++if test "$build" = "$host"; then
|
|
|
++ case $host_os in
|
|
|
++ mingw* | pw32*)
|
|
|
++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
|
|
|
++ want_nocaseglob=yes
|
|
|
++ else
|
|
|
++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
|
|
|
++ fi
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++fi
|
|
|
++
|
|
|
+ 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
|
|
|
+@@ -6301,12 +6407,162 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++if test -n "$ac_tool_prefix"; then
|
|
|
++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
|
|
|
++set dummy ${ac_tool_prefix}dlltool; ac_word=$2
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
++$as_echo_n "checking for $ac_word... " >&6; }
|
|
|
++if ${ac_cv_prog_DLLTOOL+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ if test -n "$DLLTOOL"; then
|
|
|
++ ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_DLLTOOL="${ac_tool_prefix}dlltool"
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
++ break 2
|
|
|
++ fi
|
|
|
++done
|
|
|
++ done
|
|
|
++IFS=$as_save_IFS
|
|
|
++
|
|
|
++fi
|
|
|
++fi
|
|
|
++DLLTOOL=$ac_cv_prog_DLLTOOL
|
|
|
++if test -n "$DLLTOOL"; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
|
|
|
++$as_echo "$DLLTOOL" >&6; }
|
|
|
++else
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
++fi
|
|
|
++
|
|
|
++
|
|
|
++fi
|
|
|
++if test -z "$ac_cv_prog_DLLTOOL"; then
|
|
|
++ ac_ct_DLLTOOL=$DLLTOOL
|
|
|
++ # Extract the first word of "dlltool", so it can be a program name with args.
|
|
|
++set dummy dlltool; ac_word=$2
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
++$as_echo_n "checking for $ac_word... " >&6; }
|
|
|
++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ if test -n "$ac_ct_DLLTOOL"; then
|
|
|
++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_DLLTOOL="dlltool"
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
++ break 2
|
|
|
++ fi
|
|
|
++done
|
|
|
++ done
|
|
|
++IFS=$as_save_IFS
|
|
|
++
|
|
|
++fi
|
|
|
++fi
|
|
|
++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
|
|
|
++if test -n "$ac_ct_DLLTOOL"; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
|
|
|
++$as_echo "$ac_ct_DLLTOOL" >&6; }
|
|
|
++else
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
++fi
|
|
|
++
|
|
|
++ if test "x$ac_ct_DLLTOOL" = x; then
|
|
|
++ DLLTOOL="false"
|
|
|
++ else
|
|
|
++ case $cross_compiling:$ac_tool_warned in
|
|
|
++yes:)
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
|
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
|
++ac_tool_warned=yes ;;
|
|
|
++esac
|
|
|
++ DLLTOOL=$ac_ct_DLLTOOL
|
|
|
++ fi
|
|
|
++else
|
|
|
++ DLLTOOL="$ac_cv_prog_DLLTOOL"
|
|
|
++fi
|
|
|
++
|
|
|
++test -z "$DLLTOOL" && DLLTOOL=dlltool
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
|
|
|
++$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
|
|
|
++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
++
|
|
|
++case $host_os in
|
|
|
++cygwin* | mingw* | pw32* | cegcc*)
|
|
|
++ # two different shell functions defined in ltmain.sh
|
|
|
++ # decide which to use based on capabilities of $DLLTOOL
|
|
|
++ case `$DLLTOOL --help 2>&1` in
|
|
|
++ *--identify-strict*)
|
|
|
++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ ;;
|
|
|
++*)
|
|
|
++ # fallback: assume linklib IS sharedlib
|
|
|
++ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
|
|
|
++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
|
|
|
++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
|
|
|
++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+ 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
|
|
|
++ for ac_prog in ar
|
|
|
++ do
|
|
|
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
|
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_AR+set}" = set; then :
|
|
|
++if ${ac_cv_prog_AR+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$AR"; then
|
|
|
+@@ -6319,7 +6575,7 @@
|
|
|
+ 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_AR="${ac_tool_prefix}ar"
|
|
|
++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
|
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
+ break 2
|
|
|
+ fi
|
|
|
+@@ -6339,14 +6595,18 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+
|
|
|
++ test -n "$AR" && break
|
|
|
++ done
|
|
|
+ fi
|
|
|
+-if test -z "$ac_cv_prog_AR"; then
|
|
|
++if test -z "$AR"; then
|
|
|
+ ac_ct_AR=$AR
|
|
|
+- # Extract the first word of "ar", so it can be a program name with args.
|
|
|
+-set dummy ar; ac_word=$2
|
|
|
++ for ac_prog in ar
|
|
|
++do
|
|
|
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
|
++set dummy $ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_AR+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_AR"; then
|
|
|
+@@ -6359,7 +6619,7 @@
|
|
|
+ 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_AR="ar"
|
|
|
++ ac_cv_prog_ac_ct_AR="$ac_prog"
|
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
+ break 2
|
|
|
+ fi
|
|
|
+@@ -6378,6 +6638,10 @@
|
|
|
+ $as_echo "no" >&6; }
|
|
|
+ fi
|
|
|
+
|
|
|
++
|
|
|
++ test -n "$ac_ct_AR" && break
|
|
|
++done
|
|
|
++
|
|
|
+ if test "x$ac_ct_AR" = x; then
|
|
|
+ AR="false"
|
|
|
+ else
|
|
|
+@@ -6389,12 +6653,14 @@
|
|
|
+ esac
|
|
|
+ AR=$ac_ct_AR
|
|
|
+ fi
|
|
|
+-else
|
|
|
+- AR="$ac_cv_prog_AR"
|
|
|
+ fi
|
|
|
+
|
|
|
+-test -z "$AR" && AR=ar
|
|
|
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
|
|
|
++: ${AR=ar}
|
|
|
++: ${AR_FLAGS=cru}
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+@@ -6402,6 +6668,60 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
|
|
|
++$as_echo_n "checking for archiver @FILE support... " >&6; }
|
|
|
++if ${lt_cv_ar_at_file+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ lt_cv_ar_at_file=no
|
|
|
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
++/* end confdefs.h. */
|
|
|
++
|
|
|
++int
|
|
|
++main ()
|
|
|
++{
|
|
|
++
|
|
|
++ ;
|
|
|
++ return 0;
|
|
|
++}
|
|
|
++_ACEOF
|
|
|
++if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
++ echo conftest.$ac_objext > conftest.lst
|
|
|
++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
|
|
|
++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
|
|
|
++ (eval $lt_ar_try) 2>&5
|
|
|
++ ac_status=$?
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
++ test $ac_status = 0; }
|
|
|
++ if test "$ac_status" -eq 0; then
|
|
|
++ # Ensure the archiver fails upon bogus file names.
|
|
|
++ rm -f conftest.$ac_objext libconftest.a
|
|
|
++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
|
|
|
++ (eval $lt_ar_try) 2>&5
|
|
|
++ ac_status=$?
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
++ test $ac_status = 0; }
|
|
|
++ if test "$ac_status" -ne 0; then
|
|
|
++ lt_cv_ar_at_file=@
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++ rm -f conftest.* libconftest.a
|
|
|
++
|
|
|
++fi
|
|
|
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
++
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
|
|
|
++$as_echo "$lt_cv_ar_at_file" >&6; }
|
|
|
++
|
|
|
++if test "x$lt_cv_ar_at_file" = xno; then
|
|
|
++ archiver_list_spec=
|
|
|
++else
|
|
|
++ archiver_list_spec=$lt_cv_ar_at_file
|
|
|
++fi
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+@@ -6411,7 +6731,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
|
|
|
++if ${ac_cv_prog_STRIP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$STRIP"; then
|
|
|
+@@ -6451,7 +6771,7 @@
|
|
|
+ set dummy strip; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_STRIP"; then
|
|
|
+@@ -6510,7 +6830,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
|
|
|
++if ${ac_cv_prog_RANLIB+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$RANLIB"; then
|
|
|
+@@ -6550,7 +6870,7 @@
|
|
|
+ set dummy ranlib; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_RANLIB"; then
|
|
|
+@@ -6621,6 +6941,18 @@
|
|
|
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
|
|
+ fi
|
|
|
+
|
|
|
++case $host_os in
|
|
|
++ darwin*)
|
|
|
++ lock_old_archive_extraction=yes ;;
|
|
|
++ *)
|
|
|
++ lock_old_archive_extraction=no ;;
|
|
|
++esac
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+@@ -6667,7 +6999,7 @@
|
|
|
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
|
|
|
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
|
|
|
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
|
|
|
++if ${lt_cv_sys_global_symbol_pipe+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+
|
|
|
+@@ -6728,8 +7060,8 @@
|
|
|
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
|
|
|
+
|
|
|
+ # Transform an extracted symbol line into symbol name and symbol address
|
|
|
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
|
|
|
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
|
|
|
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
|
|
|
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
|
|
|
+
|
|
|
+ # Handle CRLF in mingw tool chain
|
|
|
+ opt_cr=
|
|
|
+@@ -6765,6 +7097,7 @@
|
|
|
+ else
|
|
|
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
|
|
|
+ fi
|
|
|
++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
|
|
|
+
|
|
|
+ # Check to see that the pipe works correctly.
|
|
|
+ pipe_works=no
|
|
|
+@@ -6790,8 +7123,8 @@
|
|
|
+ test $ac_status = 0; }; then
|
|
|
+ # Now try to grab the symbols.
|
|
|
+ nlist=conftest.nm
|
|
|
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
|
|
|
+- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
|
|
|
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
|
|
|
++ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
|
|
|
+ ac_status=$?
|
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
+ test $ac_status = 0; } && test -s "$nlist"; then
|
|
|
+@@ -6806,6 +7139,18 @@
|
|
|
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
|
|
|
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
|
|
|
+ cat <<_LT_EOF > conftest.$ac_ext
|
|
|
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
|
|
|
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
|
|
|
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
|
|
|
++ relocations are performed -- see ld's documentation on pseudo-relocs. */
|
|
|
++# define LT_DLSYM_CONST
|
|
|
++#elif defined(__osf__)
|
|
|
++/* This system does not cope well with relocations in const data. */
|
|
|
++# define LT_DLSYM_CONST
|
|
|
++#else
|
|
|
++# define LT_DLSYM_CONST const
|
|
|
++#endif
|
|
|
++
|
|
|
+ #ifdef __cplusplus
|
|
|
+ extern "C" {
|
|
|
+ #endif
|
|
|
+@@ -6817,7 +7162,7 @@
|
|
|
+ cat <<_LT_EOF >> conftest.$ac_ext
|
|
|
+
|
|
|
+ /* The mapping between symbol names and symbols. */
|
|
|
+-const struct {
|
|
|
++LT_DLSYM_CONST struct {
|
|
|
+ const char *name;
|
|
|
+ void *address;
|
|
|
+ }
|
|
|
+@@ -6843,8 +7188,8 @@
|
|
|
+ _LT_EOF
|
|
|
+ # Now try linking the two files.
|
|
|
+ mv conftest.$ac_objext conftstm.$ac_objext
|
|
|
+- lt_save_LIBS="$LIBS"
|
|
|
+- lt_save_CFLAGS="$CFLAGS"
|
|
|
++ lt_globsym_save_LIBS=$LIBS
|
|
|
++ lt_globsym_save_CFLAGS=$CFLAGS
|
|
|
+ LIBS="conftstm.$ac_objext"
|
|
|
+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
|
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
|
|
|
+@@ -6854,8 +7199,8 @@
|
|
|
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
|
|
|
+ pipe_works=yes
|
|
|
+ fi
|
|
|
+- LIBS="$lt_save_LIBS"
|
|
|
+- CFLAGS="$lt_save_CFLAGS"
|
|
|
++ LIBS=$lt_globsym_save_LIBS
|
|
|
++ CFLAGS=$lt_globsym_save_CFLAGS
|
|
|
+ else
|
|
|
+ echo "cannot find nm_test_func in $nlist" >&5
|
|
|
+ fi
|
|
|
+@@ -6892,6 +7237,20 @@
|
|
|
+ $as_echo "ok" >&6; }
|
|
|
+ fi
|
|
|
+
|
|
|
++# Response file support.
|
|
|
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
|
|
|
++ nm_file_list_spec='@'
|
|
|
++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
|
|
|
++ nm_file_list_spec='@'
|
|
|
++fi
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+@@ -6911,6 +7270,41 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
|
|
++$as_echo_n "checking for sysroot... " >&6; }
|
|
|
++
|
|
|
++# Check whether --with-sysroot was given.
|
|
|
++if test "${with_sysroot+set}" = set; then :
|
|
|
++ withval=$with_sysroot;
|
|
|
++else
|
|
|
++ with_sysroot=no
|
|
|
++fi
|
|
|
++
|
|
|
++
|
|
|
++lt_sysroot=
|
|
|
++case ${with_sysroot} in #(
|
|
|
++ yes)
|
|
|
++ if test "$GCC" = yes; then
|
|
|
++ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
|
|
++ fi
|
|
|
++ ;; #(
|
|
|
++ /*)
|
|
|
++ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
|
|
++ ;; #(
|
|
|
++ no|'')
|
|
|
++ ;; #(
|
|
|
++ *)
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
|
|
++$as_echo "${with_sysroot}" >&6; }
|
|
|
++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
|
|
|
++$as_echo "${lt_sysroot:-no}" >&6; }
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+
|
|
|
+
|
|
|
+ # Check whether --enable-libtool-lock was given.
|
|
|
+@@ -6944,7 +7338,7 @@
|
|
|
+ ;;
|
|
|
+ *-*-irix6*)
|
|
|
+ # Find out which ABI we are using.
|
|
|
+- echo '#line 6947 "configure"' > conftest.$ac_ext
|
|
|
++ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
|
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
|
+ (eval $ac_compile) 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -7038,7 +7432,7 @@
|
|
|
+ CFLAGS="$CFLAGS -belf"
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
|
|
|
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
|
|
|
+-if test "${lt_cv_cc_needs_belf+set}" = set; then :
|
|
|
++if ${lt_cv_cc_needs_belf+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_ext=c
|
|
|
+@@ -7100,11 +7494,128 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+- rm -rf conftest*
|
|
|
+- ;;
|
|
|
++ rm -rf conftest*
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++
|
|
|
++need_locks="$enable_libtool_lock"
|
|
|
++
|
|
|
++if test -n "$ac_tool_prefix"; then
|
|
|
++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
|
|
|
++set dummy ${ac_tool_prefix}mt; ac_word=$2
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
++$as_echo_n "checking for $ac_word... " >&6; }
|
|
|
++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ if test -n "$MANIFEST_TOOL"; then
|
|
|
++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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_MANIFEST_TOOL="${ac_tool_prefix}mt"
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
++ break 2
|
|
|
++ fi
|
|
|
++done
|
|
|
++ done
|
|
|
++IFS=$as_save_IFS
|
|
|
++
|
|
|
++fi
|
|
|
++fi
|
|
|
++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
|
|
|
++if test -n "$MANIFEST_TOOL"; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
|
|
|
++$as_echo "$MANIFEST_TOOL" >&6; }
|
|
|
++else
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
++fi
|
|
|
++
|
|
|
++
|
|
|
++fi
|
|
|
++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
|
|
|
++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
|
|
|
++ # Extract the first word of "mt", so it can be a program name with args.
|
|
|
++set dummy mt; ac_word=$2
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
++$as_echo_n "checking for $ac_word... " >&6; }
|
|
|
++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ if test -n "$ac_ct_MANIFEST_TOOL"; then
|
|
|
++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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_MANIFEST_TOOL="mt"
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
++ break 2
|
|
|
++ fi
|
|
|
++done
|
|
|
++ done
|
|
|
++IFS=$as_save_IFS
|
|
|
++
|
|
|
++fi
|
|
|
++fi
|
|
|
++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
|
|
|
++if test -n "$ac_ct_MANIFEST_TOOL"; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
|
|
|
++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
|
|
|
++else
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
++fi
|
|
|
++
|
|
|
++ if test "x$ac_ct_MANIFEST_TOOL" = x; then
|
|
|
++ MANIFEST_TOOL=":"
|
|
|
++ else
|
|
|
++ case $cross_compiling:$ac_tool_warned in
|
|
|
++yes:)
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
|
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
|
++ac_tool_warned=yes ;;
|
|
|
+ esac
|
|
|
++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
|
|
|
++ fi
|
|
|
++else
|
|
|
++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
|
|
|
++fi
|
|
|
++
|
|
|
++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
|
|
|
++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
|
|
|
++if ${lt_cv_path_mainfest_tool+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ lt_cv_path_mainfest_tool=no
|
|
|
++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
|
|
|
++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
|
|
|
++ cat conftest.err >&5
|
|
|
++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
|
|
|
++ lt_cv_path_mainfest_tool=yes
|
|
|
++ fi
|
|
|
++ rm -f conftest*
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
|
|
|
++$as_echo "$lt_cv_path_mainfest_tool" >&6; }
|
|
|
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
|
|
|
++ MANIFEST_TOOL=:
|
|
|
++fi
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+
|
|
|
+-need_locks="$enable_libtool_lock"
|
|
|
+
|
|
|
+
|
|
|
+ case $host_os in
|
|
|
+@@ -7114,7 +7625,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
|
|
|
++if ${ac_cv_prog_DSYMUTIL+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$DSYMUTIL"; then
|
|
|
+@@ -7154,7 +7665,7 @@
|
|
|
+ set dummy dsymutil; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_DSYMUTIL"; then
|
|
|
+@@ -7206,7 +7717,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
|
|
|
++if ${ac_cv_prog_NMEDIT+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$NMEDIT"; then
|
|
|
+@@ -7246,7 +7757,7 @@
|
|
|
+ set dummy nmedit; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_NMEDIT"; then
|
|
|
+@@ -7298,7 +7809,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}lipo; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_LIPO+set}" = set; then :
|
|
|
++if ${ac_cv_prog_LIPO+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$LIPO"; then
|
|
|
+@@ -7338,7 +7849,7 @@
|
|
|
+ set dummy lipo; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_LIPO"; then
|
|
|
+@@ -7390,7 +7901,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}otool; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_OTOOL+set}" = set; then :
|
|
|
++if ${ac_cv_prog_OTOOL+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$OTOOL"; then
|
|
|
+@@ -7430,7 +7941,7 @@
|
|
|
+ set dummy otool; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_OTOOL"; then
|
|
|
+@@ -7482,7 +7993,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}otool64; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
|
|
|
++if ${ac_cv_prog_OTOOL64+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$OTOOL64"; then
|
|
|
+@@ -7522,7 +8033,7 @@
|
|
|
+ set dummy otool64; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_OTOOL64"; then
|
|
|
+@@ -7597,7 +8108,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
|
|
|
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
|
|
|
+-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
|
|
|
++if ${lt_cv_apple_cc_single_mod+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ lt_cv_apple_cc_single_mod=no
|
|
|
+@@ -7626,7 +8137,7 @@
|
|
|
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
|
|
|
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
|
|
|
+-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
|
|
|
++if ${lt_cv_ld_exported_symbols_list+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ lt_cv_ld_exported_symbols_list=no
|
|
|
+@@ -7656,6 +8167,38 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
|
|
|
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
|
|
|
++$as_echo_n "checking for -force_load linker flag... " >&6; }
|
|
|
++if ${lt_cv_ld_force_load+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ lt_cv_ld_force_load=no
|
|
|
++ cat > conftest.c << _LT_EOF
|
|
|
++int forced_loaded() { return 2;}
|
|
|
++_LT_EOF
|
|
|
++ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
|
|
|
++ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
|
|
|
++ echo "$AR cru libconftest.a conftest.o" >&5
|
|
|
++ $AR cru libconftest.a conftest.o 2>&5
|
|
|
++ echo "$RANLIB libconftest.a" >&5
|
|
|
++ $RANLIB libconftest.a 2>&5
|
|
|
++ cat > conftest.c << _LT_EOF
|
|
|
++int main() { return 0;}
|
|
|
++_LT_EOF
|
|
|
++ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
|
|
|
++ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
|
|
|
++ _lt_result=$?
|
|
|
++ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
|
|
|
++ lt_cv_ld_force_load=yes
|
|
|
++ else
|
|
|
++ cat conftest.err >&5
|
|
|
++ fi
|
|
|
++ rm -f conftest.err libconftest.a conftest conftest.c
|
|
|
++ rm -rf conftest.dSYM
|
|
|
++
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
|
|
|
++$as_echo "$lt_cv_ld_force_load" >&6; }
|
|
|
+ case $host_os in
|
|
|
+ rhapsody* | darwin1.[012])
|
|
|
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
|
|
|
+@@ -7683,7 +8226,7 @@
|
|
|
+ else
|
|
|
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
|
|
+ fi
|
|
|
+- if test "$DSYMUTIL" != ":"; then
|
|
|
++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
|
|
|
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
|
|
|
+ else
|
|
|
+ _lt_dsymutil=
|
|
|
+@@ -7695,7 +8238,7 @@
|
|
|
+ do :
|
|
|
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
|
|
|
+ "
|
|
|
+-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
|
|
|
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define HAVE_DLFCN_H 1
|
|
|
+ _ACEOF
|
|
|
+@@ -7706,17 +8249,19 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
++
|
|
|
++
|
|
|
+ # Set options
|
|
|
+ enable_win32_dll=yes
|
|
|
+
|
|
|
+ case $host in
|
|
|
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
|
|
|
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
|
+ if test -n "$ac_tool_prefix"; then
|
|
|
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
|
|
+ set dummy ${ac_tool_prefix}as; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_AS+set}" = set; then :
|
|
|
++if ${ac_cv_prog_AS+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$AS"; then
|
|
|
+@@ -7756,7 +8301,7 @@
|
|
|
+ set dummy as; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_AS+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_AS"; then
|
|
|
+@@ -7808,7 +8353,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}dlltool; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
|
|
|
++if ${ac_cv_prog_DLLTOOL+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$DLLTOOL"; then
|
|
|
+@@ -7848,7 +8393,7 @@
|
|
|
+ set dummy dlltool; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_DLLTOOL"; then
|
|
|
+@@ -7900,7 +8445,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
|
|
|
++if ${ac_cv_prog_OBJDUMP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$OBJDUMP"; then
|
|
|
+@@ -7940,7 +8485,7 @@
|
|
|
+ set dummy objdump; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_OBJDUMP"; then
|
|
|
+@@ -8156,6 +8701,7 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
++
|
|
|
+ test -z "$LN_S" && LN_S="ln -s"
|
|
|
+
|
|
|
+
|
|
|
+@@ -8177,7 +8723,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
|
|
|
+ $as_echo_n "checking for objdir... " >&6; }
|
|
|
+-if test "${lt_cv_objdir+set}" = set; then :
|
|
|
++if ${lt_cv_objdir+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ rm -f .libs 2>/dev/null
|
|
|
+@@ -8205,19 +8751,6 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+ case $host_os in
|
|
|
+ aix3*)
|
|
|
+ # AIX sometimes has problems with the GCC collect2 program. For some
|
|
|
+@@ -8230,23 +8763,6 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+-# Sed substitution that helps us do robust quoting. It backslashifies
|
|
|
+-# metacharacters that are still active within double-quoted strings.
|
|
|
+-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
|
|
|
+-
|
|
|
+-# Same as above, but do not quote variable references.
|
|
|
+-double_quote_subst='s/\(["`\\]\)/\\\1/g'
|
|
|
+-
|
|
|
+-# Sed substitution to delay expansion of an escaped shell variable in a
|
|
|
+-# double_quote_subst'ed string.
|
|
|
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
|
|
|
+-
|
|
|
+-# Sed substitution to delay expansion of an escaped single quote.
|
|
|
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
|
|
|
+-
|
|
|
+-# Sed substitution to avoid accidental globbing in evaled expressions
|
|
|
+-no_glob_subst='s/\*/\\\*/g'
|
|
|
+-
|
|
|
+ # Global variables:
|
|
|
+ ofile=libtool
|
|
|
+ can_build_shared=yes
|
|
|
+@@ -8275,7 +8791,7 @@
|
|
|
+ *) break;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
|
|
|
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
|
|
+
|
|
|
+
|
|
|
+ # Only perform the check for file, if the check method requires it
|
|
|
+@@ -8285,7 +8801,7 @@
|
|
|
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
|
|
|
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
|
|
|
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
|
|
|
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ case $MAGIC_CMD in
|
|
|
+@@ -8351,7 +8867,7 @@
|
|
|
+ if test -n "$ac_tool_prefix"; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
|
|
|
+ $as_echo_n "checking for file... " >&6; }
|
|
|
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
|
|
|
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ case $MAGIC_CMD in
|
|
|
+@@ -8484,11 +9000,16 @@
|
|
|
+ lt_prog_compiler_no_builtin_flag=
|
|
|
+
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
|
|
|
++ case $cc_basename in
|
|
|
++ nvcc*)
|
|
|
++ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
|
|
|
++ *)
|
|
|
++ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
|
|
|
++ esac
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
|
|
|
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
|
|
|
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
|
|
|
++if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ lt_cv_prog_compiler_rtti_exceptions=no
|
|
|
+@@ -8504,15 +9025,15 @@
|
|
|
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
+ -e 's:$: $lt_compiler_flag:'`
|
|
|
+- (eval echo "\"\$as_me:8507: $lt_compile\"" >&5)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
|
|
|
+ (eval "$lt_compile" 2>conftest.err)
|
|
|
+ ac_status=$?
|
|
|
+ cat conftest.err >&5
|
|
|
+- echo "$as_me:8511: \$? = $ac_status" >&5
|
|
|
++ echo "$as_me:$LINENO: \$? = $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 other than the usual output.
|
|
|
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
|
|
|
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
|
|
|
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
|
|
|
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
|
|
|
+ lt_cv_prog_compiler_rtti_exceptions=yes
|
|
|
+@@ -8541,8 +9062,6 @@
|
|
|
+ lt_prog_compiler_pic=
|
|
|
+ lt_prog_compiler_static=
|
|
|
+
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
|
|
|
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
|
+
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+ lt_prog_compiler_wl='-Wl,'
|
|
|
+@@ -8590,6 +9109,12 @@
|
|
|
+ lt_prog_compiler_pic='-fno-common'
|
|
|
+ ;;
|
|
|
+
|
|
|
++ haiku*)
|
|
|
++ # PIC is the default for Haiku.
|
|
|
++ # The "-static" flag exists, but is broken.
|
|
|
++ lt_prog_compiler_static=
|
|
|
++ ;;
|
|
|
++
|
|
|
+ hpux*)
|
|
|
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
|
|
|
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
|
|
|
+@@ -8632,6 +9157,13 @@
|
|
|
+ lt_prog_compiler_pic='-fPIC'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
++
|
|
|
++ case $cc_basename in
|
|
|
++ nvcc*) # Cuda Compiler Driver 2.2
|
|
|
++ lt_prog_compiler_wl='-Xlinker '
|
|
|
++ lt_prog_compiler_pic='-Xcompiler -fPIC'
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ else
|
|
|
+ # PORTME Check for flag to pass linker flags through the system compiler.
|
|
|
+ case $host_os in
|
|
|
+@@ -8673,7 +9205,7 @@
|
|
|
+ lt_prog_compiler_static='-non_shared'
|
|
|
+ ;;
|
|
|
+
|
|
|
+- linux* | k*bsd*-gnu)
|
|
|
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ case $cc_basename in
|
|
|
+ # old Intel for x86_64 which still supported -KPIC.
|
|
|
+ ecc*)
|
|
|
+@@ -8694,7 +9226,13 @@
|
|
|
+ lt_prog_compiler_pic='--shared'
|
|
|
+ lt_prog_compiler_static='--static'
|
|
|
+ ;;
|
|
|
+- pgcc* | pgf77* | pgf90* | pgf95*)
|
|
|
++ nagfor*)
|
|
|
++ # NAG Fortran compiler
|
|
|
++ lt_prog_compiler_wl='-Wl,-Wl,,'
|
|
|
++ lt_prog_compiler_pic='-PIC'
|
|
|
++ lt_prog_compiler_static='-Bstatic'
|
|
|
++ ;;
|
|
|
++ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
|
|
|
+ # Portland Group compilers (*not* the Pentium gcc compiler,
|
|
|
+ # which looks to be a dead project)
|
|
|
+ lt_prog_compiler_wl='-Wl,'
|
|
|
+@@ -8706,25 +9244,25 @@
|
|
|
+ # All Alpha code is PIC.
|
|
|
+ lt_prog_compiler_static='-non_shared'
|
|
|
+ ;;
|
|
|
+- xl*)
|
|
|
+- # IBM XL C 8.0/Fortran 10.1 on PPC
|
|
|
++ xl* | bgxl* | bgf* | mpixl*)
|
|
|
++ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
|
|
|
+ lt_prog_compiler_wl='-Wl,'
|
|
|
+ lt_prog_compiler_pic='-qpic'
|
|
|
+ lt_prog_compiler_static='-qstaticlink'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ case `$CC -V 2>&1 | sed 5q` in
|
|
|
+- *Sun\ C*)
|
|
|
+- # Sun C 5.9
|
|
|
++ *Sun\ F* | *Sun*Fortran*)
|
|
|
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
|
|
|
+ lt_prog_compiler_pic='-KPIC'
|
|
|
+ lt_prog_compiler_static='-Bstatic'
|
|
|
+- lt_prog_compiler_wl='-Wl,'
|
|
|
++ lt_prog_compiler_wl=''
|
|
|
+ ;;
|
|
|
+- *Sun\ F*)
|
|
|
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
|
|
|
++ *Sun\ C*)
|
|
|
++ # Sun C 5.9
|
|
|
+ lt_prog_compiler_pic='-KPIC'
|
|
|
+ lt_prog_compiler_static='-Bstatic'
|
|
|
+- lt_prog_compiler_wl=''
|
|
|
++ lt_prog_compiler_wl='-Wl,'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+@@ -8756,7 +9294,7 @@
|
|
|
+ lt_prog_compiler_pic='-KPIC'
|
|
|
+ lt_prog_compiler_static='-Bstatic'
|
|
|
+ case $cc_basename in
|
|
|
+- f77* | f90* | f95*)
|
|
|
++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
|
|
|
+ lt_prog_compiler_wl='-Qoption ld ';;
|
|
|
+ *)
|
|
|
+ lt_prog_compiler_wl='-Wl,';;
|
|
|
+@@ -8813,13 +9351,17 @@
|
|
|
+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
|
|
|
+-$as_echo "$lt_prog_compiler_pic" >&6; }
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+-
|
|
|
+
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
|
|
|
++$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
|
++if ${lt_cv_prog_compiler_pic+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
|
|
|
++$as_echo "$lt_cv_prog_compiler_pic" >&6; }
|
|
|
++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
|
|
|
+
|
|
|
+ #
|
|
|
+ # Check to make sure the PIC flag actually works.
|
|
|
+@@ -8827,7 +9369,7 @@
|
|
|
+ if test -n "$lt_prog_compiler_pic"; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
|
|
|
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
|
|
|
+-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
|
|
|
++if ${lt_cv_prog_compiler_pic_works+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ lt_cv_prog_compiler_pic_works=no
|
|
|
+@@ -8843,15 +9385,15 @@
|
|
|
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
+ -e 's:$: $lt_compiler_flag:'`
|
|
|
+- (eval echo "\"\$as_me:8846: $lt_compile\"" >&5)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
|
|
|
+ (eval "$lt_compile" 2>conftest.err)
|
|
|
+ ac_status=$?
|
|
|
+ cat conftest.err >&5
|
|
|
+- echo "$as_me:8850: \$? = $ac_status" >&5
|
|
|
++ echo "$as_me:$LINENO: \$? = $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 other than the usual output.
|
|
|
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
|
|
|
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
|
|
|
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
|
|
|
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
|
|
|
+ lt_cv_prog_compiler_pic_works=yes
|
|
|
+@@ -8880,13 +9422,18 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+ #
|
|
|
+ # Check to make sure the static flag actually works.
|
|
|
+ #
|
|
|
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
|
|
|
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
|
|
|
+-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
|
|
|
++if ${lt_cv_prog_compiler_static_works+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ lt_cv_prog_compiler_static_works=no
|
|
|
+@@ -8899,7 +9446,7 @@
|
|
|
+ if test -s conftest.err; then
|
|
|
+ # Append any errors to the config.log.
|
|
|
+ cat conftest.err 1>&5
|
|
|
+- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
|
|
|
++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
|
|
|
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
|
|
|
+ if diff conftest.exp conftest.er2 >/dev/null; then
|
|
|
+ lt_cv_prog_compiler_static_works=yes
|
|
|
+@@ -8929,7 +9476,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
|
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
|
|
|
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
|
|
|
++if ${lt_cv_prog_compiler_c_o+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ lt_cv_prog_compiler_c_o=no
|
|
|
+@@ -8948,16 +9495,16 @@
|
|
|
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
+ -e 's:$: $lt_compiler_flag:'`
|
|
|
+- (eval echo "\"\$as_me:8951: $lt_compile\"" >&5)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
|
|
|
+ (eval "$lt_compile" 2>out/conftest.err)
|
|
|
+ ac_status=$?
|
|
|
+ cat out/conftest.err >&5
|
|
|
+- echo "$as_me:8955: \$? = $ac_status" >&5
|
|
|
++ echo "$as_me:$LINENO: \$? = $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
|
|
|
+ # So say no if there are warnings
|
|
|
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
|
|
|
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
|
|
|
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
|
|
|
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
|
|
|
+ lt_cv_prog_compiler_c_o=yes
|
|
|
+@@ -8984,7 +9531,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
|
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
|
|
|
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
|
|
|
++if ${lt_cv_prog_compiler_c_o+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ lt_cv_prog_compiler_c_o=no
|
|
|
+@@ -9003,16 +9550,16 @@
|
|
|
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
+ -e 's:$: $lt_compiler_flag:'`
|
|
|
+- (eval echo "\"\$as_me:9006: $lt_compile\"" >&5)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
|
|
|
+ (eval "$lt_compile" 2>out/conftest.err)
|
|
|
+ ac_status=$?
|
|
|
+ cat out/conftest.err >&5
|
|
|
+- echo "$as_me:9010: \$? = $ac_status" >&5
|
|
|
++ echo "$as_me:$LINENO: \$? = $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
|
|
|
+ # So say no if there are warnings
|
|
|
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
|
|
|
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
|
|
|
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
|
|
|
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
|
|
|
+ lt_cv_prog_compiler_c_o=yes
|
|
|
+@@ -9122,13 +9669,36 @@
|
|
|
+ openbsd*)
|
|
|
+ with_gnu_ld=no
|
|
|
+ ;;
|
|
|
+- linux* | k*bsd*-gnu)
|
|
|
+- link_all_deplibs=no
|
|
|
+- ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+ ld_shlibs=yes
|
|
|
++
|
|
|
++ # On some targets, GNU ld is compatible enough with the native linker
|
|
|
++ # that we're better off using the native interface for both.
|
|
|
++ lt_use_gnu_ld_interface=no
|
|
|
+ if test "$with_gnu_ld" = yes; then
|
|
|
++ case $host_os in
|
|
|
++ aix*)
|
|
|
++ # The AIX port of GNU ld has always aspired to compatibility
|
|
|
++ # with the native linker. However, as the warning in the GNU ld
|
|
|
++ # block says, versions before 2.19.5* couldn't really create working
|
|
|
++ # shared libraries, regardless of the interface used.
|
|
|
++ case `$LD -v 2>&1` in
|
|
|
++ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
|
|
|
++ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
|
|
|
++ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
|
|
|
++ *)
|
|
|
++ lt_use_gnu_ld_interface=yes
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ lt_use_gnu_ld_interface=yes
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ fi
|
|
|
++
|
|
|
++ if test "$lt_use_gnu_ld_interface" = yes; then
|
|
|
+ # If archive_cmds runs LD, not CC, wlarc should be empty
|
|
|
+ wlarc='${wl}'
|
|
|
+
|
|
|
+@@ -9146,6 +9716,7 @@
|
|
|
+ fi
|
|
|
+ supports_anon_versioning=no
|
|
|
+ case `$LD -v 2>&1` in
|
|
|
++ *GNU\ gold*) supports_anon_versioning=yes ;;
|
|
|
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
|
|
|
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
|
|
|
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
|
|
|
+@@ -9161,11 +9732,12 @@
|
|
|
+ ld_shlibs=no
|
|
|
+ cat <<_LT_EOF 1>&2
|
|
|
+
|
|
|
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
|
|
|
++*** Warning: the GNU linker, at least up to release 2.19, is reported
|
|
|
+ *** to be unable to reliably create shared libraries on AIX.
|
|
|
+ *** Therefore, libtool is disabling shared libraries support. If you
|
|
|
+-*** really care for shared libraries, you may want to modify your PATH
|
|
|
+-*** so that a non-GNU linker is found, and then restart.
|
|
|
++*** really care for shared libraries, you may want to install binutils
|
|
|
++*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
|
|
|
++*** You will then need to restart the configuration process.
|
|
|
+
|
|
|
+ _LT_EOF
|
|
|
+ fi
|
|
|
+@@ -9201,10 +9773,12 @@
|
|
|
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
|
+ # as there is no search path for DLLs.
|
|
|
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
|
++ export_dynamic_flag_spec='${wl}--export-all-symbols'
|
|
|
+ allow_undefined_flag=unsupported
|
|
|
+ always_export_symbols=no
|
|
|
+ enable_shared_with_static_runtimes=yes
|
|
|
+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
|
|
|
++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
|
|
|
++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
|
|
|
+
|
|
|
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
|
|
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
|
|
+@@ -9222,6 +9796,11 @@
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+
|
|
|
++ haiku*)
|
|
|
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ link_all_deplibs=yes
|
|
|
++ ;;
|
|
|
++
|
|
|
+ interix[3-9]*)
|
|
|
+ hardcode_direct=no
|
|
|
+ hardcode_shlibpath_var=no
|
|
|
+@@ -9237,7 +9816,7 @@
|
|
|
+ archive_expsym_cmds='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'
|
|
|
+ ;;
|
|
|
+
|
|
|
+- gnu* | linux* | tpf* | k*bsd*-gnu)
|
|
|
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ tmp_diet=no
|
|
|
+ if test "$host_os" = linux-dietlibc; then
|
|
|
+ case $cc_basename in
|
|
|
+@@ -9247,15 +9826,16 @@
|
|
|
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
|
|
|
+ && test "$tmp_diet" = no
|
|
|
+ then
|
|
|
+- tmp_addflag=
|
|
|
++ tmp_addflag=' $pic_flag'
|
|
|
+ tmp_sharedflag='-shared'
|
|
|
+ case $cc_basename,$host_cpu in
|
|
|
+ pgcc*) # Portland Group C compiler
|
|
|
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
+ tmp_addflag=' $pic_flag'
|
|
|
+ ;;
|
|
|
+- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
|
|
|
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ pgf77* | pgf90* | pgf95* | pgfortran*)
|
|
|
++ # Portland Group f77 and f90 compilers
|
|
|
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
+ tmp_addflag=' $pic_flag -Mnomain' ;;
|
|
|
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
|
|
|
+ tmp_addflag=' -i_dynamic' ;;
|
|
|
+@@ -9266,13 +9846,17 @@
|
|
|
+ lf95*) # Lahey Fortran 8.1
|
|
|
+ whole_archive_flag_spec=
|
|
|
+ tmp_sharedflag='--shared' ;;
|
|
|
+- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
|
|
|
++ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
|
|
|
+ tmp_sharedflag='-qmkshrobj'
|
|
|
+ tmp_addflag= ;;
|
|
|
++ nvcc*) # Cuda Compiler Driver 2.2
|
|
|
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ compiler_needs_object=yes
|
|
|
++ ;;
|
|
|
+ esac
|
|
|
+ case `$CC -V 2>&1 | sed 5q` in
|
|
|
+ *Sun\ C*) # Sun C 5.9
|
|
|
+- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
+ compiler_needs_object=yes
|
|
|
+ tmp_sharedflag='-G' ;;
|
|
|
+ *Sun\ F*) # Sun Fortran 8.3
|
|
|
+@@ -9288,17 +9872,17 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ case $cc_basename in
|
|
|
+- xlf*)
|
|
|
++ xlf* | bgf* | bgxlf* | mpixlf*)
|
|
|
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
|
|
|
+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
|
|
|
+ hardcode_libdir_flag_spec=
|
|
|
+ hardcode_libdir_flag_spec_ld='-rpath $libdir'
|
|
|
+- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
|
|
|
++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
|
|
|
+ if test "x$supports_anon_versioning" = xyes; then
|
|
|
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
|
|
|
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
|
|
+ echo "local: *; };" >> $output_objdir/$libname.ver~
|
|
|
+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
|
|
|
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -9307,13 +9891,13 @@
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+
|
|
|
+- netbsd* | netbsdelf*-gnu)
|
|
|
++ netbsd*)
|
|
|
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
|
|
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
|
|
+ wlarc=
|
|
|
+ else
|
|
|
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+
|
|
|
+@@ -9331,8 +9915,8 @@
|
|
|
+
|
|
|
+ _LT_EOF
|
|
|
+ elif $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'
|
|
|
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
+ else
|
|
|
+ ld_shlibs=no
|
|
|
+ fi
|
|
|
+@@ -9378,8 +9962,8 @@
|
|
|
+
|
|
|
+ *)
|
|
|
+ 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'
|
|
|
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
+ else
|
|
|
+ ld_shlibs=no
|
|
|
+ fi
|
|
|
+@@ -9419,8 +10003,10 @@
|
|
|
+ else
|
|
|
+ # 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
|
|
|
++ # Also, AIX nm treats weak defined symbols like other global
|
|
|
++ # defined symbols, whereas GNU nm marks them as "W".
|
|
|
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
|
|
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
|
|
++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
|
|
+ else
|
|
|
+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
|
|
+ fi
|
|
|
+@@ -9482,7 +10068,6 @@
|
|
|
+ if test "$aix_use_runtimelinking" = yes; then
|
|
|
+ shared_flag="$shared_flag "'${wl}-G'
|
|
|
+ fi
|
|
|
+- link_all_deplibs=no
|
|
|
+ else
|
|
|
+ # not using gcc
|
|
|
+ if test "$host_cpu" = ia64; then
|
|
|
+@@ -9508,7 +10093,13 @@
|
|
|
+ allow_undefined_flag='-berok'
|
|
|
+ # Determine the default libpath from the value encoded in an
|
|
|
+ # empty executable.
|
|
|
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
++ if test "${lt_cv_aix_libpath+set}" = set; then
|
|
|
++ aix_libpath=$lt_cv_aix_libpath
|
|
|
++else
|
|
|
++ if ${lt_cv_aix_libpath_+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+ /* end confdefs.h. */
|
|
|
+
|
|
|
+ int
|
|
|
+@@ -9521,25 +10112,32 @@
|
|
|
+ _ACEOF
|
|
|
+ if ac_fn_c_try_link "$LINENO"; then :
|
|
|
+
|
|
|
+-lt_aix_libpath_sed='
|
|
|
+- /Import File Strings/,/^$/ {
|
|
|
+- /^0/ {
|
|
|
+- s/^0 *\(.*\)$/\1/
|
|
|
+- p
|
|
|
+- }
|
|
|
+- }'
|
|
|
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
+-# Check for a 64-bit object if we didn't find anything.
|
|
|
+-if test -z "$aix_libpath"; then
|
|
|
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
+-fi
|
|
|
++ lt_aix_libpath_sed='
|
|
|
++ /Import File Strings/,/^$/ {
|
|
|
++ /^0/ {
|
|
|
++ s/^0 *\([^ ]*\) *$/\1/
|
|
|
++ p
|
|
|
++ }
|
|
|
++ }'
|
|
|
++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
++ # Check for a 64-bit object if we didn't find anything.
|
|
|
++ if test -z "$lt_cv_aix_libpath_"; then
|
|
|
++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
++ fi
|
|
|
+ fi
|
|
|
+ rm -f core conftest.err conftest.$ac_objext \
|
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
|
++ if test -z "$lt_cv_aix_libpath_"; then
|
|
|
++ lt_cv_aix_libpath_="/usr/lib:/lib"
|
|
|
++ fi
|
|
|
++
|
|
|
++fi
|
|
|
++
|
|
|
++ aix_libpath=$lt_cv_aix_libpath_
|
|
|
++fi
|
|
|
+
|
|
|
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
|
+- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
|
++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
|
+ else
|
|
|
+ if test "$host_cpu" = ia64; then
|
|
|
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
|
|
|
+@@ -9548,7 +10146,13 @@
|
|
|
+ else
|
|
|
+ # Determine the default libpath from the value encoded in an
|
|
|
+ # empty executable.
|
|
|
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
++ if test "${lt_cv_aix_libpath+set}" = set; then
|
|
|
++ aix_libpath=$lt_cv_aix_libpath
|
|
|
++else
|
|
|
++ if ${lt_cv_aix_libpath_+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+ /* end confdefs.h. */
|
|
|
+
|
|
|
+ int
|
|
|
+@@ -9561,30 +10165,42 @@
|
|
|
+ _ACEOF
|
|
|
+ if ac_fn_c_try_link "$LINENO"; then :
|
|
|
+
|
|
|
+-lt_aix_libpath_sed='
|
|
|
+- /Import File Strings/,/^$/ {
|
|
|
+- /^0/ {
|
|
|
+- s/^0 *\(.*\)$/\1/
|
|
|
+- p
|
|
|
+- }
|
|
|
+- }'
|
|
|
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
+-# Check for a 64-bit object if we didn't find anything.
|
|
|
+-if test -z "$aix_libpath"; then
|
|
|
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
+-fi
|
|
|
++ lt_aix_libpath_sed='
|
|
|
++ /Import File Strings/,/^$/ {
|
|
|
++ /^0/ {
|
|
|
++ s/^0 *\([^ ]*\) *$/\1/
|
|
|
++ p
|
|
|
++ }
|
|
|
++ }'
|
|
|
++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
++ # Check for a 64-bit object if we didn't find anything.
|
|
|
++ if test -z "$lt_cv_aix_libpath_"; then
|
|
|
++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
++ fi
|
|
|
+ fi
|
|
|
+ rm -f core conftest.err conftest.$ac_objext \
|
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
|
++ if test -z "$lt_cv_aix_libpath_"; then
|
|
|
++ lt_cv_aix_libpath_="/usr/lib:/lib"
|
|
|
++ fi
|
|
|
++
|
|
|
++fi
|
|
|
++
|
|
|
++ aix_libpath=$lt_cv_aix_libpath_
|
|
|
++fi
|
|
|
+
|
|
|
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
|
+ # Warning - without using the other run time loading flags,
|
|
|
+ # -berok will link without error, but may produce a broken library.
|
|
|
+ no_undefined_flag=' ${wl}-bernotok'
|
|
|
+ allow_undefined_flag=' ${wl}-berok'
|
|
|
+- # Exported symbols can be pulled into shared objects from archives
|
|
|
+- whole_archive_flag_spec='$convenience'
|
|
|
++ if test "$with_gnu_ld" = yes; then
|
|
|
++ # We only use this code for GNU lds that support --whole-archive.
|
|
|
++ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
|
|
++ else
|
|
|
++ # Exported symbols can be pulled into shared objects from archives
|
|
|
++ whole_archive_flag_spec='$convenience'
|
|
|
++ fi
|
|
|
+ archive_cmds_need_lc=yes
|
|
|
+ # This is similar to how AIX traditionally builds its shared libraries.
|
|
|
+ archive_expsym_cmds="\$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'
|
|
|
+@@ -9616,20 +10232,63 @@
|
|
|
+ # Microsoft Visual C++.
|
|
|
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
|
+ # no search path for DLLs.
|
|
|
+- hardcode_libdir_flag_spec=' '
|
|
|
+- allow_undefined_flag=unsupported
|
|
|
+- # Tell ltmain to make .lib files, not .a files.
|
|
|
+- libext=lib
|
|
|
+- # Tell ltmain to make .dll files, not .so files.
|
|
|
+- shrext_cmds=".dll"
|
|
|
+- # FIXME: Setting linknames here is a bad hack.
|
|
|
+- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
|
|
|
+- # The linker will automatically build a .lib file if we build a DLL.
|
|
|
+- old_archive_from_new_cmds='true'
|
|
|
+- # FIXME: Should let the user specify the lib program.
|
|
|
+- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
|
|
|
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
|
|
|
+- enable_shared_with_static_runtimes=yes
|
|
|
++ case $cc_basename in
|
|
|
++ cl*)
|
|
|
++ # Native MSVC
|
|
|
++ hardcode_libdir_flag_spec=' '
|
|
|
++ allow_undefined_flag=unsupported
|
|
|
++ always_export_symbols=yes
|
|
|
++ file_list_spec='@'
|
|
|
++ # Tell ltmain to make .lib files, not .a files.
|
|
|
++ libext=lib
|
|
|
++ # Tell ltmain to make .dll files, not .so files.
|
|
|
++ shrext_cmds=".dll"
|
|
|
++ # FIXME: Setting linknames here is a bad hack.
|
|
|
++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
|
|
|
++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
|
|
|
++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
|
|
|
++ else
|
|
|
++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
|
|
|
++ fi~
|
|
|
++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
|
|
|
++ linknames='
|
|
|
++ # The linker will not automatically build a static lib if we build a DLL.
|
|
|
++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
|
|
|
++ enable_shared_with_static_runtimes=yes
|
|
|
++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
|
|
|
++ # Don't use ranlib
|
|
|
++ old_postinstall_cmds='chmod 644 $oldlib'
|
|
|
++ postlink_cmds='lt_outputfile="@OUTPUT@"~
|
|
|
++ lt_tool_outputfile="@TOOL_OUTPUT@"~
|
|
|
++ case $lt_outputfile in
|
|
|
++ *.exe|*.EXE) ;;
|
|
|
++ *)
|
|
|
++ lt_outputfile="$lt_outputfile.exe"
|
|
|
++ lt_tool_outputfile="$lt_tool_outputfile.exe"
|
|
|
++ ;;
|
|
|
++ esac~
|
|
|
++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
|
|
|
++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
|
|
|
++ $RM "$lt_outputfile.manifest";
|
|
|
++ fi'
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ # Assume MSVC wrapper
|
|
|
++ hardcode_libdir_flag_spec=' '
|
|
|
++ allow_undefined_flag=unsupported
|
|
|
++ # Tell ltmain to make .lib files, not .a files.
|
|
|
++ libext=lib
|
|
|
++ # Tell ltmain to make .dll files, not .so files.
|
|
|
++ shrext_cmds=".dll"
|
|
|
++ # FIXME: Setting linknames here is a bad hack.
|
|
|
++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
|
|
|
++ # The linker will automatically build a .lib file if we build a DLL.
|
|
|
++ old_archive_from_new_cmds='true'
|
|
|
++ # FIXME: Should let the user specify the lib program.
|
|
|
++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
|
|
|
++ enable_shared_with_static_runtimes=yes
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ ;;
|
|
|
+
|
|
|
+ darwin* | rhapsody*)
|
|
|
+@@ -9639,7 +10298,11 @@
|
|
|
+ hardcode_direct=no
|
|
|
+ hardcode_automatic=yes
|
|
|
+ hardcode_shlibpath_var=unsupported
|
|
|
+- whole_archive_flag_spec=''
|
|
|
++ if test "$lt_cv_ld_force_load" = "yes"; then
|
|
|
++ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
|
|
|
++ else
|
|
|
++ whole_archive_flag_spec=''
|
|
|
++ fi
|
|
|
+ link_all_deplibs=yes
|
|
|
+ allow_undefined_flag="$_lt_dar_allow_undefined"
|
|
|
+ case $cc_basename in
|
|
|
+@@ -9647,7 +10310,7 @@
|
|
|
+ *) _lt_dar_can_shared=$GCC ;;
|
|
|
+ esac
|
|
|
+ if test "$_lt_dar_can_shared" = "yes"; then
|
|
|
+- output_verbose_link_cmd=echo
|
|
|
++ output_verbose_link_cmd=func_echo_all
|
|
|
+ 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}"
|
|
|
+@@ -9690,7 +10353,7 @@
|
|
|
+
|
|
|
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
|
|
+ freebsd* | dragonfly*)
|
|
|
+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
|
+ hardcode_direct=yes
|
|
|
+ hardcode_shlibpath_var=no
|
|
|
+@@ -9698,7 +10361,7 @@
|
|
|
+
|
|
|
+ hpux9*)
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
|
|
|
++ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
|
|
|
+ else
|
|
|
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
|
|
|
+ fi
|
|
|
+@@ -9713,8 +10376,8 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ hpux10*)
|
|
|
+- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
|
|
|
+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
|
|
|
++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ else
|
|
|
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
|
|
|
+ fi
|
|
|
+@@ -9732,16 +10395,16 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ hpux11*)
|
|
|
+- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
|
|
|
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
|
|
|
+ case $host_cpu in
|
|
|
+ hppa*64*)
|
|
|
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ ;;
|
|
|
+ ia64*)
|
|
|
+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ else
|
|
|
+@@ -9753,7 +10416,46 @@
|
|
|
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++
|
|
|
++ # Older versions of the 11.00 compiler do not understand -b yet
|
|
|
++ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
|
|
|
++$as_echo_n "checking if $CC understands -b... " >&6; }
|
|
|
++if ${lt_cv_prog_compiler__b+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ lt_cv_prog_compiler__b=no
|
|
|
++ save_LDFLAGS="$LDFLAGS"
|
|
|
++ LDFLAGS="$LDFLAGS -b"
|
|
|
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
|
|
|
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
|
|
|
++ # The linker can only warn and ignore the option if not recognized
|
|
|
++ # So say no if there are warnings
|
|
|
++ if test -s conftest.err; then
|
|
|
++ # Append any errors to the config.log.
|
|
|
++ cat conftest.err 1>&5
|
|
|
++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
|
|
|
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
|
|
|
++ if diff conftest.exp conftest.er2 >/dev/null; then
|
|
|
++ lt_cv_prog_compiler__b=yes
|
|
|
++ fi
|
|
|
++ else
|
|
|
++ lt_cv_prog_compiler__b=yes
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++ $RM -r conftest*
|
|
|
++ LDFLAGS="$save_LDFLAGS"
|
|
|
++
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
|
|
|
++$as_echo "$lt_cv_prog_compiler__b" >&6; }
|
|
|
++
|
|
|
++if test x"$lt_cv_prog_compiler__b" = xyes; then
|
|
|
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++else
|
|
|
++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
|
|
|
++fi
|
|
|
++
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+@@ -9781,26 +10483,39 @@
|
|
|
+
|
|
|
+ irix5* | irix6* | nonstopux*)
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
+ # Try to use the -exported_symbol ld option, if it does not
|
|
|
+ # work, assume that -exports_file does not work either and
|
|
|
+ # implicitly export all symbols.
|
|
|
+- save_LDFLAGS="$LDFLAGS"
|
|
|
+- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
|
|
|
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
++ # This should be the same for all languages, so no per-tag cache variable.
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
|
|
|
++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
|
|
|
++if ${lt_cv_irix_exported_symbol+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ save_LDFLAGS="$LDFLAGS"
|
|
|
++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
|
|
|
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+ /* end confdefs.h. */
|
|
|
+-int foo(void) {}
|
|
|
++int foo (void) { return 0; }
|
|
|
+ _ACEOF
|
|
|
+ if ac_fn_c_try_link "$LINENO"; then :
|
|
|
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
|
|
|
+-
|
|
|
++ lt_cv_irix_exported_symbol=yes
|
|
|
++else
|
|
|
++ lt_cv_irix_exported_symbol=no
|
|
|
+ fi
|
|
|
+ rm -f core conftest.err conftest.$ac_objext \
|
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
+- LDFLAGS="$save_LDFLAGS"
|
|
|
++ LDFLAGS="$save_LDFLAGS"
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
|
|
|
++$as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
|
|
++ if test "$lt_cv_irix_exported_symbol" = yes; then
|
|
|
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
|
|
|
++ fi
|
|
|
+ else
|
|
|
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
|
|
|
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
|
|
|
+ fi
|
|
|
+ archive_cmds_need_lc='no'
|
|
|
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
|
+@@ -9809,7 +10524,7 @@
|
|
|
+ link_all_deplibs=yes
|
|
|
+ ;;
|
|
|
+
|
|
|
+- netbsd* | netbsdelf*-gnu)
|
|
|
++ netbsd*)
|
|
|
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
|
|
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
|
|
+ else
|
|
|
+@@ -9862,17 +10577,17 @@
|
|
|
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
|
+ hardcode_minus_L=yes
|
|
|
+ allow_undefined_flag=unsupported
|
|
|
+- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
|
|
|
++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
|
|
|
+ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
|
|
|
+ ;;
|
|
|
+
|
|
|
+ osf3*)
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
|
|
|
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
+ else
|
|
|
+ allow_undefined_flag=' -expect_unresolved \*'
|
|
|
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
+ fi
|
|
|
+ archive_cmds_need_lc='no'
|
|
|
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
|
+@@ -9882,13 +10597,13 @@
|
|
|
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
|
|
|
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
++ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
|
+ else
|
|
|
+ allow_undefined_flag=' -expect_unresolved \*'
|
|
|
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-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; printf "%s\\n" "-hidden">> $lib.exp~
|
|
|
+- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
|
|
|
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
|
|
|
+
|
|
|
+ # Both c and cxx compiler support -rpath directly
|
|
|
+ hardcode_libdir_flag_spec='-rpath $libdir'
|
|
|
+@@ -9901,9 +10616,9 @@
|
|
|
+ no_undefined_flag=' -z defs'
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+ wlarc='${wl}'
|
|
|
+- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
|
|
+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
|
|
|
++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
|
|
|
+ else
|
|
|
+ case `$CC -V 2>&1` in
|
|
|
+ *"Compilers 5.0"*)
|
|
|
+@@ -10091,44 +10806,50 @@
|
|
|
+ # to ld, don't add -lc before -lgcc.
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
|
|
|
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
|
|
|
+- $RM conftest*
|
|
|
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
|
|
++if ${lt_cv_archive_cmds_need_lc+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ $RM conftest*
|
|
|
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
|
|
+
|
|
|
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
|
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
|
+ (eval $ac_compile) 2>&5
|
|
|
+ ac_status=$?
|
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
+ test $ac_status = 0; } 2>conftest.err; then
|
|
|
+- soname=conftest
|
|
|
+- lib=conftest
|
|
|
+- libobjs=conftest.$ac_objext
|
|
|
+- deplibs=
|
|
|
+- wl=$lt_prog_compiler_wl
|
|
|
+- pic_flag=$lt_prog_compiler_pic
|
|
|
+- compiler_flags=-v
|
|
|
+- linker_flags=-v
|
|
|
+- verstring=
|
|
|
+- output_objdir=.
|
|
|
+- libname=conftest
|
|
|
+- lt_save_allow_undefined_flag=$allow_undefined_flag
|
|
|
+- allow_undefined_flag=
|
|
|
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
|
|
|
++ soname=conftest
|
|
|
++ lib=conftest
|
|
|
++ libobjs=conftest.$ac_objext
|
|
|
++ deplibs=
|
|
|
++ wl=$lt_prog_compiler_wl
|
|
|
++ pic_flag=$lt_prog_compiler_pic
|
|
|
++ compiler_flags=-v
|
|
|
++ linker_flags=-v
|
|
|
++ verstring=
|
|
|
++ output_objdir=.
|
|
|
++ libname=conftest
|
|
|
++ lt_save_allow_undefined_flag=$allow_undefined_flag
|
|
|
++ allow_undefined_flag=
|
|
|
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
|
|
|
+ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
|
|
|
+ ac_status=$?
|
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
+ test $ac_status = 0; }
|
|
|
+- then
|
|
|
+- archive_cmds_need_lc=no
|
|
|
+- else
|
|
|
+- archive_cmds_need_lc=yes
|
|
|
+- fi
|
|
|
+- allow_undefined_flag=$lt_save_allow_undefined_flag
|
|
|
+- else
|
|
|
+- cat conftest.err 1>&5
|
|
|
+- fi
|
|
|
+- $RM conftest*
|
|
|
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
|
|
|
+-$as_echo "$archive_cmds_need_lc" >&6; }
|
|
|
++ then
|
|
|
++ lt_cv_archive_cmds_need_lc=no
|
|
|
++ else
|
|
|
++ lt_cv_archive_cmds_need_lc=yes
|
|
|
++ fi
|
|
|
++ allow_undefined_flag=$lt_save_allow_undefined_flag
|
|
|
++ else
|
|
|
++ cat conftest.err 1>&5
|
|
|
++ fi
|
|
|
++ $RM conftest*
|
|
|
++
|
|
|
++fi
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
|
|
|
++$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
|
|
|
++ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+@@ -10299,16 +11020,23 @@
|
|
|
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
|
|
|
+ *) lt_awk_arg="/^libraries:/" ;;
|
|
|
+ esac
|
|
|
+- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
+- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
|
|
|
++ case $host_os in
|
|
|
++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
|
|
|
++ *) lt_sed_strip_eq="s,=/,/,g" ;;
|
|
|
++ esac
|
|
|
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
|
|
|
++ case $lt_search_path_spec in
|
|
|
++ *\;*)
|
|
|
+ # if the path contains ";" then we assume it to be the separator
|
|
|
+ # otherwise default to the standard path separator (i.e. ":") - it is
|
|
|
+ # assumed that no part of a normal pathname contains ";" but that should
|
|
|
+ # okay in the real world where ";" in dirpaths is itself problematic.
|
|
|
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
+- else
|
|
|
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
+- fi
|
|
|
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ # 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=
|
|
|
+@@ -10321,7 +11049,7 @@
|
|
|
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
|
|
+ fi
|
|
|
+ done
|
|
|
+- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
|
|
|
++ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
|
|
|
+ BEGIN {RS=" "; FS="/|\n";} {
|
|
|
+ lt_foo="";
|
|
|
+ lt_count=0;
|
|
|
+@@ -10341,7 +11069,13 @@
|
|
|
+ if (lt_foo != "") { lt_freq[lt_foo]++; }
|
|
|
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
|
|
|
+ }'`
|
|
|
+- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
|
|
|
++ # AWK program above erroneously prepends '/' to C:/dos/paths
|
|
|
++ # for these hosts.
|
|
|
++ case $host_os in
|
|
|
++ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
|
|
|
++ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
|
|
|
++ esac
|
|
|
++ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
|
|
|
+ else
|
|
|
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
|
+ fi
|
|
|
+@@ -10429,7 +11163,7 @@
|
|
|
+ m68k)
|
|
|
+ library_names_spec='$libname.ixlibrary $libname.a'
|
|
|
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
|
|
|
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
|
|
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+@@ -10460,8 +11194,9 @@
|
|
|
+ need_version=no
|
|
|
+ need_lib_prefix=no
|
|
|
+
|
|
|
+- case $GCC,$host_os in
|
|
|
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
|
++ case $GCC,$cc_basename in
|
|
|
++ yes,*)
|
|
|
++ # gcc
|
|
|
+ library_names_spec='$libname.dll.a'
|
|
|
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
|
+ postinstall_cmds='base_file=`basename \${file}`~
|
|
|
+@@ -10482,36 +11217,83 @@
|
|
|
+ cygwin*)
|
|
|
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
+- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
|
|
++
|
|
|
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
|
+ ;;
|
|
|
+ mingw* | cegcc*)
|
|
|
+ # MinGW DLLs use traditional 'lib' prefix
|
|
|
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
+- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
+- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
|
|
|
+- # It is most probably a Windows format PATH printed by
|
|
|
+- # mingw gcc, but we are running on Cygwin. Gcc prints its search
|
|
|
+- # path with ; separators, and with drive letters. We can handle the
|
|
|
+- # drive letters (cygwin fileutils understands them), so leave them,
|
|
|
+- # especially as we might pass files found there to a mingw objdump,
|
|
|
+- # which wouldn't understand a cygwinified path. Ahh.
|
|
|
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
+- else
|
|
|
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
+- fi
|
|
|
+ ;;
|
|
|
+ pw32*)
|
|
|
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
|
|
|
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
++ dynamic_linker='Win32 ld.exe'
|
|
|
++ ;;
|
|
|
++
|
|
|
++ *,cl*)
|
|
|
++ # Native MSVC
|
|
|
++ libname_spec='$name'
|
|
|
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
++ library_names_spec='${libname}.dll.lib'
|
|
|
++
|
|
|
++ case $build_os in
|
|
|
++ mingw*)
|
|
|
++ sys_lib_search_path_spec=
|
|
|
++ lt_save_ifs=$IFS
|
|
|
++ IFS=';'
|
|
|
++ for lt_path in $LIB
|
|
|
++ do
|
|
|
++ IFS=$lt_save_ifs
|
|
|
++ # Let DOS variable expansion print the short 8.3 style file name.
|
|
|
++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
|
|
|
++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
|
|
|
++ done
|
|
|
++ IFS=$lt_save_ifs
|
|
|
++ # Convert to MSYS style.
|
|
|
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
|
|
|
++ ;;
|
|
|
++ cygwin*)
|
|
|
++ # Convert to unix form, then to dos form, then back to unix form
|
|
|
++ # but this time dos style (no spaces!) so that the unix form looks
|
|
|
++ # like /cygdrive/c/PROGRA~1:/cygdr...
|
|
|
++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
|
|
|
++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
|
|
|
++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ sys_lib_search_path_spec="$LIB"
|
|
|
++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
|
|
|
++ # It is most probably a Windows format PATH.
|
|
|
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
++ else
|
|
|
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
++ fi
|
|
|
++ # FIXME: find the short name or the path components, as spaces are
|
|
|
++ # common. (e.g. "Program Files" -> "PROGRA~1")
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++
|
|
|
++ # DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
|
++ postinstall_cmds='base_file=`basename \${file}`~
|
|
|
++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
|
|
|
++ dldir=$destdir/`dirname \$dlpath`~
|
|
|
++ test -d \$dldir || mkdir -p \$dldir~
|
|
|
++ $install_prog $dir/$dlname \$dldir/$dlname'
|
|
|
++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
|
|
|
++ dlpath=$dir/\$dldll~
|
|
|
++ $RM \$dlpath'
|
|
|
++ shlibpath_overrides_runpath=yes
|
|
|
++ dynamic_linker='Win32 link.exe'
|
|
|
+ ;;
|
|
|
+
|
|
|
+ *)
|
|
|
++ # Assume MSVC wrapper
|
|
|
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
|
|
|
++ dynamic_linker='Win32 ld.exe'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+- dynamic_linker='Win32 ld.exe'
|
|
|
+ # FIXME: first we should search . and the directory the executable is in
|
|
|
+ shlibpath_var=PATH
|
|
|
+ ;;
|
|
|
+@@ -10598,6 +11380,19 @@
|
|
|
+ hardcode_into_libs=yes
|
|
|
+ ;;
|
|
|
+
|
|
|
++haiku*)
|
|
|
++ version_type=linux
|
|
|
++ need_lib_prefix=no
|
|
|
++ need_version=no
|
|
|
++ dynamic_linker="$host_os runtime_loader"
|
|
|
++ 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=LIBRARY_PATH
|
|
|
++ shlibpath_overrides_runpath=yes
|
|
|
++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
|
|
|
++ hardcode_into_libs=yes
|
|
|
++ ;;
|
|
|
++
|
|
|
+ hpux9* | hpux10* | hpux11*)
|
|
|
+ # Give a soname corresponding to the major version so that dld.sl refuses to
|
|
|
+ # link against other versions.
|
|
|
+@@ -10640,8 +11435,10 @@
|
|
|
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
|
|
|
++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
|
|
|
+ postinstall_cmds='chmod 555 $lib'
|
|
|
++ # or fails outright, so override atomically:
|
|
|
++ install_override_mode=555
|
|
|
+ ;;
|
|
|
+
|
|
|
+ interix[3-9]*)
|
|
|
+@@ -10699,7 +11496,7 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ # This must be Linux ELF.
|
|
|
+-linux* | k*bsd*-gnu)
|
|
|
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ version_type=linux
|
|
|
+ need_lib_prefix=no
|
|
|
+ need_version=no
|
|
|
+@@ -10708,12 +11505,17 @@
|
|
|
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
|
|
+ shlibpath_var=LD_LIBRARY_PATH
|
|
|
+ shlibpath_overrides_runpath=no
|
|
|
++
|
|
|
+ # Some binutils ld are patched to set DT_RUNPATH
|
|
|
+- save_LDFLAGS=$LDFLAGS
|
|
|
+- save_libdir=$libdir
|
|
|
+- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
|
|
|
+- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
|
|
|
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
++ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
|
|
|
++ $as_echo_n "(cached) " >&6
|
|
|
++else
|
|
|
++ lt_cv_shlibpath_overrides_runpath=no
|
|
|
++ save_LDFLAGS=$LDFLAGS
|
|
|
++ save_libdir=$libdir
|
|
|
++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
|
|
|
++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
|
|
|
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+ /* end confdefs.h. */
|
|
|
+
|
|
|
+ int
|
|
|
+@@ -10726,13 +11528,17 @@
|
|
|
+ _ACEOF
|
|
|
+ if ac_fn_c_try_link "$LINENO"; then :
|
|
|
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
|
|
|
+- shlibpath_overrides_runpath=yes
|
|
|
++ lt_cv_shlibpath_overrides_runpath=yes
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ rm -f core conftest.err conftest.$ac_objext \
|
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
+- LDFLAGS=$save_LDFLAGS
|
|
|
+- libdir=$save_libdir
|
|
|
++ LDFLAGS=$save_LDFLAGS
|
|
|
++ libdir=$save_libdir
|
|
|
++
|
|
|
++fi
|
|
|
++
|
|
|
++ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
|
|
|
+
|
|
|
+ # This implies no fast_install, which is unacceptable.
|
|
|
+ # Some rework will be needed to allow for fast_install
|
|
|
+@@ -10741,7 +11547,7 @@
|
|
|
+
|
|
|
+ # 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' ' '`
|
|
|
++ 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;s/"//g;/^$/d' | tr '\n' ' '`
|
|
|
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -10754,18 +11560,6 @@
|
|
|
+ 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'
|
|
|
+- ;;
|
|
|
+-
|
|
|
+ netbsd*)
|
|
|
+ version_type=sunos
|
|
|
+ need_lib_prefix=no
|
|
|
+@@ -11056,6 +11850,11 @@
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
|
|
|
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
|
|
|
+ hardcode_action=
|
|
|
+@@ -11128,7 +11927,7 @@
|
|
|
+ # if libdl is installed we need to link against it
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
|
|
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
|
|
|
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
|
|
|
++if ${ac_cv_lib_dl_dlopen+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -11162,7 +11961,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
|
|
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
|
|
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
|
|
|
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
|
|
|
+ else
|
|
|
+
|
|
|
+@@ -11176,12 +11975,12 @@
|
|
|
+
|
|
|
+ *)
|
|
|
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
|
|
|
+-if test "x$ac_cv_func_shl_load" = x""yes; then :
|
|
|
++if test "x$ac_cv_func_shl_load" = xyes; then :
|
|
|
+ lt_cv_dlopen="shl_load"
|
|
|
+ else
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
|
|
|
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
|
|
|
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
|
|
|
++if ${ac_cv_lib_dld_shl_load+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -11215,16 +12014,16 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
|
|
|
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
|
|
|
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
|
|
|
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
|
|
|
+ else
|
|
|
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
|
|
|
+-if test "x$ac_cv_func_dlopen" = x""yes; then :
|
|
|
++if test "x$ac_cv_func_dlopen" = xyes; then :
|
|
|
+ lt_cv_dlopen="dlopen"
|
|
|
+ else
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
|
|
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
|
|
|
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
|
|
|
++if ${ac_cv_lib_dl_dlopen+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -11258,12 +12057,12 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
|
|
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
|
|
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
|
|
|
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
|
|
|
+ else
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
|
|
|
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
|
|
|
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
|
|
|
++if ${ac_cv_lib_svld_dlopen+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -11297,12 +12096,12 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
|
|
|
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
|
|
|
+-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
|
|
|
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
|
|
|
+ else
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
|
|
|
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
|
|
|
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
|
|
|
++if ${ac_cv_lib_dld_dld_link+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -11336,7 +12135,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
|
|
|
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
|
|
|
+-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
|
|
|
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -11377,7 +12176,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
|
|
|
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
|
|
|
+-if test "${lt_cv_dlopen_self+set}" = set; then :
|
|
|
++if ${lt_cv_dlopen_self+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test "$cross_compiling" = yes; then :
|
|
|
+@@ -11386,7 +12185,7 @@
|
|
|
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
|
+ lt_status=$lt_dlunknown
|
|
|
+ cat > conftest.$ac_ext <<_LT_EOF
|
|
|
+-#line 11389 "configure"
|
|
|
++#line $LINENO "configure"
|
|
|
+ #include "confdefs.h"
|
|
|
+
|
|
|
+ #if HAVE_DLFCN_H
|
|
|
+@@ -11427,7 +12226,13 @@
|
|
|
+ # endif
|
|
|
+ #endif
|
|
|
+
|
|
|
+-void fnord() { int i=42;}
|
|
|
++/* When -fvisbility=hidden is used, assume the code has been annotated
|
|
|
++ correspondingly for the symbols needed. */
|
|
|
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
|
|
++int fnord () __attribute__((visibility("default")));
|
|
|
++#endif
|
|
|
++
|
|
|
++int fnord () { return 42; }
|
|
|
+ int main ()
|
|
|
+ {
|
|
|
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
|
|
+@@ -11436,7 +12241,11 @@
|
|
|
+ if (self)
|
|
|
+ {
|
|
|
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
|
|
|
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
|
|
|
++ else
|
|
|
++ {
|
|
|
++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
|
|
|
++ else puts (dlerror ());
|
|
|
++ }
|
|
|
+ /* dlclose (self); */
|
|
|
+ }
|
|
|
+ else
|
|
|
+@@ -11473,7 +12282,7 @@
|
|
|
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
|
|
|
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
|
|
|
+-if test "${lt_cv_dlopen_self_static+set}" = set; then :
|
|
|
++if ${lt_cv_dlopen_self_static+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test "$cross_compiling" = yes; then :
|
|
|
+@@ -11482,7 +12291,7 @@
|
|
|
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
|
+ lt_status=$lt_dlunknown
|
|
|
+ cat > conftest.$ac_ext <<_LT_EOF
|
|
|
+-#line 11485 "configure"
|
|
|
++#line $LINENO "configure"
|
|
|
+ #include "confdefs.h"
|
|
|
+
|
|
|
+ #if HAVE_DLFCN_H
|
|
|
+@@ -11523,7 +12332,13 @@
|
|
|
+ # endif
|
|
|
+ #endif
|
|
|
+
|
|
|
+-void fnord() { int i=42;}
|
|
|
++/* When -fvisbility=hidden is used, assume the code has been annotated
|
|
|
++ correspondingly for the symbols needed. */
|
|
|
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
|
|
++int fnord () __attribute__((visibility("default")));
|
|
|
++#endif
|
|
|
++
|
|
|
++int fnord () { return 42; }
|
|
|
+ int main ()
|
|
|
+ {
|
|
|
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
|
|
+@@ -11532,7 +12347,11 @@
|
|
|
+ if (self)
|
|
|
+ {
|
|
|
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
|
|
|
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
|
|
|
++ else
|
|
|
++ {
|
|
|
++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
|
|
|
++ else puts (dlerror ());
|
|
|
++ }
|
|
|
+ /* dlclose (self); */
|
|
|
+ }
|
|
|
+ else
|
|
|
+@@ -11714,7 +12533,7 @@
|
|
|
+ set dummy ${ac_tool_prefix}windres; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_RC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_RC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$RC"; then
|
|
|
+@@ -11754,7 +12573,7 @@
|
|
|
+ set dummy windres; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_ac_ct_RC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_ac_ct_RC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$ac_ct_RC"; then
|
|
|
+@@ -11850,9 +12669,11 @@
|
|
|
+
|
|
|
+ # Allow CC to be a program name with arguments.
|
|
|
+ lt_save_CC="$CC"
|
|
|
++lt_save_CFLAGS=$CFLAGS
|
|
|
+ lt_save_GCC=$GCC
|
|
|
+ GCC=
|
|
|
+ CC=${RC-"windres"}
|
|
|
++CFLAGS=
|
|
|
+ compiler=$CC
|
|
|
+ compiler_RC=$CC
|
|
|
+ for cc_temp in $compiler""; do
|
|
|
+@@ -11863,7 +12684,7 @@
|
|
|
+ *) break;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
|
|
|
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
|
|
+
|
|
|
+ lt_cv_prog_compiler_c_o_RC=yes
|
|
|
+
|
|
|
+@@ -11881,7 +12702,8 @@
|
|
|
+ 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"
|
|
|
++CC=$lt_save_CC
|
|
|
++CFLAGS=$lt_save_CFLAGS
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+@@ -11896,7 +12718,7 @@
|
|
|
+ set dummy $ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_XSLTPROC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_XSLTPROC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$XSLTPROC"; then
|
|
|
+@@ -11938,7 +12760,7 @@
|
|
|
+ set dummy $ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_SVN+set}" = set; then :
|
|
|
++if ${ac_cv_prog_SVN+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$SVN"; then
|
|
|
+@@ -11980,7 +12802,7 @@
|
|
|
+ set dummy $ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_WGET+set}" = set; then :
|
|
|
++if ${ac_cv_prog_WGET+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$WGET"; then
|
|
|
+@@ -12022,7 +12844,7 @@
|
|
|
+ set dummy $ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_TR+set}" = set; then :
|
|
|
++if ${ac_cv_prog_TR+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$TR"; then
|
|
|
+@@ -12075,7 +12897,7 @@
|
|
|
+ elif test "${xslstylesheetsdir}" != "no"; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking xsl-stylesheets" >&5
|
|
|
+ $as_echo_n "checking xsl-stylesheets... " >&6; }
|
|
|
+- test -e "${xslstylesheetsdir}/html/docbook.xsl" || as_fn_error "invalid" "$LINENO" 5
|
|
|
++ test -e "${xslstylesheetsdir}/html/docbook.xsl" || as_fn_error $? "invalid" "$LINENO" 5
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test "${svn_checkout}" = "yes"; then
|
|
|
+@@ -12086,7 +12908,7 @@
|
|
|
+ $as_echo "ok" >&6; }
|
|
|
+ else
|
|
|
+ if test "${enable_man}" = "yes" -o "${enable_doc}" = "yes"; then
|
|
|
+- as_fn_error "Missing XSLTPROC svn build with man or doc" "$LINENO" 5
|
|
|
++ as_fn_error $? "Missing XSLTPROC svn build with man or doc" "$LINENO" 5
|
|
|
+ else
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"make dist\" will not work" >&5
|
|
|
+ $as_echo "$as_me: WARNING: \"make dist\" will not work" >&2;}
|
|
|
+@@ -12094,7 +12916,7 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test "${enable_man}" = "yes"; then
|
|
|
+- test "${xslstylesheetsdir}" = "no" && as_fn_error "xsl-stylesheets are required for svn build with man" "$LINENO" 5
|
|
|
++ test "${xslstylesheetsdir}" = "no" && as_fn_error $? "xsl-stylesheets are required for svn build with man" "$LINENO" 5
|
|
|
+ fi
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking svn doc build dependencies" >&5
|
|
|
+@@ -12104,7 +12926,7 @@
|
|
|
+ $as_echo "ok" >&6; }
|
|
|
+ else
|
|
|
+ if test "${enable_doc}" = "yes"; then
|
|
|
+- as_fn_error "Missing SVN, TR or WGET for svn doc build" "$LINENO" 5
|
|
|
++ as_fn_error $? "Missing SVN, TR or WGET for svn doc build" "$LINENO" 5
|
|
|
+ else
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"make dist\" will not work" >&5
|
|
|
+ $as_echo "$as_me: WARNING: \"make dist\" will not work" >&2;}
|
|
|
+@@ -12114,7 +12936,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
|
|
|
+ $as_echo_n "checking for inline... " >&6; }
|
|
|
+-if test "${ac_cv_c_inline+set}" = set; then :
|
|
|
++if ${ac_cv_c_inline+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_cv_c_inline=no
|
|
|
+@@ -12157,7 +12979,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
|
|
+ $as_echo_n "checking for ANSI C header files... " >&6; }
|
|
|
+-if test "${ac_cv_header_stdc+set}" = set; then :
|
|
|
++if ${ac_cv_header_stdc+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -12269,7 +13091,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
|
|
|
+ $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
|
|
|
+-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
|
|
|
++if ${ac_cv_header_sys_wait_h+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -12316,8 +13138,7 @@
|
|
|
+ do :
|
|
|
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
|
|
+-eval as_val=\$$as_ac_Header
|
|
|
+- if test "x$as_val" = x""yes; then :
|
|
|
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
|
+ _ACEOF
|
|
|
+@@ -12329,7 +13150,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
|
|
|
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
|
|
|
+-if test "${ac_cv_c_const+set}" = set; then :
|
|
|
++if ${ac_cv_c_const+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -12409,7 +13230,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
|
|
|
+ $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
|
|
|
+-if test "${ac_cv_type_uid_t+set}" = set; then :
|
|
|
++if ${ac_cv_type_uid_t+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -12438,7 +13259,7 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
|
|
|
+-if test "x$ac_cv_type_size_t" = x""yes; then :
|
|
|
++if test "x$ac_cv_type_size_t" = xyes; then :
|
|
|
+
|
|
|
+ else
|
|
|
+
|
|
|
+@@ -12450,7 +13271,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
|
|
|
+ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
|
|
|
+-if test "${ac_cv_header_time+set}" = set; then :
|
|
|
++if ${ac_cv_header_time+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -12486,7 +13307,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
|
|
|
+ $as_echo_n "checking for error_at_line... " >&6; }
|
|
|
+-if test "${ac_cv_lib_error_at_line+set}" = set; then :
|
|
|
++if ${ac_cv_lib_error_at_line+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+@@ -12519,9 +13340,9 @@
|
|
|
+
|
|
|
+ fi
|
|
|
+
|
|
|
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
|
|
|
+-$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; }
|
|
|
+-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
|
|
|
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
|
|
|
++$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
|
|
|
++if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ rm -f conftest.sym conftest.file
|
|
|
+@@ -12537,7 +13358,7 @@
|
|
|
+ main ()
|
|
|
+ {
|
|
|
+ struct stat sbuf;
|
|
|
+- /* Linux will dereference the symlink and fail.
|
|
|
++ /* Linux will dereference the symlink and fail, as required by POSIX.
|
|
|
+ That is better in the sense that it means we will not
|
|
|
+ have to compile and use the lstat wrapper. */
|
|
|
+ return lstat ("conftest.sym/", &sbuf) == 0;
|
|
|
+@@ -12572,7 +13393,7 @@
|
|
|
+ _ACEOF
|
|
|
+
|
|
|
+
|
|
|
+-if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
|
|
|
++if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
|
|
|
+ case " $LIBOBJS " in
|
|
|
+ *" lstat.$ac_objext "* ) ;;
|
|
|
+ *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
|
|
|
+@@ -12583,7 +13404,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
|
|
|
+ $as_echo_n "checking whether stat accepts an empty string... " >&6; }
|
|
|
+-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
|
|
|
++if ${ac_cv_func_stat_empty_string_bug+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test "$cross_compiling" = yes; then :
|
|
|
+@@ -12630,13 +13451,13 @@
|
|
|
+ for ac_func in vprintf
|
|
|
+ do :
|
|
|
+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
|
|
|
+-if test "x$ac_cv_func_vprintf" = x""yes; then :
|
|
|
++if test "x$ac_cv_func_vprintf" = xyes; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define HAVE_VPRINTF 1
|
|
|
+ _ACEOF
|
|
|
+
|
|
|
+ ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
|
|
|
+-if test "x$ac_cv_func__doprnt" = x""yes; then :
|
|
|
++if test "x$ac_cv_func__doprnt" = xyes; then :
|
|
|
+
|
|
|
+ $as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
|
|
|
+
|
|
|
+@@ -12655,8 +13476,7 @@
|
|
|
+ do :
|
|
|
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
|
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
|
|
+-eval as_val=\$$as_ac_var
|
|
|
+- if test "x$as_val" = x""yes; then :
|
|
|
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
|
+ _ACEOF
|
|
|
+@@ -12667,7 +13487,7 @@
|
|
|
+
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
|
|
|
+ $as_echo_n "checking for socket in -lsocket... " >&6; }
|
|
|
+-if test "${ac_cv_lib_socket_socket+set}" = set; then :
|
|
|
++if ${ac_cv_lib_socket_socket+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -12701,12 +13521,12 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
|
|
|
+ $as_echo "$ac_cv_lib_socket_socket" >&6; }
|
|
|
+-if test "x$ac_cv_lib_socket_socket" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_socket_socket" = xyes; then :
|
|
|
+
|
|
|
+ LIBS="${LIBS} -lsocket"
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv" >&5
|
|
|
+ $as_echo_n "checking for res_query in -lresolv... " >&6; }
|
|
|
+-if test "${ac_cv_lib_resolv_res_query+set}" = set; then :
|
|
|
++if ${ac_cv_lib_resolv_res_query+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -12740,7 +13560,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_query" >&5
|
|
|
+ $as_echo "$ac_cv_lib_resolv_res_query" >&6; }
|
|
|
+-if test "x$ac_cv_lib_resolv_res_query" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_resolv_res_query" = xyes; then :
|
|
|
+ LIBS="${LIBS} -lresolv"
|
|
|
+
|
|
|
+ fi
|
|
|
+@@ -12755,7 +13575,7 @@
|
|
|
+ if test -z "${LTLIB_LIBS}"; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlopen in -lltdl" >&5
|
|
|
+ $as_echo_n "checking for lt_dlopen in -lltdl... " >&6; }
|
|
|
+-if test "${ac_cv_lib_ltdl_lt_dlopen+set}" = set; then :
|
|
|
++if ${ac_cv_lib_ltdl_lt_dlopen+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -12789,10 +13609,10 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dlopen" >&5
|
|
|
+ $as_echo "$ac_cv_lib_ltdl_lt_dlopen" >&6; }
|
|
|
+-if test "x$ac_cv_lib_ltdl_lt_dlopen" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_ltdl_lt_dlopen" = xyes; then :
|
|
|
+ LTLIB_LIBS="-lltdl"
|
|
|
+ else
|
|
|
+- as_fn_error "ltdl not found, please install libltdl and/or libtool" "$LINENO" 5
|
|
|
++ as_fn_error $? "ltdl not found, please install libltdl and/or libtool" "$LINENO" 5
|
|
|
+
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -12800,10 +13620,10 @@
|
|
|
+ saved_CFLAGS="${CFLAGS}"
|
|
|
+ CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}"
|
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
|
|
|
+-if test "x$ac_cv_header_ltdl_h" = x""yes; then :
|
|
|
++if test "x$ac_cv_header_ltdl_h" = xyes; then :
|
|
|
+
|
|
|
+ else
|
|
|
+- as_fn_error "ltdl.h not found, please install libltdl and/or libtool" "$LINENO" 5
|
|
|
++ as_fn_error $? "ltdl.h not found, please install libltdl and/or libtool" "$LINENO" 5
|
|
|
+
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -12936,7 +13756,7 @@
|
|
|
+ set dummy pthread-config; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_acx_pthread_config+set}" = set; then :
|
|
|
++if ${ac_cv_prog_acx_pthread_config+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$acx_pthread_config"; then
|
|
|
+@@ -13092,7 +13912,7 @@
|
|
|
+ set dummy $ac_prog; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :
|
|
|
++if ${ac_cv_prog_PTHREAD_CC+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ if test -n "$PTHREAD_CC"; then
|
|
|
+@@ -13148,7 +13968,7 @@
|
|
|
+ :
|
|
|
+ else
|
|
|
+ acx_pthread_ok=no
|
|
|
+- as_fn_error "POSIX thread support required" "$LINENO" 5
|
|
|
++ as_fn_error $? "POSIX thread support required" "$LINENO" 5
|
|
|
+
|
|
|
+ fi
|
|
|
+ ac_ext=c
|
|
|
+@@ -13166,7 +13986,7 @@
|
|
|
+ if test -z "${ZLIB_LIBS}"; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
|
|
|
+ $as_echo_n "checking for inflate in -lz... " >&6; }
|
|
|
+-if test "${ac_cv_lib_z_inflate+set}" = set; then :
|
|
|
++if ${ac_cv_lib_z_inflate+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -13200,7 +14020,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
|
|
|
+ $as_echo "$ac_cv_lib_z_inflate" >&6; }
|
|
|
+-if test "x$ac_cv_lib_z_inflate" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_z_inflate" = xyes; then :
|
|
|
+ ZLIB_LIBS="-lz"
|
|
|
+
|
|
|
+ fi
|
|
|
+@@ -13211,7 +14031,7 @@
|
|
|
+ for ac_header in zlib.h
|
|
|
+ do :
|
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
|
|
|
+-if test "x$ac_cv_header_zlib_h" = x""yes; then :
|
|
|
++if test "x$ac_cv_header_zlib_h" = xyes; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define HAVE_ZLIB_H 1
|
|
|
+ _ACEOF
|
|
|
+@@ -13242,7 +14062,7 @@
|
|
|
+ $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
|
|
|
+
|
|
|
+ else
|
|
|
+- as_fn_error "zlib linkage required, but no zlib was found" "$LINENO" 5
|
|
|
++ as_fn_error $? "zlib linkage required, but no zlib was found" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -13253,7 +14073,7 @@
|
|
|
+ unset ac_cv_lib_readline_readline
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
|
|
|
+ $as_echo_n "checking for readline in -lreadline... " >&6; }
|
|
|
+-if test "${ac_cv_lib_readline_readline+set}" = set; then :
|
|
|
++if ${ac_cv_lib_readline_readline+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -13288,7 +14108,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
|
|
|
+ $as_echo "$ac_cv_lib_readline_readline" >&6; }
|
|
|
+-if test "x$ac_cv_lib_readline_readline" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_readline_readline" = xyes; then :
|
|
|
+ READLINE_LIBS="-lreadline ${l}"
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -13300,7 +14120,7 @@
|
|
|
+ for ac_header in readline/readline.h
|
|
|
+ do :
|
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
|
|
|
+-if test "x$ac_cv_header_readline_readline_h" = x""yes; then :
|
|
|
++if test "x$ac_cv_header_readline_readline_h" = xyes; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define HAVE_READLINE_READLINE_H 1
|
|
|
+ _ACEOF
|
|
|
+@@ -13331,7 +14151,7 @@
|
|
|
+ $as_echo "#define ENABLE_READLINE 1" >>confdefs.h
|
|
|
+
|
|
|
+ else
|
|
|
+- as_fn_error "readline linkage required, but no readline was found" "$LINENO" 5
|
|
|
++ as_fn_error $? "readline linkage required, but no readline was found" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -13395,7 +14215,7 @@
|
|
|
+ $as_echo "no" >&6; }
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -liconv" >&5
|
|
|
+ $as_echo_n "checking for iconv in -liconv... " >&6; }
|
|
|
+-if test "${ac_cv_lib_iconv_iconv+set}" = set; then :
|
|
|
++if ${ac_cv_lib_iconv_iconv+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -13429,7 +14249,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv" >&5
|
|
|
+ $as_echo "$ac_cv_lib_iconv_iconv" >&6; }
|
|
|
+-if test "x$ac_cv_lib_iconv_iconv" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_iconv_iconv" = xyes; then :
|
|
|
+
|
|
|
+ ac_cv_lib_iconv="yes"
|
|
|
+ ICONV_LIBS="-liconv"
|
|
|
+@@ -13437,7 +14257,7 @@
|
|
|
+ else
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -liconv" >&5
|
|
|
+ $as_echo_n "checking for libiconv in -liconv... " >&6; }
|
|
|
+-if test "${ac_cv_lib_iconv_libiconv+set}" = set; then :
|
|
|
++if ${ac_cv_lib_iconv_libiconv+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -13471,7 +14291,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv" >&5
|
|
|
+ $as_echo "$ac_cv_lib_iconv_libiconv" >&6; }
|
|
|
+-if test "x$ac_cv_lib_iconv_libiconv" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_iconv_libiconv" = xyes; then :
|
|
|
+
|
|
|
+ ac_cv_lib_iconv="yes"
|
|
|
+ ICONV_LIBS="-liconv"
|
|
|
+@@ -13493,7 +14313,7 @@
|
|
|
+ for ac_header in iconv.h
|
|
|
+ do :
|
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
|
|
|
+-if test "x$ac_cv_header_iconv_h" = x""yes; then :
|
|
|
++if test "x$ac_cv_header_iconv_h" = xyes; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define HAVE_ICONV_H 1
|
|
|
+ _ACEOF
|
|
|
+@@ -13524,7 +14344,7 @@
|
|
|
+ $as_echo "#define ENABLE_ICONV 1" >>confdefs.h
|
|
|
+
|
|
|
+ else
|
|
|
+- as_fn_error "iconv linkage required, but no iconv was found" "$LINENO" 5
|
|
|
++ as_fn_error $? "iconv linkage required, but no iconv was found" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -13533,11 +14353,10 @@
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
|
|
|
+ $as_echo_n "checking for OPENSSL... " >&6; }
|
|
|
+
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$OPENSSL_CFLAGS"; then
|
|
|
+- pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$OPENSSL_CFLAGS"; then
|
|
|
++ pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcrypto >= 0.9.7\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "libcrypto >= 0.9.7") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -13547,15 +14366,13 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$OPENSSL_LIBS"; then
|
|
|
+- pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$OPENSSL_LIBS"; then
|
|
|
++ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcrypto >= 0.9.7\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "libcrypto >= 0.9.7") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -13565,14 +14382,15 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if test $pkg_failed = yes; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
+
|
|
|
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
|
+ _pkg_short_errors_supported=yes
|
|
|
+@@ -13580,25 +14398,22 @@
|
|
|
+ _pkg_short_errors_supported=no
|
|
|
+ fi
|
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
|
+- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcrypto >= 0.9.7"`
|
|
|
++ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcrypto >= 0.9.7" 2>&1`
|
|
|
+ else
|
|
|
+- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcrypto >= 0.9.7"`
|
|
|
++ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcrypto >= 0.9.7" 2>&1`
|
|
|
+ fi
|
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
|
+ echo "$OPENSSL_PKG_ERRORS" >&5
|
|
|
+
|
|
|
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
+-$as_echo "no" >&6; }
|
|
|
+
|
|
|
+ pkg_failed=no
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
|
|
|
+ $as_echo_n "checking for OPENSSL... " >&6; }
|
|
|
+
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$OPENSSL_CFLAGS"; then
|
|
|
+- pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$OPENSSL_CFLAGS"; then
|
|
|
++ pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.7\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.7") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -13608,15 +14423,13 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$OPENSSL_LIBS"; then
|
|
|
+- pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$OPENSSL_LIBS"; then
|
|
|
++ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.7\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.7") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -13626,14 +14439,15 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if test $pkg_failed = yes; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
+
|
|
|
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
|
+ _pkg_short_errors_supported=yes
|
|
|
+@@ -13641,18 +14455,16 @@
|
|
|
+ _pkg_short_errors_supported=no
|
|
|
+ fi
|
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
|
+- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl >= 0.9.7"`
|
|
|
++ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl >= 0.9.7" 2>&1`
|
|
|
+ else
|
|
|
+- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl >= 0.9.7"`
|
|
|
++ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl >= 0.9.7" 2>&1`
|
|
|
+ fi
|
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
|
+ echo "$OPENSSL_PKG_ERRORS" >&5
|
|
|
+
|
|
|
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
+-$as_echo "no" >&6; }
|
|
|
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_version in -lcrypto" >&5
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_version in -lcrypto" >&5
|
|
|
+ $as_echo_n "checking for RSA_version in -lcrypto... " >&6; }
|
|
|
+-if test "${ac_cv_lib_crypto_RSA_version+set}" = set; then :
|
|
|
++if ${ac_cv_lib_crypto_RSA_version+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -13686,7 +14498,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_version" >&5
|
|
|
+ $as_echo "$ac_cv_lib_crypto_RSA_version" >&6; }
|
|
|
+-if test "x$ac_cv_lib_crypto_RSA_version" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_crypto_RSA_version" = xyes; then :
|
|
|
+
|
|
|
+ have_openssl="yes"
|
|
|
+ OPENSSL_LIBS="-lcrypto"
|
|
|
+@@ -13698,9 +14510,11 @@
|
|
|
+
|
|
|
+
|
|
|
+ elif test $pkg_failed = untried; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_version in -lcrypto" >&5
|
|
|
+ $as_echo_n "checking for RSA_version in -lcrypto... " >&6; }
|
|
|
+-if test "${ac_cv_lib_crypto_RSA_version+set}" = set; then :
|
|
|
++if ${ac_cv_lib_crypto_RSA_version+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -13734,7 +14548,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_version" >&5
|
|
|
+ $as_echo "$ac_cv_lib_crypto_RSA_version" >&6; }
|
|
|
+-if test "x$ac_cv_lib_crypto_RSA_version" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_crypto_RSA_version" = xyes; then :
|
|
|
+
|
|
|
+ have_openssl="yes"
|
|
|
+ OPENSSL_LIBS="-lcrypto"
|
|
|
+@@ -13754,16 +14568,17 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ elif test $pkg_failed = untried; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
+
|
|
|
+ pkg_failed=no
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
|
|
|
+ $as_echo_n "checking for OPENSSL... " >&6; }
|
|
|
+
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$OPENSSL_CFLAGS"; then
|
|
|
+- pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$OPENSSL_CFLAGS"; then
|
|
|
++ pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.7\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.7") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -13773,15 +14588,13 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$OPENSSL_LIBS"; then
|
|
|
+- pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$OPENSSL_LIBS"; then
|
|
|
++ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.7\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.7") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -13791,14 +14604,15 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if test $pkg_failed = yes; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
+
|
|
|
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
|
+ _pkg_short_errors_supported=yes
|
|
|
+@@ -13806,18 +14620,16 @@
|
|
|
+ _pkg_short_errors_supported=no
|
|
|
+ fi
|
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
|
+- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl >= 0.9.7"`
|
|
|
++ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl >= 0.9.7" 2>&1`
|
|
|
+ else
|
|
|
+- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl >= 0.9.7"`
|
|
|
++ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl >= 0.9.7" 2>&1`
|
|
|
+ fi
|
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
|
+ echo "$OPENSSL_PKG_ERRORS" >&5
|
|
|
+
|
|
|
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
+-$as_echo "no" >&6; }
|
|
|
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_version in -lcrypto" >&5
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_version in -lcrypto" >&5
|
|
|
+ $as_echo_n "checking for RSA_version in -lcrypto... " >&6; }
|
|
|
+-if test "${ac_cv_lib_crypto_RSA_version+set}" = set; then :
|
|
|
++if ${ac_cv_lib_crypto_RSA_version+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -13851,7 +14663,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_version" >&5
|
|
|
+ $as_echo "$ac_cv_lib_crypto_RSA_version" >&6; }
|
|
|
+-if test "x$ac_cv_lib_crypto_RSA_version" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_crypto_RSA_version" = xyes; then :
|
|
|
+
|
|
|
+ have_openssl="yes"
|
|
|
+ OPENSSL_LIBS="-lcrypto"
|
|
|
+@@ -13863,9 +14675,11 @@
|
|
|
+
|
|
|
+
|
|
|
+ elif test $pkg_failed = untried; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_version in -lcrypto" >&5
|
|
|
+ $as_echo_n "checking for RSA_version in -lcrypto... " >&6; }
|
|
|
+-if test "${ac_cv_lib_crypto_RSA_version+set}" = set; then :
|
|
|
++if ${ac_cv_lib_crypto_RSA_version+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
+@@ -13899,7 +14713,7 @@
|
|
|
+ fi
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_version" >&5
|
|
|
+ $as_echo "$ac_cv_lib_crypto_RSA_version" >&6; }
|
|
|
+-if test "x$ac_cv_lib_crypto_RSA_version" = x""yes; then :
|
|
|
++if test "x$ac_cv_lib_crypto_RSA_version" = xyes; then :
|
|
|
+
|
|
|
+ have_openssl="yes"
|
|
|
+ OPENSSL_LIBS="-lcrypto"
|
|
|
+@@ -13945,7 +14759,7 @@
|
|
|
+ $as_echo "#define ENABLE_OPENSSL 1" >>confdefs.h
|
|
|
+
|
|
|
+ else
|
|
|
+- as_fn_error "OpenSSL linkage required, but no OpenSSL was found" "$LINENO" 5
|
|
|
++ as_fn_error $? "OpenSSL linkage required, but no OpenSSL was found" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -13955,11 +14769,10 @@
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENCT" >&5
|
|
|
+ $as_echo_n "checking for OPENCT... " >&6; }
|
|
|
+
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$OPENCT_CFLAGS"; then
|
|
|
+- pkg_cv_OPENCT_CFLAGS="$OPENCT_CFLAGS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$OPENCT_CFLAGS"; then
|
|
|
++ pkg_cv_OPENCT_CFLAGS="$OPENCT_CFLAGS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenct\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "libopenct") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -13969,15 +14782,13 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$OPENCT_LIBS"; then
|
|
|
+- pkg_cv_OPENCT_LIBS="$OPENCT_LIBS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$OPENCT_LIBS"; then
|
|
|
++ pkg_cv_OPENCT_LIBS="$OPENCT_LIBS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenct\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "libopenct") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -13987,14 +14798,15 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if test $pkg_failed = yes; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
+
|
|
|
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
|
+ _pkg_short_errors_supported=yes
|
|
|
+@@ -14002,19 +14814,19 @@
|
|
|
+ _pkg_short_errors_supported=no
|
|
|
+ fi
|
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
|
+- OPENCT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libopenct"`
|
|
|
++ OPENCT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libopenct" 2>&1`
|
|
|
+ else
|
|
|
+- OPENCT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libopenct"`
|
|
|
++ OPENCT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libopenct" 2>&1`
|
|
|
+ fi
|
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
|
+ echo "$OPENCT_PKG_ERRORS" >&5
|
|
|
+
|
|
|
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
+-$as_echo "no" >&6; }
|
|
|
+- as_fn_error "openct requested but not available" "$LINENO" 5
|
|
|
++ as_fn_error $? "openct requested but not available" "$LINENO" 5
|
|
|
+
|
|
|
+ elif test $pkg_failed = untried; then
|
|
|
+- as_fn_error "openct requested but not available" "$LINENO" 5
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
++ as_fn_error $? "openct requested but not available" "$LINENO" 5
|
|
|
+
|
|
|
+ else
|
|
|
+ OPENCT_CFLAGS=$pkg_cv_OPENCT_CFLAGS
|
|
|
+@@ -14040,11 +14852,10 @@
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCSC" >&5
|
|
|
+ $as_echo_n "checking for PCSC... " >&6; }
|
|
|
+
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$PCSC_CFLAGS"; then
|
|
|
+- pkg_cv_PCSC_CFLAGS="$PCSC_CFLAGS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$PCSC_CFLAGS"; then
|
|
|
++ pkg_cv_PCSC_CFLAGS="$PCSC_CFLAGS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcsclite\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "libpcsclite") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -14054,15 +14865,13 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+-if test -n "$PKG_CONFIG"; then
|
|
|
+- if test -n "$PCSC_LIBS"; then
|
|
|
+- pkg_cv_PCSC_LIBS="$PCSC_LIBS"
|
|
|
+- else
|
|
|
+- if test -n "$PKG_CONFIG" && \
|
|
|
++if test -n "$PCSC_LIBS"; then
|
|
|
++ pkg_cv_PCSC_LIBS="$PCSC_LIBS"
|
|
|
++ elif test -n "$PKG_CONFIG"; then
|
|
|
++ if test -n "$PKG_CONFIG" && \
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcsclite\""; } >&5
|
|
|
+ ($PKG_CONFIG --exists --print-errors "libpcsclite") 2>&5
|
|
|
+ ac_status=$?
|
|
|
+@@ -14072,14 +14881,15 @@
|
|
|
+ else
|
|
|
+ pkg_failed=yes
|
|
|
+ fi
|
|
|
+- fi
|
|
|
+-else
|
|
|
+- pkg_failed=untried
|
|
|
++ else
|
|
|
++ pkg_failed=untried
|
|
|
+ fi
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if test $pkg_failed = yes; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
+
|
|
|
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
|
+ _pkg_short_errors_supported=yes
|
|
|
+@@ -14087,14 +14897,14 @@
|
|
|
+ _pkg_short_errors_supported=no
|
|
|
+ fi
|
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
|
+- PCSC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpcsclite"`
|
|
|
++ PCSC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpcsclite" 2>&1`
|
|
|
+ else
|
|
|
+- PCSC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpcsclite"`
|
|
|
++ PCSC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpcsclite" 2>&1`
|
|
|
+ fi
|
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
|
+ echo "$PCSC_PKG_ERRORS" >&5
|
|
|
+
|
|
|
+- as_fn_error "Package requirements (libpcsclite) were not met:
|
|
|
++ as_fn_error $? "Package requirements (libpcsclite) were not met:
|
|
|
+
|
|
|
+ $PCSC_PKG_ERRORS
|
|
|
+
|
|
|
+@@ -14103,12 +14913,13 @@
|
|
|
+
|
|
|
+ Alternatively, you may set the environment variables PCSC_CFLAGS
|
|
|
+ and PCSC_LIBS to avoid the need to call pkg-config.
|
|
|
+-See the pkg-config man page for more details.
|
|
|
+-" "$LINENO" 5
|
|
|
++See the pkg-config man page for more details." "$LINENO" 5
|
|
|
+ elif test $pkg_failed = untried; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
++$as_echo "no" >&6; }
|
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
|
|
|
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
|
|
|
+ is in your PATH or set the PKG_CONFIG environment variable to the full
|
|
|
+ path to pkg-config.
|
|
|
+
|
|
|
+@@ -14117,13 +14928,13 @@
|
|
|
+ See the pkg-config man page for more details.
|
|
|
+
|
|
|
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
|
|
+-See \`config.log' for more details." "$LINENO" 5; }
|
|
|
++See \`config.log' for more details" "$LINENO" 5; }
|
|
|
+ else
|
|
|
+ PCSC_CFLAGS=$pkg_cv_PCSC_CFLAGS
|
|
|
+ PCSC_LIBS=$pkg_cv_PCSC_LIBS
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
+ $as_echo "yes" >&6; }
|
|
|
+- :
|
|
|
++
|
|
|
+ fi
|
|
|
+
|
|
|
+ fi
|
|
|
+@@ -14145,13 +14956,13 @@
|
|
|
+ for ac_header in winscard.h
|
|
|
+ do :
|
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "winscard.h" "ac_cv_header_winscard_h" "$ac_includes_default"
|
|
|
+-if test "x$ac_cv_header_winscard_h" = x""yes; then :
|
|
|
++if test "x$ac_cv_header_winscard_h" = xyes; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define HAVE_WINSCARD_H 1
|
|
|
+ _ACEOF
|
|
|
+
|
|
|
+ else
|
|
|
+- test "${WIN32}" != "yes" && as_fn_error "winscard.h is required for pcsc" "$LINENO" 5
|
|
|
++ test "${WIN32}" != "yes" && as_fn_error $? "winscard.h is required for pcsc" "$LINENO" 5
|
|
|
+ fi
|
|
|
+
|
|
|
+ done
|
|
|
+@@ -14201,7 +15012,7 @@
|
|
|
+ set dummy libassuan-config; ac_word=$2
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
+ $as_echo_n "checking for $ac_word... " >&6; }
|
|
|
+-if test "${ac_cv_path_LIBASSUAN_CONFIG+set}" = set; then :
|
|
|
++if ${ac_cv_path_LIBASSUAN_CONFIG+:} false; then :
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
+ else
|
|
|
+ case $LIBASSUAN_CONFIG in
|
|
|
+@@ -14330,7 +15141,7 @@
|
|
|
+
|
|
|
+ if test "${enable_nsplugin}" = "yes"; then
|
|
|
+ if test "x${have_assuan}" != "xyes" -o "x${have_openssl}" != "xyes"; then
|
|
|
+- as_fn_error "nsplugin requires assuan and openssl" "$LINENO" 5
|
|
|
++ as_fn_error $? "nsplugin requires assuan and openssl" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -14589,10 +15400,21 @@
|
|
|
+ :end' >>confcache
|
|
|
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
|
|
+ if test -w "$cache_file"; then
|
|
|
+- test "x$cache_file" != "x/dev/null" &&
|
|
|
++ if test "x$cache_file" != "x/dev/null"; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
|
|
|
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
|
|
|
+- cat confcache >$cache_file
|
|
|
++ if test ! -f "$cache_file" || test -h "$cache_file"; then
|
|
|
++ cat confcache >"$cache_file"
|
|
|
++ else
|
|
|
++ case $cache_file in #(
|
|
|
++ */* | ?:*)
|
|
|
++ mv -f confcache "$cache_file"$$ &&
|
|
|
++ mv -f "$cache_file"$$ "$cache_file" ;; #(
|
|
|
++ *)
|
|
|
++ mv -f confcache "$cache_file" ;;
|
|
|
++ esac
|
|
|
++ fi
|
|
|
++ fi
|
|
|
+ else
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
|
|
|
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
|
|
+@@ -14608,6 +15430,7 @@
|
|
|
+
|
|
|
+ ac_libobjs=
|
|
|
+ ac_ltlibobjs=
|
|
|
++U=
|
|
|
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
|
|
+ # 1. Remove the extension, and $U if already installed.
|
|
|
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
|
|
+@@ -14631,60 +15454,60 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"AMDEP\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"AMDEP\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"am__fastdepCC\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test -z "${SVN_CHECKOUT_TRUE}" && test -z "${SVN_CHECKOUT_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"SVN_CHECKOUT\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"SVN_CHECKOUT\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"ENABLE_MAN\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"ENABLE_MAN\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${ENABLE_ZLIB_TRUE}" && test -z "${ENABLE_ZLIB_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"ENABLE_ZLIB\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"ENABLE_ZLIB\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${ENABLE_READLINE_TRUE}" && test -z "${ENABLE_READLINE_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"ENABLE_READLINE\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"ENABLE_READLINE\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${ENABLE_ICONV_TRUE}" && test -z "${ENABLE_ICONV_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"ENABLE_ICONV\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"ENABLE_ICONV\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${ENABLE_OPENSSL_TRUE}" && test -z "${ENABLE_OPENSSL_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"ENABLE_OPENSSL\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"ENABLE_OPENSSL\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${ENABLE_OPENCT_TRUE}" && test -z "${ENABLE_OPENCT_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"ENABLE_OPENCT\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"ENABLE_OPENCT\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${ENABLE_NSPLUGIN_TRUE}" && test -z "${ENABLE_NSPLUGIN_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"ENABLE_NSPLUGIN\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"ENABLE_NSPLUGIN\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${ENABLE_DOC_TRUE}" && test -z "${ENABLE_DOC_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"ENABLE_DOC\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"ENABLE_DOC\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"WIN32\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"WIN32\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+ if test -z "${CYGWIN_TRUE}" && test -z "${CYGWIN_FALSE}"; then
|
|
|
+- as_fn_error "conditional \"CYGWIN\" was never defined.
|
|
|
++ as_fn_error $? "conditional \"CYGWIN\" was never defined.
|
|
|
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
|
+ fi
|
|
|
+
|
|
|
+-: ${CONFIG_STATUS=./config.status}
|
|
|
++: "${CONFIG_STATUS=./config.status}"
|
|
|
+ ac_write_fail=0
|
|
|
+ ac_clean_files_save=$ac_clean_files
|
|
|
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
|
|
+@@ -14785,6 +15608,7 @@
|
|
|
+ IFS=" "" $as_nl"
|
|
|
+
|
|
|
+ # Find who we are. Look in the path if we contain no directory separator.
|
|
|
++as_myself=
|
|
|
+ case $0 in #((
|
|
|
+ *[\\/]* ) as_myself=$0 ;;
|
|
|
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
+@@ -14830,19 +15654,19 @@
|
|
|
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
+
|
|
|
+
|
|
|
+-# as_fn_error ERROR [LINENO LOG_FD]
|
|
|
+-# ---------------------------------
|
|
|
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
|
|
++# ----------------------------------------
|
|
|
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
|
|
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
|
|
+-# script with status $?, using 1 if that was 0.
|
|
|
++# script with STATUS, using 1 if that was 0.
|
|
|
+ as_fn_error ()
|
|
|
+ {
|
|
|
+- as_status=$?; test $as_status -eq 0 && as_status=1
|
|
|
+- if test "$3"; then
|
|
|
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
|
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
|
|
++ as_status=$1; test $as_status -eq 0 && as_status=1
|
|
|
++ if test "$4"; then
|
|
|
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
|
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
|
|
+ fi
|
|
|
+- $as_echo "$as_me: error: $1" >&2
|
|
|
++ $as_echo "$as_me: error: $2" >&2
|
|
|
+ as_fn_exit $as_status
|
|
|
+ } # as_fn_error
|
|
|
+
|
|
|
+@@ -15038,7 +15862,7 @@
|
|
|
+ test -d "$as_dir" && break
|
|
|
+ done
|
|
|
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
|
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
|
|
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
|
|
+
|
|
|
+
|
|
|
+ } # as_fn_mkdir_p
|
|
|
+@@ -15092,7 +15916,7 @@
|
|
|
+ # values after options handling.
|
|
|
+ ac_log="
|
|
|
+ This file was extended by opensc $as_me 0.11.13, which was
|
|
|
+-generated by GNU Autoconf 2.64. Invocation command line was
|
|
|
++generated by GNU Autoconf 2.68. Invocation command line was
|
|
|
+
|
|
|
+ CONFIG_FILES = $CONFIG_FILES
|
|
|
+ CONFIG_HEADERS = $CONFIG_HEADERS
|
|
|
+@@ -15132,6 +15956,7 @@
|
|
|
+
|
|
|
+ -h, --help print this help, then exit
|
|
|
+ -V, --version print version number and configuration settings, then exit
|
|
|
++ --config print configuration, then exit
|
|
|
+ -q, --quiet, --silent
|
|
|
+ do not print progress messages
|
|
|
+ -d, --debug don't remove temporary files
|
|
|
+@@ -15154,12 +15979,13 @@
|
|
|
+
|
|
|
+ _ACEOF
|
|
|
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
|
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
|
+ ac_cs_version="\\
|
|
|
+ opensc config.status 0.11.13
|
|
|
+-configured by $0, generated by GNU Autoconf 2.64,
|
|
|
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
|
++configured by $0, generated by GNU Autoconf 2.68,
|
|
|
++ with options \\"\$ac_cs_config\\"
|
|
|
+
|
|
|
+-Copyright (C) 2009 Free Software Foundation, Inc.
|
|
|
++Copyright (C) 2010 Free Software Foundation, Inc.
|
|
|
+ This config.status script is free software; the Free Software Foundation
|
|
|
+ gives unlimited permission to copy, distribute and modify it."
|
|
|
+
|
|
|
+@@ -15177,11 +16003,16 @@
|
|
|
+ while test $# != 0
|
|
|
+ do
|
|
|
+ case $1 in
|
|
|
+- --*=*)
|
|
|
++ --*=?*)
|
|
|
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
|
|
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
|
|
|
+ ac_shift=:
|
|
|
+ ;;
|
|
|
++ --*=)
|
|
|
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
|
|
++ ac_optarg=
|
|
|
++ ac_shift=:
|
|
|
++ ;;
|
|
|
+ *)
|
|
|
+ ac_option=$1
|
|
|
+ ac_optarg=$2
|
|
|
+@@ -15195,12 +16026,15 @@
|
|
|
+ ac_cs_recheck=: ;;
|
|
|
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
|
|
|
+ $as_echo "$ac_cs_version"; exit ;;
|
|
|
++ --config | --confi | --conf | --con | --co | --c )
|
|
|
++ $as_echo "$ac_cs_config"; exit ;;
|
|
|
+ --debug | --debu | --deb | --de | --d | -d )
|
|
|
+ debug=: ;;
|
|
|
+ --file | --fil | --fi | --f )
|
|
|
+ $ac_shift
|
|
|
+ case $ac_optarg in
|
|
|
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
|
++ '') as_fn_error $? "missing file argument" ;;
|
|
|
+ esac
|
|
|
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
|
|
|
+ ac_need_defaults=false;;
|
|
|
+@@ -15213,7 +16047,7 @@
|
|
|
+ ac_need_defaults=false;;
|
|
|
+ --he | --h)
|
|
|
+ # Conflict between --help and --header
|
|
|
+- as_fn_error "ambiguous option: \`$1'
|
|
|
++ as_fn_error $? "ambiguous option: \`$1'
|
|
|
+ Try \`$0 --help' for more information.";;
|
|
|
+ --help | --hel | -h )
|
|
|
+ $as_echo "$ac_cs_usage"; exit ;;
|
|
|
+@@ -15222,7 +16056,7 @@
|
|
|
+ ac_cs_silent=: ;;
|
|
|
+
|
|
|
+ # This is an error.
|
|
|
+- -*) as_fn_error "unrecognized option: \`$1'
|
|
|
++ -*) as_fn_error $? "unrecognized option: \`$1'
|
|
|
+ Try \`$0 --help' for more information." ;;
|
|
|
+
|
|
|
+ *) as_fn_append ac_config_targets " $1"
|
|
|
+@@ -15276,174 +16110,200 @@
|
|
|
+ sed_quote_subst='$sed_quote_subst'
|
|
|
+ double_quote_subst='$double_quote_subst'
|
|
|
+ delay_variable_subst='$delay_variable_subst'
|
|
|
+-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-LD_RC='`$ECHO "X$LD_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-old_archive_cmds_RC='`$ECHO "X$old_archive_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-compiler_RC='`$ECHO "X$compiler_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-GCC_RC='`$ECHO "X$GCC_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_prog_compiler_no_builtin_flag_RC='`$ECHO "X$lt_prog_compiler_no_builtin_flag_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_prog_compiler_wl_RC='`$ECHO "X$lt_prog_compiler_wl_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_prog_compiler_pic_RC='`$ECHO "X$lt_prog_compiler_pic_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_prog_compiler_static_RC='`$ECHO "X$lt_prog_compiler_static_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-lt_cv_prog_compiler_c_o_RC='`$ECHO "X$lt_cv_prog_compiler_c_o_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-archive_cmds_need_lc_RC='`$ECHO "X$archive_cmds_need_lc_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-enable_shared_with_static_runtimes_RC='`$ECHO "X$enable_shared_with_static_runtimes_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-export_dynamic_flag_spec_RC='`$ECHO "X$export_dynamic_flag_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-whole_archive_flag_spec_RC='`$ECHO "X$whole_archive_flag_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-compiler_needs_object_RC='`$ECHO "X$compiler_needs_object_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-old_archive_from_new_cmds_RC='`$ECHO "X$old_archive_from_new_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-old_archive_from_expsyms_cmds_RC='`$ECHO "X$old_archive_from_expsyms_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-archive_cmds_RC='`$ECHO "X$archive_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-archive_expsym_cmds_RC='`$ECHO "X$archive_expsym_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-module_cmds_RC='`$ECHO "X$module_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-module_expsym_cmds_RC='`$ECHO "X$module_expsym_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-with_gnu_ld_RC='`$ECHO "X$with_gnu_ld_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-allow_undefined_flag_RC='`$ECHO "X$allow_undefined_flag_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-no_undefined_flag_RC='`$ECHO "X$no_undefined_flag_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_libdir_flag_spec_RC='`$ECHO "X$hardcode_libdir_flag_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_libdir_flag_spec_ld_RC='`$ECHO "X$hardcode_libdir_flag_spec_ld_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_libdir_separator_RC='`$ECHO "X$hardcode_libdir_separator_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_direct_RC='`$ECHO "X$hardcode_direct_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_direct_absolute_RC='`$ECHO "X$hardcode_direct_absolute_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_minus_L_RC='`$ECHO "X$hardcode_minus_L_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_shlibpath_var_RC='`$ECHO "X$hardcode_shlibpath_var_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_automatic_RC='`$ECHO "X$hardcode_automatic_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-inherit_rpath_RC='`$ECHO "X$inherit_rpath_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-link_all_deplibs_RC='`$ECHO "X$link_all_deplibs_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-fix_srcfile_path_RC='`$ECHO "X$fix_srcfile_path_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-always_export_symbols_RC='`$ECHO "X$always_export_symbols_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-export_symbols_cmds_RC='`$ECHO "X$export_symbols_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-exclude_expsyms_RC='`$ECHO "X$exclude_expsyms_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-include_expsyms_RC='`$ECHO "X$include_expsyms_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-prelink_cmds_RC='`$ECHO "X$prelink_cmds_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-file_list_spec_RC='`$ECHO "X$file_list_spec_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
+-hardcode_action_RC='`$ECHO "X$hardcode_action_RC" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
++macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
|
|
|
++macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
|
|
|
++AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
|
|
|
++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
|
|
|
++OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
|
|
|
++enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
|
|
|
++enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
|
|
|
++pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
|
|
|
++enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
|
|
|
++SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
|
|
|
++ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
|
|
|
++host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
|
|
|
++host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
|
|
|
++host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
|
|
|
++build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
|
|
|
++build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
|
|
|
++build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
|
|
|
++SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
|
|
|
++Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
|
|
|
++GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
|
|
|
++EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
|
|
|
++FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
|
|
|
++LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
|
|
|
++NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
|
|
|
++LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
|
|
|
++max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
|
|
|
++ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
|
|
|
++exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
|
|
|
++reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
|
|
|
++reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
|
|
|
++file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
|
|
|
++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
|
|
|
++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
|
|
|
++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
|
|
|
++AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
|
|
|
++AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
|
|
|
++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
|
|
|
++RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
|
|
|
++old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
|
|
|
++CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
|
|
|
++CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
|
|
|
++compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
|
|
|
++GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
|
|
|
++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
|
|
|
++objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
|
|
|
++MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
|
|
|
++need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
|
|
|
++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
|
|
|
++DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
|
|
|
++NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
|
|
|
++LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
|
|
|
++OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
|
|
|
++OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
|
|
|
++libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
|
|
|
++shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
|
|
|
++enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
|
|
|
++export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
|
|
|
++old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
|
|
|
++allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
|
|
|
++no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
|
|
|
++inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
|
|
|
++link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
|
|
|
++always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
|
|
|
++export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
|
|
|
++include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
|
|
|
++prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
|
|
|
++need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
|
|
|
++need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
|
|
|
++version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
|
|
|
++runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
|
|
|
++shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
|
|
|
++shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
|
|
|
++libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
|
|
|
++postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
|
|
|
++finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
|
|
|
++sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
|
|
|
++enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
|
|
|
++enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
|
|
|
++enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
|
|
|
++old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
|
|
|
++striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
|
|
|
++LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++old_archive_cmds_RC='`$ECHO "$old_archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++compiler_RC='`$ECHO "$compiler_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++GCC_RC='`$ECHO "$GCC_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_prog_compiler_no_builtin_flag_RC='`$ECHO "$lt_prog_compiler_no_builtin_flag_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_prog_compiler_pic_RC='`$ECHO "$lt_prog_compiler_pic_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_prog_compiler_wl_RC='`$ECHO "$lt_prog_compiler_wl_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_prog_compiler_static_RC='`$ECHO "$lt_prog_compiler_static_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++lt_cv_prog_compiler_c_o_RC='`$ECHO "$lt_cv_prog_compiler_c_o_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++archive_cmds_need_lc_RC='`$ECHO "$archive_cmds_need_lc_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++enable_shared_with_static_runtimes_RC='`$ECHO "$enable_shared_with_static_runtimes_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++export_dynamic_flag_spec_RC='`$ECHO "$export_dynamic_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++whole_archive_flag_spec_RC='`$ECHO "$whole_archive_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++compiler_needs_object_RC='`$ECHO "$compiler_needs_object_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++old_archive_from_new_cmds_RC='`$ECHO "$old_archive_from_new_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++old_archive_from_expsyms_cmds_RC='`$ECHO "$old_archive_from_expsyms_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++archive_cmds_RC='`$ECHO "$archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++archive_expsym_cmds_RC='`$ECHO "$archive_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++module_cmds_RC='`$ECHO "$module_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++module_expsym_cmds_RC='`$ECHO "$module_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++with_gnu_ld_RC='`$ECHO "$with_gnu_ld_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++allow_undefined_flag_RC='`$ECHO "$allow_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++no_undefined_flag_RC='`$ECHO "$no_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_libdir_flag_spec_RC='`$ECHO "$hardcode_libdir_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_libdir_flag_spec_ld_RC='`$ECHO "$hardcode_libdir_flag_spec_ld_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_libdir_separator_RC='`$ECHO "$hardcode_libdir_separator_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_direct_RC='`$ECHO "$hardcode_direct_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_direct_absolute_RC='`$ECHO "$hardcode_direct_absolute_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_minus_L_RC='`$ECHO "$hardcode_minus_L_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_shlibpath_var_RC='`$ECHO "$hardcode_shlibpath_var_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_automatic_RC='`$ECHO "$hardcode_automatic_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++inherit_rpath_RC='`$ECHO "$inherit_rpath_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++link_all_deplibs_RC='`$ECHO "$link_all_deplibs_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++always_export_symbols_RC='`$ECHO "$always_export_symbols_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++export_symbols_cmds_RC='`$ECHO "$export_symbols_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++exclude_expsyms_RC='`$ECHO "$exclude_expsyms_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++include_expsyms_RC='`$ECHO "$include_expsyms_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++prelink_cmds_RC='`$ECHO "$prelink_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
++hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`'
|
|
|
+
|
|
|
+ LTCC='$LTCC'
|
|
|
+ LTCFLAGS='$LTCFLAGS'
|
|
|
+ compiler='$compiler_DEFAULT'
|
|
|
+
|
|
|
++# A function that is used when there is no print builtin or printf.
|
|
|
++func_fallback_echo ()
|
|
|
++{
|
|
|
++ eval 'cat <<_LTECHO_EOF
|
|
|
++\$1
|
|
|
++_LTECHO_EOF'
|
|
|
++}
|
|
|
++
|
|
|
+ # Quote evaled strings.
|
|
|
+-for var in SED \
|
|
|
++for var in AS \
|
|
|
++DLLTOOL \
|
|
|
++OBJDUMP \
|
|
|
++SHELL \
|
|
|
++ECHO \
|
|
|
++SED \
|
|
|
+ GREP \
|
|
|
+ EGREP \
|
|
|
+ FGREP \
|
|
|
+@@ -15455,8 +16315,12 @@
|
|
|
+ reload_flag \
|
|
|
+ deplibs_check_method \
|
|
|
+ file_magic_cmd \
|
|
|
++file_magic_glob \
|
|
|
++want_nocaseglob \
|
|
|
++sharedlib_from_linklib_cmd \
|
|
|
+ AR \
|
|
|
+ AR_FLAGS \
|
|
|
++archiver_list_spec \
|
|
|
+ STRIP \
|
|
|
+ RANLIB \
|
|
|
+ CC \
|
|
|
+@@ -15466,14 +16330,14 @@
|
|
|
+ lt_cv_sys_global_symbol_to_cdecl \
|
|
|
+ lt_cv_sys_global_symbol_to_c_name_address \
|
|
|
+ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
|
|
|
+-SHELL \
|
|
|
+-ECHO \
|
|
|
++nm_file_list_spec \
|
|
|
+ lt_prog_compiler_no_builtin_flag \
|
|
|
+-lt_prog_compiler_wl \
|
|
|
+ lt_prog_compiler_pic \
|
|
|
++lt_prog_compiler_wl \
|
|
|
+ lt_prog_compiler_static \
|
|
|
+ lt_cv_prog_compiler_c_o \
|
|
|
+ need_locks \
|
|
|
++MANIFEST_TOOL \
|
|
|
+ DSYMUTIL \
|
|
|
+ NMEDIT \
|
|
|
+ LIPO \
|
|
|
+@@ -15489,7 +16353,6 @@
|
|
|
+ hardcode_libdir_flag_spec \
|
|
|
+ hardcode_libdir_flag_spec_ld \
|
|
|
+ hardcode_libdir_separator \
|
|
|
+-fix_srcfile_path \
|
|
|
+ exclude_expsyms \
|
|
|
+ include_expsyms \
|
|
|
+ file_list_spec \
|
|
|
+@@ -15497,14 +16360,16 @@
|
|
|
+ libname_spec \
|
|
|
+ library_names_spec \
|
|
|
+ soname_spec \
|
|
|
++install_override_mode \
|
|
|
+ finish_eval \
|
|
|
+ old_striplib \
|
|
|
+ striplib \
|
|
|
+ LD_RC \
|
|
|
++reload_flag_RC \
|
|
|
+ compiler_RC \
|
|
|
+ lt_prog_compiler_no_builtin_flag_RC \
|
|
|
+-lt_prog_compiler_wl_RC \
|
|
|
+ lt_prog_compiler_pic_RC \
|
|
|
++lt_prog_compiler_wl_RC \
|
|
|
+ lt_prog_compiler_static_RC \
|
|
|
+ lt_cv_prog_compiler_c_o_RC \
|
|
|
+ export_dynamic_flag_spec_RC \
|
|
|
+@@ -15516,13 +16381,12 @@
|
|
|
+ hardcode_libdir_flag_spec_RC \
|
|
|
+ hardcode_libdir_flag_spec_ld_RC \
|
|
|
+ hardcode_libdir_separator_RC \
|
|
|
+-fix_srcfile_path_RC \
|
|
|
+ exclude_expsyms_RC \
|
|
|
+ include_expsyms_RC \
|
|
|
+ file_list_spec_RC; do
|
|
|
+- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
|
|
|
++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
|
|
+ *[\\\\\\\`\\"\\\$]*)
|
|
|
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
|
|
|
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
|
|
|
+@@ -15544,11 +16408,13 @@
|
|
|
+ module_expsym_cmds \
|
|
|
+ export_symbols_cmds \
|
|
|
+ prelink_cmds \
|
|
|
++postlink_cmds \
|
|
|
+ postinstall_cmds \
|
|
|
+ postuninstall_cmds \
|
|
|
+ finish_cmds \
|
|
|
+ sys_lib_search_path_spec \
|
|
|
+ sys_lib_dlsearch_path_spec \
|
|
|
++reload_cmds_RC \
|
|
|
+ old_archive_cmds_RC \
|
|
|
+ old_archive_from_new_cmds_RC \
|
|
|
+ old_archive_from_expsyms_cmds_RC \
|
|
|
+@@ -15557,10 +16423,11 @@
|
|
|
+ module_cmds_RC \
|
|
|
+ module_expsym_cmds_RC \
|
|
|
+ export_symbols_cmds_RC \
|
|
|
+-prelink_cmds_RC; do
|
|
|
+- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
|
|
|
++prelink_cmds_RC \
|
|
|
++postlink_cmds_RC; do
|
|
|
++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
|
|
+ *[\\\\\\\`\\"\\\$]*)
|
|
|
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
|
|
|
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
|
|
|
+@@ -15568,12 +16435,6 @@
|
|
|
+ esac
|
|
|
+ done
|
|
|
+
|
|
|
+-# Fix-up fallback echo if it was mangled by the above quoting rules.
|
|
|
+-case \$lt_ECHO in
|
|
|
+-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
|
|
|
+- ;;
|
|
|
+-esac
|
|
|
+-
|
|
|
+ ac_aux_dir='$ac_aux_dir'
|
|
|
+ xsi_shell='$xsi_shell'
|
|
|
+ lt_shell_append='$lt_shell_append'
|
|
|
+@@ -15633,7 +16494,7 @@
|
|
|
+ "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
|
|
|
+ "win32/versioninfo.rc.in") CONFIG_FILES="$CONFIG_FILES win32/versioninfo.rc.in" ;;
|
|
|
+
|
|
|
+- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
|
|
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+
|
|
|
+@@ -15656,9 +16517,10 @@
|
|
|
+ # after its creation but before its name has been assigned to `$tmp'.
|
|
|
+ $debug ||
|
|
|
+ {
|
|
|
+- tmp=
|
|
|
++ tmp= ac_tmp=
|
|
|
+ trap 'exit_status=$?
|
|
|
+- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
|
|
++ : "${ac_tmp:=$tmp}"
|
|
|
++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
|
|
|
+ ' 0
|
|
|
+ trap 'as_fn_exit 1' 1 2 13 15
|
|
|
+ }
|
|
|
+@@ -15666,12 +16528,13 @@
|
|
|
+
|
|
|
+ {
|
|
|
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
|
|
|
+- test -n "$tmp" && test -d "$tmp"
|
|
|
++ test -d "$tmp"
|
|
|
+ } ||
|
|
|
+ {
|
|
|
+ tmp=./conf$$-$RANDOM
|
|
|
+ (umask 077 && mkdir "$tmp")
|
|
|
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
|
|
|
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
|
|
|
++ac_tmp=$tmp
|
|
|
+
|
|
|
+ # Set up the scripts for CONFIG_FILES section.
|
|
|
+ # No need to generate them if there are no CONFIG_FILES.
|
|
|
+@@ -15688,12 +16551,12 @@
|
|
|
+ fi
|
|
|
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
|
|
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
|
|
+- ac_cs_awk_cr='\r'
|
|
|
++ ac_cs_awk_cr='\\r'
|
|
|
+ else
|
|
|
+ ac_cs_awk_cr=$ac_cr
|
|
|
+ fi
|
|
|
+
|
|
|
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
|
|
|
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
|
|
|
+ _ACEOF
|
|
|
+
|
|
|
+
|
|
|
+@@ -15702,18 +16565,18 @@
|
|
|
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
|
|
+ echo "_ACEOF"
|
|
|
+ } >conf$$subs.sh ||
|
|
|
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
|
|
|
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
|
|
|
+ ac_delim='%!_!# '
|
|
|
+ for ac_last_try in false false false false false :; do
|
|
|
+ . ./conf$$subs.sh ||
|
|
|
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
+
|
|
|
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
|
|
+ if test $ac_delim_n = $ac_delim_num; then
|
|
|
+ break
|
|
|
+ elif $ac_last_try; then
|
|
|
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
+ else
|
|
|
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
|
+ fi
|
|
|
+@@ -15721,7 +16584,7 @@
|
|
|
+ rm -f conf$$subs.sh
|
|
|
+
|
|
|
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
|
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
|
|
|
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
|
|
|
+ _ACEOF
|
|
|
+ sed -n '
|
|
|
+ h
|
|
|
+@@ -15735,7 +16598,7 @@
|
|
|
+ t delim
|
|
|
+ :nl
|
|
|
+ h
|
|
|
+-s/\(.\{148\}\).*/\1/
|
|
|
++s/\(.\{148\}\)..*/\1/
|
|
|
+ t more1
|
|
|
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
|
|
|
+ p
|
|
|
+@@ -15749,7 +16612,7 @@
|
|
|
+ t nl
|
|
|
+ :delim
|
|
|
+ h
|
|
|
+-s/\(.\{148\}\).*/\1/
|
|
|
++s/\(.\{148\}\)..*/\1/
|
|
|
+ t more2
|
|
|
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
|
|
|
+ p
|
|
|
+@@ -15769,7 +16632,7 @@
|
|
|
+ rm -f conf$$subs.awk
|
|
|
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
|
+ _ACAWK
|
|
|
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
|
|
|
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
|
|
|
+ for (key in S) S_is_set[key] = 1
|
|
|
+ FS = ""
|
|
|
+
|
|
|
+@@ -15801,21 +16664,29 @@
|
|
|
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
|
|
|
+ else
|
|
|
+ cat
|
|
|
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
|
|
+- || as_fn_error "could not setup config files machinery" "$LINENO" 5
|
|
|
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
|
|
|
++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
|
|
|
+ _ACEOF
|
|
|
+
|
|
|
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
|
|
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
|
|
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
|
|
|
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
|
|
|
+ # trailing colons and then remove the whole line if VPATH becomes empty
|
|
|
+ # (actually we leave an empty line to preserve line numbers).
|
|
|
+ if test "x$srcdir" = x.; then
|
|
|
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
|
|
+-s/:*\$(srcdir):*/:/
|
|
|
+-s/:*\${srcdir}:*/:/
|
|
|
+-s/:*@srcdir@:*/:/
|
|
|
+-s/^\([^=]*=[ ]*\):*/\1/
|
|
|
++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
|
|
|
++h
|
|
|
++s///
|
|
|
++s/^/:/
|
|
|
++s/[ ]*$/:/
|
|
|
++s/:\$(srcdir):/:/g
|
|
|
++s/:\${srcdir}:/:/g
|
|
|
++s/:@srcdir@:/:/g
|
|
|
++s/^:*//
|
|
|
+ s/:*$//
|
|
|
++x
|
|
|
++s/\(=[ ]*\).*/\1/
|
|
|
++G
|
|
|
++s/\n//
|
|
|
+ s/^[^=]*=[ ]*$//
|
|
|
+ }'
|
|
|
+ fi
|
|
|
+@@ -15827,7 +16698,7 @@
|
|
|
+ # No need to generate them if there are no CONFIG_HEADERS.
|
|
|
+ # This happens for instance with `./config.status Makefile'.
|
|
|
+ if test -n "$CONFIG_HEADERS"; then
|
|
|
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
|
|
|
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
|
|
|
+ BEGIN {
|
|
|
+ _ACEOF
|
|
|
+
|
|
|
+@@ -15839,11 +16710,11 @@
|
|
|
+ # handling of long lines.
|
|
|
+ ac_delim='%!_!# '
|
|
|
+ for ac_last_try in false false :; do
|
|
|
+- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
|
|
|
+- if test -z "$ac_t"; then
|
|
|
++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
|
|
|
++ if test -z "$ac_tt"; then
|
|
|
+ break
|
|
|
+ elif $ac_last_try; then
|
|
|
+- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
|
|
|
++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
|
|
|
+ else
|
|
|
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
|
+ fi
|
|
|
+@@ -15928,7 +16799,7 @@
|
|
|
+ _ACAWK
|
|
|
+ _ACEOF
|
|
|
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
|
+- as_fn_error "could not setup config headers machinery" "$LINENO" 5
|
|
|
++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
|
|
|
+ fi # test -n "$CONFIG_HEADERS"
|
|
|
+
|
|
|
+
|
|
|
+@@ -15941,7 +16812,7 @@
|
|
|
+ esac
|
|
|
+ case $ac_mode$ac_tag in
|
|
|
+ :[FHL]*:*);;
|
|
|
+- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
|
|
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
|
|
+ :[FH]-) ac_tag=-:-;;
|
|
|
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
|
|
+ esac
|
|
|
+@@ -15960,7 +16831,7 @@
|
|
|
+ for ac_f
|
|
|
+ do
|
|
|
+ case $ac_f in
|
|
|
+- -) ac_f="$tmp/stdin";;
|
|
|
++ -) ac_f="$ac_tmp/stdin";;
|
|
|
+ *) # Look for the file first in the build tree, then in the source tree
|
|
|
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
|
|
|
+ # because $ac_f cannot contain `:'.
|
|
|
+@@ -15969,7 +16840,7 @@
|
|
|
+ [\\/$]*) false;;
|
|
|
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
|
|
+ esac ||
|
|
|
+- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
|
|
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
|
|
+ esac
|
|
|
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
|
|
+ as_fn_append ac_file_inputs " '$ac_f'"
|
|
|
+@@ -15995,8 +16866,8 @@
|
|
|
+ esac
|
|
|
+
|
|
|
+ case $ac_tag in
|
|
|
+- *:-:* | *:-) cat >"$tmp/stdin" \
|
|
|
+- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
|
|
|
++ *:-:* | *:-) cat >"$ac_tmp/stdin" \
|
|
|
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -16132,23 +17003,24 @@
|
|
|
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
|
|
|
+ $ac_datarootdir_hack
|
|
|
+ "
|
|
|
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
|
|
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
|
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
|
|
|
++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
|
|
+
|
|
|
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
|
|
+- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
|
|
+- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
|
|
++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
|
|
|
++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
|
|
|
++ "$ac_tmp/out"`; test -z "$ac_out"; } &&
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
|
+-which seems to be undefined. Please make sure it is defined." >&5
|
|
|
++which seems to be undefined. Please make sure it is defined" >&5
|
|
|
+ $as_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;}
|
|
|
++which seems to be undefined. Please make sure it is defined" >&2;}
|
|
|
+
|
|
|
+- rm -f "$tmp/stdin"
|
|
|
++ rm -f "$ac_tmp/stdin"
|
|
|
+ case $ac_file in
|
|
|
+- -) cat "$tmp/out" && rm -f "$tmp/out";;
|
|
|
+- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
|
|
++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
|
|
|
++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
|
|
|
+ esac \
|
|
|
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
|
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
|
|
+ ;;
|
|
|
+ :H)
|
|
|
+ #
|
|
|
+@@ -16157,21 +17029,21 @@
|
|
|
+ if test x"$ac_file" != x-; then
|
|
|
+ {
|
|
|
+ $as_echo "/* $configure_input */" \
|
|
|
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
|
|
|
+- } >"$tmp/config.h" \
|
|
|
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
|
+- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
|
|
|
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
|
|
|
++ } >"$ac_tmp/config.h" \
|
|
|
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
|
|
++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
|
|
|
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
|
|
|
+ else
|
|
|
+ rm -f "$ac_file"
|
|
|
+- mv "$tmp/config.h" "$ac_file" \
|
|
|
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
|
++ mv "$ac_tmp/config.h" "$ac_file" \
|
|
|
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ $as_echo "/* $configure_input */" \
|
|
|
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|
|
|
+- || as_fn_error "could not create -" "$LINENO" 5
|
|
|
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
|
|
|
++ || as_fn_error $? "could not create -" "$LINENO" 5
|
|
|
+ fi
|
|
|
+ # Compute "$ac_file"'s index in $config_headers.
|
|
|
+ _am_arg="$ac_file"
|
|
|
+@@ -16332,7 +17204,8 @@
|
|
|
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
|
|
+ #
|
|
|
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
|
|
+-# 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
|
++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
|
|
++# Inc.
|
|
|
+ # Written by Gordon Matzigkeit, 1996
|
|
|
+ #
|
|
|
+ # This file is part of GNU Libtool.
|
|
|
+@@ -16369,13 +17242,13 @@
|
|
|
+ macro_revision=$macro_revision
|
|
|
+
|
|
|
+ # Assembler program.
|
|
|
+-AS=$AS
|
|
|
++AS=$lt_AS
|
|
|
+
|
|
|
+ # DLL creation program.
|
|
|
+-DLLTOOL=$DLLTOOL
|
|
|
++DLLTOOL=$lt_DLLTOOL
|
|
|
+
|
|
|
+ # Object dumper program.
|
|
|
+-OBJDUMP=$OBJDUMP
|
|
|
++OBJDUMP=$lt_OBJDUMP
|
|
|
+
|
|
|
+ # Whether or not to build shared libraries.
|
|
|
+ build_libtool_libs=$enable_shared
|
|
|
+@@ -16389,6 +17262,12 @@
|
|
|
+ # Whether or not to optimize for fast installation.
|
|
|
+ fast_install=$enable_fast_install
|
|
|
+
|
|
|
++# Shell to use when invoking shell scripts.
|
|
|
++SHELL=$lt_SHELL
|
|
|
++
|
|
|
++# An echo program that protects backslashes.
|
|
|
++ECHO=$lt_ECHO
|
|
|
++
|
|
|
+ # The host system.
|
|
|
+ host_alias=$host_alias
|
|
|
+ host=$host
|
|
|
+@@ -16438,20 +17317,36 @@
|
|
|
+ # turn newlines into spaces.
|
|
|
+ NL2SP=$lt_lt_NL2SP
|
|
|
+
|
|
|
+-# How to create reloadable object files.
|
|
|
+-reload_flag=$lt_reload_flag
|
|
|
+-reload_cmds=$lt_reload_cmds
|
|
|
++# convert \$build file names to \$host format.
|
|
|
++to_host_file_cmd=$lt_cv_to_host_file_cmd
|
|
|
++
|
|
|
++# convert \$build files to toolchain format.
|
|
|
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
|
|
|
+
|
|
|
+ # 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".
|
|
|
++# Command to use when deplibs_check_method = "file_magic".
|
|
|
+ file_magic_cmd=$lt_file_magic_cmd
|
|
|
+
|
|
|
++# How to find potential files when deplibs_check_method = "file_magic".
|
|
|
++file_magic_glob=$lt_file_magic_glob
|
|
|
++
|
|
|
++# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
|
|
|
++want_nocaseglob=$lt_want_nocaseglob
|
|
|
++
|
|
|
++# Command to associate shared and link libraries.
|
|
|
++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
|
|
|
++
|
|
|
+ # The archiver.
|
|
|
+ AR=$lt_AR
|
|
|
++
|
|
|
++# Flags to create an archive.
|
|
|
+ AR_FLAGS=$lt_AR_FLAGS
|
|
|
+
|
|
|
++# How to feed a file listing to the archiver.
|
|
|
++archiver_list_spec=$lt_archiver_list_spec
|
|
|
++
|
|
|
+ # A symbol stripping program.
|
|
|
+ STRIP=$lt_STRIP
|
|
|
+
|
|
|
+@@ -16460,6 +17355,9 @@
|
|
|
+ old_postinstall_cmds=$lt_old_postinstall_cmds
|
|
|
+ old_postuninstall_cmds=$lt_old_postuninstall_cmds
|
|
|
+
|
|
|
++# Whether to use a lock for old archive extraction.
|
|
|
++lock_old_archive_extraction=$lock_old_archive_extraction
|
|
|
++
|
|
|
+ # A C compiler.
|
|
|
+ LTCC=$lt_CC
|
|
|
+
|
|
|
+@@ -16478,14 +17376,14 @@
|
|
|
+ # Transform the output of nm in a C name address pair when lib prefix is needed.
|
|
|
+ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
|
|
|
+
|
|
|
+-# The name of the directory that contains temporary libtool files.
|
|
|
+-objdir=$objdir
|
|
|
++# Specify filename containing input files for \$NM.
|
|
|
++nm_file_list_spec=$lt_nm_file_list_spec
|
|
|
+
|
|
|
+-# Shell to use when invoking shell scripts.
|
|
|
+-SHELL=$lt_SHELL
|
|
|
++# The root where to search for dependent libraries,and in which our libraries should be installed.
|
|
|
++lt_sysroot=$lt_sysroot
|
|
|
+
|
|
|
+-# An echo program that does not interpret backslashes.
|
|
|
+-ECHO=$lt_ECHO
|
|
|
++# The name of the directory that contains temporary libtool files.
|
|
|
++objdir=$objdir
|
|
|
+
|
|
|
+ # Used to examine libraries when file_magic_cmd begins with "file".
|
|
|
+ MAGIC_CMD=$MAGIC_CMD
|
|
|
+@@ -16493,6 +17391,9 @@
|
|
|
+ # Must we lock files when doing compilation?
|
|
|
+ need_locks=$lt_need_locks
|
|
|
+
|
|
|
++# Manifest tool.
|
|
|
++MANIFEST_TOOL=$lt_MANIFEST_TOOL
|
|
|
++
|
|
|
+ # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
|
|
|
+ DSYMUTIL=$lt_DSYMUTIL
|
|
|
+
|
|
|
+@@ -16549,6 +17450,9 @@
|
|
|
+ # The coded name of the library, if different from the real name.
|
|
|
+ soname_spec=$lt_soname_spec
|
|
|
+
|
|
|
++# Permission mode override for installation of shared libraries.
|
|
|
++install_override_mode=$lt_install_override_mode
|
|
|
++
|
|
|
+ # Command to use after installation of a shared archive.
|
|
|
+ postinstall_cmds=$lt_postinstall_cmds
|
|
|
+
|
|
|
+@@ -16588,6 +17492,10 @@
|
|
|
+ # The linker used to build libraries.
|
|
|
+ LD=$lt_LD
|
|
|
+
|
|
|
++# How to create reloadable object files.
|
|
|
++reload_flag=$lt_reload_flag
|
|
|
++reload_cmds=$lt_reload_cmds
|
|
|
++
|
|
|
+ # Commands used to build an old-style archive.
|
|
|
+ old_archive_cmds=$lt_old_archive_cmds
|
|
|
+
|
|
|
+@@ -16600,12 +17508,12 @@
|
|
|
+ # Compiler flag to turn off builtin functions.
|
|
|
+ no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
|
|
|
+
|
|
|
+-# How to pass a linker flag through the compiler.
|
|
|
+-wl=$lt_lt_prog_compiler_wl
|
|
|
+-
|
|
|
+ # Additional compiler flags for building library objects.
|
|
|
+ pic_flag=$lt_lt_prog_compiler_pic
|
|
|
+
|
|
|
++# How to pass a linker flag through the compiler.
|
|
|
++wl=$lt_lt_prog_compiler_wl
|
|
|
++
|
|
|
+ # Compiler flag to prevent dynamic linking.
|
|
|
+ link_static_flag=$lt_lt_prog_compiler_static
|
|
|
+
|
|
|
+@@ -16692,9 +17600,6 @@
|
|
|
+ # Whether libtool must link a program against all its dependency libraries.
|
|
|
+ link_all_deplibs=$link_all_deplibs
|
|
|
+
|
|
|
+-# Fix the shell variable \$srcfile for the compiler.
|
|
|
+-fix_srcfile_path=$lt_fix_srcfile_path
|
|
|
+-
|
|
|
+ # Set to "yes" if exported symbols are required.
|
|
|
+ always_export_symbols=$always_export_symbols
|
|
|
+
|
|
|
+@@ -16710,6 +17615,9 @@
|
|
|
+ # Commands necessary for linking programs (against libraries) with templates.
|
|
|
+ prelink_cmds=$lt_prelink_cmds
|
|
|
+
|
|
|
++# Commands necessary for finishing linking programs.
|
|
|
++postlink_cmds=$lt_postlink_cmds
|
|
|
++
|
|
|
+ # Specify filename containing input files.
|
|
|
+ file_list_spec=$lt_file_list_spec
|
|
|
+
|
|
|
+@@ -16742,212 +17650,169 @@
|
|
|
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
|
|
|
+ # text mode, it properly converts lines to CR/LF. This bash problem
|
|
|
+ # is reportedly fixed, but why not run on old versions too?
|
|
|
+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
|
|
|
+- || (rm -f "$cfgfile"; exit 1)
|
|
|
+-
|
|
|
+- case $xsi_shell in
|
|
|
+- yes)
|
|
|
+- cat << \_LT_EOF >> "$cfgfile"
|
|
|
+-
|
|
|
+-# func_dirname file append nondir_replacement
|
|
|
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
|
|
|
+-# otherwise set result to NONDIR_REPLACEMENT.
|
|
|
+-func_dirname ()
|
|
|
+-{
|
|
|
+- case ${1} in
|
|
|
+- */*) func_dirname_result="${1%/*}${2}" ;;
|
|
|
+- * ) func_dirname_result="${3}" ;;
|
|
|
+- esac
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_basename file
|
|
|
+-func_basename ()
|
|
|
+-{
|
|
|
+- func_basename_result="${1##*/}"
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_dirname_and_basename file append nondir_replacement
|
|
|
+-# perform func_basename and func_dirname in a single function
|
|
|
+-# call:
|
|
|
+-# dirname: Compute the dirname of FILE. If nonempty,
|
|
|
+-# add APPEND to the result, otherwise set result
|
|
|
+-# to NONDIR_REPLACEMENT.
|
|
|
+-# value returned in "$func_dirname_result"
|
|
|
+-# basename: Compute filename of FILE.
|
|
|
+-# value retuned in "$func_basename_result"
|
|
|
+-# Implementation must be kept synchronized with func_dirname
|
|
|
+-# and func_basename. For efficiency, we do not delegate to
|
|
|
+-# those functions but instead duplicate the functionality here.
|
|
|
+-func_dirname_and_basename ()
|
|
|
+-{
|
|
|
+- case ${1} in
|
|
|
+- */*) func_dirname_result="${1%/*}${2}" ;;
|
|
|
+- * ) func_dirname_result="${3}" ;;
|
|
|
+- esac
|
|
|
+- func_basename_result="${1##*/}"
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_stripname prefix suffix name
|
|
|
+-# strip PREFIX and SUFFIX off of NAME.
|
|
|
+-# PREFIX and SUFFIX must not contain globbing or regex special
|
|
|
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
|
|
|
+-# dot (in which case that matches only a dot).
|
|
|
+-func_stripname ()
|
|
|
+-{
|
|
|
+- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
|
|
|
+- # positional parameters, so assign one to ordinary parameter first.
|
|
|
+- func_stripname_result=${3}
|
|
|
+- func_stripname_result=${func_stripname_result#"${1}"}
|
|
|
+- func_stripname_result=${func_stripname_result%"${2}"}
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_opt_split
|
|
|
+-func_opt_split ()
|
|
|
+-{
|
|
|
+- func_opt_split_opt=${1%%=*}
|
|
|
+- func_opt_split_arg=${1#*=}
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_lo2o object
|
|
|
+-func_lo2o ()
|
|
|
+-{
|
|
|
+- case ${1} in
|
|
|
+- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
|
|
|
+- *) func_lo2o_result=${1} ;;
|
|
|
+- esac
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_xform libobj-or-source
|
|
|
+-func_xform ()
|
|
|
+-{
|
|
|
+- func_xform_result=${1%.*}.lo
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_arith arithmetic-term...
|
|
|
+-func_arith ()
|
|
|
+-{
|
|
|
+- func_arith_result=$(( $* ))
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_len string
|
|
|
+-# STRING may not start with a hyphen.
|
|
|
+-func_len ()
|
|
|
+-{
|
|
|
+- func_len_result=${#1}
|
|
|
+-}
|
|
|
+-
|
|
|
+-_LT_EOF
|
|
|
+- ;;
|
|
|
+- *) # Bourne compatible functions.
|
|
|
+- cat << \_LT_EOF >> "$cfgfile"
|
|
|
+-
|
|
|
+-# func_dirname file append nondir_replacement
|
|
|
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
|
|
|
+-# otherwise set result to NONDIR_REPLACEMENT.
|
|
|
+-func_dirname ()
|
|
|
+-{
|
|
|
+- # Extract subdirectory from the argument.
|
|
|
+- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
|
|
|
+- if test "X$func_dirname_result" = "X${1}"; then
|
|
|
+- func_dirname_result="${3}"
|
|
|
+- else
|
|
|
+- func_dirname_result="$func_dirname_result${2}"
|
|
|
+- fi
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_basename file
|
|
|
+-func_basename ()
|
|
|
+-{
|
|
|
+- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
|
|
|
+-}
|
|
|
+-
|
|
|
+-
|
|
|
+-# func_stripname prefix suffix name
|
|
|
+-# strip PREFIX and SUFFIX off of NAME.
|
|
|
+-# PREFIX and SUFFIX must not contain globbing or regex special
|
|
|
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
|
|
|
+-# dot (in which case that matches only a dot).
|
|
|
+-# func_strip_suffix prefix name
|
|
|
+-func_stripname ()
|
|
|
+-{
|
|
|
+- case ${2} in
|
|
|
+- .*) func_stripname_result=`$ECHO "X${3}" \
|
|
|
+- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
|
|
|
+- *) func_stripname_result=`$ECHO "X${3}" \
|
|
|
+- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
|
|
|
+- esac
|
|
|
+-}
|
|
|
+-
|
|
|
+-# sed scripts:
|
|
|
+-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
|
|
|
+-my_sed_long_arg='1s/^-[^=]*=//'
|
|
|
+-
|
|
|
+-# func_opt_split
|
|
|
+-func_opt_split ()
|
|
|
+-{
|
|
|
+- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
|
|
|
+- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_lo2o object
|
|
|
+-func_lo2o ()
|
|
|
+-{
|
|
|
+- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_xform libobj-or-source
|
|
|
+-func_xform ()
|
|
|
+-{
|
|
|
+- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_arith arithmetic-term...
|
|
|
+-func_arith ()
|
|
|
+-{
|
|
|
+- func_arith_result=`expr "$@"`
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_len string
|
|
|
+-# STRING may not start with a hyphen.
|
|
|
+-func_len ()
|
|
|
+-{
|
|
|
+- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
|
|
|
+-}
|
|
|
+-
|
|
|
+-_LT_EOF
|
|
|
+-esac
|
|
|
+-
|
|
|
+-case $lt_shell_append in
|
|
|
+- yes)
|
|
|
+- cat << \_LT_EOF >> "$cfgfile"
|
|
|
+-
|
|
|
+-# func_append var value
|
|
|
+-# Append VALUE to the end of shell variable VAR.
|
|
|
+-func_append ()
|
|
|
+-{
|
|
|
+- eval "$1+=\$2"
|
|
|
+-}
|
|
|
+-_LT_EOF
|
|
|
+- ;;
|
|
|
+- *)
|
|
|
+- cat << \_LT_EOF >> "$cfgfile"
|
|
|
+-
|
|
|
+-# func_append var value
|
|
|
+-# Append VALUE to the end of shell variable VAR.
|
|
|
+-func_append ()
|
|
|
+-{
|
|
|
+- eval "$1=\$$1\$2"
|
|
|
+-}
|
|
|
+-
|
|
|
+-_LT_EOF
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
++ sed '$q' "$ltmain" >> "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile"; exit 1)
|
|
|
+
|
|
|
++ if test x"$xsi_shell" = xyes; then
|
|
|
++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
|
|
|
++func_dirname ()\
|
|
|
++{\
|
|
|
++\ case ${1} in\
|
|
|
++\ */*) func_dirname_result="${1%/*}${2}" ;;\
|
|
|
++\ * ) func_dirname_result="${3}" ;;\
|
|
|
++\ esac\
|
|
|
++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_basename ()$/,/^} # func_basename /c\
|
|
|
++func_basename ()\
|
|
|
++{\
|
|
|
++\ func_basename_result="${1##*/}"\
|
|
|
++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
|
|
|
++func_dirname_and_basename ()\
|
|
|
++{\
|
|
|
++\ case ${1} in\
|
|
|
++\ */*) func_dirname_result="${1%/*}${2}" ;;\
|
|
|
++\ * ) func_dirname_result="${3}" ;;\
|
|
|
++\ esac\
|
|
|
++\ func_basename_result="${1##*/}"\
|
|
|
++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
|
|
|
++func_stripname ()\
|
|
|
++{\
|
|
|
++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
|
|
|
++\ # positional parameters, so assign one to ordinary parameter first.\
|
|
|
++\ func_stripname_result=${3}\
|
|
|
++\ func_stripname_result=${func_stripname_result#"${1}"}\
|
|
|
++\ func_stripname_result=${func_stripname_result%"${2}"}\
|
|
|
++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
|
|
|
++func_split_long_opt ()\
|
|
|
++{\
|
|
|
++\ func_split_long_opt_name=${1%%=*}\
|
|
|
++\ func_split_long_opt_arg=${1#*=}\
|
|
|
++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
|
|
|
++func_split_short_opt ()\
|
|
|
++{\
|
|
|
++\ func_split_short_opt_arg=${1#??}\
|
|
|
++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
|
|
|
++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
|
|
|
++func_lo2o ()\
|
|
|
++{\
|
|
|
++\ case ${1} in\
|
|
|
++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
|
|
|
++\ *) func_lo2o_result=${1} ;;\
|
|
|
++\ esac\
|
|
|
++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_xform ()$/,/^} # func_xform /c\
|
|
|
++func_xform ()\
|
|
|
++{\
|
|
|
++ func_xform_result=${1%.*}.lo\
|
|
|
++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_arith ()$/,/^} # func_arith /c\
|
|
|
++func_arith ()\
|
|
|
++{\
|
|
|
++ func_arith_result=$(( $* ))\
|
|
|
++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_len ()$/,/^} # func_len /c\
|
|
|
++func_len ()\
|
|
|
++{\
|
|
|
++ func_len_result=${#1}\
|
|
|
++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++fi
|
|
|
++
|
|
|
++if test x"$lt_shell_append" = xyes; then
|
|
|
++ sed -e '/^func_append ()$/,/^} # func_append /c\
|
|
|
++func_append ()\
|
|
|
++{\
|
|
|
++ eval "${1}+=\\${2}"\
|
|
|
++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
|
|
|
++func_append_quoted ()\
|
|
|
++{\
|
|
|
++\ func_quote_for_eval "${2}"\
|
|
|
++\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
|
|
|
++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++
|
|
|
++
|
|
|
++ # Save a `func_append' function call where possible by direct use of '+='
|
|
|
++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++ test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++else
|
|
|
++ # Save a `func_append' function call even when '+=' is not available
|
|
|
++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++ test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++fi
|
|
|
++
|
|
|
++if test x"$_lt_function_replace_fail" = x":"; then
|
|
|
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
|
|
|
++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
|
|
|
++fi
|
|
|
+
|
|
|
+- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
|
|
|
+- || (rm -f "$cfgfile"; exit 1)
|
|
|
+
|
|
|
+- mv -f "$cfgfile" "$ofile" ||
|
|
|
++ mv -f "$cfgfile" "$ofile" ||
|
|
|
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
|
|
|
+ chmod +x "$ofile"
|
|
|
+
|
|
|
+@@ -16959,6 +17824,10 @@
|
|
|
+ # The linker used to build libraries.
|
|
|
+ LD=$lt_LD_RC
|
|
|
+
|
|
|
++# How to create reloadable object files.
|
|
|
++reload_flag=$lt_reload_flag_RC
|
|
|
++reload_cmds=$lt_reload_cmds_RC
|
|
|
++
|
|
|
+ # Commands used to build an old-style archive.
|
|
|
+ old_archive_cmds=$lt_old_archive_cmds_RC
|
|
|
+
|
|
|
+@@ -16971,12 +17840,12 @@
|
|
|
+ # Compiler flag to turn off builtin functions.
|
|
|
+ no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
|
|
|
+
|
|
|
+-# How to pass a linker flag through the compiler.
|
|
|
+-wl=$lt_lt_prog_compiler_wl_RC
|
|
|
+-
|
|
|
+ # Additional compiler flags for building library objects.
|
|
|
+ pic_flag=$lt_lt_prog_compiler_pic_RC
|
|
|
+
|
|
|
++# How to pass a linker flag through the compiler.
|
|
|
++wl=$lt_lt_prog_compiler_wl_RC
|
|
|
++
|
|
|
+ # Compiler flag to prevent dynamic linking.
|
|
|
+ link_static_flag=$lt_lt_prog_compiler_static_RC
|
|
|
+
|
|
|
+@@ -17063,9 +17932,6 @@
|
|
|
+ # Whether libtool must link a program against all its dependency libraries.
|
|
|
+ link_all_deplibs=$link_all_deplibs_RC
|
|
|
+
|
|
|
+-# Fix the shell variable \$srcfile for the compiler.
|
|
|
+-fix_srcfile_path=$lt_fix_srcfile_path_RC
|
|
|
+-
|
|
|
+ # Set to "yes" if exported symbols are required.
|
|
|
+ always_export_symbols=$always_export_symbols_RC
|
|
|
+
|
|
|
+@@ -17081,6 +17947,9 @@
|
|
|
+ # Commands necessary for linking programs (against libraries) with templates.
|
|
|
+ prelink_cmds=$lt_prelink_cmds_RC
|
|
|
+
|
|
|
++# Commands necessary for finishing linking programs.
|
|
|
++postlink_cmds=$lt_postlink_cmds_RC
|
|
|
++
|
|
|
+ # Specify filename containing input files.
|
|
|
+ file_list_spec=$lt_file_list_spec_RC
|
|
|
+
|
|
|
+@@ -17101,7 +17970,7 @@
|
|
|
+ ac_clean_files=$ac_clean_files_save
|
|
|
+
|
|
|
+ test $ac_write_fail = 0 ||
|
|
|
+- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
|
|
++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
|
|
+
|
|
|
+
|
|
|
+ # configure is writing to config.log, and then calls config.status.
|
|
|
+@@ -17122,7 +17991,7 @@
|
|
|
+ exec 5>>config.log
|
|
|
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
|
|
+ # would make configure fail if this is the last instruction.
|
|
|
+- $ac_cs_success || as_fn_exit $?
|
|
|
++ $ac_cs_success || as_fn_exit 1
|
|
|
+ fi
|
|
|
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
|
|
+diff -Nur opensc-0.11.13.orig/doc/Makefile.in opensc-0.11.13/doc/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/doc/Makefile.in 2010-02-16 10:32:17.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -181,6 +181,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -221,6 +222,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -245,6 +248,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -278,7 +282,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+@@ -504,7 +507,7 @@
|
|
|
+ # (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):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+@@ -529,7 +532,7 @@
|
|
|
+ fi; test -z "$$fail"
|
|
|
+
|
|
|
+ $(RECURSIVE_CLEAN_TARGETS):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+diff -Nur opensc-0.11.13.orig/doc/nonpersistent/Makefile.in opensc-0.11.13/doc/nonpersistent/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/doc/nonpersistent/Makefile.in 2010-02-16 10:32:17.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -126,6 +126,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -166,6 +167,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -190,6 +193,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -223,7 +227,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/etc/Makefile.in opensc-0.11.13/etc/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/etc/Makefile.in 2010-02-16 10:32:17.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -123,6 +123,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -163,6 +164,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -187,6 +190,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -220,7 +224,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/ltmain.sh opensc-0.11.13/ltmain.sh
|
|
|
+--- opensc-0.11.13.orig/ltmain.sh 2010-02-16 10:32:09.000000000 +0100
|
|
|
|
|
|
+@@ -1,9 +1,9 @@
|
|
|
+-# Generated from ltmain.m4sh.
|
|
|
+
|
|
|
+-# ltmain.sh (GNU libtool) 2.2.6
|
|
|
++# libtool (GNU libtool) 2.4
|
|
|
+ # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
|
|
+
|
|
|
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
|
|
|
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
|
|
++# 2007, 2008, 2009, 2010 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.
|
|
|
+
|
|
|
+@@ -32,50 +32,56 @@
|
|
|
+ #
|
|
|
+ # Provide generalized library-building support services.
|
|
|
+ #
|
|
|
+-# --config show all configuration variables
|
|
|
+-# --debug enable verbose shell tracing
|
|
|
+-# -n, --dry-run display commands without modifying any files
|
|
|
+-# --features display basic configuration information and exit
|
|
|
+-# --mode=MODE use operation mode MODE
|
|
|
+-# --preserve-dup-deps don't remove duplicate dependency libraries
|
|
|
+-# --quiet, --silent don't print informational messages
|
|
|
+-# --tag=TAG use configuration variables from tag TAG
|
|
|
+-# -v, --verbose print informational messages (default)
|
|
|
+-# --version print version information
|
|
|
+-# -h, --help print short or long help message
|
|
|
++# --config show all configuration variables
|
|
|
++# --debug enable verbose shell tracing
|
|
|
++# -n, --dry-run display commands without modifying any files
|
|
|
++# --features display basic configuration information and exit
|
|
|
++# --mode=MODE use operation mode MODE
|
|
|
++# --preserve-dup-deps don't remove duplicate dependency libraries
|
|
|
++# --quiet, --silent don't print informational messages
|
|
|
++# --no-quiet, --no-silent
|
|
|
++# print informational messages (default)
|
|
|
++# --tag=TAG use configuration variables from tag TAG
|
|
|
++# -v, --verbose print more informational messages than default
|
|
|
++# --no-verbose don't print the extra informational messages
|
|
|
++# --version print version information
|
|
|
++# -h, --help, --help-all print short, long, or detailed help message
|
|
|
+ #
|
|
|
+ # MODE must be one of the following:
|
|
|
+ #
|
|
|
+-# clean remove files from the build directory
|
|
|
+-# compile compile a source file into a libtool object
|
|
|
+-# execute automatically set library path, then run a program
|
|
|
+-# finish complete the installation of libtool libraries
|
|
|
+-# install install libraries or executables
|
|
|
+-# link create a library or an executable
|
|
|
+-# uninstall remove libraries from an installed directory
|
|
|
++# clean remove files from the build directory
|
|
|
++# compile compile a source file into a libtool object
|
|
|
++# execute automatically set library path, then run a program
|
|
|
++# finish complete the installation of libtool libraries
|
|
|
++# install install libraries or executables
|
|
|
++# link create a library or an executable
|
|
|
++# uninstall remove libraries from an installed directory
|
|
|
+ #
|
|
|
+-# MODE-ARGS vary depending on the MODE.
|
|
|
++# MODE-ARGS vary depending on the MODE. When passed as first option,
|
|
|
++# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
|
|
|
+ # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
|
|
|
+ #
|
|
|
+ # When reporting a bug, please describe a test case to reproduce it and
|
|
|
+ # include the following information:
|
|
|
+ #
|
|
|
+-# host-triplet: $host
|
|
|
+-# shell: $SHELL
|
|
|
+-# compiler: $LTCC
|
|
|
+-# compiler flags: $LTCFLAGS
|
|
|
+-# linker: $LD (gnu? $with_gnu_ld)
|
|
|
+-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
|
|
|
+-# automake: $automake_version
|
|
|
+-# autoconf: $autoconf_version
|
|
|
++# host-triplet: $host
|
|
|
++# shell: $SHELL
|
|
|
++# compiler: $LTCC
|
|
|
++# compiler flags: $LTCFLAGS
|
|
|
++# linker: $LD (gnu? $with_gnu_ld)
|
|
|
++# $progname: (GNU libtool) 2.4
|
|
|
++# automake: $automake_version
|
|
|
++# autoconf: $autoconf_version
|
|
|
+ #
|
|
|
+ # Report bugs to <bug-libtool@gnu.org>.
|
|
|
++# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
|
|
|
++# General help using GNU software: <http://www.gnu.org/gethelp/>.
|
|
|
+
|
|
|
+-PROGRAM=ltmain.sh
|
|
|
++PROGRAM=libtool
|
|
|
+ PACKAGE=libtool
|
|
|
+-VERSION="2.2.6 Debian-2.2.6a-4"
|
|
|
++VERSION=2.4
|
|
|
+ TIMESTAMP=""
|
|
|
+-package_revision=1.3012
|
|
|
++package_revision=1.3293
|
|
|
+
|
|
|
+ # Be Bourne compatible
|
|
|
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
|
+@@ -91,10 +97,15 @@
|
|
|
+ BIN_SH=xpg4; export BIN_SH # for Tru64
|
|
|
+ DUALCASE=1; export DUALCASE # for MKS sh
|
|
|
+
|
|
|
++# A function that is used when there is no print builtin or printf.
|
|
|
++func_fallback_echo ()
|
|
|
++{
|
|
|
++ eval 'cat <<_LTECHO_EOF
|
|
|
++$1
|
|
|
++_LTECHO_EOF'
|
|
|
++}
|
|
|
++
|
|
|
+ # NLS nuisances: We save the old values to restore during execute mode.
|
|
|
+-# Only set LANG and LC_ALL to C if already set.
|
|
|
+-# These must not be set unconditionally because not all systems understand
|
|
|
+-# e.g. LANG=C (notably SCO).
|
|
|
+ lt_user_locale=
|
|
|
+ lt_safe_locale=
|
|
|
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
|
|
+@@ -107,24 +118,33 @@
|
|
|
+ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
|
|
|
+ fi"
|
|
|
+ done
|
|
|
++LC_ALL=C
|
|
|
++LANGUAGE=C
|
|
|
++export LANGUAGE LC_ALL
|
|
|
+
|
|
|
+ $lt_unset CDPATH
|
|
|
+
|
|
|
+
|
|
|
++# 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"
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ : ${CP="cp -f"}
|
|
|
+-: ${ECHO="echo"}
|
|
|
+-: ${EGREP="/bin/grep -E"}
|
|
|
+-: ${FGREP="/bin/grep -F"}
|
|
|
+-: ${GREP="/bin/grep"}
|
|
|
++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
|
|
|
++: ${EGREP="grep -E"}
|
|
|
++: ${FGREP="grep -F"}
|
|
|
++: ${GREP="grep"}
|
|
|
+ : ${LN_S="ln -s"}
|
|
|
+ : ${MAKE="make"}
|
|
|
+ : ${MKDIR="mkdir"}
|
|
|
+ : ${MV="mv -f"}
|
|
|
+ : ${RM="rm -f"}
|
|
|
+-: ${SED="/bin/sed"}
|
|
|
++: ${SED="sed"}
|
|
|
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
|
|
|
+ : ${Xsed="$SED -e 1s/^X//"}
|
|
|
+
|
|
|
+@@ -144,6 +164,27 @@
|
|
|
+ dirname="s,/[^/]*$,,"
|
|
|
+ basename="s,^.*/,,"
|
|
|
+
|
|
|
++# func_dirname file append nondir_replacement
|
|
|
++# Compute the dirname of FILE. If nonempty, add APPEND to the result,
|
|
|
++# otherwise set result to NONDIR_REPLACEMENT.
|
|
|
++func_dirname ()
|
|
|
++{
|
|
|
++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
|
|
|
++ if test "X$func_dirname_result" = "X${1}"; then
|
|
|
++ func_dirname_result="${3}"
|
|
|
++ else
|
|
|
++ func_dirname_result="$func_dirname_result${2}"
|
|
|
++ fi
|
|
|
++} # func_dirname may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
++# func_basename file
|
|
|
++func_basename ()
|
|
|
++{
|
|
|
++ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
|
|
|
++} # func_basename may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
+ # func_dirname_and_basename file append nondir_replacement
|
|
|
+ # perform func_basename and func_dirname in a single function
|
|
|
+ # call:
|
|
|
+@@ -158,33 +199,183 @@
|
|
|
+ # those functions but instead duplicate the functionality here.
|
|
|
+ func_dirname_and_basename ()
|
|
|
+ {
|
|
|
+- # Extract subdirectory from the argument.
|
|
|
+- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
|
|
|
+- if test "X$func_dirname_result" = "X${1}"; then
|
|
|
+- func_dirname_result="${3}"
|
|
|
+- else
|
|
|
+- func_dirname_result="$func_dirname_result${2}"
|
|
|
+- fi
|
|
|
+- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
|
|
|
++ # Extract subdirectory from the argument.
|
|
|
++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
|
|
|
++ if test "X$func_dirname_result" = "X${1}"; then
|
|
|
++ func_dirname_result="${3}"
|
|
|
++ else
|
|
|
++ func_dirname_result="$func_dirname_result${2}"
|
|
|
++ fi
|
|
|
++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
|
|
|
++} # func_dirname_and_basename may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
++# func_stripname prefix suffix name
|
|
|
++# strip PREFIX and SUFFIX off of NAME.
|
|
|
++# PREFIX and SUFFIX must not contain globbing or regex special
|
|
|
++# characters, hashes, percent signs, but SUFFIX may contain a leading
|
|
|
++# dot (in which case that matches only a dot).
|
|
|
++# func_strip_suffix prefix name
|
|
|
++func_stripname ()
|
|
|
++{
|
|
|
++ case ${2} in
|
|
|
++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
|
|
|
++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
|
|
|
++ esac
|
|
|
++} # func_stripname may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
++# These SED scripts presuppose an absolute path with a trailing slash.
|
|
|
++pathcar='s,^/\([^/]*\).*$,\1,'
|
|
|
++pathcdr='s,^/[^/]*,,'
|
|
|
++removedotparts=':dotsl
|
|
|
++ s@/\./@/@g
|
|
|
++ t dotsl
|
|
|
++ s,/\.$,/,'
|
|
|
++collapseslashes='s@/\{1,\}@/@g'
|
|
|
++finalslash='s,/*$,/,'
|
|
|
++
|
|
|
++# func_normal_abspath PATH
|
|
|
++# Remove doubled-up and trailing slashes, "." path components,
|
|
|
++# and cancel out any ".." path components in PATH after making
|
|
|
++# it an absolute path.
|
|
|
++# value returned in "$func_normal_abspath_result"
|
|
|
++func_normal_abspath ()
|
|
|
++{
|
|
|
++ # Start from root dir and reassemble the path.
|
|
|
++ func_normal_abspath_result=
|
|
|
++ func_normal_abspath_tpath=$1
|
|
|
++ func_normal_abspath_altnamespace=
|
|
|
++ case $func_normal_abspath_tpath in
|
|
|
++ "")
|
|
|
++ # Empty path, that just means $cwd.
|
|
|
++ func_stripname '' '/' "`pwd`"
|
|
|
++ func_normal_abspath_result=$func_stripname_result
|
|
|
++ return
|
|
|
++ ;;
|
|
|
++ # The next three entries are used to spot a run of precisely
|
|
|
++ # two leading slashes without using negated character classes;
|
|
|
++ # we take advantage of case's first-match behaviour.
|
|
|
++ ///*)
|
|
|
++ # Unusual form of absolute path, do nothing.
|
|
|
++ ;;
|
|
|
++ //*)
|
|
|
++ # Not necessarily an ordinary path; POSIX reserves leading '//'
|
|
|
++ # and for example Cygwin uses it to access remote file shares
|
|
|
++ # over CIFS/SMB, so we conserve a leading double slash if found.
|
|
|
++ func_normal_abspath_altnamespace=/
|
|
|
++ ;;
|
|
|
++ /*)
|
|
|
++ # Absolute path, do nothing.
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ # Relative path, prepend $cwd.
|
|
|
++ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ # Cancel out all the simple stuff to save iterations. We also want
|
|
|
++ # the path to end with a slash for ease of parsing, so make sure
|
|
|
++ # there is one (and only one) here.
|
|
|
++ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
|
|
|
++ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
|
|
|
++ while :; do
|
|
|
++ # Processed it all yet?
|
|
|
++ if test "$func_normal_abspath_tpath" = / ; then
|
|
|
++ # If we ascended to the root using ".." the result may be empty now.
|
|
|
++ if test -z "$func_normal_abspath_result" ; then
|
|
|
++ func_normal_abspath_result=/
|
|
|
++ fi
|
|
|
++ break
|
|
|
++ fi
|
|
|
++ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
|
|
|
++ -e "$pathcar"`
|
|
|
++ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
|
|
|
++ -e "$pathcdr"`
|
|
|
++ # Figure out what to do with it
|
|
|
++ case $func_normal_abspath_tcomponent in
|
|
|
++ "")
|
|
|
++ # Trailing empty path component, ignore it.
|
|
|
++ ;;
|
|
|
++ ..)
|
|
|
++ # Parent dir; strip last assembled component from result.
|
|
|
++ func_dirname "$func_normal_abspath_result"
|
|
|
++ func_normal_abspath_result=$func_dirname_result
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ # Actual path component, append it.
|
|
|
++ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ done
|
|
|
++ # Restore leading double-slash if one was found on entry.
|
|
|
++ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
|
|
|
+ }
|
|
|
+
|
|
|
+-# Generated shell functions inserted here.
|
|
|
++# func_relative_path SRCDIR DSTDIR
|
|
|
++# generates a relative path from SRCDIR to DSTDIR, with a trailing
|
|
|
++# slash if non-empty, suitable for immediately appending a filename
|
|
|
++# without needing to append a separator.
|
|
|
++# value returned in "$func_relative_path_result"
|
|
|
++func_relative_path ()
|
|
|
++{
|
|
|
++ func_relative_path_result=
|
|
|
++ func_normal_abspath "$1"
|
|
|
++ func_relative_path_tlibdir=$func_normal_abspath_result
|
|
|
++ func_normal_abspath "$2"
|
|
|
++ func_relative_path_tbindir=$func_normal_abspath_result
|
|
|
++
|
|
|
++ # Ascend the tree starting from libdir
|
|
|
++ while :; do
|
|
|
++ # check if we have found a prefix of bindir
|
|
|
++ case $func_relative_path_tbindir in
|
|
|
++ $func_relative_path_tlibdir)
|
|
|
++ # found an exact match
|
|
|
++ func_relative_path_tcancelled=
|
|
|
++ break
|
|
|
++ ;;
|
|
|
++ $func_relative_path_tlibdir*)
|
|
|
++ # found a matching prefix
|
|
|
++ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
|
|
|
++ func_relative_path_tcancelled=$func_stripname_result
|
|
|
++ if test -z "$func_relative_path_result"; then
|
|
|
++ func_relative_path_result=.
|
|
|
++ fi
|
|
|
++ break
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ func_dirname $func_relative_path_tlibdir
|
|
|
++ func_relative_path_tlibdir=${func_dirname_result}
|
|
|
++ if test "x$func_relative_path_tlibdir" = x ; then
|
|
|
++ # Have to descend all the way to the root!
|
|
|
++ func_relative_path_result=../$func_relative_path_result
|
|
|
++ func_relative_path_tcancelled=$func_relative_path_tbindir
|
|
|
++ break
|
|
|
++ fi
|
|
|
++ func_relative_path_result=../$func_relative_path_result
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ done
|
|
|
+
|
|
|
+-# 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"
|
|
|
++ # Now calculate path; take care to avoid doubling-up slashes.
|
|
|
++ func_stripname '' '/' "$func_relative_path_result"
|
|
|
++ func_relative_path_result=$func_stripname_result
|
|
|
++ func_stripname '/' '/' "$func_relative_path_tcancelled"
|
|
|
++ if test "x$func_stripname_result" != x ; then
|
|
|
++ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
|
|
|
++ fi
|
|
|
++
|
|
|
++ # Normalisation. If bindir is libdir, return empty string,
|
|
|
++ # else relative path ending with a slash; either way, target
|
|
|
++ # file name can be directly appended.
|
|
|
++ if test ! -z "$func_relative_path_result"; then
|
|
|
++ func_stripname './' '' "$func_relative_path_result/"
|
|
|
++ func_relative_path_result=$func_stripname_result
|
|
|
++ fi
|
|
|
++}
|
|
|
+
|
|
|
+ # The name of this program:
|
|
|
+-# In the unlikely event $progname began with a '-', it would play havoc with
|
|
|
+-# func_echo (imagine progname=-n), so we prepend ./ in that case:
|
|
|
+ func_dirname_and_basename "$progpath"
|
|
|
+ progname=$func_basename_result
|
|
|
+-case $progname in
|
|
|
+- -*) progname=./$progname ;;
|
|
|
+-esac
|
|
|
+
|
|
|
+ # Make sure we have an absolute path for reexecution:
|
|
|
+ case $progpath in
|
|
|
+@@ -215,6 +406,15 @@
|
|
|
+ # Same as above, but do not quote variable references.
|
|
|
+ double_quote_subst='s/\(["`\\]\)/\\\1/g'
|
|
|
+
|
|
|
++# Sed substitution that turns a string into a regex matching for the
|
|
|
++# string literally.
|
|
|
++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
|
|
|
++
|
|
|
++# Sed substitution that converts a w32 file name or path
|
|
|
++# which contains forward slashes, into one that contains
|
|
|
++# (escaped) backslashes. A very naive implementation.
|
|
|
++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
|
|
|
++
|
|
|
+ # Re-`\' parameter expansions in output of double_quote_subst that were
|
|
|
+ # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
|
|
|
+ # in input to double_quote_subst, that '$' was protected from expansion.
|
|
|
+@@ -243,7 +443,7 @@
|
|
|
+ # name if it has been set yet.
|
|
|
+ func_echo ()
|
|
|
+ {
|
|
|
+- $ECHO "$progname${mode+: }$mode: $*"
|
|
|
++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
|
|
|
+ }
|
|
|
+
|
|
|
+ # func_verbose arg...
|
|
|
+@@ -258,18 +458,25 @@
|
|
|
+ :
|
|
|
+ }
|
|
|
+
|
|
|
++# func_echo_all arg...
|
|
|
++# Invoke $ECHO with all args, space-separated.
|
|
|
++func_echo_all ()
|
|
|
++{
|
|
|
++ $ECHO "$*"
|
|
|
++}
|
|
|
++
|
|
|
+ # func_error arg...
|
|
|
+ # Echo program name prefixed message to standard error.
|
|
|
+ func_error ()
|
|
|
+ {
|
|
|
+- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
|
|
|
++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
|
|
|
+ }
|
|
|
+
|
|
|
+ # func_warning arg...
|
|
|
+ # Echo program name prefixed warning message to standard error.
|
|
|
+ func_warning ()
|
|
|
+ {
|
|
|
+- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
|
|
|
++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
|
|
|
+
|
|
|
+ # bash bug again:
|
|
|
+ :
|
|
|
+@@ -326,9 +533,9 @@
|
|
|
+ case $my_directory_path in */*) ;; *) break ;; esac
|
|
|
+
|
|
|
+ # ...otherwise throw away the child directory and loop
|
|
|
+- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
|
|
|
++ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
|
|
|
+ done
|
|
|
+- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
|
|
|
++ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
|
|
|
+
|
|
|
+ save_mkdir_p_IFS="$IFS"; IFS=':'
|
|
|
+ for my_dir in $my_dir_list; do
|
|
|
+@@ -378,7 +585,7 @@
|
|
|
+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
|
|
|
+ fi
|
|
|
+
|
|
|
+- $ECHO "X$my_tmpdir" | $Xsed
|
|
|
++ $ECHO "$my_tmpdir"
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+@@ -392,7 +599,7 @@
|
|
|
+ {
|
|
|
+ case $1 in
|
|
|
+ *[\\\`\"\$]*)
|
|
|
+- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
|
|
|
++ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
|
|
|
+ *)
|
|
|
+ func_quote_for_eval_unquoted_result="$1" ;;
|
|
|
+ esac
|
|
|
+@@ -419,7 +626,7 @@
|
|
|
+ {
|
|
|
+ case $1 in
|
|
|
+ *[\\\`\"]*)
|
|
|
+- my_arg=`$ECHO "X$1" | $Xsed \
|
|
|
++ my_arg=`$ECHO "$1" | $SED \
|
|
|
+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
|
|
|
+ *)
|
|
|
+ my_arg="$1" ;;
|
|
|
+@@ -488,15 +695,39 @@
|
|
|
+ fi
|
|
|
+ }
|
|
|
+
|
|
|
+-
|
|
|
+-
|
|
|
++# func_tr_sh
|
|
|
++# Turn $1 into a string suitable for a shell variable name.
|
|
|
++# Result is stored in $func_tr_sh_result. All characters
|
|
|
++# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
|
|
|
++# if $1 begins with a digit, a '_' is prepended as well.
|
|
|
++func_tr_sh ()
|
|
|
++{
|
|
|
++ case $1 in
|
|
|
++ [0-9]* | *[!a-zA-Z0-9_]*)
|
|
|
++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
|
|
|
++ ;;
|
|
|
++ * )
|
|
|
++ func_tr_sh_result=$1
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++}
|
|
|
+
|
|
|
+
|
|
|
+ # func_version
|
|
|
+ # Echo version message to standard output and exit.
|
|
|
+ func_version ()
|
|
|
+ {
|
|
|
+- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
|
|
|
++ $opt_debug
|
|
|
++
|
|
|
++ $SED -n '/(C)/!b go
|
|
|
++ :more
|
|
|
++ /\./!{
|
|
|
++ N
|
|
|
++ s/\n# / /
|
|
|
++ b more
|
|
|
++ }
|
|
|
++ :go
|
|
|
++ /^# '$PROGRAM' (GNU /,/# warranty; / {
|
|
|
+ s/^# //
|
|
|
+ s/^# *$//
|
|
|
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
|
|
|
+@@ -509,22 +740,28 @@
|
|
|
+ # Echo short help message to standard output and exit.
|
|
|
+ func_usage ()
|
|
|
+ {
|
|
|
+- $SED -n '/^# Usage:/,/# -h/ {
|
|
|
++ $opt_debug
|
|
|
++
|
|
|
++ $SED -n '/^# Usage:/,/^# *.*--help/ {
|
|
|
+ s/^# //
|
|
|
+ s/^# *$//
|
|
|
+ s/\$progname/'$progname'/
|
|
|
+ p
|
|
|
+ }' < "$progpath"
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "run \`$progname --help | more' for full usage"
|
|
|
+ exit $?
|
|
|
+ }
|
|
|
+
|
|
|
+-# func_help
|
|
|
+-# Echo long help message to standard output and exit.
|
|
|
++# func_help [NOEXIT]
|
|
|
++# Echo long help message to standard output and exit,
|
|
|
++# unless 'noexit' is passed as argument.
|
|
|
+ func_help ()
|
|
|
+ {
|
|
|
++ $opt_debug
|
|
|
++
|
|
|
+ $SED -n '/^# Usage:/,/# Report bugs to/ {
|
|
|
++ :print
|
|
|
+ s/^# //
|
|
|
+ s/^# *$//
|
|
|
+ s*\$progname*'$progname'*
|
|
|
+@@ -537,8 +774,15 @@
|
|
|
+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
|
|
|
+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
|
|
|
+ p
|
|
|
+- }' < "$progpath"
|
|
|
+- exit $?
|
|
|
++ d
|
|
|
++ }
|
|
|
++ /^# .* home page:/b print
|
|
|
++ /^# General help using/b print
|
|
|
++ ' < "$progpath"
|
|
|
++ ret=$?
|
|
|
++ if test -z "$1"; then
|
|
|
++ exit $ret
|
|
|
++ fi
|
|
|
+ }
|
|
|
+
|
|
|
+ # func_missing_arg argname
|
|
|
+@@ -546,63 +790,106 @@
|
|
|
+ # exit_cmd.
|
|
|
+ func_missing_arg ()
|
|
|
+ {
|
|
|
+- func_error "missing argument for $1"
|
|
|
++ $opt_debug
|
|
|
++
|
|
|
++ func_error "missing argument for $1."
|
|
|
+ exit_cmd=exit
|
|
|
+ }
|
|
|
+
|
|
|
+-exit_cmd=:
|
|
|
+
|
|
|
++# func_split_short_opt shortopt
|
|
|
++# Set func_split_short_opt_name and func_split_short_opt_arg shell
|
|
|
++# variables after splitting SHORTOPT after the 2nd character.
|
|
|
++func_split_short_opt ()
|
|
|
++{
|
|
|
++ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
|
|
|
++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
|
|
|
++
|
|
|
++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
|
|
|
++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
|
|
|
++} # func_split_short_opt may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
++# func_split_long_opt longopt
|
|
|
++# Set func_split_long_opt_name and func_split_long_opt_arg shell
|
|
|
++# variables after splitting LONGOPT at the `=' sign.
|
|
|
++func_split_long_opt ()
|
|
|
++{
|
|
|
++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
|
|
|
++ my_sed_long_arg='1s/^--[^=]*=//'
|
|
|
++
|
|
|
++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
|
|
|
++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
|
|
|
++} # func_split_long_opt may be replaced by extended shell implementation
|
|
|
+
|
|
|
++exit_cmd=:
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+-# Check that we have a working $ECHO.
|
|
|
+-if test "X$1" = X--no-reexec; then
|
|
|
+- # Discard the --no-reexec flag, and continue.
|
|
|
+- shift
|
|
|
+-elif test "X$1" = X--fallback-echo; then
|
|
|
+- # Avoid inline document here, it may be left over
|
|
|
+- :
|
|
|
+-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
|
|
|
+- # Yippee, $ECHO works!
|
|
|
+- :
|
|
|
+-else
|
|
|
+- # Restart under the correct shell, and then maybe $ECHO will work.
|
|
|
+- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
|
|
|
+-fi
|
|
|
+
|
|
|
+-if test "X$1" = X--fallback-echo; then
|
|
|
+- # used as fallback echo
|
|
|
+- shift
|
|
|
+- cat <<EOF
|
|
|
+-$*
|
|
|
+-EOF
|
|
|
+- exit $EXIT_SUCCESS
|
|
|
+-fi
|
|
|
+
|
|
|
+ magic="%%%MAGIC variable%%%"
|
|
|
+ magic_exe="%%%MAGIC EXE variable%%%"
|
|
|
+
|
|
|
+ # Global variables.
|
|
|
+-# $mode is unset
|
|
|
+ nonopt=
|
|
|
+-execute_dlfiles=
|
|
|
+ preserve_args=
|
|
|
+ lo2o="s/\\.lo\$/.${objext}/"
|
|
|
+ o2lo="s/\\.${objext}\$/.lo/"
|
|
|
+ extracted_archives=
|
|
|
+ extracted_serial=0
|
|
|
+
|
|
|
+-opt_dry_run=false
|
|
|
+-opt_duplicate_deps=false
|
|
|
+-opt_silent=false
|
|
|
+-opt_debug=:
|
|
|
+-
|
|
|
+ # 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.
|
|
|
+ exec_cmd=
|
|
|
+
|
|
|
++# func_append var value
|
|
|
++# Append VALUE to the end of shell variable VAR.
|
|
|
++func_append ()
|
|
|
++{
|
|
|
++ eval "${1}=\$${1}\${2}"
|
|
|
++} # func_append may be replaced by extended shell implementation
|
|
|
++
|
|
|
++# func_append_quoted var value
|
|
|
++# Quote VALUE and append to the end of shell variable VAR, separated
|
|
|
++# by a space.
|
|
|
++func_append_quoted ()
|
|
|
++{
|
|
|
++ func_quote_for_eval "${2}"
|
|
|
++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
|
|
|
++} # func_append_quoted may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
++# func_arith arithmetic-term...
|
|
|
++func_arith ()
|
|
|
++{
|
|
|
++ func_arith_result=`expr "${@}"`
|
|
|
++} # func_arith may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
++# func_len string
|
|
|
++# STRING may not start with a hyphen.
|
|
|
++func_len ()
|
|
|
++{
|
|
|
++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
|
|
|
++} # func_len may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
++# func_lo2o object
|
|
|
++func_lo2o ()
|
|
|
++{
|
|
|
++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
|
|
|
++} # func_lo2o may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
++# func_xform libobj-or-source
|
|
|
++func_xform ()
|
|
|
++{
|
|
|
++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
|
|
|
++} # func_xform may be replaced by extended shell implementation
|
|
|
++
|
|
|
++
|
|
|
+ # func_fatal_configuration arg...
|
|
|
+ # Echo program name prefixed message to standard error, followed by
|
|
|
+ # a configuration failure hint, and exit.
|
|
|
+@@ -636,16 +923,16 @@
|
|
|
+ # Display the features supported by this script.
|
|
|
+ func_features ()
|
|
|
+ {
|
|
|
+- $ECHO "host: $host"
|
|
|
++ echo "host: $host"
|
|
|
+ if test "$build_libtool_libs" = yes; then
|
|
|
+- $ECHO "enable shared libraries"
|
|
|
++ echo "enable shared libraries"
|
|
|
+ else
|
|
|
+- $ECHO "disable shared libraries"
|
|
|
++ echo "disable shared libraries"
|
|
|
+ fi
|
|
|
+ if test "$build_old_libs" = yes; then
|
|
|
+- $ECHO "enable static libraries"
|
|
|
++ echo "enable static libraries"
|
|
|
+ else
|
|
|
+- $ECHO "disable static libraries"
|
|
|
++ echo "disable static libraries"
|
|
|
+ fi
|
|
|
+
|
|
|
+ exit $?
|
|
|
+@@ -692,117 +979,204 @@
|
|
|
+ esac
|
|
|
+ }
|
|
|
+
|
|
|
+-# Parse options once, thoroughly. This comes as soon as possible in
|
|
|
+-# the script to make things like `libtool --version' happen quickly.
|
|
|
++# func_check_version_match
|
|
|
++# Ensure that we are using m4 macros, and libtool script from the same
|
|
|
++# release of libtool.
|
|
|
++func_check_version_match ()
|
|
|
+ {
|
|
|
++ if test "$package_revision" != "$macro_revision"; then
|
|
|
++ if test "$VERSION" != "$macro_version"; then
|
|
|
++ if test -z "$macro_version"; then
|
|
|
++ cat >&2 <<_LT_EOF
|
|
|
++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
|
|
++$progname: definition of this LT_INIT comes from an older release.
|
|
|
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
|
|
|
++$progname: and run autoconf again.
|
|
|
++_LT_EOF
|
|
|
++ else
|
|
|
++ cat >&2 <<_LT_EOF
|
|
|
++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
|
|
++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
|
|
|
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
|
|
|
++$progname: and run autoconf again.
|
|
|
++_LT_EOF
|
|
|
++ fi
|
|
|
++ else
|
|
|
++ cat >&2 <<_LT_EOF
|
|
|
++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
|
|
|
++$progname: but the definition of this LT_INIT comes from revision $macro_revision.
|
|
|
++$progname: You should recreate aclocal.m4 with macros from revision $package_revision
|
|
|
++$progname: of $PACKAGE $VERSION and run autoconf again.
|
|
|
++_LT_EOF
|
|
|
++ fi
|
|
|
+
|
|
|
+- # Shorthand for --mode=foo, only valid as the first argument
|
|
|
+- case $1 in
|
|
|
+- clean|clea|cle|cl)
|
|
|
+- shift; set dummy --mode clean ${1+"$@"}; shift
|
|
|
+- ;;
|
|
|
+- compile|compil|compi|comp|com|co|c)
|
|
|
+- shift; set dummy --mode compile ${1+"$@"}; shift
|
|
|
+- ;;
|
|
|
+- execute|execut|execu|exec|exe|ex|e)
|
|
|
+- shift; set dummy --mode execute ${1+"$@"}; shift
|
|
|
+- ;;
|
|
|
+- finish|finis|fini|fin|fi|f)
|
|
|
+- shift; set dummy --mode finish ${1+"$@"}; shift
|
|
|
+- ;;
|
|
|
+- install|instal|insta|inst|ins|in|i)
|
|
|
+- shift; set dummy --mode install ${1+"$@"}; shift
|
|
|
+- ;;
|
|
|
+- link|lin|li|l)
|
|
|
+- shift; set dummy --mode link ${1+"$@"}; shift
|
|
|
+- ;;
|
|
|
+- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
|
|
|
+- shift; set dummy --mode uninstall ${1+"$@"}; shift
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
++ exit $EXIT_MISMATCH
|
|
|
++ fi
|
|
|
++}
|
|
|
+
|
|
|
+- # Parse non-mode specific arguments:
|
|
|
+- while test "$#" -gt 0; do
|
|
|
++
|
|
|
++# Shorthand for --mode=foo, only valid as the first argument
|
|
|
++case $1 in
|
|
|
++clean|clea|cle|cl)
|
|
|
++ shift; set dummy --mode clean ${1+"$@"}; shift
|
|
|
++ ;;
|
|
|
++compile|compil|compi|comp|com|co|c)
|
|
|
++ shift; set dummy --mode compile ${1+"$@"}; shift
|
|
|
++ ;;
|
|
|
++execute|execut|execu|exec|exe|ex|e)
|
|
|
++ shift; set dummy --mode execute ${1+"$@"}; shift
|
|
|
++ ;;
|
|
|
++finish|finis|fini|fin|fi|f)
|
|
|
++ shift; set dummy --mode finish ${1+"$@"}; shift
|
|
|
++ ;;
|
|
|
++install|instal|insta|inst|ins|in|i)
|
|
|
++ shift; set dummy --mode install ${1+"$@"}; shift
|
|
|
++ ;;
|
|
|
++link|lin|li|l)
|
|
|
++ shift; set dummy --mode link ${1+"$@"}; shift
|
|
|
++ ;;
|
|
|
++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
|
|
|
++ shift; set dummy --mode uninstall ${1+"$@"}; shift
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++
|
|
|
++
|
|
|
++
|
|
|
++# Option defaults:
|
|
|
++opt_debug=:
|
|
|
++opt_dry_run=false
|
|
|
++opt_config=false
|
|
|
++opt_preserve_dup_deps=false
|
|
|
++opt_features=false
|
|
|
++opt_finish=false
|
|
|
++opt_help=false
|
|
|
++opt_help_all=false
|
|
|
++opt_silent=:
|
|
|
++opt_verbose=:
|
|
|
++opt_silent=false
|
|
|
++opt_verbose=false
|
|
|
++
|
|
|
++
|
|
|
++# Parse options once, thoroughly. This comes as soon as possible in the
|
|
|
++# script to make things like `--version' happen as quickly as we can.
|
|
|
++{
|
|
|
++ # this just eases exit handling
|
|
|
++ while test $# -gt 0; do
|
|
|
+ opt="$1"
|
|
|
+ shift
|
|
|
+-
|
|
|
+ case $opt in
|
|
|
+- --config) func_config ;;
|
|
|
+-
|
|
|
+- --debug) preserve_args="$preserve_args $opt"
|
|
|
++ --debug|-x) opt_debug='set -x'
|
|
|
+ func_echo "enabling shell trace mode"
|
|
|
+- opt_debug='set -x'
|
|
|
+ $opt_debug
|
|
|
+ ;;
|
|
|
+-
|
|
|
+- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
|
|
|
+- execute_dlfiles="$execute_dlfiles $1"
|
|
|
+- shift
|
|
|
++ --dry-run|--dryrun|-n)
|
|
|
++ opt_dry_run=:
|
|
|
+ ;;
|
|
|
+-
|
|
|
+- --dry-run | -n) opt_dry_run=: ;;
|
|
|
+- --features) func_features ;;
|
|
|
+- --finish) mode="finish" ;;
|
|
|
+-
|
|
|
+- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
|
|
|
+- case $1 in
|
|
|
+- # Valid mode arguments:
|
|
|
+- clean) ;;
|
|
|
+- compile) ;;
|
|
|
+- execute) ;;
|
|
|
+- finish) ;;
|
|
|
+- install) ;;
|
|
|
+- link) ;;
|
|
|
+- relink) ;;
|
|
|
+- uninstall) ;;
|
|
|
+-
|
|
|
+- # Catch anything else as an error
|
|
|
+- *) func_error "invalid argument for $opt"
|
|
|
+- exit_cmd=exit
|
|
|
+- break
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
+-
|
|
|
+- mode="$1"
|
|
|
++ --config)
|
|
|
++ opt_config=:
|
|
|
++func_config
|
|
|
++ ;;
|
|
|
++ --dlopen|-dlopen)
|
|
|
++ optarg="$1"
|
|
|
++ opt_dlopen="${opt_dlopen+$opt_dlopen
|
|
|
++}$optarg"
|
|
|
+ shift
|
|
|
+ ;;
|
|
|
+-
|
|
|
+ --preserve-dup-deps)
|
|
|
+- opt_duplicate_deps=: ;;
|
|
|
+-
|
|
|
+- --quiet|--silent) preserve_args="$preserve_args $opt"
|
|
|
+- opt_silent=:
|
|
|
++ opt_preserve_dup_deps=:
|
|
|
+ ;;
|
|
|
+-
|
|
|
+- --verbose| -v) preserve_args="$preserve_args $opt"
|
|
|
++ --features)
|
|
|
++ opt_features=:
|
|
|
++func_features
|
|
|
++ ;;
|
|
|
++ --finish)
|
|
|
++ opt_finish=:
|
|
|
++set dummy --mode finish ${1+"$@"}; shift
|
|
|
++ ;;
|
|
|
++ --help)
|
|
|
++ opt_help=:
|
|
|
++ ;;
|
|
|
++ --help-all)
|
|
|
++ opt_help_all=:
|
|
|
++opt_help=': help-all'
|
|
|
++ ;;
|
|
|
++ --mode)
|
|
|
++ test $# = 0 && func_missing_arg $opt && break
|
|
|
++ optarg="$1"
|
|
|
++ opt_mode="$optarg"
|
|
|
++case $optarg in
|
|
|
++ # Valid mode arguments:
|
|
|
++ clean|compile|execute|finish|install|link|relink|uninstall) ;;
|
|
|
++
|
|
|
++ # Catch anything else as an error
|
|
|
++ *) func_error "invalid argument for $opt"
|
|
|
++ exit_cmd=exit
|
|
|
++ break
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++ shift
|
|
|
++ ;;
|
|
|
++ --no-silent|--no-quiet)
|
|
|
+ opt_silent=false
|
|
|
++func_append preserve_args " $opt"
|
|
|
+ ;;
|
|
|
+-
|
|
|
+- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
|
|
|
+- preserve_args="$preserve_args $opt $1"
|
|
|
+- func_enable_tag "$1" # tagname is set here
|
|
|
++ --no-verbose)
|
|
|
++ opt_verbose=false
|
|
|
++func_append preserve_args " $opt"
|
|
|
++ ;;
|
|
|
++ --silent|--quiet)
|
|
|
++ opt_silent=:
|
|
|
++func_append preserve_args " $opt"
|
|
|
++ opt_verbose=false
|
|
|
++ ;;
|
|
|
++ --verbose|-v)
|
|
|
++ opt_verbose=:
|
|
|
++func_append preserve_args " $opt"
|
|
|
++opt_silent=false
|
|
|
++ ;;
|
|
|
++ --tag)
|
|
|
++ test $# = 0 && func_missing_arg $opt && break
|
|
|
++ optarg="$1"
|
|
|
++ opt_tag="$optarg"
|
|
|
++func_append preserve_args " $opt $optarg"
|
|
|
++func_enable_tag "$optarg"
|
|
|
+ shift
|
|
|
+ ;;
|
|
|
+
|
|
|
++ -\?|-h) func_usage ;;
|
|
|
++ --help) func_help ;;
|
|
|
++ --version) func_version ;;
|
|
|
++
|
|
|
+ # Separate optargs to long options:
|
|
|
+- -dlopen=*|--mode=*|--tag=*)
|
|
|
+- func_opt_split "$opt"
|
|
|
+- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
|
|
|
++ --*=*)
|
|
|
++ func_split_long_opt "$opt"
|
|
|
++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
|
|
|
+ shift
|
|
|
+ ;;
|
|
|
+
|
|
|
+- -\?|-h) func_usage ;;
|
|
|
+- --help) opt_help=: ;;
|
|
|
+- --version) func_version ;;
|
|
|
+-
|
|
|
+- -*) func_fatal_help "unrecognized option \`$opt'" ;;
|
|
|
+-
|
|
|
+- *) nonopt="$opt"
|
|
|
+- break
|
|
|
++ # Separate non-argument short options:
|
|
|
++ -\?*|-h*|-n*|-v*)
|
|
|
++ func_split_short_opt "$opt"
|
|
|
++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
|
|
|
++ shift
|
|
|
+ ;;
|
|
|
++
|
|
|
++ --) break ;;
|
|
|
++ -*) func_fatal_help "unrecognized option \`$opt'" ;;
|
|
|
++ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+
|
|
|
++ # Validate options:
|
|
|
++
|
|
|
++ # save first non-option argument
|
|
|
++ if test "$#" -gt 0; then
|
|
|
++ nonopt="$opt"
|
|
|
++ shift
|
|
|
++ fi
|
|
|
++
|
|
|
++ # preserve --debug
|
|
|
++ test "$opt_debug" = : || func_append preserve_args " --debug"
|
|
|
+
|
|
|
+ case $host in
|
|
|
+ *cygwin* | *mingw* | *pw32* | *cegcc*)
|
|
|
+@@ -810,82 +1184,44 @@
|
|
|
+ opt_duplicate_compiler_generated_deps=:
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
|
|
|
++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+- # Having warned about all mis-specified options, bail out if
|
|
|
+- # anything was wrong.
|
|
|
+- $exit_cmd $EXIT_FAILURE
|
|
|
+-}
|
|
|
++ $opt_help || {
|
|
|
++ # Sanity checks first:
|
|
|
++ func_check_version_match
|
|
|
+
|
|
|
+-# func_check_version_match
|
|
|
+-# Ensure that we are using m4 macros, and libtool script from the same
|
|
|
+-# release of libtool.
|
|
|
+-func_check_version_match ()
|
|
|
+-{
|
|
|
+- if test "$package_revision" != "$macro_revision"; then
|
|
|
+- if test "$VERSION" != "$macro_version"; then
|
|
|
+- if test -z "$macro_version"; then
|
|
|
+- cat >&2 <<_LT_EOF
|
|
|
+-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
|
|
+-$progname: definition of this LT_INIT comes from an older release.
|
|
|
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
|
|
|
+-$progname: and run autoconf again.
|
|
|
+-_LT_EOF
|
|
|
+- else
|
|
|
+- cat >&2 <<_LT_EOF
|
|
|
+-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
|
|
+-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
|
|
|
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
|
|
|
+-$progname: and run autoconf again.
|
|
|
+-_LT_EOF
|
|
|
+- fi
|
|
|
+- else
|
|
|
+- cat >&2 <<_LT_EOF
|
|
|
+-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
|
|
|
+-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
|
|
|
+-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
|
|
|
+-$progname: of $PACKAGE $VERSION and run autoconf again.
|
|
|
+-_LT_EOF
|
|
|
++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
|
|
|
++ func_fatal_configuration "not configured to build any kind of library"
|
|
|
+ fi
|
|
|
+
|
|
|
+- exit $EXIT_MISMATCH
|
|
|
+- fi
|
|
|
+-}
|
|
|
+-
|
|
|
+-
|
|
|
+-## ----------- ##
|
|
|
+-## Main. ##
|
|
|
+-## ----------- ##
|
|
|
++ # Darwin sucks
|
|
|
++ eval std_shrext=\"$shrext_cmds\"
|
|
|
+
|
|
|
+-$opt_help || {
|
|
|
+- # Sanity checks first:
|
|
|
+- func_check_version_match
|
|
|
++ # Only execute mode is allowed to have -dlopen flags.
|
|
|
++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
|
|
|
++ func_error "unrecognized option \`-dlopen'"
|
|
|
++ $ECHO "$help" 1>&2
|
|
|
++ exit $EXIT_FAILURE
|
|
|
++ fi
|
|
|
+
|
|
|
+- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
|
|
|
+- func_fatal_configuration "not configured to build any kind of library"
|
|
|
+- fi
|
|
|
++ # Change the help message to a mode-specific one.
|
|
|
++ generic_help="$help"
|
|
|
++ help="Try \`$progname --help --mode=$opt_mode' for more information."
|
|
|
++ }
|
|
|
+
|
|
|
+- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
|
|
|
+
|
|
|
++ # Bail if the options were screwed
|
|
|
++ $exit_cmd $EXIT_FAILURE
|
|
|
++}
|
|
|
+
|
|
|
+- # Darwin sucks
|
|
|
+- eval std_shrext=\"$shrext_cmds\"
|
|
|
+
|
|
|
+
|
|
|
+- # Only execute mode is allowed to have -dlopen flags.
|
|
|
+- if test -n "$execute_dlfiles" && test "$mode" != execute; then
|
|
|
+- func_error "unrecognized option \`-dlopen'"
|
|
|
+- $ECHO "$help" 1>&2
|
|
|
+- exit $EXIT_FAILURE
|
|
|
+- fi
|
|
|
+-
|
|
|
+- # Change the help message to a mode-specific one.
|
|
|
+- generic_help="$help"
|
|
|
+- help="Try \`$progname --help --mode=$mode' for more information."
|
|
|
+-}
|
|
|
+
|
|
|
++## ----------- ##
|
|
|
++## Main. ##
|
|
|
++## ----------- ##
|
|
|
+
|
|
|
+ # func_lalib_p file
|
|
|
+ # True iff FILE is a libtool `.la' library or `.lo' object file.
|
|
|
+@@ -950,12 +1286,9 @@
|
|
|
+ # temporary ltwrapper_script.
|
|
|
+ func_ltwrapper_scriptname ()
|
|
|
+ {
|
|
|
+- func_ltwrapper_scriptname_result=""
|
|
|
+- if func_ltwrapper_executable_p "$1"; then
|
|
|
+- func_dirname_and_basename "$1" "" "."
|
|
|
+- func_stripname '' '.exe' "$func_basename_result"
|
|
|
+- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
|
|
|
+- fi
|
|
|
++ func_dirname_and_basename "$1" "" "."
|
|
|
++ func_stripname '' '.exe' "$func_basename_result"
|
|
|
++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
|
|
|
+ }
|
|
|
+
|
|
|
+ # func_ltwrapper_p file
|
|
|
+@@ -1001,6 +1334,37 @@
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
++# func_resolve_sysroot PATH
|
|
|
++# Replace a leading = in PATH with a sysroot. Store the result into
|
|
|
++# func_resolve_sysroot_result
|
|
|
++func_resolve_sysroot ()
|
|
|
++{
|
|
|
++ func_resolve_sysroot_result=$1
|
|
|
++ case $func_resolve_sysroot_result in
|
|
|
++ =*)
|
|
|
++ func_stripname '=' '' "$func_resolve_sysroot_result"
|
|
|
++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++}
|
|
|
++
|
|
|
++# func_replace_sysroot PATH
|
|
|
++# If PATH begins with the sysroot, replace it with = and
|
|
|
++# store the result into func_replace_sysroot_result.
|
|
|
++func_replace_sysroot ()
|
|
|
++{
|
|
|
++ case "$lt_sysroot:$1" in
|
|
|
++ ?*:"$lt_sysroot"*)
|
|
|
++ func_stripname "$lt_sysroot" '' "$1"
|
|
|
++ func_replace_sysroot_result="=$func_stripname_result"
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ # Including no sysroot.
|
|
|
++ func_replace_sysroot_result=$1
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++}
|
|
|
++
|
|
|
+ # 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.
|
|
|
+@@ -1013,13 +1377,15 @@
|
|
|
+ if test -n "$available_tags" && test -z "$tagname"; then
|
|
|
+ CC_quoted=
|
|
|
+ for arg in $CC; do
|
|
|
+- func_quote_for_eval "$arg"
|
|
|
+- CC_quoted="$CC_quoted $func_quote_for_eval_result"
|
|
|
++ func_append_quoted CC_quoted "$arg"
|
|
|
+ done
|
|
|
++ CC_expanded=`func_echo_all $CC`
|
|
|
++ CC_quoted_expanded=`func_echo_all $CC_quoted`
|
|
|
+ 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` "*) ;;
|
|
|
++ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
|
|
|
++ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
|
|
|
+ # Blanks at the start of $base_compile will cause this to fail
|
|
|
+ # if we don't check for them as well.
|
|
|
+ *)
|
|
|
+@@ -1030,11 +1396,13 @@
|
|
|
+ CC_quoted=
|
|
|
+ for arg in $CC; do
|
|
|
+ # Double-quote args containing other shell metacharacters.
|
|
|
+- func_quote_for_eval "$arg"
|
|
|
+- CC_quoted="$CC_quoted $func_quote_for_eval_result"
|
|
|
++ func_append_quoted CC_quoted "$arg"
|
|
|
+ done
|
|
|
++ CC_expanded=`func_echo_all $CC`
|
|
|
++ CC_quoted_expanded=`func_echo_all $CC_quoted`
|
|
|
+ case "$@ " in
|
|
|
+- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
|
|
|
++ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
|
|
|
++ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
|
|
|
+ # The compiler in the base compile command matches
|
|
|
+ # the one in the tagged configuration.
|
|
|
+ # Assume this is the tagged configuration we want.
|
|
|
+@@ -1097,6 +1465,486 @@
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
++
|
|
|
++##################################################
|
|
|
++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
|
|
|
++##################################################
|
|
|
++
|
|
|
++# func_convert_core_file_wine_to_w32 ARG
|
|
|
++# Helper function used by file name conversion functions when $build is *nix,
|
|
|
++# and $host is mingw, cygwin, or some other w32 environment. Relies on a
|
|
|
++# correctly configured wine environment available, with the winepath program
|
|
|
++# in $build's $PATH.
|
|
|
++#
|
|
|
++# ARG is the $build file name to be converted to w32 format.
|
|
|
++# Result is available in $func_convert_core_file_wine_to_w32_result, and will
|
|
|
++# be empty on error (or when ARG is empty)
|
|
|
++func_convert_core_file_wine_to_w32 ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_convert_core_file_wine_to_w32_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ # Unfortunately, winepath does not exit with a non-zero error code, so we
|
|
|
++ # are forced to check the contents of stdout. On the other hand, if the
|
|
|
++ # command is not found, the shell will set an exit code of 127 and print
|
|
|
++ # *an error message* to stdout. So we must check for both error code of
|
|
|
++ # zero AND non-empty stdout, which explains the odd construction:
|
|
|
++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
|
|
|
++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
|
|
|
++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
|
|
|
++ $SED -e "$lt_sed_naive_backslashify"`
|
|
|
++ else
|
|
|
++ func_convert_core_file_wine_to_w32_result=
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++}
|
|
|
++# end: func_convert_core_file_wine_to_w32
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_core_path_wine_to_w32 ARG
|
|
|
++# Helper function used by path conversion functions when $build is *nix, and
|
|
|
++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
|
|
|
++# configured wine environment available, with the winepath program in $build's
|
|
|
++# $PATH. Assumes ARG has no leading or trailing path separator characters.
|
|
|
++#
|
|
|
++# ARG is path to be converted from $build format to win32.
|
|
|
++# Result is available in $func_convert_core_path_wine_to_w32_result.
|
|
|
++# Unconvertible file (directory) names in ARG are skipped; if no directory names
|
|
|
++# are convertible, then the result may be empty.
|
|
|
++func_convert_core_path_wine_to_w32 ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ # unfortunately, winepath doesn't convert paths, only file names
|
|
|
++ func_convert_core_path_wine_to_w32_result=""
|
|
|
++ if test -n "$1"; then
|
|
|
++ oldIFS=$IFS
|
|
|
++ IFS=:
|
|
|
++ for func_convert_core_path_wine_to_w32_f in $1; do
|
|
|
++ IFS=$oldIFS
|
|
|
++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
|
|
|
++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
|
|
|
++ if test -z "$func_convert_core_path_wine_to_w32_result"; then
|
|
|
++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
|
|
|
++ else
|
|
|
++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++ done
|
|
|
++ IFS=$oldIFS
|
|
|
++ fi
|
|
|
++}
|
|
|
++# end: func_convert_core_path_wine_to_w32
|
|
|
++
|
|
|
++
|
|
|
++# func_cygpath ARGS...
|
|
|
++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
|
|
|
++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
|
|
|
++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
|
|
|
++# (2), returns the Cygwin file name or path in func_cygpath_result (input
|
|
|
++# file name or path is assumed to be in w32 format, as previously converted
|
|
|
++# from $build's *nix or MSYS format). In case (3), returns the w32 file name
|
|
|
++# or path in func_cygpath_result (input file name or path is assumed to be in
|
|
|
++# Cygwin format). Returns an empty string on error.
|
|
|
++#
|
|
|
++# ARGS are passed to cygpath, with the last one being the file name or path to
|
|
|
++# be converted.
|
|
|
++#
|
|
|
++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
|
|
|
++# environment variable; do not put it in $PATH.
|
|
|
++func_cygpath ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
|
|
|
++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
|
|
|
++ if test "$?" -ne 0; then
|
|
|
++ # on failure, ensure result is empty
|
|
|
++ func_cygpath_result=
|
|
|
++ fi
|
|
|
++ else
|
|
|
++ func_cygpath_result=
|
|
|
++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
|
|
|
++ fi
|
|
|
++}
|
|
|
++#end: func_cygpath
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_core_msys_to_w32 ARG
|
|
|
++# Convert file name or path ARG from MSYS format to w32 format. Return
|
|
|
++# result in func_convert_core_msys_to_w32_result.
|
|
|
++func_convert_core_msys_to_w32 ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ # awkward: cmd appends spaces to result
|
|
|
++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
|
|
|
++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
|
|
|
++}
|
|
|
++#end: func_convert_core_msys_to_w32
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_file_check ARG1 ARG2
|
|
|
++# Verify that ARG1 (a file name in $build format) was converted to $host
|
|
|
++# format in ARG2. Otherwise, emit an error message, but continue (resetting
|
|
|
++# func_to_host_file_result to ARG1).
|
|
|
++func_convert_file_check ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ if test -z "$2" && test -n "$1" ; then
|
|
|
++ func_error "Could not determine host file name corresponding to"
|
|
|
++ func_error " \`$1'"
|
|
|
++ func_error "Continuing, but uninstalled executables may not work."
|
|
|
++ # Fallback:
|
|
|
++ func_to_host_file_result="$1"
|
|
|
++ fi
|
|
|
++}
|
|
|
++# end func_convert_file_check
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
|
|
|
++# Verify that FROM_PATH (a path in $build format) was converted to $host
|
|
|
++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
|
|
|
++# func_to_host_file_result to a simplistic fallback value (see below).
|
|
|
++func_convert_path_check ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ if test -z "$4" && test -n "$3"; then
|
|
|
++ func_error "Could not determine the host path corresponding to"
|
|
|
++ func_error " \`$3'"
|
|
|
++ func_error "Continuing, but uninstalled executables may not work."
|
|
|
++ # Fallback. This is a deliberately simplistic "conversion" and
|
|
|
++ # should not be "improved". See libtool.info.
|
|
|
++ if test "x$1" != "x$2"; then
|
|
|
++ lt_replace_pathsep_chars="s|$1|$2|g"
|
|
|
++ func_to_host_path_result=`echo "$3" |
|
|
|
++ $SED -e "$lt_replace_pathsep_chars"`
|
|
|
++ else
|
|
|
++ func_to_host_path_result="$3"
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++}
|
|
|
++# end func_convert_path_check
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
|
|
|
++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
|
|
|
++# and appending REPL if ORIG matches BACKPAT.
|
|
|
++func_convert_path_front_back_pathsep ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ case $4 in
|
|
|
++ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ case $4 in
|
|
|
++ $2 ) func_append func_to_host_path_result "$3"
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++}
|
|
|
++# end func_convert_path_front_back_pathsep
|
|
|
++
|
|
|
++
|
|
|
++##################################################
|
|
|
++# $build to $host FILE NAME CONVERSION FUNCTIONS #
|
|
|
++##################################################
|
|
|
++# invoked via `$to_host_file_cmd ARG'
|
|
|
++#
|
|
|
++# In each case, ARG is the path to be converted from $build to $host format.
|
|
|
++# Result will be available in $func_to_host_file_result.
|
|
|
++
|
|
|
++
|
|
|
++# func_to_host_file ARG
|
|
|
++# Converts the file name ARG from $build format to $host format. Return result
|
|
|
++# in func_to_host_file_result.
|
|
|
++func_to_host_file ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ $to_host_file_cmd "$1"
|
|
|
++}
|
|
|
++# end func_to_host_file
|
|
|
++
|
|
|
++
|
|
|
++# func_to_tool_file ARG LAZY
|
|
|
++# converts the file name ARG from $build format to toolchain format. Return
|
|
|
++# result in func_to_tool_file_result. If the conversion in use is listed
|
|
|
++# in (the comma separated) LAZY, no conversion takes place.
|
|
|
++func_to_tool_file ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ case ,$2, in
|
|
|
++ *,"$to_tool_file_cmd",*)
|
|
|
++ func_to_tool_file_result=$1
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ $to_tool_file_cmd "$1"
|
|
|
++ func_to_tool_file_result=$func_to_host_file_result
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++}
|
|
|
++# end func_to_tool_file
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_file_noop ARG
|
|
|
++# Copy ARG to func_to_host_file_result.
|
|
|
++func_convert_file_noop ()
|
|
|
++{
|
|
|
++ func_to_host_file_result="$1"
|
|
|
++}
|
|
|
++# end func_convert_file_noop
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_file_msys_to_w32 ARG
|
|
|
++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
|
|
|
++# conversion to w32 is not available inside the cwrapper. Returns result in
|
|
|
++# func_to_host_file_result.
|
|
|
++func_convert_file_msys_to_w32 ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_file_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ func_convert_core_msys_to_w32 "$1"
|
|
|
++ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
|
|
|
++ fi
|
|
|
++ func_convert_file_check "$1" "$func_to_host_file_result"
|
|
|
++}
|
|
|
++# end func_convert_file_msys_to_w32
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_file_cygwin_to_w32 ARG
|
|
|
++# Convert file name ARG from Cygwin to w32 format. Returns result in
|
|
|
++# func_to_host_file_result.
|
|
|
++func_convert_file_cygwin_to_w32 ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_file_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
|
|
|
++ # LT_CYGPATH in this case.
|
|
|
++ func_to_host_file_result=`cygpath -m "$1"`
|
|
|
++ fi
|
|
|
++ func_convert_file_check "$1" "$func_to_host_file_result"
|
|
|
++}
|
|
|
++# end func_convert_file_cygwin_to_w32
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_file_nix_to_w32 ARG
|
|
|
++# Convert file name ARG from *nix to w32 format. Requires a wine environment
|
|
|
++# and a working winepath. Returns result in func_to_host_file_result.
|
|
|
++func_convert_file_nix_to_w32 ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_file_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ func_convert_core_file_wine_to_w32 "$1"
|
|
|
++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
|
|
|
++ fi
|
|
|
++ func_convert_file_check "$1" "$func_to_host_file_result"
|
|
|
++}
|
|
|
++# end func_convert_file_nix_to_w32
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_file_msys_to_cygwin ARG
|
|
|
++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
|
|
|
++# Returns result in func_to_host_file_result.
|
|
|
++func_convert_file_msys_to_cygwin ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_file_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ func_convert_core_msys_to_w32 "$1"
|
|
|
++ func_cygpath -u "$func_convert_core_msys_to_w32_result"
|
|
|
++ func_to_host_file_result="$func_cygpath_result"
|
|
|
++ fi
|
|
|
++ func_convert_file_check "$1" "$func_to_host_file_result"
|
|
|
++}
|
|
|
++# end func_convert_file_msys_to_cygwin
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_file_nix_to_cygwin ARG
|
|
|
++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
|
|
|
++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
|
|
|
++# in func_to_host_file_result.
|
|
|
++func_convert_file_nix_to_cygwin ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_file_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
|
|
|
++ func_convert_core_file_wine_to_w32 "$1"
|
|
|
++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
|
|
|
++ func_to_host_file_result="$func_cygpath_result"
|
|
|
++ fi
|
|
|
++ func_convert_file_check "$1" "$func_to_host_file_result"
|
|
|
++}
|
|
|
++# end func_convert_file_nix_to_cygwin
|
|
|
++
|
|
|
++
|
|
|
++#############################################
|
|
|
++# $build to $host PATH CONVERSION FUNCTIONS #
|
|
|
++#############################################
|
|
|
++# invoked via `$to_host_path_cmd ARG'
|
|
|
++#
|
|
|
++# In each case, ARG is the path to be converted from $build to $host format.
|
|
|
++# The result will be available in $func_to_host_path_result.
|
|
|
++#
|
|
|
++# Path separators are also converted from $build format to $host format. If
|
|
|
++# ARG begins or ends with a path separator character, it is preserved (but
|
|
|
++# converted to $host format) on output.
|
|
|
++#
|
|
|
++# All path conversion functions are named using the following convention:
|
|
|
++# file name conversion function : func_convert_file_X_to_Y ()
|
|
|
++# path conversion function : func_convert_path_X_to_Y ()
|
|
|
++# where, for any given $build/$host combination the 'X_to_Y' value is the
|
|
|
++# same. If conversion functions are added for new $build/$host combinations,
|
|
|
++# the two new functions must follow this pattern, or func_init_to_host_path_cmd
|
|
|
++# will break.
|
|
|
++
|
|
|
++
|
|
|
++# func_init_to_host_path_cmd
|
|
|
++# Ensures that function "pointer" variable $to_host_path_cmd is set to the
|
|
|
++# appropriate value, based on the value of $to_host_file_cmd.
|
|
|
++to_host_path_cmd=
|
|
|
++func_init_to_host_path_cmd ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ if test -z "$to_host_path_cmd"; then
|
|
|
++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
|
|
|
++ to_host_path_cmd="func_convert_path_${func_stripname_result}"
|
|
|
++ fi
|
|
|
++}
|
|
|
++
|
|
|
++
|
|
|
++# func_to_host_path ARG
|
|
|
++# Converts the path ARG from $build format to $host format. Return result
|
|
|
++# in func_to_host_path_result.
|
|
|
++func_to_host_path ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_init_to_host_path_cmd
|
|
|
++ $to_host_path_cmd "$1"
|
|
|
++}
|
|
|
++# end func_to_host_path
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_path_noop ARG
|
|
|
++# Copy ARG to func_to_host_path_result.
|
|
|
++func_convert_path_noop ()
|
|
|
++{
|
|
|
++ func_to_host_path_result="$1"
|
|
|
++}
|
|
|
++# end func_convert_path_noop
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_path_msys_to_w32 ARG
|
|
|
++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
|
|
|
++# conversion to w32 is not available inside the cwrapper. Returns result in
|
|
|
++# func_to_host_path_result.
|
|
|
++func_convert_path_msys_to_w32 ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_path_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ # Remove leading and trailing path separator characters from ARG. MSYS
|
|
|
++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
|
|
|
++ # and winepath ignores them completely.
|
|
|
++ func_stripname : : "$1"
|
|
|
++ func_to_host_path_tmp1=$func_stripname_result
|
|
|
++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
|
|
|
++ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
|
|
|
++ func_convert_path_check : ";" \
|
|
|
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
|
|
|
++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
|
|
|
++ fi
|
|
|
++}
|
|
|
++# end func_convert_path_msys_to_w32
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_path_cygwin_to_w32 ARG
|
|
|
++# Convert path ARG from Cygwin to w32 format. Returns result in
|
|
|
++# func_to_host_file_result.
|
|
|
++func_convert_path_cygwin_to_w32 ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_path_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ # See func_convert_path_msys_to_w32:
|
|
|
++ func_stripname : : "$1"
|
|
|
++ func_to_host_path_tmp1=$func_stripname_result
|
|
|
++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
|
|
|
++ func_convert_path_check : ";" \
|
|
|
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
|
|
|
++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
|
|
|
++ fi
|
|
|
++}
|
|
|
++# end func_convert_path_cygwin_to_w32
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_path_nix_to_w32 ARG
|
|
|
++# Convert path ARG from *nix to w32 format. Requires a wine environment and
|
|
|
++# a working winepath. Returns result in func_to_host_file_result.
|
|
|
++func_convert_path_nix_to_w32 ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_path_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ # See func_convert_path_msys_to_w32:
|
|
|
++ func_stripname : : "$1"
|
|
|
++ func_to_host_path_tmp1=$func_stripname_result
|
|
|
++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
|
|
|
++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
|
|
|
++ func_convert_path_check : ";" \
|
|
|
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
|
|
|
++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
|
|
|
++ fi
|
|
|
++}
|
|
|
++# end func_convert_path_nix_to_w32
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_path_msys_to_cygwin ARG
|
|
|
++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
|
|
|
++# Returns result in func_to_host_file_result.
|
|
|
++func_convert_path_msys_to_cygwin ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_path_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ # See func_convert_path_msys_to_w32:
|
|
|
++ func_stripname : : "$1"
|
|
|
++ func_to_host_path_tmp1=$func_stripname_result
|
|
|
++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
|
|
|
++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
|
|
|
++ func_to_host_path_result="$func_cygpath_result"
|
|
|
++ func_convert_path_check : : \
|
|
|
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
|
|
|
++ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
|
|
|
++ fi
|
|
|
++}
|
|
|
++# end func_convert_path_msys_to_cygwin
|
|
|
++
|
|
|
++
|
|
|
++# func_convert_path_nix_to_cygwin ARG
|
|
|
++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
|
|
|
++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
|
|
|
++# func_to_host_file_result.
|
|
|
++func_convert_path_nix_to_cygwin ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_host_path_result="$1"
|
|
|
++ if test -n "$1"; then
|
|
|
++ # Remove leading and trailing path separator characters from
|
|
|
++ # ARG. msys behavior is inconsistent here, cygpath turns them
|
|
|
++ # into '.;' and ';.', and winepath ignores them completely.
|
|
|
++ func_stripname : : "$1"
|
|
|
++ func_to_host_path_tmp1=$func_stripname_result
|
|
|
++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
|
|
|
++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
|
|
|
++ func_to_host_path_result="$func_cygpath_result"
|
|
|
++ func_convert_path_check : : \
|
|
|
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
|
|
|
++ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
|
|
|
++ fi
|
|
|
++}
|
|
|
++# end func_convert_path_nix_to_cygwin
|
|
|
++
|
|
|
++
|
|
|
+ # func_mode_compile arg...
|
|
|
+ func_mode_compile ()
|
|
|
+ {
|
|
|
+@@ -1137,12 +1985,12 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ -pie | -fpie | -fPIE)
|
|
|
+- pie_flag="$pie_flag $arg"
|
|
|
++ func_append pie_flag " $arg"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+
|
|
|
+ -shared | -static | -prefer-pic | -prefer-non-pic)
|
|
|
+- later="$later $arg"
|
|
|
++ func_append later " $arg"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+
|
|
|
+@@ -1163,15 +2011,14 @@
|
|
|
+ save_ifs="$IFS"; IFS=','
|
|
|
+ for arg in $args; do
|
|
|
+ IFS="$save_ifs"
|
|
|
+- func_quote_for_eval "$arg"
|
|
|
+- lastarg="$lastarg $func_quote_for_eval_result"
|
|
|
++ func_append_quoted lastarg "$arg"
|
|
|
+ done
|
|
|
+ IFS="$save_ifs"
|
|
|
+ func_stripname ' ' '' "$lastarg"
|
|
|
+ lastarg=$func_stripname_result
|
|
|
+
|
|
|
+ # Add the arguments to base_compile.
|
|
|
+- base_compile="$base_compile $lastarg"
|
|
|
++ func_append base_compile " $lastarg"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+
|
|
|
+@@ -1187,8 +2034,7 @@
|
|
|
+ esac # case $arg_mode
|
|
|
+
|
|
|
+ # Aesthetically quote the previous argument.
|
|
|
+- func_quote_for_eval "$lastarg"
|
|
|
+- base_compile="$base_compile $func_quote_for_eval_result"
|
|
|
++ func_append_quoted base_compile "$lastarg"
|
|
|
+ done # for arg
|
|
|
+
|
|
|
+ case $arg_mode in
|
|
|
+@@ -1213,7 +2059,7 @@
|
|
|
+ *.[cCFSifmso] | \
|
|
|
+ *.ada | *.adb | *.ads | *.asm | \
|
|
|
+ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
|
|
|
+- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
|
|
|
++ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
|
|
|
+ func_xform "$libobj"
|
|
|
+ libobj=$func_xform_result
|
|
|
+ ;;
|
|
|
+@@ -1288,7 +2134,7 @@
|
|
|
+ # Calculate the filename of the output object if compiler does
|
|
|
+ # not support -o with -c
|
|
|
+ if test "$compiler_c_o" = no; then
|
|
|
+- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
|
|
|
++ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
|
|
|
+ lockfile="$output_obj.lock"
|
|
|
+ else
|
|
|
+ output_obj=
|
|
|
+@@ -1319,17 +2165,16 @@
|
|
|
+ $opt_dry_run || $RM $removelist
|
|
|
+ exit $EXIT_FAILURE
|
|
|
+ fi
|
|
|
+- removelist="$removelist $output_obj"
|
|
|
++ func_append removelist " $output_obj"
|
|
|
+ $ECHO "$srcfile" > "$lockfile"
|
|
|
+ fi
|
|
|
+
|
|
|
+ $opt_dry_run || $RM $removelist
|
|
|
+- removelist="$removelist $lockfile"
|
|
|
++ func_append removelist " $lockfile"
|
|
|
+ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
|
|
|
+
|
|
|
+- if test -n "$fix_srcfile_path"; then
|
|
|
+- eval srcfile=\"$fix_srcfile_path\"
|
|
|
+- fi
|
|
|
++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
|
|
|
++ srcfile=$func_to_tool_file_result
|
|
|
+ func_quote_for_eval "$srcfile"
|
|
|
+ qsrcfile=$func_quote_for_eval_result
|
|
|
+
|
|
|
+@@ -1349,7 +2194,7 @@
|
|
|
+
|
|
|
+ if test -z "$output_obj"; then
|
|
|
+ # Place PIC objects in $objdir
|
|
|
+- command="$command -o $lobj"
|
|
|
++ func_append command " -o $lobj"
|
|
|
+ fi
|
|
|
+
|
|
|
+ func_show_eval_locale "$command" \
|
|
|
+@@ -1396,11 +2241,11 @@
|
|
|
+ command="$base_compile $qsrcfile $pic_flag"
|
|
|
+ fi
|
|
|
+ if test "$compiler_c_o" = yes; then
|
|
|
+- command="$command -o $obj"
|
|
|
++ func_append command " -o $obj"
|
|
|
+ fi
|
|
|
+
|
|
|
+ # Suppress compiler output if we already did a PIC compilation.
|
|
|
+- command="$command$suppress_output"
|
|
|
++ func_append command "$suppress_output"
|
|
|
+ func_show_eval_locale "$command" \
|
|
|
+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
|
|
|
+
|
|
|
+@@ -1445,13 +2290,13 @@
|
|
|
+ }
|
|
|
+
|
|
|
+ $opt_help || {
|
|
|
+-test "$mode" = compile && func_mode_compile ${1+"$@"}
|
|
|
++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
|
|
|
+ }
|
|
|
+
|
|
|
+ func_mode_help ()
|
|
|
+ {
|
|
|
+ # We need to display help for each of the modes.
|
|
|
+- case $mode in
|
|
|
++ case $opt_mode in
|
|
|
+ "")
|
|
|
+ # Generic help is extracted from the usage comments
|
|
|
+ # at the start of this file.
|
|
|
+@@ -1482,10 +2327,11 @@
|
|
|
+
|
|
|
+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
|
|
|
+ -no-suppress do not suppress compiler output for multiple passes
|
|
|
+- -prefer-pic try to building PIC objects only
|
|
|
+- -prefer-non-pic try to building non-PIC objects only
|
|
|
++ -prefer-pic try to build PIC objects only
|
|
|
++ -prefer-non-pic try to build non-PIC objects only
|
|
|
+ -shared do not build a \`.o' file suitable for static linking
|
|
|
+ -static only build a \`.o' file suitable for static linking
|
|
|
++ -Wc,FLAG pass FLAG directly to the compiler
|
|
|
+
|
|
|
+ COMPILE-COMMAND is a command to be used in creating a \`standard' object file
|
|
|
+ from the given SOURCEFILE.
|
|
|
+@@ -1538,7 +2384,7 @@
|
|
|
+
|
|
|
+ The following components of INSTALL-COMMAND are treated specially:
|
|
|
+
|
|
|
+- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
|
|
|
++ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
|
|
|
+
|
|
|
+ The rest of the components are interpreted as arguments to that command (only
|
|
|
+ BSD-compatible install options are recognized)."
|
|
|
+@@ -1558,6 +2404,8 @@
|
|
|
+
|
|
|
+ -all-static do not do any dynamic linking at all
|
|
|
+ -avoid-version do not add a version suffix if possible
|
|
|
++ -bindir BINDIR specify path to binaries directory (for systems where
|
|
|
++ libraries must be found in the PATH setting at runtime)
|
|
|
+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
|
|
|
+ -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)
|
|
|
+@@ -1586,6 +2434,11 @@
|
|
|
+ -version-info CURRENT[:REVISION[:AGE]]
|
|
|
+ specify library version info [each variable defaults to 0]
|
|
|
+ -weak LIBNAME declare that the target provides the LIBNAME interface
|
|
|
++ -Wc,FLAG
|
|
|
++ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
|
|
|
++ -Wl,FLAG
|
|
|
++ -Xlinker FLAG pass linker-specific FLAG directly to the linker
|
|
|
++ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
|
|
|
+
|
|
|
+ All other options (arguments beginning with \`-') are ignored.
|
|
|
+
|
|
|
+@@ -1619,18 +2472,44 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ *)
|
|
|
+- func_fatal_help "invalid operation mode \`$mode'"
|
|
|
++ func_fatal_help "invalid operation mode \`$opt_mode'"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "Try \`$progname --help' for more information about other modes."
|
|
|
+-
|
|
|
+- exit $?
|
|
|
+ }
|
|
|
+
|
|
|
+- # Now that we've collected a possible --mode arg, show help if necessary
|
|
|
+- $opt_help && func_mode_help
|
|
|
++# Now that we've collected a possible --mode arg, show help if necessary
|
|
|
++if $opt_help; then
|
|
|
++ if test "$opt_help" = :; then
|
|
|
++ func_mode_help
|
|
|
++ else
|
|
|
++ {
|
|
|
++ func_help noexit
|
|
|
++ for opt_mode in compile link execute install finish uninstall clean; do
|
|
|
++ func_mode_help
|
|
|
++ done
|
|
|
++ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
|
|
|
++ {
|
|
|
++ func_help noexit
|
|
|
++ for opt_mode in compile link execute install finish uninstall clean; do
|
|
|
++ echo
|
|
|
++ func_mode_help
|
|
|
++ done
|
|
|
++ } |
|
|
|
++ sed '1d
|
|
|
++ /^When reporting/,/^Report/{
|
|
|
++ H
|
|
|
++ d
|
|
|
++ }
|
|
|
++ $x
|
|
|
++ /information about other modes/d
|
|
|
++ /more detailed .*MODE/d
|
|
|
++ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
|
|
|
++ fi
|
|
|
++ exit $?
|
|
|
++fi
|
|
|
+
|
|
|
+
|
|
|
+ # func_mode_execute arg...
|
|
|
+@@ -1643,13 +2522,16 @@
|
|
|
+ func_fatal_help "you must specify a COMMAND"
|
|
|
+
|
|
|
+ # Handle -dlopen flags immediately.
|
|
|
+- for file in $execute_dlfiles; do
|
|
|
++ for file in $opt_dlopen; do
|
|
|
+ test -f "$file" \
|
|
|
+ || func_fatal_help "\`$file' is not a file"
|
|
|
+
|
|
|
+ dir=
|
|
|
+ case $file in
|
|
|
+ *.la)
|
|
|
++ func_resolve_sysroot "$file"
|
|
|
++ file=$func_resolve_sysroot_result
|
|
|
++
|
|
|
+ # Check to see that this really is a libtool archive.
|
|
|
+ func_lalib_unsafe_p "$file" \
|
|
|
+ || func_fatal_help "\`$lib' is not a valid libtool archive"
|
|
|
+@@ -1671,7 +2553,7 @@
|
|
|
+ dir="$func_dirname_result"
|
|
|
+
|
|
|
+ if test -f "$dir/$objdir/$dlname"; then
|
|
|
+- dir="$dir/$objdir"
|
|
|
++ func_append dir "/$objdir"
|
|
|
+ else
|
|
|
+ if test ! -f "$dir/$dlname"; then
|
|
|
+ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
|
|
|
+@@ -1712,7 +2594,7 @@
|
|
|
+ for file
|
|
|
+ do
|
|
|
+ case $file in
|
|
|
+- -*) ;;
|
|
|
++ -* | *.la | *.lo ) ;;
|
|
|
+ *)
|
|
|
+ # Do a test to see if this is really a libtool program.
|
|
|
+ if func_ltwrapper_script_p "$file"; then
|
|
|
+@@ -1728,8 +2610,7 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ # Quote arguments (to preserve shell metacharacters).
|
|
|
+- func_quote_for_eval "$file"
|
|
|
+- args="$args $func_quote_for_eval_result"
|
|
|
++ func_append_quoted args "$file"
|
|
|
+ done
|
|
|
+
|
|
|
+ if test "X$opt_dry_run" = Xfalse; then
|
|
|
+@@ -1754,29 +2635,66 @@
|
|
|
+ # Display what would be done.
|
|
|
+ if test -n "$shlibpath_var"; then
|
|
|
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
|
|
|
+- $ECHO "export $shlibpath_var"
|
|
|
++ echo "export $shlibpath_var"
|
|
|
+ fi
|
|
|
+ $ECHO "$cmd$args"
|
|
|
+ exit $EXIT_SUCCESS
|
|
|
+ fi
|
|
|
+ }
|
|
|
+
|
|
|
+-test "$mode" = execute && func_mode_execute ${1+"$@"}
|
|
|
++test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
|
|
|
+
|
|
|
+
|
|
|
+ # func_mode_finish arg...
|
|
|
+ func_mode_finish ()
|
|
|
+ {
|
|
|
+ $opt_debug
|
|
|
+- libdirs="$nonopt"
|
|
|
++ libs=
|
|
|
++ libdirs=
|
|
|
+ admincmds=
|
|
|
+
|
|
|
+- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
|
|
|
+- for dir
|
|
|
+- do
|
|
|
+- libdirs="$libdirs $dir"
|
|
|
+- done
|
|
|
++ for opt in "$nonopt" ${1+"$@"}
|
|
|
++ do
|
|
|
++ if test -d "$opt"; then
|
|
|
++ func_append libdirs " $opt"
|
|
|
++
|
|
|
++ elif test -f "$opt"; then
|
|
|
++ if func_lalib_unsafe_p "$opt"; then
|
|
|
++ func_append libs " $opt"
|
|
|
++ else
|
|
|
++ func_warning "\`$opt' is not a valid libtool archive"
|
|
|
++ fi
|
|
|
+
|
|
|
++ else
|
|
|
++ func_fatal_error "invalid argument \`$opt'"
|
|
|
++ fi
|
|
|
++ done
|
|
|
++
|
|
|
++ if test -n "$libs"; then
|
|
|
++ if test -n "$lt_sysroot"; then
|
|
|
++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
|
|
|
++ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
|
|
|
++ else
|
|
|
++ sysroot_cmd=
|
|
|
++ fi
|
|
|
++
|
|
|
++ # Remove sysroot references
|
|
|
++ if $opt_dry_run; then
|
|
|
++ for lib in $libs; do
|
|
|
++ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
|
|
|
++ done
|
|
|
++ else
|
|
|
++ tmpdir=`func_mktempdir`
|
|
|
++ for lib in $libs; do
|
|
|
++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
|
|
|
++ > $tmpdir/tmp-la
|
|
|
++ mv -f $tmpdir/tmp-la $lib
|
|
|
++ done
|
|
|
++ ${RM}r "$tmpdir"
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++
|
|
|
++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
|
|
|
+ for libdir in $libdirs; do
|
|
|
+ if test -n "$finish_cmds"; then
|
|
|
+ # Do each command in the finish commands.
|
|
|
+@@ -1786,7 +2704,7 @@
|
|
|
+ if test -n "$finish_eval"; then
|
|
|
+ # Do the single finish_eval.
|
|
|
+ eval cmds=\"$finish_eval\"
|
|
|
+- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
|
|
|
++ $opt_dry_run || eval "$cmds" || func_append admincmds "
|
|
|
+ $cmds"
|
|
|
+ fi
|
|
|
+ done
|
|
|
+@@ -1795,53 +2713,55 @@
|
|
|
+ # Exit here if they wanted silent mode.
|
|
|
+ $opt_silent && exit $EXIT_SUCCESS
|
|
|
+
|
|
|
+- $ECHO "X----------------------------------------------------------------------" | $Xsed
|
|
|
+- $ECHO "Libraries have been installed in:"
|
|
|
+- for libdir in $libdirs; do
|
|
|
+- $ECHO " $libdir"
|
|
|
+- done
|
|
|
+- $ECHO
|
|
|
+- $ECHO "If you ever happen to want to link against installed libraries"
|
|
|
+- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
|
|
|
+- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
|
|
+- $ECHO "flag during linking and do at least one of the following:"
|
|
|
+- if test -n "$shlibpath_var"; then
|
|
|
+- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
|
|
+- $ECHO " during execution"
|
|
|
+- fi
|
|
|
+- if test -n "$runpath_var"; then
|
|
|
+- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
|
|
|
+- $ECHO " during linking"
|
|
|
+- fi
|
|
|
+- if test -n "$hardcode_libdir_flag_spec"; then
|
|
|
+- libdir=LIBDIR
|
|
|
+- eval flag=\"$hardcode_libdir_flag_spec\"
|
|
|
++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
|
|
|
++ echo "----------------------------------------------------------------------"
|
|
|
++ echo "Libraries have been installed in:"
|
|
|
++ for libdir in $libdirs; do
|
|
|
++ $ECHO " $libdir"
|
|
|
++ done
|
|
|
++ echo
|
|
|
++ echo "If you ever happen to want to link against installed libraries"
|
|
|
++ echo "in a given directory, LIBDIR, you must either use libtool, and"
|
|
|
++ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
|
|
++ echo "flag during linking and do at least one of the following:"
|
|
|
++ if test -n "$shlibpath_var"; then
|
|
|
++ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
|
|
++ echo " during execution"
|
|
|
++ fi
|
|
|
++ if test -n "$runpath_var"; then
|
|
|
++ echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
|
|
++ echo " during linking"
|
|
|
++ fi
|
|
|
++ if test -n "$hardcode_libdir_flag_spec"; then
|
|
|
++ libdir=LIBDIR
|
|
|
++ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
|
++
|
|
|
++ $ECHO " - use the \`$flag' linker flag"
|
|
|
++ fi
|
|
|
++ if test -n "$admincmds"; then
|
|
|
++ $ECHO " - have your system administrator run these commands:$admincmds"
|
|
|
++ fi
|
|
|
++ if test -f /etc/ld.so.conf; then
|
|
|
++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
|
|
++ fi
|
|
|
++ echo
|
|
|
+
|
|
|
+- $ECHO " - use the \`$flag' linker flag"
|
|
|
+- fi
|
|
|
+- if test -n "$admincmds"; then
|
|
|
+- $ECHO " - have your system administrator run these commands:$admincmds"
|
|
|
+- fi
|
|
|
+- if test -f /etc/ld.so.conf; then
|
|
|
+- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
|
|
++ echo "See any operating system documentation about shared libraries for"
|
|
|
++ case $host in
|
|
|
++ solaris2.[6789]|solaris2.1[0-9])
|
|
|
++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
|
|
|
++ echo "pages."
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ echo "----------------------------------------------------------------------"
|
|
|
+ fi
|
|
|
+- $ECHO
|
|
|
+-
|
|
|
+- $ECHO "See any operating system documentation about shared libraries for"
|
|
|
+- case $host in
|
|
|
+- solaris2.[6789]|solaris2.1[0-9])
|
|
|
+- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
|
|
|
+- $ECHO "pages."
|
|
|
+- ;;
|
|
|
+- *)
|
|
|
+- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
+- $ECHO "X----------------------------------------------------------------------" | $Xsed
|
|
|
+ exit $EXIT_SUCCESS
|
|
|
+ }
|
|
|
+
|
|
|
+-test "$mode" = finish && func_mode_finish ${1+"$@"}
|
|
|
++test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
|
|
|
+
|
|
|
+
|
|
|
+ # func_mode_install arg...
|
|
|
+@@ -1852,7 +2772,7 @@
|
|
|
+ # 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" | $GREP shtool >/dev/null; then
|
|
|
++ case $nonopt in *shtool*) :;; *) false;; esac; then
|
|
|
+ # Aesthetically quote it.
|
|
|
+ func_quote_for_eval "$nonopt"
|
|
|
+ install_prog="$func_quote_for_eval_result "
|
|
|
+@@ -1866,7 +2786,12 @@
|
|
|
+ # The real first argument should be the name of the installation program.
|
|
|
+ # Aesthetically quote it.
|
|
|
+ func_quote_for_eval "$arg"
|
|
|
+- install_prog="$install_prog$func_quote_for_eval_result"
|
|
|
++ func_append install_prog "$func_quote_for_eval_result"
|
|
|
++ install_shared_prog=$install_prog
|
|
|
++ case " $install_prog " in
|
|
|
++ *[\\\ /]cp\ *) install_cp=: ;;
|
|
|
++ *) install_cp=false ;;
|
|
|
++ esac
|
|
|
+
|
|
|
+ # We need to accept at least all the BSD install flags.
|
|
|
+ dest=
|
|
|
+@@ -1876,10 +2801,12 @@
|
|
|
+ install_type=
|
|
|
+ isdir=no
|
|
|
+ stripme=
|
|
|
++ no_mode=:
|
|
|
+ for arg
|
|
|
+ do
|
|
|
++ arg2=
|
|
|
+ if test -n "$dest"; then
|
|
|
+- files="$files $dest"
|
|
|
++ func_append files " $dest"
|
|
|
+ dest=$arg
|
|
|
+ continue
|
|
|
+ fi
|
|
|
+@@ -1887,10 +2814,9 @@
|
|
|
+ case $arg in
|
|
|
+ -d) isdir=yes ;;
|
|
|
+ -f)
|
|
|
+- case " $install_prog " in
|
|
|
+- *[\\\ /]cp\ *) ;;
|
|
|
+- *) prev=$arg ;;
|
|
|
+- esac
|
|
|
++ if $install_cp; then :; else
|
|
|
++ prev=$arg
|
|
|
++ fi
|
|
|
+ ;;
|
|
|
+ -g | -m | -o)
|
|
|
+ prev=$arg
|
|
|
+@@ -1904,6 +2830,10 @@
|
|
|
+ *)
|
|
|
+ # If the previous option needed an argument, then skip it.
|
|
|
+ if test -n "$prev"; then
|
|
|
++ if test "x$prev" = x-m && test -n "$install_override_mode"; then
|
|
|
++ arg2=$install_override_mode
|
|
|
++ no_mode=false
|
|
|
++ fi
|
|
|
+ prev=
|
|
|
+ else
|
|
|
+ dest=$arg
|
|
|
+@@ -1914,7 +2844,11 @@
|
|
|
+
|
|
|
+ # Aesthetically quote the argument.
|
|
|
+ func_quote_for_eval "$arg"
|
|
|
+- install_prog="$install_prog $func_quote_for_eval_result"
|
|
|
++ func_append install_prog " $func_quote_for_eval_result"
|
|
|
++ if test -n "$arg2"; then
|
|
|
++ func_quote_for_eval "$arg2"
|
|
|
++ fi
|
|
|
++ func_append install_shared_prog " $func_quote_for_eval_result"
|
|
|
+ done
|
|
|
+
|
|
|
+ test -z "$install_prog" && \
|
|
|
+@@ -1923,6 +2857,13 @@
|
|
|
+ test -n "$prev" && \
|
|
|
+ func_fatal_help "the \`$prev' option requires an argument"
|
|
|
+
|
|
|
++ if test -n "$install_override_mode" && $no_mode; then
|
|
|
++ if $install_cp; then :; else
|
|
|
++ func_quote_for_eval "$install_override_mode"
|
|
|
++ func_append install_shared_prog " -m $func_quote_for_eval_result"
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++
|
|
|
+ if test -z "$files"; then
|
|
|
+ if test -z "$dest"; then
|
|
|
+ func_fatal_help "no file or destination specified"
|
|
|
+@@ -1977,10 +2918,13 @@
|
|
|
+ case $file in
|
|
|
+ *.$libext)
|
|
|
+ # Do the static libraries later.
|
|
|
+- staticlibs="$staticlibs $file"
|
|
|
++ func_append staticlibs " $file"
|
|
|
+ ;;
|
|
|
+
|
|
|
+ *.la)
|
|
|
++ func_resolve_sysroot "$file"
|
|
|
++ file=$func_resolve_sysroot_result
|
|
|
++
|
|
|
+ # Check to see that this really is a libtool archive.
|
|
|
+ func_lalib_unsafe_p "$file" \
|
|
|
+ || func_fatal_help "\`$file' is not a valid libtool archive"
|
|
|
+@@ -1994,23 +2938,23 @@
|
|
|
+ if test "X$destdir" = "X$libdir"; then
|
|
|
+ case "$current_libdirs " in
|
|
|
+ *" $libdir "*) ;;
|
|
|
+- *) current_libdirs="$current_libdirs $libdir" ;;
|
|
|
++ *) func_append current_libdirs " $libdir" ;;
|
|
|
+ esac
|
|
|
+ else
|
|
|
+ # Note the libdir as a future libdir.
|
|
|
+ case "$future_libdirs " in
|
|
|
+ *" $libdir "*) ;;
|
|
|
+- *) future_libdirs="$future_libdirs $libdir" ;;
|
|
|
++ *) func_append future_libdirs " $libdir" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+
|
|
|
+ func_dirname "$file" "/" ""
|
|
|
+ dir="$func_dirname_result"
|
|
|
+- dir="$dir$objdir"
|
|
|
++ func_append dir "$objdir"
|
|
|
+
|
|
|
+ if test -n "$relink_command"; then
|
|
|
+ # Determine the prefix the user has applied to our future dir.
|
|
|
+- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
|
|
|
++ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
|
|
|
+
|
|
|
+ # Don't allow the user to place us outside of our expected
|
|
|
+ # location b/c this prevents finding dependent libraries that
|
|
|
+@@ -2023,9 +2967,9 @@
|
|
|
+
|
|
|
+ if test -n "$inst_prefix_dir"; then
|
|
|
+ # Stick the inst_prefix_dir data into the link command.
|
|
|
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
|
|
++ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
|
|
+ else
|
|
|
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
|
|
|
++ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
|
|
|
+ fi
|
|
|
+
|
|
|
+ func_warning "relinking \`$file'"
|
|
|
+@@ -2043,7 +2987,7 @@
|
|
|
+ test -n "$relink_command" && srcname="$realname"T
|
|
|
+
|
|
|
+ # Install the shared library and build the symlinks.
|
|
|
+- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
|
|
|
++ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
|
|
|
+ 'exit $?'
|
|
|
+ tstripme="$stripme"
|
|
|
+ case $host_os in
|
|
|
+@@ -2083,7 +3027,7 @@
|
|
|
+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
|
|
|
+
|
|
|
+ # Maybe install the static library, too.
|
|
|
+- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
|
|
|
++ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
|
|
|
+ ;;
|
|
|
+
|
|
|
+ *.lo)
|
|
|
+@@ -2183,7 +3127,7 @@
|
|
|
+ if test -f "$lib"; then
|
|
|
+ func_source "$lib"
|
|
|
+ fi
|
|
|
+- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
|
|
|
++ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
|
|
|
+ if test -n "$libdir" && test ! -f "$libfile"; then
|
|
|
+ func_warning "\`$lib' has not been installed in \`$libdir'"
|
|
|
+ finalize=no
|
|
|
+@@ -2202,7 +3146,7 @@
|
|
|
+ file="$func_basename_result"
|
|
|
+ outputname="$tmpdir/$file"
|
|
|
+ # Replace the output file specification.
|
|
|
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
|
|
|
++ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
|
|
|
+
|
|
|
+ $opt_silent || {
|
|
|
+ func_quote_for_expand "$relink_command"
|
|
|
+@@ -2221,7 +3165,7 @@
|
|
|
+ }
|
|
|
+ else
|
|
|
+ # Install the binary that we compiled earlier.
|
|
|
+- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
|
|
|
++ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -2280,7 +3224,7 @@
|
|
|
+ fi
|
|
|
+ }
|
|
|
+
|
|
|
+-test "$mode" = install && func_mode_install ${1+"$@"}
|
|
|
++test "$opt_mode" = install && func_mode_install ${1+"$@"}
|
|
|
+
|
|
|
+
|
|
|
+ # func_generate_dlsyms outputname originator pic_p
|
|
|
+@@ -2323,6 +3267,22 @@
|
|
|
+ extern \"C\" {
|
|
|
+ #endif
|
|
|
+
|
|
|
++#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
|
|
|
++#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
|
|
|
++#endif
|
|
|
++
|
|
|
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
|
|
|
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
|
|
|
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
|
|
|
++ relocations are performed -- see ld's documentation on pseudo-relocs. */
|
|
|
++# define LT_DLSYM_CONST
|
|
|
++#elif defined(__osf__)
|
|
|
++/* This system does not cope well with relocations in const data. */
|
|
|
++# define LT_DLSYM_CONST
|
|
|
++#else
|
|
|
++# define LT_DLSYM_CONST const
|
|
|
++#endif
|
|
|
++
|
|
|
+ /* External symbol declarations for the compiler. */\
|
|
|
+ "
|
|
|
+
|
|
|
+@@ -2332,10 +3292,11 @@
|
|
|
+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
|
|
|
+
|
|
|
+ # Add our own program objects to the symbol list.
|
|
|
+- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
|
|
++ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
|
|
|
+ for progfile in $progfiles; do
|
|
|
+- func_verbose "extracting global C symbols from \`$progfile'"
|
|
|
+- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
|
|
|
++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
|
|
|
++ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
|
|
|
++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
|
|
|
+ done
|
|
|
+
|
|
|
+ if test -n "$exclude_expsyms"; then
|
|
|
+@@ -2371,7 +3332,7 @@
|
|
|
+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
|
|
|
+ eval '$MV "$nlist"T "$nlist"'
|
|
|
+ case $host in
|
|
|
+- *cygwin | *mingw* | *cegcc* )
|
|
|
++ *cygwin* | *mingw* | *cegcc* )
|
|
|
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
|
|
|
+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
|
|
|
+ ;;
|
|
|
+@@ -2384,10 +3345,52 @@
|
|
|
+ func_verbose "extracting global C symbols from \`$dlprefile'"
|
|
|
+ func_basename "$dlprefile"
|
|
|
+ name="$func_basename_result"
|
|
|
+- $opt_dry_run || {
|
|
|
+- eval '$ECHO ": $name " >> "$nlist"'
|
|
|
+- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
|
|
|
+- }
|
|
|
++ case $host in
|
|
|
++ *cygwin* | *mingw* | *cegcc* )
|
|
|
++ # if an import library, we need to obtain dlname
|
|
|
++ if func_win32_import_lib_p "$dlprefile"; then
|
|
|
++ func_tr_sh "$dlprefile"
|
|
|
++ eval "curr_lafile=\$libfile_$func_tr_sh_result"
|
|
|
++ dlprefile_dlbasename=""
|
|
|
++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
|
|
|
++ # Use subshell, to avoid clobbering current variable values
|
|
|
++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
|
|
|
++ if test -n "$dlprefile_dlname" ; then
|
|
|
++ func_basename "$dlprefile_dlname"
|
|
|
++ dlprefile_dlbasename="$func_basename_result"
|
|
|
++ else
|
|
|
++ # no lafile. user explicitly requested -dlpreopen <import library>.
|
|
|
++ $sharedlib_from_linklib_cmd "$dlprefile"
|
|
|
++ dlprefile_dlbasename=$sharedlib_from_linklib_result
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++ $opt_dry_run || {
|
|
|
++ if test -n "$dlprefile_dlbasename" ; then
|
|
|
++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
|
|
|
++ else
|
|
|
++ func_warning "Could not compute DLL name from $name"
|
|
|
++ eval '$ECHO ": $name " >> "$nlist"'
|
|
|
++ fi
|
|
|
++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
|
|
|
++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
|
|
|
++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
|
|
|
++ }
|
|
|
++ else # not an import lib
|
|
|
++ $opt_dry_run || {
|
|
|
++ eval '$ECHO ": $name " >> "$nlist"'
|
|
|
++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
|
|
|
++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
|
|
|
++ }
|
|
|
++ fi
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ $opt_dry_run || {
|
|
|
++ eval '$ECHO ": $name " >> "$nlist"'
|
|
|
++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
|
|
|
++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
|
|
|
++ }
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ done
|
|
|
+
|
|
|
+ $opt_dry_run || {
|
|
|
+@@ -2415,36 +3418,19 @@
|
|
|
+ if test -f "$nlist"S; then
|
|
|
+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
|
|
|
+ else
|
|
|
+- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
|
|
|
++ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
|
|
|
+ fi
|
|
|
+
|
|
|
+- $ECHO >> "$output_objdir/$my_dlsyms" "\
|
|
|
++ echo >> "$output_objdir/$my_dlsyms" "\
|
|
|
+
|
|
|
+ /* The mapping between symbol names and symbols. */
|
|
|
+ typedef struct {
|
|
|
+ const char *name;
|
|
|
+ void *address;
|
|
|
+ } lt_dlsymlist;
|
|
|
+-"
|
|
|
+- case $host in
|
|
|
+- *cygwin* | *mingw* | *cegcc* )
|
|
|
+- $ECHO >> "$output_objdir/$my_dlsyms" "\
|
|
|
+-/* DATA imports from DLLs on WIN32 con't be const, because
|
|
|
+- runtime relocations are performed -- see ld's documentation
|
|
|
+- on pseudo-relocs. */"
|
|
|
+- lt_dlsym_const= ;;
|
|
|
+- *osf5*)
|
|
|
+- echo >> "$output_objdir/$my_dlsyms" "\
|
|
|
+-/* This system does not cope well with relocations in const data */"
|
|
|
+- lt_dlsym_const= ;;
|
|
|
+- *)
|
|
|
+- lt_dlsym_const=const ;;
|
|
|
+- esac
|
|
|
+-
|
|
|
+- $ECHO >> "$output_objdir/$my_dlsyms" "\
|
|
|
+-extern $lt_dlsym_const lt_dlsymlist
|
|
|
++extern LT_DLSYM_CONST lt_dlsymlist
|
|
|
+ lt_${my_prefix}_LTX_preloaded_symbols[];
|
|
|
+-$lt_dlsym_const lt_dlsymlist
|
|
|
++LT_DLSYM_CONST lt_dlsymlist
|
|
|
+ lt_${my_prefix}_LTX_preloaded_symbols[] =
|
|
|
+ {\
|
|
|
+ { \"$my_originator\", (void *) 0 },"
|
|
|
+@@ -2457,7 +3443,7 @@
|
|
|
+ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+- $ECHO >> "$output_objdir/$my_dlsyms" "\
|
|
|
++ echo >> "$output_objdir/$my_dlsyms" "\
|
|
|
+ {0, (void *) 0}
|
|
|
+ };
|
|
|
+
|
|
|
+@@ -2500,7 +3486,7 @@
|
|
|
+ for arg in $LTCFLAGS; do
|
|
|
+ case $arg in
|
|
|
+ -pie | -fpie | -fPIE) ;;
|
|
|
+- *) symtab_cflags="$symtab_cflags $arg" ;;
|
|
|
++ *) func_append symtab_cflags " $arg" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+
|
|
|
+@@ -2515,16 +3501,16 @@
|
|
|
+ case $host in
|
|
|
+ *cygwin* | *mingw* | *cegcc* )
|
|
|
+ if test -f "$output_objdir/$my_outputname.def"; then
|
|
|
+- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
|
|
+- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
|
|
++ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
|
|
++ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
|
|
+ else
|
|
|
+- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
|
|
|
+- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
|
|
|
++ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
|
|
|
++ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
|
|
|
+- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
|
|
|
++ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
|
|
|
++ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+@@ -2538,8 +3524,8 @@
|
|
|
+ # 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 "$compile_command" | $SED "s% @SYMFILE@%%"`
|
|
|
++ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
|
|
|
+ fi
|
|
|
+ }
|
|
|
+
|
|
|
+@@ -2549,6 +3535,7 @@
|
|
|
+ # 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.
|
|
|
++# Despite the name, also deal with 64 bit binaries.
|
|
|
+ func_win32_libid ()
|
|
|
+ {
|
|
|
+ $opt_debug
|
|
|
+@@ -2559,9 +3546,11 @@
|
|
|
+ win32_libid_type="x86 archive import"
|
|
|
+ ;;
|
|
|
+ *ar\ archive*) # could be an import, or static
|
|
|
++ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
|
|
|
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
|
|
|
+- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
|
|
+- win32_nmres=`eval $NM -f posix -A $1 |
|
|
|
++ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
|
|
|
++ func_to_tool_file "$1" func_convert_file_msys_to_w32
|
|
|
++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
|
|
|
+ $SED -n -e '
|
|
|
+ 1,100{
|
|
|
+ / I /{
|
|
|
+@@ -2590,6 +3579,131 @@
|
|
|
+ $ECHO "$win32_libid_type"
|
|
|
+ }
|
|
|
+
|
|
|
++# func_cygming_dll_for_implib ARG
|
|
|
++#
|
|
|
++# Platform-specific function to extract the
|
|
|
++# name of the DLL associated with the specified
|
|
|
++# import library ARG.
|
|
|
++# Invoked by eval'ing the libtool variable
|
|
|
++# $sharedlib_from_linklib_cmd
|
|
|
++# Result is available in the variable
|
|
|
++# $sharedlib_from_linklib_result
|
|
|
++func_cygming_dll_for_implib ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
|
|
|
++}
|
|
|
++
|
|
|
++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
|
|
|
++#
|
|
|
++# The is the core of a fallback implementation of a
|
|
|
++# platform-specific function to extract the name of the
|
|
|
++# DLL associated with the specified import library LIBNAME.
|
|
|
++#
|
|
|
++# SECTION_NAME is either .idata$6 or .idata$7, depending
|
|
|
++# on the platform and compiler that created the implib.
|
|
|
++#
|
|
|
++# Echos the name of the DLL associated with the
|
|
|
++# specified import library.
|
|
|
++func_cygming_dll_for_implib_fallback_core ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
|
|
|
++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
|
|
|
++ $SED '/^Contents of section '"$match_literal"':/{
|
|
|
++ # Place marker at beginning of archive member dllname section
|
|
|
++ s/.*/====MARK====/
|
|
|
++ p
|
|
|
++ d
|
|
|
++ }
|
|
|
++ # These lines can sometimes be longer than 43 characters, but
|
|
|
++ # are always uninteresting
|
|
|
++ /:[ ]*file format pe[i]\{,1\}-/d
|
|
|
++ /^In archive [^:]*:/d
|
|
|
++ # Ensure marker is printed
|
|
|
++ /^====MARK====/p
|
|
|
++ # Remove all lines with less than 43 characters
|
|
|
++ /^.\{43\}/!d
|
|
|
++ # From remaining lines, remove first 43 characters
|
|
|
++ s/^.\{43\}//' |
|
|
|
++ $SED -n '
|
|
|
++ # Join marker and all lines until next marker into a single line
|
|
|
++ /^====MARK====/ b para
|
|
|
++ H
|
|
|
++ $ b para
|
|
|
++ b
|
|
|
++ :para
|
|
|
++ x
|
|
|
++ s/\n//g
|
|
|
++ # Remove the marker
|
|
|
++ s/^====MARK====//
|
|
|
++ # Remove trailing dots and whitespace
|
|
|
++ s/[\. \t]*$//
|
|
|
++ # Print
|
|
|
++ /./p' |
|
|
|
++ # we now have a list, one entry per line, of the stringified
|
|
|
++ # contents of the appropriate section of all members of the
|
|
|
++ # archive which possess that section. Heuristic: eliminate
|
|
|
++ # all those which have a first or second character that is
|
|
|
++ # a '.' (that is, objdump's representation of an unprintable
|
|
|
++ # character.) This should work for all archives with less than
|
|
|
++ # 0x302f exports -- but will fail for DLLs whose name actually
|
|
|
++ # begins with a literal '.' or a single character followed by
|
|
|
++ # a '.'.
|
|
|
++ #
|
|
|
++ # Of those that remain, print the first one.
|
|
|
++ $SED -e '/^\./d;/^.\./d;q'
|
|
|
++}
|
|
|
++
|
|
|
++# func_cygming_gnu_implib_p ARG
|
|
|
++# This predicate returns with zero status (TRUE) if
|
|
|
++# ARG is a GNU/binutils-style import library. Returns
|
|
|
++# with nonzero status (FALSE) otherwise.
|
|
|
++func_cygming_gnu_implib_p ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_tool_file "$1" func_convert_file_msys_to_w32
|
|
|
++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
|
|
|
++ test -n "$func_cygming_gnu_implib_tmp"
|
|
|
++}
|
|
|
++
|
|
|
++# func_cygming_ms_implib_p ARG
|
|
|
++# This predicate returns with zero status (TRUE) if
|
|
|
++# ARG is an MS-style import library. Returns
|
|
|
++# with nonzero status (FALSE) otherwise.
|
|
|
++func_cygming_ms_implib_p ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ func_to_tool_file "$1" func_convert_file_msys_to_w32
|
|
|
++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
|
|
|
++ test -n "$func_cygming_ms_implib_tmp"
|
|
|
++}
|
|
|
++
|
|
|
++# func_cygming_dll_for_implib_fallback ARG
|
|
|
++# Platform-specific function to extract the
|
|
|
++# name of the DLL associated with the specified
|
|
|
++# import library ARG.
|
|
|
++#
|
|
|
++# This fallback implementation is for use when $DLLTOOL
|
|
|
++# does not support the --identify-strict option.
|
|
|
++# Invoked by eval'ing the libtool variable
|
|
|
++# $sharedlib_from_linklib_cmd
|
|
|
++# Result is available in the variable
|
|
|
++# $sharedlib_from_linklib_result
|
|
|
++func_cygming_dll_for_implib_fallback ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ if func_cygming_gnu_implib_p "$1" ; then
|
|
|
++ # binutils import library
|
|
|
++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
|
|
|
++ elif func_cygming_ms_implib_p "$1" ; then
|
|
|
++ # ms-generated import library
|
|
|
++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
|
|
|
++ else
|
|
|
++ # unknown
|
|
|
++ sharedlib_from_linklib_result=""
|
|
|
++ fi
|
|
|
++}
|
|
|
+
|
|
|
+
|
|
|
+ # func_extract_an_archive dir oldlib
|
|
|
+@@ -2598,7 +3712,18 @@
|
|
|
+ $opt_debug
|
|
|
+ f_ex_an_ar_dir="$1"; shift
|
|
|
+ f_ex_an_ar_oldlib="$1"
|
|
|
+- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
|
|
|
++ if test "$lock_old_archive_extraction" = yes; then
|
|
|
++ lockfile=$f_ex_an_ar_oldlib.lock
|
|
|
++ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
|
|
|
++ func_echo "Waiting for $lockfile to be removed"
|
|
|
++ sleep 2
|
|
|
++ done
|
|
|
++ fi
|
|
|
++ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
|
|
|
++ 'stat=$?; rm -f "$lockfile"; exit $stat'
|
|
|
++ if test "$lock_old_archive_extraction" = yes; then
|
|
|
++ $opt_dry_run || rm -f "$lockfile"
|
|
|
++ fi
|
|
|
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
|
|
|
+ :
|
|
|
+ else
|
|
|
+@@ -2669,7 +3794,7 @@
|
|
|
+ darwin_file=
|
|
|
+ darwin_files=
|
|
|
+ for darwin_file in $darwin_filelist; do
|
|
|
+- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
|
|
|
++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
|
|
|
+ $LIPO -create -output "$darwin_file" $darwin_files
|
|
|
+ done # $darwin_filelist
|
|
|
+ $RM -rf unfat-$$
|
|
|
+@@ -2684,25 +3809,30 @@
|
|
|
+ func_extract_an_archive "$my_xdir" "$my_xabs"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
|
|
|
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
|
|
|
+ done
|
|
|
+
|
|
|
+ func_extract_archives_result="$my_oldobjs"
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+-
|
|
|
+-# func_emit_wrapper_part1 [arg=no]
|
|
|
++# func_emit_wrapper [arg=no]
|
|
|
+ #
|
|
|
+-# Emit the first part of a libtool wrapper script on stdout.
|
|
|
+-# For more information, see the description associated with
|
|
|
+-# func_emit_wrapper(), below.
|
|
|
+-func_emit_wrapper_part1 ()
|
|
|
+-{
|
|
|
+- func_emit_wrapper_part1_arg1=no
|
|
|
+- if test -n "$1" ; then
|
|
|
+- func_emit_wrapper_part1_arg1=$1
|
|
|
+- fi
|
|
|
++# Emit a libtool wrapper script on stdout.
|
|
|
++# Don't directly open a file because we may want to
|
|
|
++# incorporate the script contents within a cygwin/mingw
|
|
|
++# wrapper executable. Must ONLY be called from within
|
|
|
++# func_mode_link because it depends on a number of variables
|
|
|
++# set therein.
|
|
|
++#
|
|
|
++# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
|
|
|
++# variable will take. If 'yes', then the emitted script
|
|
|
++# will assume that the directory in which it is stored is
|
|
|
++# the $objdir directory. This is a cygwin/mingw-specific
|
|
|
++# behavior.
|
|
|
++func_emit_wrapper ()
|
|
|
++{
|
|
|
++ func_emit_wrapper_arg1=${1-no}
|
|
|
+
|
|
|
+ $ECHO "\
|
|
|
+ #! $SHELL
|
|
|
+@@ -2718,7 +3848,6 @@
|
|
|
+
|
|
|
+ # Sed substitution that helps us do robust quoting. It backslashifies
|
|
|
+ # metacharacters that are still active within double-quoted strings.
|
|
|
+-Xsed='${SED} -e 1s/^X//'
|
|
|
+ sed_quote_subst='$sed_quote_subst'
|
|
|
+
|
|
|
+ # Be Bourne compatible
|
|
|
+@@ -2749,31 +3878,132 @@
|
|
|
+ else
|
|
|
+ # When we are sourced in execute mode, \$file and \$ECHO are already set.
|
|
|
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
|
|
+- ECHO=\"$qecho\"
|
|
|
+- file=\"\$0\"
|
|
|
+- # Make sure echo works.
|
|
|
+- if test \"X\$1\" = X--no-reexec; then
|
|
|
+- # Discard the --no-reexec flag, and continue.
|
|
|
+- shift
|
|
|
+- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
|
|
|
+- # Yippee, \$ECHO works!
|
|
|
+- :
|
|
|
+- else
|
|
|
+- # Restart under the correct shell, and then maybe \$ECHO will work.
|
|
|
+- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
|
|
|
+- fi
|
|
|
+- fi\
|
|
|
++ file=\"\$0\""
|
|
|
++
|
|
|
++ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
|
|
|
++ $ECHO "\
|
|
|
++
|
|
|
++# A function that is used when there is no print builtin or printf.
|
|
|
++func_fallback_echo ()
|
|
|
++{
|
|
|
++ eval 'cat <<_LTECHO_EOF
|
|
|
++\$1
|
|
|
++_LTECHO_EOF'
|
|
|
++}
|
|
|
++ ECHO=\"$qECHO\"
|
|
|
++ fi
|
|
|
++
|
|
|
++# Very basic option parsing. These options are (a) specific to
|
|
|
++# the libtool wrapper, (b) are identical between the wrapper
|
|
|
++# /script/ and the wrapper /executable/ which is used only on
|
|
|
++# windows platforms, and (c) all begin with the string "--lt-"
|
|
|
++# (application programs are unlikely to have options which match
|
|
|
++# this pattern).
|
|
|
++#
|
|
|
++# There are only two supported options: --lt-debug and
|
|
|
++# --lt-dump-script. There is, deliberately, no --lt-help.
|
|
|
++#
|
|
|
++# The first argument to this parsing function should be the
|
|
|
++# script's $0 value, followed by "$@".
|
|
|
++lt_option_debug=
|
|
|
++func_parse_lt_options ()
|
|
|
++{
|
|
|
++ lt_script_arg0=\$0
|
|
|
++ shift
|
|
|
++ for lt_opt
|
|
|
++ do
|
|
|
++ case \"\$lt_opt\" in
|
|
|
++ --lt-debug) lt_option_debug=1 ;;
|
|
|
++ --lt-dump-script)
|
|
|
++ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
|
|
|
++ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
|
|
|
++ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
|
|
|
++ cat \"\$lt_dump_D/\$lt_dump_F\"
|
|
|
++ exit 0
|
|
|
++ ;;
|
|
|
++ --lt-*)
|
|
|
++ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
|
|
|
++ exit 1
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ done
|
|
|
++
|
|
|
++ # Print the debug banner immediately:
|
|
|
++ if test -n \"\$lt_option_debug\"; then
|
|
|
++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
|
|
|
++ fi
|
|
|
++}
|
|
|
++
|
|
|
++# Used when --lt-debug. Prints its arguments to stdout
|
|
|
++# (redirection is the responsibility of the caller)
|
|
|
++func_lt_dump_args ()
|
|
|
++{
|
|
|
++ lt_dump_args_N=1;
|
|
|
++ for lt_arg
|
|
|
++ do
|
|
|
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
|
|
|
++ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
|
|
|
++ done
|
|
|
++}
|
|
|
++
|
|
|
++# Core function for launching the target application
|
|
|
++func_exec_program_core ()
|
|
|
++{
|
|
|
+ "
|
|
|
+- $ECHO "\
|
|
|
++ case $host in
|
|
|
++ # Backslashes separate directories on plain windows
|
|
|
++ *-*-mingw | *-*-os2* | *-cegcc*)
|
|
|
++ $ECHO "\
|
|
|
++ if test -n \"\$lt_option_debug\"; then
|
|
|
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
|
|
|
++ func_lt_dump_args \${1+\"\$@\"} 1>&2
|
|
|
++ fi
|
|
|
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
|
|
|
++"
|
|
|
++ ;;
|
|
|
++
|
|
|
++ *)
|
|
|
++ $ECHO "\
|
|
|
++ if test -n \"\$lt_option_debug\"; then
|
|
|
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
|
|
|
++ func_lt_dump_args \${1+\"\$@\"} 1>&2
|
|
|
++ fi
|
|
|
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
|
|
|
++"
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ $ECHO "\
|
|
|
++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
|
|
|
++ exit 1
|
|
|
++}
|
|
|
++
|
|
|
++# A function to encapsulate launching the target application
|
|
|
++# Strips options in the --lt-* namespace from \$@ and
|
|
|
++# launches target application with the remaining arguments.
|
|
|
++func_exec_program ()
|
|
|
++{
|
|
|
++ for lt_wr_arg
|
|
|
++ do
|
|
|
++ case \$lt_wr_arg in
|
|
|
++ --lt-*) ;;
|
|
|
++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
|
|
|
++ esac
|
|
|
++ shift
|
|
|
++ done
|
|
|
++ func_exec_program_core \${1+\"\$@\"}
|
|
|
++}
|
|
|
++
|
|
|
++ # Parse options
|
|
|
++ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
|
|
|
+
|
|
|
+ # Find the directory that this script lives in.
|
|
|
+- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
|
|
|
++ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
|
|
|
+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
|
|
|
+
|
|
|
+ # Follow symbolic links until we get to the real thisdir.
|
|
|
+- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
|
|
|
++ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
|
|
|
+ while test -n \"\$file\"; do
|
|
|
+- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
|
|
|
++ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
|
|
|
+
|
|
|
+ # If there was a directory component, then change thisdir.
|
|
|
+ if test \"x\$destdir\" != \"x\$file\"; then
|
|
|
+@@ -2783,30 +4013,13 @@
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+
|
|
|
+- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
|
|
|
+- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
|
|
|
++ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
|
|
|
++ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
|
|
|
+ done
|
|
|
+-"
|
|
|
+-}
|
|
|
+-# end: func_emit_wrapper_part1
|
|
|
+-
|
|
|
+-# func_emit_wrapper_part2 [arg=no]
|
|
|
+-#
|
|
|
+-# Emit the second part of a libtool wrapper script on stdout.
|
|
|
+-# For more information, see the description associated with
|
|
|
+-# func_emit_wrapper(), below.
|
|
|
+-func_emit_wrapper_part2 ()
|
|
|
+-{
|
|
|
+- func_emit_wrapper_part2_arg1=no
|
|
|
+- if test -n "$1" ; then
|
|
|
+- func_emit_wrapper_part2_arg1=$1
|
|
|
+- fi
|
|
|
+-
|
|
|
+- $ECHO "\
|
|
|
+
|
|
|
+ # Usually 'no', except on cygwin/mingw when embedded into
|
|
|
+ # the cwrapper.
|
|
|
+- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
|
|
|
++ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
|
|
|
+ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
|
|
|
+ # special case for '.'
|
|
|
+ if test \"\$thisdir\" = \".\"; then
|
|
|
+@@ -2814,7 +4027,7 @@
|
|
|
+ fi
|
|
|
+ # remove .libs from thisdir
|
|
|
+ case \"\$thisdir\" in
|
|
|
+- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
|
|
|
++ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
|
|
|
+ $objdir ) thisdir=. ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+@@ -2869,6 +4082,18 @@
|
|
|
+
|
|
|
+ if test -f \"\$progdir/\$program\"; then"
|
|
|
+
|
|
|
++ # fixup the dll searchpath if we need to.
|
|
|
++ #
|
|
|
++ # Fix the DLL searchpath if we need to. Do this before prepending
|
|
|
++ # to shlibpath, because on Windows, both are PATH and uninstalled
|
|
|
++ # libraries must come first.
|
|
|
++ if test -n "$dllsearchpath"; then
|
|
|
++ $ECHO "\
|
|
|
++ # Add the dll search path components to the executable PATH
|
|
|
++ PATH=$dllsearchpath:\$PATH
|
|
|
++"
|
|
|
++ fi
|
|
|
++
|
|
|
+ # Export our shlibpath_var if we have one.
|
|
|
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
|
|
|
+ $ECHO "\
|
|
|
+@@ -2877,253 +4102,28 @@
|
|
|
+
|
|
|
+ # Some systems cannot cope with colon-terminated $shlibpath_var
|
|
|
+ # The second colon is a workaround for a bug in BeOS R4 sed
|
|
|
+- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
|
|
|
++ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
|
|
|
+
|
|
|
+ export $shlibpath_var
|
|
|
+ "
|
|
|
+ fi
|
|
|
+
|
|
|
+- # fixup the dll searchpath if we need to.
|
|
|
+- if test -n "$dllsearchpath"; then
|
|
|
+- $ECHO "\
|
|
|
+- # Add the dll search path components to the executable PATH
|
|
|
+- PATH=$dllsearchpath:\$PATH
|
|
|
+-"
|
|
|
+- fi
|
|
|
+-
|
|
|
+ $ECHO "\
|
|
|
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
|
|
+ # Run the actual program with our arguments.
|
|
|
+-"
|
|
|
+- case $host in
|
|
|
+- # Backslashes separate directories on plain windows
|
|
|
+- *-*-mingw | *-*-os2* | *-cegcc*)
|
|
|
+- $ECHO "\
|
|
|
+- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
|
|
|
+-"
|
|
|
+- ;;
|
|
|
+-
|
|
|
+- *)
|
|
|
+- $ECHO "\
|
|
|
+- exec \"\$progdir/\$program\" \${1+\"\$@\"}
|
|
|
+-"
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
+- $ECHO "\
|
|
|
+- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
|
|
|
+- exit 1
|
|
|
++ func_exec_program \${1+\"\$@\"}
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ # The program doesn't exist.
|
|
|
+ \$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
|
|
|
++ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
|
|
|
+ exit 1
|
|
|
+ fi
|
|
|
+ fi\
|
|
|
+ "
|
|
|
+ }
|
|
|
+-# end: func_emit_wrapper_part2
|
|
|
+-
|
|
|
+-
|
|
|
+-# func_emit_wrapper [arg=no]
|
|
|
+-#
|
|
|
+-# Emit a libtool wrapper script on stdout.
|
|
|
+-# Don't directly open a file because we may want to
|
|
|
+-# incorporate the script contents within a cygwin/mingw
|
|
|
+-# wrapper executable. Must ONLY be called from within
|
|
|
+-# func_mode_link because it depends on a number of variables
|
|
|
+-# set therein.
|
|
|
+-#
|
|
|
+-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
|
|
|
+-# variable will take. If 'yes', then the emitted script
|
|
|
+-# will assume that the directory in which it is stored is
|
|
|
+-# the $objdir directory. This is a cygwin/mingw-specific
|
|
|
+-# behavior.
|
|
|
+-func_emit_wrapper ()
|
|
|
+-{
|
|
|
+- func_emit_wrapper_arg1=no
|
|
|
+- if test -n "$1" ; then
|
|
|
+- func_emit_wrapper_arg1=$1
|
|
|
+- fi
|
|
|
+-
|
|
|
+- # split this up so that func_emit_cwrapperexe_src
|
|
|
+- # can call each part independently.
|
|
|
+- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
|
|
|
+- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
|
|
|
+-}
|
|
|
+-
|
|
|
+-
|
|
|
+-# func_to_host_path arg
|
|
|
+-#
|
|
|
+-# Convert paths to host format when used with build tools.
|
|
|
+-# Intended for use with "native" mingw (where libtool itself
|
|
|
+-# is running under the msys shell), or in the following cross-
|
|
|
+-# build environments:
|
|
|
+-# $build $host
|
|
|
+-# mingw (msys) mingw [e.g. native]
|
|
|
+-# cygwin mingw
|
|
|
+-# *nix + wine mingw
|
|
|
+-# where wine is equipped with the `winepath' executable.
|
|
|
+-# In the native mingw case, the (msys) shell automatically
|
|
|
+-# converts paths for any non-msys applications it launches,
|
|
|
+-# but that facility isn't available from inside the cwrapper.
|
|
|
+-# Similar accommodations are necessary for $host mingw and
|
|
|
+-# $build cygwin. Calling this function does no harm for other
|
|
|
+-# $host/$build combinations not listed above.
|
|
|
+-#
|
|
|
+-# ARG is the path (on $build) that should be converted to
|
|
|
+-# the proper representation for $host. The result is stored
|
|
|
+-# in $func_to_host_path_result.
|
|
|
+-func_to_host_path ()
|
|
|
+-{
|
|
|
+- func_to_host_path_result="$1"
|
|
|
+- if test -n "$1" ; then
|
|
|
+- case $host in
|
|
|
+- *mingw* )
|
|
|
+- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
|
|
|
+- case $build in
|
|
|
+- *mingw* ) # actually, msys
|
|
|
+- # awkward: cmd appends spaces to result
|
|
|
+- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
|
|
|
+- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
|
|
|
+- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
|
|
|
+- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
|
|
|
+- $SED -e "$lt_sed_naive_backslashify"`
|
|
|
+- ;;
|
|
|
+- *cygwin* )
|
|
|
+- func_to_host_path_tmp1=`cygpath -w "$1"`
|
|
|
+- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
|
|
|
+- $SED -e "$lt_sed_naive_backslashify"`
|
|
|
+- ;;
|
|
|
+- * )
|
|
|
+- # Unfortunately, winepath does not exit with a non-zero
|
|
|
+- # error code, so we are forced to check the contents of
|
|
|
+- # stdout. On the other hand, if the command is not
|
|
|
+- # found, the shell will set an exit code of 127 and print
|
|
|
+- # *an error message* to stdout. So we must check for both
|
|
|
+- # error code of zero AND non-empty stdout, which explains
|
|
|
+- # the odd construction:
|
|
|
+- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
|
|
|
+- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
|
|
|
+- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
|
|
|
+- $SED -e "$lt_sed_naive_backslashify"`
|
|
|
+- else
|
|
|
+- # Allow warning below.
|
|
|
+- func_to_host_path_result=""
|
|
|
+- fi
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
+- if test -z "$func_to_host_path_result" ; then
|
|
|
+- func_error "Could not determine host path corresponding to"
|
|
|
+- func_error " '$1'"
|
|
|
+- func_error "Continuing, but uninstalled executables may not work."
|
|
|
+- # Fallback:
|
|
|
+- func_to_host_path_result="$1"
|
|
|
+- fi
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
+- fi
|
|
|
+-}
|
|
|
+-# end: func_to_host_path
|
|
|
+
|
|
|
+-# func_to_host_pathlist arg
|
|
|
+-#
|
|
|
+-# Convert pathlists to host format when used with build tools.
|
|
|
+-# See func_to_host_path(), above. This function supports the
|
|
|
+-# following $build/$host combinations (but does no harm for
|
|
|
+-# combinations not listed here):
|
|
|
+-# $build $host
|
|
|
+-# mingw (msys) mingw [e.g. native]
|
|
|
+-# cygwin mingw
|
|
|
+-# *nix + wine mingw
|
|
|
+-#
|
|
|
+-# Path separators are also converted from $build format to
|
|
|
+-# $host format. If ARG begins or ends with a path separator
|
|
|
+-# character, it is preserved (but converted to $host format)
|
|
|
+-# on output.
|
|
|
+-#
|
|
|
+-# ARG is a pathlist (on $build) that should be converted to
|
|
|
+-# the proper representation on $host. The result is stored
|
|
|
+-# in $func_to_host_pathlist_result.
|
|
|
+-func_to_host_pathlist ()
|
|
|
+-{
|
|
|
+- func_to_host_pathlist_result="$1"
|
|
|
+- if test -n "$1" ; then
|
|
|
+- case $host in
|
|
|
+- *mingw* )
|
|
|
+- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
|
|
|
+- # Remove leading and trailing path separator characters from
|
|
|
+- # ARG. msys behavior is inconsistent here, cygpath turns them
|
|
|
+- # into '.;' and ';.', and winepath ignores them completely.
|
|
|
+- func_to_host_pathlist_tmp2="$1"
|
|
|
+- # Once set for this call, this variable should not be
|
|
|
+- # reassigned. It is used in tha fallback case.
|
|
|
+- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
|
|
|
+- $SED -e 's|^:*||' -e 's|:*$||'`
|
|
|
+- case $build in
|
|
|
+- *mingw* ) # Actually, msys.
|
|
|
+- # Awkward: cmd appends spaces to result.
|
|
|
+- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
|
|
|
+- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
|
|
|
+- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
|
|
|
+- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
|
|
|
+- $SED -e "$lt_sed_naive_backslashify"`
|
|
|
+- ;;
|
|
|
+- *cygwin* )
|
|
|
+- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
|
|
|
+- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
|
|
|
+- $SED -e "$lt_sed_naive_backslashify"`
|
|
|
+- ;;
|
|
|
+- * )
|
|
|
+- # unfortunately, winepath doesn't convert pathlists
|
|
|
+- func_to_host_pathlist_result=""
|
|
|
+- func_to_host_pathlist_oldIFS=$IFS
|
|
|
+- IFS=:
|
|
|
+- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
|
|
|
+- IFS=$func_to_host_pathlist_oldIFS
|
|
|
+- if test -n "$func_to_host_pathlist_f" ; then
|
|
|
+- func_to_host_path "$func_to_host_pathlist_f"
|
|
|
+- if test -n "$func_to_host_path_result" ; then
|
|
|
+- if test -z "$func_to_host_pathlist_result" ; then
|
|
|
+- func_to_host_pathlist_result="$func_to_host_path_result"
|
|
|
+- else
|
|
|
+- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+- IFS=:
|
|
|
+- done
|
|
|
+- IFS=$func_to_host_pathlist_oldIFS
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
+- if test -z "$func_to_host_pathlist_result" ; then
|
|
|
+- func_error "Could not determine the host path(s) corresponding to"
|
|
|
+- func_error " '$1'"
|
|
|
+- func_error "Continuing, but uninstalled executables may not work."
|
|
|
+- # Fallback. This may break if $1 contains DOS-style drive
|
|
|
+- # specifications. The fix is not to complicate the expression
|
|
|
+- # below, but for the user to provide a working wine installation
|
|
|
+- # with winepath so that path translation in the cross-to-mingw
|
|
|
+- # case works properly.
|
|
|
+- lt_replace_pathsep_nix_to_dos="s|:|;|g"
|
|
|
+- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
|
|
|
+- $SED -e "$lt_replace_pathsep_nix_to_dos"`
|
|
|
+- fi
|
|
|
+- # Now, add the leading and trailing path separators back
|
|
|
+- case "$1" in
|
|
|
+- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
+- case "$1" in
|
|
|
+- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
+- ;;
|
|
|
+- esac
|
|
|
+- fi
|
|
|
+-}
|
|
|
+-# end: func_to_host_pathlist
|
|
|
+
|
|
|
+ # func_emit_cwrapperexe_src
|
|
|
+ # emit the source code for a wrapper executable on stdout
|
|
|
+@@ -3141,41 +4141,71 @@
|
|
|
+
|
|
|
+ This wrapper executable should never be moved out of the build directory.
|
|
|
+ If it is, it will not operate correctly.
|
|
|
+-
|
|
|
+- Currently, it simply execs the wrapper *script* "$SHELL $output",
|
|
|
+- but could eventually absorb all of the scripts functionality and
|
|
|
+- exec $objdir/$outputname directly.
|
|
|
+ */
|
|
|
+ EOF
|
|
|
+ cat <<"EOF"
|
|
|
++#ifdef _MSC_VER
|
|
|
++# define _CRT_SECURE_NO_DEPRECATE 1
|
|
|
++#endif
|
|
|
+ #include <stdio.h>
|
|
|
+ #include <stdlib.h>
|
|
|
+ #ifdef _MSC_VER
|
|
|
+ # include <direct.h>
|
|
|
+ # include <process.h>
|
|
|
+ # include <io.h>
|
|
|
+-# define setmode _setmode
|
|
|
+ #else
|
|
|
+ # include <unistd.h>
|
|
|
+ # include <stdint.h>
|
|
|
+ # ifdef __CYGWIN__
|
|
|
+ # include <io.h>
|
|
|
+-# define HAVE_SETENV
|
|
|
+-# ifdef __STRICT_ANSI__
|
|
|
++# endif
|
|
|
++#endif
|
|
|
++#include <malloc.h>
|
|
|
++#include <stdarg.h>
|
|
|
++#include <assert.h>
|
|
|
++#include <string.h>
|
|
|
++#include <ctype.h>
|
|
|
++#include <errno.h>
|
|
|
++#include <fcntl.h>
|
|
|
++#include <sys/stat.h>
|
|
|
++
|
|
|
++/* declarations of non-ANSI functions */
|
|
|
++#if defined(__MINGW32__)
|
|
|
++# ifdef __STRICT_ANSI__
|
|
|
++int _putenv (const char *);
|
|
|
++# endif
|
|
|
++#elif defined(__CYGWIN__)
|
|
|
++# ifdef __STRICT_ANSI__
|
|
|
+ char *realpath (const char *, char *);
|
|
|
+ int putenv (char *);
|
|
|
+ int setenv (const char *, const char *, int);
|
|
|
+-# endif
|
|
|
+ # endif
|
|
|
++/* #elif defined (other platforms) ... */
|
|
|
++#endif
|
|
|
++
|
|
|
++/* portability defines, excluding path handling macros */
|
|
|
++#if defined(_MSC_VER)
|
|
|
++# define setmode _setmode
|
|
|
++# define stat _stat
|
|
|
++# define chmod _chmod
|
|
|
++# define getcwd _getcwd
|
|
|
++# define putenv _putenv
|
|
|
++# define S_IXUSR _S_IEXEC
|
|
|
++# ifndef _INTPTR_T_DEFINED
|
|
|
++# define _INTPTR_T_DEFINED
|
|
|
++# define intptr_t int
|
|
|
++# endif
|
|
|
++#elif defined(__MINGW32__)
|
|
|
++# define setmode _setmode
|
|
|
++# define stat _stat
|
|
|
++# define chmod _chmod
|
|
|
++# define getcwd _getcwd
|
|
|
++# define putenv _putenv
|
|
|
++#elif defined(__CYGWIN__)
|
|
|
++# define HAVE_SETENV
|
|
|
++# define FOPEN_WB "wb"
|
|
|
++/* #elif defined (other platforms) ... */
|
|
|
+ #endif
|
|
|
+-#include <malloc.h>
|
|
|
+-#include <stdarg.h>
|
|
|
+-#include <assert.h>
|
|
|
+-#include <string.h>
|
|
|
+-#include <ctype.h>
|
|
|
+-#include <errno.h>
|
|
|
+-#include <fcntl.h>
|
|
|
+-#include <sys/stat.h>
|
|
|
+
|
|
|
+ #if defined(PATH_MAX)
|
|
|
+ # define LT_PATHMAX PATH_MAX
|
|
|
+@@ -3192,14 +4222,7 @@
|
|
|
+ # define S_IXGRP 0
|
|
|
+ #endif
|
|
|
+
|
|
|
+-#ifdef _MSC_VER
|
|
|
+-# define S_IXUSR _S_IEXEC
|
|
|
+-# define stat _stat
|
|
|
+-# ifndef _INTPTR_T_DEFINED
|
|
|
+-# define intptr_t int
|
|
|
+-# endif
|
|
|
+-#endif
|
|
|
+-
|
|
|
++/* path handling portability macros */
|
|
|
+ #ifndef DIR_SEPARATOR
|
|
|
+ # define DIR_SEPARATOR '/'
|
|
|
+ # define PATH_SEPARATOR ':'
|
|
|
+@@ -3230,10 +4253,6 @@
|
|
|
+ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
|
|
|
+ #endif /* PATH_SEPARATOR_2 */
|
|
|
+
|
|
|
+-#ifdef __CYGWIN__
|
|
|
+-# define FOPEN_WB "wb"
|
|
|
+-#endif
|
|
|
+-
|
|
|
+ #ifndef FOPEN_WB
|
|
|
+ # define FOPEN_WB "w"
|
|
|
+ #endif
|
|
|
+@@ -3246,22 +4265,13 @@
|
|
|
+ if (stale) { free ((void *) stale); stale = 0; } \
|
|
|
+ } while (0)
|
|
|
+
|
|
|
+-#undef LTWRAPPER_DEBUGPRINTF
|
|
|
+-#if defined DEBUGWRAPPER
|
|
|
+-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
|
|
|
+-static void
|
|
|
+-ltwrapper_debugprintf (const char *fmt, ...)
|
|
|
+-{
|
|
|
+- va_list args;
|
|
|
+- va_start (args, fmt);
|
|
|
+- (void) vfprintf (stderr, fmt, args);
|
|
|
+- va_end (args);
|
|
|
+-}
|
|
|
++#if defined(LT_DEBUGWRAPPER)
|
|
|
++static int lt_debug = 1;
|
|
|
+ #else
|
|
|
+-# define LTWRAPPER_DEBUGPRINTF(args)
|
|
|
++static int lt_debug = 0;
|
|
|
+ #endif
|
|
|
+
|
|
|
+-const char *program_name = NULL;
|
|
|
++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
|
|
|
+
|
|
|
+ void *xmalloc (size_t num);
|
|
|
+ char *xstrdup (const char *string);
|
|
|
+@@ -3271,41 +4281,27 @@
|
|
|
+ int make_executable (const char *path);
|
|
|
+ int check_executable (const char *path);
|
|
|
+ char *strendzap (char *str, const char *pat);
|
|
|
+-void lt_fatal (const char *message, ...);
|
|
|
++void lt_debugprintf (const char *file, int line, const char *fmt, ...);
|
|
|
++void lt_fatal (const char *file, int line, const char *message, ...);
|
|
|
++static const char *nonnull (const char *s);
|
|
|
++static const char *nonempty (const char *s);
|
|
|
+ void lt_setenv (const char *name, const char *value);
|
|
|
+ char *lt_extend_str (const char *orig_value, const char *add, int to_end);
|
|
|
+-void lt_opt_process_env_set (const char *arg);
|
|
|
+-void lt_opt_process_env_prepend (const char *arg);
|
|
|
+-void lt_opt_process_env_append (const char *arg);
|
|
|
+-int lt_split_name_value (const char *arg, char** name, char** value);
|
|
|
+ void lt_update_exe_path (const char *name, const char *value);
|
|
|
+ void lt_update_lib_path (const char *name, const char *value);
|
|
|
+-
|
|
|
+-static const char *script_text_part1 =
|
|
|
+-EOF
|
|
|
+-
|
|
|
+- func_emit_wrapper_part1 yes |
|
|
|
+- $SED -e 's/\([\\"]\)/\\\1/g' \
|
|
|
+- -e 's/^/ "/' -e 's/$/\\n"/'
|
|
|
+- echo ";"
|
|
|
+- cat <<EOF
|
|
|
+-
|
|
|
+-static const char *script_text_part2 =
|
|
|
++char **prepare_spawn (char **argv);
|
|
|
++void lt_dump_script (FILE *f);
|
|
|
+ EOF
|
|
|
+- func_emit_wrapper_part2 yes |
|
|
|
+- $SED -e 's/\([\\"]\)/\\\1/g' \
|
|
|
+- -e 's/^/ "/' -e 's/$/\\n"/'
|
|
|
+- echo ";"
|
|
|
+
|
|
|
+ cat <<EOF
|
|
|
+-const char * MAGIC_EXE = "$magic_exe";
|
|
|
++volatile const char * MAGIC_EXE = "$magic_exe";
|
|
|
+ const char * LIB_PATH_VARNAME = "$shlibpath_var";
|
|
|
+ EOF
|
|
|
+
|
|
|
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
|
|
|
+- func_to_host_pathlist "$temp_rpath"
|
|
|
++ func_to_host_path "$temp_rpath"
|
|
|
+ cat <<EOF
|
|
|
+-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
|
|
|
++const char * LIB_PATH_VALUE = "$func_to_host_path_result";
|
|
|
+ EOF
|
|
|
+ else
|
|
|
+ cat <<"EOF"
|
|
|
+@@ -3314,10 +4310,10 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test -n "$dllsearchpath"; then
|
|
|
+- func_to_host_pathlist "$dllsearchpath:"
|
|
|
++ func_to_host_path "$dllsearchpath:"
|
|
|
+ cat <<EOF
|
|
|
+ const char * EXE_PATH_VARNAME = "PATH";
|
|
|
+-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
|
|
|
++const char * EXE_PATH_VALUE = "$func_to_host_path_result";
|
|
|
+ EOF
|
|
|
+ else
|
|
|
+ cat <<"EOF"
|
|
|
+@@ -3340,24 +4336,10 @@
|
|
|
+ cat <<"EOF"
|
|
|
+
|
|
|
+ #define LTWRAPPER_OPTION_PREFIX "--lt-"
|
|
|
+-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
|
|
|
+
|
|
|
+-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
|
|
|
+ static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
|
|
|
+-
|
|
|
+ static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
|
|
|
+-
|
|
|
+-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
|
|
|
+-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
|
|
|
+- /* argument is putenv-style "foo=bar", value of foo is set to bar */
|
|
|
+-
|
|
|
+-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
|
|
|
+-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
|
|
|
+- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
|
|
|
+-
|
|
|
+-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
|
|
|
+-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
|
|
|
+- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
|
|
|
++static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
|
|
|
+
|
|
|
+ int
|
|
|
+ main (int argc, char *argv[])
|
|
|
+@@ -3374,10 +4356,13 @@
|
|
|
+ int i;
|
|
|
+
|
|
|
+ program_name = (char *) xstrdup (base_name (argv[0]));
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
|
|
|
++ newargz = XMALLOC (char *, argc + 1);
|
|
|
+
|
|
|
+- /* very simple arg parsing; don't want to rely on getopt */
|
|
|
++ /* very simple arg parsing; don't want to rely on getopt
|
|
|
++ * also, copy all non cwrapper options to newargz, except
|
|
|
++ * argz[0], which is handled differently
|
|
|
++ */
|
|
|
++ newargc=0;
|
|
|
+ for (i = 1; i < argc; i++)
|
|
|
+ {
|
|
|
+ if (strcmp (argv[i], dumpscript_opt) == 0)
|
|
|
+@@ -3391,25 +4376,57 @@
|
|
|
+ esac
|
|
|
+
|
|
|
+ cat <<"EOF"
|
|
|
+- printf ("%s", script_text_part1);
|
|
|
+- printf ("%s", script_text_part2);
|
|
|
++ lt_dump_script (stdout);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
++ if (strcmp (argv[i], debug_opt) == 0)
|
|
|
++ {
|
|
|
++ lt_debug = 1;
|
|
|
++ continue;
|
|
|
++ }
|
|
|
++ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
|
|
|
++ {
|
|
|
++ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
|
|
|
++ namespace, but it is not one of the ones we know about and
|
|
|
++ have already dealt with, above (inluding dump-script), then
|
|
|
++ report an error. Otherwise, targets might begin to believe
|
|
|
++ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
|
|
|
++ namespace. The first time any user complains about this, we'll
|
|
|
++ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
|
|
|
++ or a configure.ac-settable value.
|
|
|
++ */
|
|
|
++ lt_fatal (__FILE__, __LINE__,
|
|
|
++ "unrecognized %s option: '%s'",
|
|
|
++ ltwrapper_option_prefix, argv[i]);
|
|
|
++ }
|
|
|
++ /* otherwise ... */
|
|
|
++ newargz[++newargc] = xstrdup (argv[i]);
|
|
|
+ }
|
|
|
++ newargz[++newargc] = NULL;
|
|
|
++
|
|
|
++EOF
|
|
|
++ cat <<EOF
|
|
|
++ /* The GNU banner must be the first non-error debug message */
|
|
|
++ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
|
|
|
++EOF
|
|
|
++ cat <<"EOF"
|
|
|
++ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
|
|
|
++ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
|
|
|
+
|
|
|
+- newargz = XMALLOC (char *, argc + 1);
|
|
|
+ tmp_pathspec = find_executable (argv[0]);
|
|
|
+ if (tmp_pathspec == NULL)
|
|
|
+- lt_fatal ("Couldn't find %s", argv[0]);
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
|
|
|
+- tmp_pathspec));
|
|
|
++ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
|
|
|
++ lt_debugprintf (__FILE__, __LINE__,
|
|
|
++ "(main) found exe (before symlink chase) at: %s\n",
|
|
|
++ tmp_pathspec);
|
|
|
+
|
|
|
+ actual_cwrapper_path = chase_symlinks (tmp_pathspec);
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
|
|
|
+- actual_cwrapper_path));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__,
|
|
|
++ "(main) found exe (after symlink chase) at: %s\n",
|
|
|
++ actual_cwrapper_path);
|
|
|
+ XFREE (tmp_pathspec);
|
|
|
+
|
|
|
+- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
|
|
|
++ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
|
|
|
+ strendzap (actual_cwrapper_path, actual_cwrapper_name);
|
|
|
+
|
|
|
+ /* wrapper name transforms */
|
|
|
+@@ -3427,8 +4444,9 @@
|
|
|
+ target_name = tmp_pathspec;
|
|
|
+ tmp_pathspec = 0;
|
|
|
+
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
|
|
|
+- target_name));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__,
|
|
|
++ "(main) libtool target name: %s\n",
|
|
|
++ target_name);
|
|
|
+ EOF
|
|
|
+
|
|
|
+ cat <<EOF
|
|
|
+@@ -3478,80 +4496,19 @@
|
|
|
+
|
|
|
+ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
|
|
|
+ lt_setenv ("DUALCASE", "1"); /* for MSK sh */
|
|
|
+- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
|
|
|
++ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
|
|
|
++ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
|
|
|
++ because on Windows, both *_VARNAMEs are PATH but uninstalled
|
|
|
++ libraries must come first. */
|
|
|
+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
|
|
|
++ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
|
|
|
+
|
|
|
+- newargc=0;
|
|
|
+- for (i = 1; i < argc; i++)
|
|
|
+- {
|
|
|
+- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
|
|
|
+- {
|
|
|
+- if (argv[i][env_set_opt_len] == '=')
|
|
|
+- {
|
|
|
+- const char *p = argv[i] + env_set_opt_len + 1;
|
|
|
+- lt_opt_process_env_set (p);
|
|
|
+- }
|
|
|
+- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
|
|
|
+- {
|
|
|
+- lt_opt_process_env_set (argv[++i]); /* don't copy */
|
|
|
+- }
|
|
|
+- else
|
|
|
+- lt_fatal ("%s missing required argument", env_set_opt);
|
|
|
+- continue;
|
|
|
+- }
|
|
|
+- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
|
|
|
+- {
|
|
|
+- if (argv[i][env_prepend_opt_len] == '=')
|
|
|
+- {
|
|
|
+- const char *p = argv[i] + env_prepend_opt_len + 1;
|
|
|
+- lt_opt_process_env_prepend (p);
|
|
|
+- }
|
|
|
+- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
|
|
|
+- {
|
|
|
+- lt_opt_process_env_prepend (argv[++i]); /* don't copy */
|
|
|
+- }
|
|
|
+- else
|
|
|
+- lt_fatal ("%s missing required argument", env_prepend_opt);
|
|
|
+- continue;
|
|
|
+- }
|
|
|
+- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
|
|
|
+- {
|
|
|
+- if (argv[i][env_append_opt_len] == '=')
|
|
|
+- {
|
|
|
+- const char *p = argv[i] + env_append_opt_len + 1;
|
|
|
+- lt_opt_process_env_append (p);
|
|
|
+- }
|
|
|
+- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
|
|
|
+- {
|
|
|
+- lt_opt_process_env_append (argv[++i]); /* don't copy */
|
|
|
+- }
|
|
|
+- else
|
|
|
+- lt_fatal ("%s missing required argument", env_append_opt);
|
|
|
+- continue;
|
|
|
+- }
|
|
|
+- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
|
|
|
+- {
|
|
|
+- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
|
|
|
+- namespace, but it is not one of the ones we know about and
|
|
|
+- have already dealt with, above (inluding dump-script), then
|
|
|
+- report an error. Otherwise, targets might begin to believe
|
|
|
+- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
|
|
|
+- namespace. The first time any user complains about this, we'll
|
|
|
+- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
|
|
|
+- or a configure.ac-settable value.
|
|
|
+- */
|
|
|
+- lt_fatal ("Unrecognized option in %s namespace: '%s'",
|
|
|
+- ltwrapper_option_prefix, argv[i]);
|
|
|
+- }
|
|
|
+- /* otherwise ... */
|
|
|
+- newargz[++newargc] = xstrdup (argv[i]);
|
|
|
+- }
|
|
|
+- newargz[++newargc] = NULL;
|
|
|
+-
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
|
|
|
++ nonnull (lt_argv_zero));
|
|
|
+ for (i = 0; i < newargc; i++)
|
|
|
+ {
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
|
|
|
++ i, nonnull (newargz[i]));
|
|
|
+ }
|
|
|
+
|
|
|
+ EOF
|
|
|
+@@ -3560,11 +4517,14 @@
|
|
|
+ mingw*)
|
|
|
+ cat <<"EOF"
|
|
|
+ /* execv doesn't actually work on mingw as expected on unix */
|
|
|
++ newargz = prepare_spawn (newargz);
|
|
|
+ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
|
|
|
+ if (rval == -1)
|
|
|
+ {
|
|
|
+ /* failed to start process */
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__,
|
|
|
++ "(main) failed to launch target \"%s\": %s\n",
|
|
|
++ lt_argv_zero, nonnull (strerror (errno)));
|
|
|
+ return 127;
|
|
|
+ }
|
|
|
+ return rval;
|
|
|
+@@ -3586,7 +4546,7 @@
|
|
|
+ {
|
|
|
+ void *p = (void *) malloc (num);
|
|
|
+ if (!p)
|
|
|
+- lt_fatal ("Memory exhausted");
|
|
|
++ lt_fatal (__FILE__, __LINE__, "memory exhausted");
|
|
|
+
|
|
|
+ return p;
|
|
|
+ }
|
|
|
+@@ -3620,8 +4580,8 @@
|
|
|
+ {
|
|
|
+ struct stat st;
|
|
|
+
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
|
|
|
+- path ? (*path ? path : "EMPTY!") : "NULL!"));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
|
|
|
++ nonempty (path));
|
|
|
+ if ((!path) || (!*path))
|
|
|
+ return 0;
|
|
|
+
|
|
|
+@@ -3638,8 +4598,8 @@
|
|
|
+ int rval = 0;
|
|
|
+ struct stat st;
|
|
|
+
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
|
|
|
+- path ? (*path ? path : "EMPTY!") : "NULL!"));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
|
|
|
++ nonempty (path));
|
|
|
+ if ((!path) || (!*path))
|
|
|
+ return 0;
|
|
|
+
|
|
|
+@@ -3665,8 +4625,8 @@
|
|
|
+ int tmp_len;
|
|
|
+ char *concat_name;
|
|
|
+
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
|
|
|
+- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
|
|
|
++ nonempty (wrapper));
|
|
|
+
|
|
|
+ if ((wrapper == NULL) || (*wrapper == '\0'))
|
|
|
+ return NULL;
|
|
|
+@@ -3719,7 +4679,8 @@
|
|
|
+ {
|
|
|
+ /* empty path: current directory */
|
|
|
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
|
|
|
+- lt_fatal ("getcwd failed");
|
|
|
++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
|
|
|
++ nonnull (strerror (errno)));
|
|
|
+ tmp_len = strlen (tmp);
|
|
|
+ concat_name =
|
|
|
+ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
|
|
|
+@@ -3744,7 +4705,8 @@
|
|
|
+ }
|
|
|
+ /* Relative path | not found in path: prepend cwd */
|
|
|
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
|
|
|
+- lt_fatal ("getcwd failed");
|
|
|
++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
|
|
|
++ nonnull (strerror (errno)));
|
|
|
+ tmp_len = strlen (tmp);
|
|
|
+ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
|
|
|
+ memcpy (concat_name, tmp, tmp_len);
|
|
|
+@@ -3770,8 +4732,9 @@
|
|
|
+ int has_symlinks = 0;
|
|
|
+ while (strlen (tmp_pathspec) && !has_symlinks)
|
|
|
+ {
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
|
|
|
+- tmp_pathspec));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__,
|
|
|
++ "checking path component for symlinks: %s\n",
|
|
|
++ tmp_pathspec);
|
|
|
+ if (lstat (tmp_pathspec, &s) == 0)
|
|
|
+ {
|
|
|
+ if (S_ISLNK (s.st_mode) != 0)
|
|
|
+@@ -3793,8 +4756,9 @@
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+- char *errstr = strerror (errno);
|
|
|
+- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
|
|
|
++ lt_fatal (__FILE__, __LINE__,
|
|
|
++ "error accessing file \"%s\": %s",
|
|
|
++ tmp_pathspec, nonnull (strerror (errno)));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ XFREE (tmp_pathspec);
|
|
|
+@@ -3807,7 +4771,8 @@
|
|
|
+ tmp_pathspec = realpath (pathspec, buf);
|
|
|
+ if (tmp_pathspec == 0)
|
|
|
+ {
|
|
|
+- lt_fatal ("Could not follow symlinks for %s", pathspec);
|
|
|
++ lt_fatal (__FILE__, __LINE__,
|
|
|
++ "could not follow symlinks for %s", pathspec);
|
|
|
+ }
|
|
|
+ return xstrdup (tmp_pathspec);
|
|
|
+ #endif
|
|
|
+@@ -3833,11 +4798,25 @@
|
|
|
+ return str;
|
|
|
+ }
|
|
|
+
|
|
|
++void
|
|
|
++lt_debugprintf (const char *file, int line, const char *fmt, ...)
|
|
|
++{
|
|
|
++ va_list args;
|
|
|
++ if (lt_debug)
|
|
|
++ {
|
|
|
++ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
|
|
|
++ va_start (args, fmt);
|
|
|
++ (void) vfprintf (stderr, fmt, args);
|
|
|
++ va_end (args);
|
|
|
++ }
|
|
|
++}
|
|
|
++
|
|
|
+ static void
|
|
|
+-lt_error_core (int exit_status, const char *mode,
|
|
|
++lt_error_core (int exit_status, const char *file,
|
|
|
++ int line, const char *mode,
|
|
|
+ const char *message, va_list ap)
|
|
|
+ {
|
|
|
+- fprintf (stderr, "%s: %s: ", program_name, mode);
|
|
|
++ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
|
|
|
+ vfprintf (stderr, message, ap);
|
|
|
+ fprintf (stderr, ".\n");
|
|
|
+
|
|
|
+@@ -3846,20 +4825,32 @@
|
|
|
+ }
|
|
|
+
|
|
|
+ void
|
|
|
+-lt_fatal (const char *message, ...)
|
|
|
++lt_fatal (const char *file, int line, const char *message, ...)
|
|
|
+ {
|
|
|
+ va_list ap;
|
|
|
+ va_start (ap, message);
|
|
|
+- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
|
|
|
++ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
|
|
|
+ va_end (ap);
|
|
|
+ }
|
|
|
+
|
|
|
++static const char *
|
|
|
++nonnull (const char *s)
|
|
|
++{
|
|
|
++ return s ? s : "(null)";
|
|
|
++}
|
|
|
++
|
|
|
++static const char *
|
|
|
++nonempty (const char *s)
|
|
|
++{
|
|
|
++ return (s && !*s) ? "(empty)" : nonnull (s);
|
|
|
++}
|
|
|
++
|
|
|
+ void
|
|
|
+ lt_setenv (const char *name, const char *value)
|
|
|
+ {
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
|
|
|
+- (name ? name : "<NULL>"),
|
|
|
+- (value ? value : "<NULL>")));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__,
|
|
|
++ "(lt_setenv) setting '%s' to '%s'\n",
|
|
|
++ nonnull (name), nonnull (value));
|
|
|
+ {
|
|
|
+ #ifdef HAVE_SETENV
|
|
|
+ /* always make a copy, for consistency with !HAVE_SETENV */
|
|
|
+@@ -3904,95 +4895,12 @@
|
|
|
+ return new_value;
|
|
|
+ }
|
|
|
+
|
|
|
+-int
|
|
|
+-lt_split_name_value (const char *arg, char** name, char** value)
|
|
|
+-{
|
|
|
+- const char *p;
|
|
|
+- int len;
|
|
|
+- if (!arg || !*arg)
|
|
|
+- return 1;
|
|
|
+-
|
|
|
+- p = strchr (arg, (int)'=');
|
|
|
+-
|
|
|
+- if (!p)
|
|
|
+- return 1;
|
|
|
+-
|
|
|
+- *value = xstrdup (++p);
|
|
|
+-
|
|
|
+- len = strlen (arg) - strlen (*value);
|
|
|
+- *name = XMALLOC (char, len);
|
|
|
+- strncpy (*name, arg, len-1);
|
|
|
+- (*name)[len - 1] = '\0';
|
|
|
+-
|
|
|
+- return 0;
|
|
|
+-}
|
|
|
+-
|
|
|
+-void
|
|
|
+-lt_opt_process_env_set (const char *arg)
|
|
|
+-{
|
|
|
+- char *name = NULL;
|
|
|
+- char *value = NULL;
|
|
|
+-
|
|
|
+- if (lt_split_name_value (arg, &name, &value) != 0)
|
|
|
+- {
|
|
|
+- XFREE (name);
|
|
|
+- XFREE (value);
|
|
|
+- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
|
|
|
+- }
|
|
|
+-
|
|
|
+- lt_setenv (name, value);
|
|
|
+- XFREE (name);
|
|
|
+- XFREE (value);
|
|
|
+-}
|
|
|
+-
|
|
|
+-void
|
|
|
+-lt_opt_process_env_prepend (const char *arg)
|
|
|
+-{
|
|
|
+- char *name = NULL;
|
|
|
+- char *value = NULL;
|
|
|
+- char *new_value = NULL;
|
|
|
+-
|
|
|
+- if (lt_split_name_value (arg, &name, &value) != 0)
|
|
|
+- {
|
|
|
+- XFREE (name);
|
|
|
+- XFREE (value);
|
|
|
+- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
|
|
|
+- }
|
|
|
+-
|
|
|
+- new_value = lt_extend_str (getenv (name), value, 0);
|
|
|
+- lt_setenv (name, new_value);
|
|
|
+- XFREE (new_value);
|
|
|
+- XFREE (name);
|
|
|
+- XFREE (value);
|
|
|
+-}
|
|
|
+-
|
|
|
+-void
|
|
|
+-lt_opt_process_env_append (const char *arg)
|
|
|
+-{
|
|
|
+- char *name = NULL;
|
|
|
+- char *value = NULL;
|
|
|
+- char *new_value = NULL;
|
|
|
+-
|
|
|
+- if (lt_split_name_value (arg, &name, &value) != 0)
|
|
|
+- {
|
|
|
+- XFREE (name);
|
|
|
+- XFREE (value);
|
|
|
+- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
|
|
|
+- }
|
|
|
+-
|
|
|
+- new_value = lt_extend_str (getenv (name), value, 1);
|
|
|
+- lt_setenv (name, new_value);
|
|
|
+- XFREE (new_value);
|
|
|
+- XFREE (name);
|
|
|
+- XFREE (value);
|
|
|
+-}
|
|
|
+-
|
|
|
+ void
|
|
|
+ lt_update_exe_path (const char *name, const char *value)
|
|
|
+ {
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
|
|
|
+- (name ? name : "<NULL>"),
|
|
|
+- (value ? value : "<NULL>")));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__,
|
|
|
++ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
|
|
|
++ nonnull (name), nonnull (value));
|
|
|
+
|
|
|
+ if (name && *name && value && *value)
|
|
|
+ {
|
|
|
+@@ -4011,9 +4919,9 @@
|
|
|
+ void
|
|
|
+ lt_update_lib_path (const char *name, const char *value)
|
|
|
+ {
|
|
|
+- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
|
|
|
+- (name ? name : "<NULL>"),
|
|
|
+- (value ? value : "<NULL>")));
|
|
|
++ lt_debugprintf (__FILE__, __LINE__,
|
|
|
++ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
|
|
|
++ nonnull (name), nonnull (value));
|
|
|
+
|
|
|
+ if (name && *name && value && *value)
|
|
|
+ {
|
|
|
+@@ -4023,11 +4931,152 @@
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
++EOF
|
|
|
++ case $host_os in
|
|
|
++ mingw*)
|
|
|
++ cat <<"EOF"
|
|
|
++
|
|
|
++/* Prepares an argument vector before calling spawn().
|
|
|
++ Note that spawn() does not by itself call the command interpreter
|
|
|
++ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
|
|
|
++ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
|
|
|
++ GetVersionEx(&v);
|
|
|
++ v.dwPlatformId == VER_PLATFORM_WIN32_NT;
|
|
|
++ }) ? "cmd.exe" : "command.com").
|
|
|
++ Instead it simply concatenates the arguments, separated by ' ', and calls
|
|
|
++ CreateProcess(). We must quote the arguments since Win32 CreateProcess()
|
|
|
++ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
|
|
|
++ special way:
|
|
|
++ - Space and tab are interpreted as delimiters. They are not treated as
|
|
|
++ delimiters if they are surrounded by double quotes: "...".
|
|
|
++ - Unescaped double quotes are removed from the input. Their only effect is
|
|
|
++ that within double quotes, space and tab are treated like normal
|
|
|
++ characters.
|
|
|
++ - Backslashes not followed by double quotes are not special.
|
|
|
++ - But 2*n+1 backslashes followed by a double quote become
|
|
|
++ n backslashes followed by a double quote (n >= 0):
|
|
|
++ \" -> "
|
|
|
++ \\\" -> \"
|
|
|
++ \\\\\" -> \\"
|
|
|
++ */
|
|
|
++#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
|
|
|
++#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
|
|
|
++char **
|
|
|
++prepare_spawn (char **argv)
|
|
|
++{
|
|
|
++ size_t argc;
|
|
|
++ char **new_argv;
|
|
|
++ size_t i;
|
|
|
++
|
|
|
++ /* Count number of arguments. */
|
|
|
++ for (argc = 0; argv[argc] != NULL; argc++)
|
|
|
++ ;
|
|
|
++
|
|
|
++ /* Allocate new argument vector. */
|
|
|
++ new_argv = XMALLOC (char *, argc + 1);
|
|
|
++
|
|
|
++ /* Put quoted arguments into the new argument vector. */
|
|
|
++ for (i = 0; i < argc; i++)
|
|
|
++ {
|
|
|
++ const char *string = argv[i];
|
|
|
++
|
|
|
++ if (string[0] == '\0')
|
|
|
++ new_argv[i] = xstrdup ("\"\"");
|
|
|
++ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
|
|
|
++ {
|
|
|
++ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
|
|
|
++ size_t length;
|
|
|
++ unsigned int backslashes;
|
|
|
++ const char *s;
|
|
|
++ char *quoted_string;
|
|
|
++ char *p;
|
|
|
++
|
|
|
++ length = 0;
|
|
|
++ backslashes = 0;
|
|
|
++ if (quote_around)
|
|
|
++ length++;
|
|
|
++ for (s = string; *s != '\0'; s++)
|
|
|
++ {
|
|
|
++ char c = *s;
|
|
|
++ if (c == '"')
|
|
|
++ length += backslashes + 1;
|
|
|
++ length++;
|
|
|
++ if (c == '\\')
|
|
|
++ backslashes++;
|
|
|
++ else
|
|
|
++ backslashes = 0;
|
|
|
++ }
|
|
|
++ if (quote_around)
|
|
|
++ length += backslashes + 1;
|
|
|
++
|
|
|
++ quoted_string = XMALLOC (char, length + 1);
|
|
|
++
|
|
|
++ p = quoted_string;
|
|
|
++ backslashes = 0;
|
|
|
++ if (quote_around)
|
|
|
++ *p++ = '"';
|
|
|
++ for (s = string; *s != '\0'; s++)
|
|
|
++ {
|
|
|
++ char c = *s;
|
|
|
++ if (c == '"')
|
|
|
++ {
|
|
|
++ unsigned int j;
|
|
|
++ for (j = backslashes + 1; j > 0; j--)
|
|
|
++ *p++ = '\\';
|
|
|
++ }
|
|
|
++ *p++ = c;
|
|
|
++ if (c == '\\')
|
|
|
++ backslashes++;
|
|
|
++ else
|
|
|
++ backslashes = 0;
|
|
|
++ }
|
|
|
++ if (quote_around)
|
|
|
++ {
|
|
|
++ unsigned int j;
|
|
|
++ for (j = backslashes; j > 0; j--)
|
|
|
++ *p++ = '\\';
|
|
|
++ *p++ = '"';
|
|
|
++ }
|
|
|
++ *p = '\0';
|
|
|
++
|
|
|
++ new_argv[i] = quoted_string;
|
|
|
++ }
|
|
|
++ else
|
|
|
++ new_argv[i] = (char *) string;
|
|
|
++ }
|
|
|
++ new_argv[argc] = NULL;
|
|
|
++
|
|
|
++ return new_argv;
|
|
|
++}
|
|
|
++EOF
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++
|
|
|
++ cat <<"EOF"
|
|
|
++void lt_dump_script (FILE* f)
|
|
|
++{
|
|
|
++EOF
|
|
|
++ func_emit_wrapper yes |
|
|
|
++ $SED -e 's/\([\\"]\)/\\\1/g' \
|
|
|
++ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
|
|
|
+
|
|
|
++ cat <<"EOF"
|
|
|
++}
|
|
|
+ EOF
|
|
|
+ }
|
|
|
+ # end: func_emit_cwrapperexe_src
|
|
|
+
|
|
|
++# func_win32_import_lib_p ARG
|
|
|
++# True if ARG is an import lib, as indicated by $file_magic_cmd
|
|
|
++func_win32_import_lib_p ()
|
|
|
++{
|
|
|
++ $opt_debug
|
|
|
++ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
|
|
|
++ *import*) : ;;
|
|
|
++ *) false ;;
|
|
|
++ esac
|
|
|
++}
|
|
|
++
|
|
|
+ # func_mode_link arg...
|
|
|
+ func_mode_link ()
|
|
|
+ {
|
|
|
+@@ -4072,6 +5121,7 @@
|
|
|
+ new_inherited_linker_flags=
|
|
|
+
|
|
|
+ avoid_version=no
|
|
|
++ bindir=
|
|
|
+ dlfiles=
|
|
|
+ dlprefiles=
|
|
|
+ dlself=no
|
|
|
+@@ -4164,6 +5214,11 @@
|
|
|
+ esac
|
|
|
+
|
|
|
+ case $prev in
|
|
|
++ bindir)
|
|
|
++ bindir="$arg"
|
|
|
++ prev=
|
|
|
++ continue
|
|
|
++ ;;
|
|
|
+ dlfiles|dlprefiles)
|
|
|
+ if test "$preload" = no; then
|
|
|
+ # Add the symbol object into the linking commands.
|
|
|
+@@ -4195,9 +5250,9 @@
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ if test "$prev" = dlfiles; then
|
|
|
+- dlfiles="$dlfiles $arg"
|
|
|
++ func_append dlfiles " $arg"
|
|
|
+ else
|
|
|
+- dlprefiles="$dlprefiles $arg"
|
|
|
++ func_append dlprefiles " $arg"
|
|
|
+ fi
|
|
|
+ prev=
|
|
|
+ continue
|
|
|
+@@ -4221,7 +5276,7 @@
|
|
|
+ *-*-darwin*)
|
|
|
+ case "$deplibs " in
|
|
|
+ *" $qarg.ltframework "*) ;;
|
|
|
+- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
|
|
|
++ *) func_append deplibs " $qarg.ltframework" # this is fixed later
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+@@ -4240,7 +5295,7 @@
|
|
|
+ moreargs=
|
|
|
+ for fil in `cat "$save_arg"`
|
|
|
+ do
|
|
|
+-# moreargs="$moreargs $fil"
|
|
|
++# func_append moreargs " $fil"
|
|
|
+ arg=$fil
|
|
|
+ # A libtool-controlled object.
|
|
|
+
|
|
|
+@@ -4269,7 +5324,7 @@
|
|
|
+
|
|
|
+ if test "$prev" = dlfiles; then
|
|
|
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
|
|
|
+- dlfiles="$dlfiles $pic_object"
|
|
|
++ func_append dlfiles " $pic_object"
|
|
|
+ prev=
|
|
|
+ continue
|
|
|
+ else
|
|
|
+@@ -4281,7 +5336,7 @@
|
|
|
+ # CHECK ME: I think I busted this. -Ossama
|
|
|
+ if test "$prev" = dlprefiles; then
|
|
|
+ # Preload the old-style object.
|
|
|
+- dlprefiles="$dlprefiles $pic_object"
|
|
|
++ func_append dlprefiles " $pic_object"
|
|
|
+ prev=
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -4351,12 +5406,12 @@
|
|
|
+ if test "$prev" = rpath; then
|
|
|
+ case "$rpath " in
|
|
|
+ *" $arg "*) ;;
|
|
|
+- *) rpath="$rpath $arg" ;;
|
|
|
++ *) func_append rpath " $arg" ;;
|
|
|
+ esac
|
|
|
+ else
|
|
|
+ case "$xrpath " in
|
|
|
+ *" $arg "*) ;;
|
|
|
+- *) xrpath="$xrpath $arg" ;;
|
|
|
++ *) func_append xrpath " $arg" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ prev=
|
|
|
+@@ -4368,28 +5423,28 @@
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+ weak)
|
|
|
+- weak_libs="$weak_libs $arg"
|
|
|
++ func_append weak_libs " $arg"
|
|
|
+ prev=
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+ xcclinker)
|
|
|
+- linker_flags="$linker_flags $qarg"
|
|
|
+- compiler_flags="$compiler_flags $qarg"
|
|
|
++ func_append linker_flags " $qarg"
|
|
|
++ func_append compiler_flags " $qarg"
|
|
|
+ prev=
|
|
|
+ func_append compile_command " $qarg"
|
|
|
+ func_append finalize_command " $qarg"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+ xcompiler)
|
|
|
+- compiler_flags="$compiler_flags $qarg"
|
|
|
++ func_append compiler_flags " $qarg"
|
|
|
+ prev=
|
|
|
+ func_append compile_command " $qarg"
|
|
|
+ func_append finalize_command " $qarg"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+ xlinker)
|
|
|
+- linker_flags="$linker_flags $qarg"
|
|
|
+- compiler_flags="$compiler_flags $wl$qarg"
|
|
|
++ func_append linker_flags " $qarg"
|
|
|
++ func_append compiler_flags " $wl$qarg"
|
|
|
+ prev=
|
|
|
+ func_append compile_command " $wl$qarg"
|
|
|
+ func_append finalize_command " $wl$qarg"
|
|
|
+@@ -4425,6 +5480,11 @@
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+
|
|
|
++ -bindir)
|
|
|
++ prev=bindir
|
|
|
++ continue
|
|
|
++ ;;
|
|
|
++
|
|
|
+ -dlopen)
|
|
|
+ prev=dlfiles
|
|
|
+ continue
|
|
|
+@@ -4475,15 +5535,16 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ -L*)
|
|
|
+- func_stripname '-L' '' "$arg"
|
|
|
+- dir=$func_stripname_result
|
|
|
+- if test -z "$dir"; then
|
|
|
++ func_stripname "-L" '' "$arg"
|
|
|
++ if test -z "$func_stripname_result"; then
|
|
|
+ if test "$#" -gt 0; then
|
|
|
+ func_fatal_error "require no space between \`-L' and \`$1'"
|
|
|
+ else
|
|
|
+ func_fatal_error "need path for \`-L' option"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
++ func_resolve_sysroot "$func_stripname_result"
|
|
|
++ dir=$func_resolve_sysroot_result
|
|
|
+ # We need an absolute path.
|
|
|
+ case $dir in
|
|
|
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
|
|
|
+@@ -4495,24 +5556,30 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ case "$deplibs " in
|
|
|
+- *" -L$dir "*) ;;
|
|
|
++ *" -L$dir "* | *" $arg "*)
|
|
|
++ # Will only happen for absolute or sysroot arguments
|
|
|
++ ;;
|
|
|
+ *)
|
|
|
+- deplibs="$deplibs -L$dir"
|
|
|
+- lib_search_path="$lib_search_path $dir"
|
|
|
++ # Preserve sysroot, but never include relative directories
|
|
|
++ case $dir in
|
|
|
++ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
|
|
|
++ *) func_append deplibs " -L$dir" ;;
|
|
|
++ esac
|
|
|
++ func_append lib_search_path " $dir"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ case $host in
|
|
|
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
|
+- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
|
|
|
++ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
|
|
|
+ case :$dllsearchpath: in
|
|
|
+ *":$dir:"*) ;;
|
|
|
+ ::) dllsearchpath=$dir;;
|
|
|
+- *) dllsearchpath="$dllsearchpath:$dir";;
|
|
|
++ *) func_append dllsearchpath ":$dir";;
|
|
|
+ esac
|
|
|
+ case :$dllsearchpath: in
|
|
|
+ *":$testbindir:"*) ;;
|
|
|
+ ::) dllsearchpath=$testbindir;;
|
|
|
+- *) dllsearchpath="$dllsearchpath:$testbindir";;
|
|
|
++ *) func_append dllsearchpath ":$testbindir";;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -4522,7 +5589,7 @@
|
|
|
+ -l*)
|
|
|
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
|
|
|
+ case $host in
|
|
|
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
|
|
|
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
|
+ # These systems don't actually have a C or math library (as such)
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+@@ -4536,7 +5603,7 @@
|
|
|
+ ;;
|
|
|
+ *-*-rhapsody* | *-*-darwin1.[012])
|
|
|
+ # Rhapsody C and math libraries are in the System framework
|
|
|
+- deplibs="$deplibs System.ltframework"
|
|
|
++ func_append deplibs " System.ltframework"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+ *-*-sco3.2v5* | *-*-sco5v6*)
|
|
|
+@@ -4556,7 +5623,7 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+- deplibs="$deplibs $arg"
|
|
|
++ func_append deplibs " $arg"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+
|
|
|
+@@ -4568,8 +5635,8 @@
|
|
|
+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
|
|
|
+ # classes, name mangling, and exception handling.
|
|
|
+ # Darwin uses the -arch flag to determine output architecture.
|
|
|
+- -model|-arch|-isysroot)
|
|
|
+- compiler_flags="$compiler_flags $arg"
|
|
|
++ -model|-arch|-isysroot|--sysroot)
|
|
|
++ func_append compiler_flags " $arg"
|
|
|
+ func_append compile_command " $arg"
|
|
|
+ func_append finalize_command " $arg"
|
|
|
+ prev=xcompiler
|
|
|
+@@ -4577,12 +5644,12 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
|
|
+- compiler_flags="$compiler_flags $arg"
|
|
|
++ func_append compiler_flags " $arg"
|
|
|
+ func_append compile_command " $arg"
|
|
|
+ func_append finalize_command " $arg"
|
|
|
+ case "$new_inherited_linker_flags " in
|
|
|
+ *" $arg "*) ;;
|
|
|
+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
|
|
|
++ * ) func_append new_inherited_linker_flags " $arg" ;;
|
|
|
+ esac
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+@@ -4649,13 +5716,17 @@
|
|
|
+ # We need an absolute path.
|
|
|
+ case $dir in
|
|
|
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
|
|
|
++ =*)
|
|
|
++ func_stripname '=' '' "$dir"
|
|
|
++ dir=$lt_sysroot$func_stripname_result
|
|
|
++ ;;
|
|
|
+ *)
|
|
|
+ func_fatal_error "only absolute run-paths are allowed"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ case "$xrpath " in
|
|
|
+ *" $dir "*) ;;
|
|
|
+- *) xrpath="$xrpath $dir" ;;
|
|
|
++ *) func_append xrpath " $dir" ;;
|
|
|
+ esac
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+@@ -4708,8 +5779,8 @@
|
|
|
+ for flag in $args; do
|
|
|
+ IFS="$save_ifs"
|
|
|
+ func_quote_for_eval "$flag"
|
|
|
+- arg="$arg $wl$func_quote_for_eval_result"
|
|
|
+- compiler_flags="$compiler_flags $func_quote_for_eval_result"
|
|
|
++ func_append arg " $func_quote_for_eval_result"
|
|
|
++ func_append compiler_flags " $func_quote_for_eval_result"
|
|
|
+ done
|
|
|
+ IFS="$save_ifs"
|
|
|
+ func_stripname ' ' '' "$arg"
|
|
|
+@@ -4724,9 +5795,9 @@
|
|
|
+ for flag in $args; do
|
|
|
+ IFS="$save_ifs"
|
|
|
+ func_quote_for_eval "$flag"
|
|
|
+- arg="$arg $wl$func_quote_for_eval_result"
|
|
|
+- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
|
|
|
+- linker_flags="$linker_flags $func_quote_for_eval_result"
|
|
|
++ func_append arg " $wl$func_quote_for_eval_result"
|
|
|
++ func_append compiler_flags " $wl$func_quote_for_eval_result"
|
|
|
++ func_append linker_flags " $func_quote_for_eval_result"
|
|
|
+ done
|
|
|
+ IFS="$save_ifs"
|
|
|
+ func_stripname ' ' '' "$arg"
|
|
|
+@@ -4754,23 +5825,27 @@
|
|
|
+ arg="$func_quote_for_eval_result"
|
|
|
+ ;;
|
|
|
+
|
|
|
+- # -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*, -t[45]*, -txscale* pass through architecture-specific
|
|
|
+- # compiler args for GCC
|
|
|
+- # -F/path gives path to uninstalled frameworks, gcc on darwin
|
|
|
+- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
|
|
|
+- # @file GCC response files
|
|
|
++ # Flags to be passed through unchanged, with rationale:
|
|
|
++ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
|
|
|
++ # -r[0-9][0-9]* specify processor for the SGI compiler
|
|
|
++ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
|
|
|
++ # +DA*, +DD* enable 64-bit mode for the HP compiler
|
|
|
++ # -q* compiler args for the IBM compiler
|
|
|
++ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
|
|
|
++ # -F/path path to uninstalled frameworks, gcc on darwin
|
|
|
++ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
|
|
|
++ # @file GCC response files
|
|
|
++ # -tp=* Portland pgcc target processor selection
|
|
|
++ # --sysroot=* for sysroot support
|
|
|
++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
|
|
|
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
|
|
|
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
|
|
|
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
|
|
|
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
|
|
|
+ func_quote_for_eval "$arg"
|
|
|
+ arg="$func_quote_for_eval_result"
|
|
|
+ func_append compile_command " $arg"
|
|
|
+ func_append finalize_command " $arg"
|
|
|
+- compiler_flags="$compiler_flags $arg"
|
|
|
++ func_append compiler_flags " $arg"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+
|
|
|
+@@ -4782,7 +5857,7 @@
|
|
|
+
|
|
|
+ *.$objext)
|
|
|
+ # A standard object.
|
|
|
+- objs="$objs $arg"
|
|
|
++ func_append objs " $arg"
|
|
|
+ ;;
|
|
|
+
|
|
|
+ *.lo)
|
|
|
+@@ -4813,7 +5888,7 @@
|
|
|
+
|
|
|
+ if test "$prev" = dlfiles; then
|
|
|
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
|
|
|
+- dlfiles="$dlfiles $pic_object"
|
|
|
++ func_append dlfiles " $pic_object"
|
|
|
+ prev=
|
|
|
+ continue
|
|
|
+ else
|
|
|
+@@ -4825,7 +5900,7 @@
|
|
|
+ # CHECK ME: I think I busted this. -Ossama
|
|
|
+ if test "$prev" = dlprefiles; then
|
|
|
+ # Preload the old-style object.
|
|
|
+- dlprefiles="$dlprefiles $pic_object"
|
|
|
++ func_append dlprefiles " $pic_object"
|
|
|
+ prev=
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -4870,24 +5945,25 @@
|
|
|
+
|
|
|
+ *.$libext)
|
|
|
+ # An archive.
|
|
|
+- deplibs="$deplibs $arg"
|
|
|
+- old_deplibs="$old_deplibs $arg"
|
|
|
++ func_append deplibs " $arg"
|
|
|
++ func_append old_deplibs " $arg"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+
|
|
|
+ *.la)
|
|
|
+ # A libtool-controlled library.
|
|
|
+
|
|
|
++ func_resolve_sysroot "$arg"
|
|
|
+ if test "$prev" = dlfiles; then
|
|
|
+ # This library was specified with -dlopen.
|
|
|
+- dlfiles="$dlfiles $arg"
|
|
|
++ func_append dlfiles " $func_resolve_sysroot_result"
|
|
|
+ prev=
|
|
|
+ elif test "$prev" = dlprefiles; then
|
|
|
+ # The library was specified with -dlpreopen.
|
|
|
+- dlprefiles="$dlprefiles $arg"
|
|
|
++ func_append dlprefiles " $func_resolve_sysroot_result"
|
|
|
+ prev=
|
|
|
+ else
|
|
|
+- deplibs="$deplibs $arg"
|
|
|
++ func_append deplibs " $func_resolve_sysroot_result"
|
|
|
+ fi
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+@@ -4925,7 +6001,7 @@
|
|
|
+
|
|
|
+ if test -n "$shlibpath_var"; then
|
|
|
+ # get the directories listed in $shlibpath_var
|
|
|
+- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
|
|
|
++ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
|
|
|
+ else
|
|
|
+ shlib_search_path=
|
|
|
+ fi
|
|
|
+@@ -4934,6 +6010,8 @@
|
|
|
+
|
|
|
+ func_dirname "$output" "/" ""
|
|
|
+ output_objdir="$func_dirname_result$objdir"
|
|
|
++ func_to_tool_file "$output_objdir/"
|
|
|
++ tool_output_objdir=$func_to_tool_file_result
|
|
|
+ # Create the object directory.
|
|
|
+ func_mkdir_p "$output_objdir"
|
|
|
+
|
|
|
+@@ -4954,12 +6032,12 @@
|
|
|
+ # Find all interdependent deplibs by searching for libraries
|
|
|
+ # that are linked more than once (e.g. -la -lb -la)
|
|
|
+ for deplib in $deplibs; do
|
|
|
+- if $opt_duplicate_deps ; then
|
|
|
++ if $opt_preserve_dup_deps ; then
|
|
|
+ case "$libs " in
|
|
|
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
|
++ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+- libs="$libs $deplib"
|
|
|
++ func_append libs " $deplib"
|
|
|
+ done
|
|
|
+
|
|
|
+ if test "$linkmode" = lib; then
|
|
|
+@@ -4972,9 +6050,9 @@
|
|
|
+ if $opt_duplicate_compiler_generated_deps; then
|
|
|
+ for pre_post_dep in $predeps $postdeps; do
|
|
|
+ case "$pre_post_deps " in
|
|
|
+- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
|
|
|
++ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
|
|
|
+ esac
|
|
|
+- pre_post_deps="$pre_post_deps $pre_post_dep"
|
|
|
++ func_append pre_post_deps " $pre_post_dep"
|
|
|
+ done
|
|
|
+ fi
|
|
|
+ pre_post_deps=
|
|
|
+@@ -5033,10 +6111,7 @@
|
|
|
+ case $pass in
|
|
|
+ dlopen) libs="$dlfiles" ;;
|
|
|
+ dlpreopen) libs="$dlprefiles" ;;
|
|
|
+- link)
|
|
|
+- libs="$deplibs %DEPLIBS%"
|
|
|
+- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
|
|
|
+- ;;
|
|
|
++ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
|
|
|
+@@ -5044,17 +6119,19 @@
|
|
|
+ for lib in $dlprefiles; do
|
|
|
+ # Ignore non-libtool-libs
|
|
|
+ dependency_libs=
|
|
|
++ func_resolve_sysroot "$lib"
|
|
|
+ case $lib in
|
|
|
+- *.la) func_source "$lib" ;;
|
|
|
++ *.la) func_source "$func_resolve_sysroot_result" ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+ # Collect preopened libtool deplibs, except any this library
|
|
|
+ # has declared as weak libs
|
|
|
+ for deplib in $dependency_libs; do
|
|
|
+- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
|
|
|
++ func_basename "$deplib"
|
|
|
++ deplib_base=$func_basename_result
|
|
|
+ case " $weak_libs " in
|
|
|
+ *" $deplib_base "*) ;;
|
|
|
+- *) deplibs="$deplibs $deplib" ;;
|
|
|
++ *) func_append deplibs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ done
|
|
|
+@@ -5075,11 +6152,11 @@
|
|
|
+ compile_deplibs="$deplib $compile_deplibs"
|
|
|
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
|
+ else
|
|
|
+- compiler_flags="$compiler_flags $deplib"
|
|
|
++ func_append compiler_flags " $deplib"
|
|
|
+ if test "$linkmode" = lib ; then
|
|
|
+ case "$new_inherited_linker_flags " in
|
|
|
+ *" $deplib "*) ;;
|
|
|
+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
|
|
|
++ * ) func_append new_inherited_linker_flags " $deplib" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+@@ -5164,7 +6241,7 @@
|
|
|
+ if test "$linkmode" = lib ; then
|
|
|
+ case "$new_inherited_linker_flags " in
|
|
|
+ *" $deplib "*) ;;
|
|
|
+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
|
|
|
++ * ) func_append new_inherited_linker_flags " $deplib" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+@@ -5177,7 +6254,8 @@
|
|
|
+ test "$pass" = conv && continue
|
|
|
+ newdependency_libs="$deplib $newdependency_libs"
|
|
|
+ func_stripname '-L' '' "$deplib"
|
|
|
+- newlib_search_path="$newlib_search_path $func_stripname_result"
|
|
|
++ func_resolve_sysroot "$func_stripname_result"
|
|
|
++ func_append newlib_search_path " $func_resolve_sysroot_result"
|
|
|
+ ;;
|
|
|
+ prog)
|
|
|
+ if test "$pass" = conv; then
|
|
|
+@@ -5191,7 +6269,8 @@
|
|
|
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
|
+ fi
|
|
|
+ func_stripname '-L' '' "$deplib"
|
|
|
+- newlib_search_path="$newlib_search_path $func_stripname_result"
|
|
|
++ func_resolve_sysroot "$func_stripname_result"
|
|
|
++ func_append newlib_search_path " $func_resolve_sysroot_result"
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ func_warning "\`-L' is ignored for archives/objects"
|
|
|
+@@ -5202,17 +6281,21 @@
|
|
|
+ -R*)
|
|
|
+ if test "$pass" = link; then
|
|
|
+ func_stripname '-R' '' "$deplib"
|
|
|
+- dir=$func_stripname_result
|
|
|
++ func_resolve_sysroot "$func_stripname_result"
|
|
|
++ dir=$func_resolve_sysroot_result
|
|
|
+ # Make sure the xrpath contains only unique directories.
|
|
|
+ case "$xrpath " in
|
|
|
+ *" $dir "*) ;;
|
|
|
+- *) xrpath="$xrpath $dir" ;;
|
|
|
++ *) func_append xrpath " $dir" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ deplibs="$deplib $deplibs"
|
|
|
+ continue
|
|
|
+ ;;
|
|
|
+- *.la) lib="$deplib" ;;
|
|
|
++ *.la)
|
|
|
++ func_resolve_sysroot "$deplib"
|
|
|
++ lib=$func_resolve_sysroot_result
|
|
|
++ ;;
|
|
|
+ *.$libext)
|
|
|
+ if test "$pass" = conv; then
|
|
|
+ deplibs="$deplib $deplibs"
|
|
|
+@@ -5230,7 +6313,7 @@
|
|
|
+ match_pattern*)
|
|
|
+ set dummy $deplibs_check_method; shift
|
|
|
+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
|
|
|
+- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
|
|
|
++ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
|
|
|
+ | $EGREP "$match_pattern_regex" > /dev/null; then
|
|
|
+ valid_a_lib=yes
|
|
|
+ fi
|
|
|
+@@ -5240,15 +6323,15 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ if test "$valid_a_lib" != yes; then
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "*** Warning: Trying to link with static lib archive $deplib."
|
|
|
+- $ECHO "*** I have the capability to make that library automatically link in when"
|
|
|
+- $ECHO "*** you link to this library. But I can only do this if you have a"
|
|
|
+- $ECHO "*** shared version of the library, which you do not appear to have"
|
|
|
+- $ECHO "*** because the file extensions .$libext of this argument makes me believe"
|
|
|
+- $ECHO "*** that it is just a static archive that I should not use here."
|
|
|
++ echo "*** I have the capability to make that library automatically link in when"
|
|
|
++ echo "*** you link to this library. But I can only do this if you have a"
|
|
|
++ echo "*** shared version of the library, which you do not appear to have"
|
|
|
++ echo "*** because the file extensions .$libext of this argument makes me believe"
|
|
|
++ echo "*** that it is just a static archive that I should not use here."
|
|
|
+ else
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "*** Warning: Linking the shared library $output against the"
|
|
|
+ $ECHO "*** static library $deplib is not portable!"
|
|
|
+ deplibs="$deplib $deplibs"
|
|
|
+@@ -5275,11 +6358,11 @@
|
|
|
+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
|
|
|
+ # If there is no dlopen support or we're linking statically,
|
|
|
+ # we need to preload.
|
|
|
+- newdlprefiles="$newdlprefiles $deplib"
|
|
|
++ func_append newdlprefiles " $deplib"
|
|
|
+ compile_deplibs="$deplib $compile_deplibs"
|
|
|
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
|
+ else
|
|
|
+- newdlfiles="$newdlfiles $deplib"
|
|
|
++ func_append newdlfiles " $deplib"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ continue
|
|
|
+@@ -5321,20 +6404,20 @@
|
|
|
+
|
|
|
+ # Convert "-framework foo" to "foo.ltframework"
|
|
|
+ if test -n "$inherited_linker_flags"; then
|
|
|
+- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
|
|
|
++ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
|
|
|
+ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
|
|
|
+ case " $new_inherited_linker_flags " in
|
|
|
+ *" $tmp_inherited_linker_flag "*) ;;
|
|
|
+- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
|
|
|
++ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ fi
|
|
|
+- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
++ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
+ if test "$linkmode,$pass" = "lib,link" ||
|
|
|
+ test "$linkmode,$pass" = "prog,scan" ||
|
|
|
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
|
|
|
+- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
|
|
|
+- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
|
|
|
++ test -n "$dlopen" && func_append dlfiles " $dlopen"
|
|
|
++ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test "$pass" = conv; then
|
|
|
+@@ -5345,30 +6428,36 @@
|
|
|
+ func_fatal_error "cannot find name of link library for \`$lib'"
|
|
|
+ fi
|
|
|
+ # It is a libtool convenience library, so add in its objects.
|
|
|
+- convenience="$convenience $ladir/$objdir/$old_library"
|
|
|
+- old_convenience="$old_convenience $ladir/$objdir/$old_library"
|
|
|
+- tmp_libs=
|
|
|
+- for deplib in $dependency_libs; do
|
|
|
+- deplibs="$deplib $deplibs"
|
|
|
+- if $opt_duplicate_deps ; then
|
|
|
+- case "$tmp_libs " in
|
|
|
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
|
+- esac
|
|
|
+- fi
|
|
|
+- tmp_libs="$tmp_libs $deplib"
|
|
|
+- done
|
|
|
++ func_append convenience " $ladir/$objdir/$old_library"
|
|
|
++ func_append old_convenience " $ladir/$objdir/$old_library"
|
|
|
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
|
|
|
+ func_fatal_error "\`$lib' is not a convenience library"
|
|
|
+ fi
|
|
|
++ tmp_libs=
|
|
|
++ for deplib in $dependency_libs; do
|
|
|
++ deplibs="$deplib $deplibs"
|
|
|
++ if $opt_preserve_dup_deps ; then
|
|
|
++ case "$tmp_libs " in
|
|
|
++ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
|
|
|
++ esac
|
|
|
++ fi
|
|
|
++ func_append tmp_libs " $deplib"
|
|
|
++ done
|
|
|
+ continue
|
|
|
+ fi # $pass = conv
|
|
|
+
|
|
|
+
|
|
|
+ # Get the name of the library we link against.
|
|
|
+ linklib=
|
|
|
+- for l in $old_library $library_names; do
|
|
|
+- linklib="$l"
|
|
|
+- done
|
|
|
++ if test -n "$old_library" &&
|
|
|
++ { test "$prefer_static_libs" = yes ||
|
|
|
++ test "$prefer_static_libs,$installed" = "built,no"; }; then
|
|
|
++ linklib=$old_library
|
|
|
++ else
|
|
|
++ for l in $old_library $library_names; do
|
|
|
++ linklib="$l"
|
|
|
++ done
|
|
|
++ fi
|
|
|
+ if test -z "$linklib"; then
|
|
|
+ func_fatal_error "cannot find name of link library for \`$lib'"
|
|
|
+ fi
|
|
|
+@@ -5385,9 +6474,9 @@
|
|
|
+ # statically, we need to preload. We also need to preload any
|
|
|
+ # dependent libraries so libltdl's deplib preloader doesn't
|
|
|
+ # bomb out in the load deplibs phase.
|
|
|
+- dlprefiles="$dlprefiles $lib $dependency_libs"
|
|
|
++ func_append dlprefiles " $lib $dependency_libs"
|
|
|
+ else
|
|
|
+- newdlfiles="$newdlfiles $lib"
|
|
|
++ func_append newdlfiles " $lib"
|
|
|
+ fi
|
|
|
+ continue
|
|
|
+ fi # $pass = dlopen
|
|
|
+@@ -5409,14 +6498,14 @@
|
|
|
+
|
|
|
+ # Find the relevant object directory and library name.
|
|
|
+ if test "X$installed" = Xyes; then
|
|
|
+- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
|
|
++ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
|
|
+ func_warning "library \`$lib' was moved."
|
|
|
+ dir="$ladir"
|
|
|
+ absdir="$abs_ladir"
|
|
|
+ libdir="$abs_ladir"
|
|
|
+ else
|
|
|
+- dir="$libdir"
|
|
|
+- absdir="$libdir"
|
|
|
++ dir="$lt_sysroot$libdir"
|
|
|
++ absdir="$lt_sysroot$libdir"
|
|
|
+ fi
|
|
|
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
|
|
|
+ else
|
|
|
+@@ -5424,12 +6513,12 @@
|
|
|
+ dir="$ladir"
|
|
|
+ absdir="$abs_ladir"
|
|
|
+ # Remove this search path later
|
|
|
+- notinst_path="$notinst_path $abs_ladir"
|
|
|
++ func_append notinst_path " $abs_ladir"
|
|
|
+ else
|
|
|
+ dir="$ladir/$objdir"
|
|
|
+ absdir="$abs_ladir/$objdir"
|
|
|
+ # Remove this search path later
|
|
|
+- notinst_path="$notinst_path $abs_ladir"
|
|
|
++ func_append notinst_path " $abs_ladir"
|
|
|
+ fi
|
|
|
+ fi # $installed = yes
|
|
|
+ func_stripname 'lib' '.la' "$laname"
|
|
|
+@@ -5440,20 +6529,46 @@
|
|
|
+ if test -z "$libdir" && test "$linkmode" = prog; then
|
|
|
+ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
|
|
|
+ fi
|
|
|
+- # Prefer using a static library (so that no silly _DYNAMIC symbols
|
|
|
+- # are required to link).
|
|
|
+- if test -n "$old_library"; then
|
|
|
+- newdlprefiles="$newdlprefiles $dir/$old_library"
|
|
|
+- # Keep a list of preopened convenience libraries to check
|
|
|
+- # that they are being used correctly in the link pass.
|
|
|
+- test -z "$libdir" && \
|
|
|
+- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
|
|
|
+- # Otherwise, use the dlname, so that lt_dlopen finds it.
|
|
|
+- elif test -n "$dlname"; then
|
|
|
+- newdlprefiles="$newdlprefiles $dir/$dlname"
|
|
|
+- else
|
|
|
+- newdlprefiles="$newdlprefiles $dir/$linklib"
|
|
|
+- fi
|
|
|
++ case "$host" in
|
|
|
++ # special handling for platforms with PE-DLLs.
|
|
|
++ *cygwin* | *mingw* | *cegcc* )
|
|
|
++ # Linker will automatically link against shared library if both
|
|
|
++ # static and shared are present. Therefore, ensure we extract
|
|
|
++ # symbols from the import library if a shared library is present
|
|
|
++ # (otherwise, the dlopen module name will be incorrect). We do
|
|
|
++ # this by putting the import library name into $newdlprefiles.
|
|
|
++ # We recover the dlopen module name by 'saving' the la file
|
|
|
++ # name in a special purpose variable, and (later) extracting the
|
|
|
++ # dlname from the la file.
|
|
|
++ if test -n "$dlname"; then
|
|
|
++ func_tr_sh "$dir/$linklib"
|
|
|
++ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
|
|
|
++ func_append newdlprefiles " $dir/$linklib"
|
|
|
++ else
|
|
|
++ func_append newdlprefiles " $dir/$old_library"
|
|
|
++ # Keep a list of preopened convenience libraries to check
|
|
|
++ # that they are being used correctly in the link pass.
|
|
|
++ test -z "$libdir" && \
|
|
|
++ func_append dlpreconveniencelibs " $dir/$old_library"
|
|
|
++ fi
|
|
|
++ ;;
|
|
|
++ * )
|
|
|
++ # Prefer using a static library (so that no silly _DYNAMIC symbols
|
|
|
++ # are required to link).
|
|
|
++ if test -n "$old_library"; then
|
|
|
++ func_append newdlprefiles " $dir/$old_library"
|
|
|
++ # Keep a list of preopened convenience libraries to check
|
|
|
++ # that they are being used correctly in the link pass.
|
|
|
++ test -z "$libdir" && \
|
|
|
++ func_append dlpreconveniencelibs " $dir/$old_library"
|
|
|
++ # Otherwise, use the dlname, so that lt_dlopen finds it.
|
|
|
++ elif test -n "$dlname"; then
|
|
|
++ func_append newdlprefiles " $dir/$dlname"
|
|
|
++ else
|
|
|
++ func_append newdlprefiles " $dir/$linklib"
|
|
|
++ fi
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ fi # $pass = dlpreopen
|
|
|
+
|
|
|
+ if test -z "$libdir"; then
|
|
|
+@@ -5471,7 +6586,7 @@
|
|
|
+
|
|
|
+
|
|
|
+ if test "$linkmode" = prog && test "$pass" != link; then
|
|
|
+- newlib_search_path="$newlib_search_path $ladir"
|
|
|
++ func_append newlib_search_path " $ladir"
|
|
|
+ deplibs="$lib $deplibs"
|
|
|
+
|
|
|
+ linkalldeplibs=no
|
|
|
+@@ -5484,7 +6599,8 @@
|
|
|
+ for deplib in $dependency_libs; do
|
|
|
+ case $deplib in
|
|
|
+ -L*) func_stripname '-L' '' "$deplib"
|
|
|
+- newlib_search_path="$newlib_search_path $func_stripname_result"
|
|
|
++ func_resolve_sysroot "$func_stripname_result"
|
|
|
++ func_append newlib_search_path " $func_resolve_sysroot_result"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ # Need to link against all dependency_libs?
|
|
|
+@@ -5495,12 +6611,12 @@
|
|
|
+ # or/and link against static libraries
|
|
|
+ newdependency_libs="$deplib $newdependency_libs"
|
|
|
+ fi
|
|
|
+- if $opt_duplicate_deps ; then
|
|
|
++ if $opt_preserve_dup_deps ; then
|
|
|
+ case "$tmp_libs " in
|
|
|
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
|
++ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+- tmp_libs="$tmp_libs $deplib"
|
|
|
++ func_append tmp_libs " $deplib"
|
|
|
+ done # for deplib
|
|
|
+ continue
|
|
|
+ fi # $linkmode = prog...
|
|
|
+@@ -5515,7 +6631,7 @@
|
|
|
+ # Make sure the rpath contains only unique directories.
|
|
|
+ case "$temp_rpath:" in
|
|
|
+ *"$absdir:"*) ;;
|
|
|
+- *) temp_rpath="$temp_rpath$absdir:" ;;
|
|
|
++ *) func_append temp_rpath "$absdir:" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -5527,7 +6643,7 @@
|
|
|
+ *)
|
|
|
+ case "$compile_rpath " in
|
|
|
+ *" $absdir "*) ;;
|
|
|
+- *) compile_rpath="$compile_rpath $absdir"
|
|
|
++ *) func_append compile_rpath " $absdir" ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -5536,7 +6652,7 @@
|
|
|
+ *)
|
|
|
+ case "$finalize_rpath " in
|
|
|
+ *" $libdir "*) ;;
|
|
|
+- *) finalize_rpath="$finalize_rpath $libdir"
|
|
|
++ *) func_append finalize_rpath " $libdir" ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -5561,12 +6677,12 @@
|
|
|
+ case $host in
|
|
|
+ *cygwin* | *mingw* | *cegcc*)
|
|
|
+ # No point in relinking DLLs because paths are not encoded
|
|
|
+- notinst_deplibs="$notinst_deplibs $lib"
|
|
|
++ func_append notinst_deplibs " $lib"
|
|
|
+ need_relink=no
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ if test "$installed" = no; then
|
|
|
+- notinst_deplibs="$notinst_deplibs $lib"
|
|
|
++ func_append notinst_deplibs " $lib"
|
|
|
+ need_relink=yes
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+@@ -5583,7 +6699,7 @@
|
|
|
+ fi
|
|
|
+ done
|
|
|
+ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ if test "$linkmode" = prog; then
|
|
|
+ $ECHO "*** Warning: Linking the executable $output against the loadable module"
|
|
|
+ else
|
|
|
+@@ -5601,7 +6717,7 @@
|
|
|
+ *)
|
|
|
+ case "$compile_rpath " in
|
|
|
+ *" $absdir "*) ;;
|
|
|
+- *) compile_rpath="$compile_rpath $absdir"
|
|
|
++ *) func_append compile_rpath " $absdir" ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -5610,7 +6726,7 @@
|
|
|
+ *)
|
|
|
+ case "$finalize_rpath " in
|
|
|
+ *" $libdir "*) ;;
|
|
|
+- *) finalize_rpath="$finalize_rpath $libdir"
|
|
|
++ *) func_append finalize_rpath " $libdir" ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -5664,7 +6780,7 @@
|
|
|
+ linklib=$newlib
|
|
|
+ fi # test -n "$old_archive_from_expsyms_cmds"
|
|
|
+
|
|
|
+- if test "$linkmode" = prog || test "$mode" != relink; then
|
|
|
++ if test "$linkmode" = prog || test "$opt_mode" != relink; then
|
|
|
+ add_shlibpath=
|
|
|
+ add_dir=
|
|
|
+ add=
|
|
|
+@@ -5686,9 +6802,9 @@
|
|
|
+ if test "X$dlopenmodule" != "X$lib"; then
|
|
|
+ $ECHO "*** Warning: lib $linklib is a module, not a shared library"
|
|
|
+ if test -z "$old_library" ; then
|
|
|
+- $ECHO
|
|
|
+- $ECHO "*** And there doesn't seem to be a static archive available"
|
|
|
+- $ECHO "*** The link will probably fail, sorry"
|
|
|
++ echo
|
|
|
++ echo "*** And there doesn't seem to be a static archive available"
|
|
|
++ echo "*** The link will probably fail, sorry"
|
|
|
+ else
|
|
|
+ add="$dir/$old_library"
|
|
|
+ fi
|
|
|
+@@ -5720,7 +6836,7 @@
|
|
|
+ if test -n "$inst_prefix_dir"; then
|
|
|
+ case $libdir in
|
|
|
+ [\\/]*)
|
|
|
+- add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
|
|
++ func_append add_dir " -L$inst_prefix_dir$libdir"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+@@ -5742,7 +6858,7 @@
|
|
|
+ if test -n "$add_shlibpath"; then
|
|
|
+ case :$compile_shlibpath: in
|
|
|
+ *":$add_shlibpath:"*) ;;
|
|
|
+- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
|
|
|
++ *) func_append compile_shlibpath "$add_shlibpath:" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ if test "$linkmode" = prog; then
|
|
|
+@@ -5756,13 +6872,13 @@
|
|
|
+ test "$hardcode_shlibpath_var" = yes; then
|
|
|
+ case :$finalize_shlibpath: in
|
|
|
+ *":$libdir:"*) ;;
|
|
|
+- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
|
|
|
++ *) func_append finalize_shlibpath "$libdir:" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+- if test "$linkmode" = prog || test "$mode" = relink; then
|
|
|
++ if test "$linkmode" = prog || test "$opt_mode" = relink; then
|
|
|
+ add_shlibpath=
|
|
|
+ add_dir=
|
|
|
+ add=
|
|
|
+@@ -5776,7 +6892,7 @@
|
|
|
+ elif test "$hardcode_shlibpath_var" = yes; then
|
|
|
+ case :$finalize_shlibpath: in
|
|
|
+ *":$libdir:"*) ;;
|
|
|
+- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
|
|
|
++ *) func_append finalize_shlibpath "$libdir:" ;;
|
|
|
+ esac
|
|
|
+ add="-l$name"
|
|
|
+ elif test "$hardcode_automatic" = yes; then
|
|
|
+@@ -5793,7 +6909,7 @@
|
|
|
+ if test -n "$inst_prefix_dir"; then
|
|
|
+ case $libdir in
|
|
|
+ [\\/]*)
|
|
|
+- add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
|
|
++ func_append add_dir " -L$inst_prefix_dir$libdir"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+@@ -5828,21 +6944,21 @@
|
|
|
+
|
|
|
+ # Just print a warning and add the library to dependency_libs so
|
|
|
+ # that the program can be linked against the static library.
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "*** Warning: This system can not link to static lib archive $lib."
|
|
|
+- $ECHO "*** I have the capability to make that library automatically link in when"
|
|
|
+- $ECHO "*** you link to this library. But I can only do this if you have a"
|
|
|
+- $ECHO "*** shared version of the library, which you do not appear to have."
|
|
|
++ echo "*** I have the capability to make that library automatically link in when"
|
|
|
++ echo "*** you link to this library. But I can only do this if you have a"
|
|
|
++ echo "*** shared version of the library, which you do not appear to have."
|
|
|
+ if test "$module" = yes; then
|
|
|
+- $ECHO "*** But as you try to build a module library, libtool will still create "
|
|
|
+- $ECHO "*** a static module, that should work as long as the dlopening application"
|
|
|
+- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
|
|
|
++ echo "*** But as you try to build a module library, libtool will still create "
|
|
|
++ echo "*** a static module, that should work as long as the dlopening application"
|
|
|
++ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
|
|
|
+ if test -z "$global_symbol_pipe"; then
|
|
|
+- $ECHO
|
|
|
+- $ECHO "*** However, this would only work if libtool was able to extract symbol"
|
|
|
+- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
|
|
|
+- $ECHO "*** not find such a program. So, this module is probably useless."
|
|
|
+- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
|
|
|
++ echo
|
|
|
++ echo "*** However, this would only work if libtool was able to extract symbol"
|
|
|
++ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
|
|
|
++ echo "*** not find such a program. So, this module is probably useless."
|
|
|
++ echo "*** \`nm' from GNU binutils and a full rebuild may help."
|
|
|
+ fi
|
|
|
+ if test "$build_old_libs" = no; then
|
|
|
+ build_libtool_libs=module
|
|
|
+@@ -5870,27 +6986,33 @@
|
|
|
+ temp_xrpath=$func_stripname_result
|
|
|
+ case " $xrpath " in
|
|
|
+ *" $temp_xrpath "*) ;;
|
|
|
+- *) xrpath="$xrpath $temp_xrpath";;
|
|
|
++ *) func_append xrpath " $temp_xrpath";;
|
|
|
+ esac;;
|
|
|
+- *) temp_deplibs="$temp_deplibs $libdir";;
|
|
|
++ *) func_append temp_deplibs " $libdir";;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ dependency_libs="$temp_deplibs"
|
|
|
+ fi
|
|
|
+
|
|
|
+- newlib_search_path="$newlib_search_path $absdir"
|
|
|
++ func_append newlib_search_path " $absdir"
|
|
|
+ # Link against this library
|
|
|
+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
|
|
|
+ # ... and its dependency_libs
|
|
|
+ tmp_libs=
|
|
|
+ for deplib in $dependency_libs; do
|
|
|
+ newdependency_libs="$deplib $newdependency_libs"
|
|
|
+- if $opt_duplicate_deps ; then
|
|
|
++ case $deplib in
|
|
|
++ -L*) func_stripname '-L' '' "$deplib"
|
|
|
++ func_resolve_sysroot "$func_stripname_result";;
|
|
|
++ *) func_resolve_sysroot "$deplib" ;;
|
|
|
++ esac
|
|
|
++ if $opt_preserve_dup_deps ; then
|
|
|
+ case "$tmp_libs " in
|
|
|
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
|
++ *" $func_resolve_sysroot_result "*)
|
|
|
++ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+- tmp_libs="$tmp_libs $deplib"
|
|
|
++ func_append tmp_libs " $func_resolve_sysroot_result"
|
|
|
+ done
|
|
|
+
|
|
|
+ if test "$link_all_deplibs" != no; then
|
|
|
+@@ -5900,8 +7022,10 @@
|
|
|
+ case $deplib in
|
|
|
+ -L*) path="$deplib" ;;
|
|
|
+ *.la)
|
|
|
++ func_resolve_sysroot "$deplib"
|
|
|
++ deplib=$func_resolve_sysroot_result
|
|
|
+ func_dirname "$deplib" "" "."
|
|
|
+- dir="$func_dirname_result"
|
|
|
++ dir=$func_dirname_result
|
|
|
+ # We need an absolute path.
|
|
|
+ case $dir in
|
|
|
+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
|
|
|
+@@ -5928,8 +7052,8 @@
|
|
|
+ if test -z "$darwin_install_name"; then
|
|
|
+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
|
|
|
+ fi
|
|
|
+- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
|
|
|
+- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
|
|
|
++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
|
|
|
++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
|
|
|
+ path=
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+@@ -5962,7 +7086,7 @@
|
|
|
+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
|
|
|
+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
|
|
|
+ else
|
|
|
+- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
++ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ dependency_libs="$newdependency_libs"
|
|
|
+@@ -5979,7 +7103,7 @@
|
|
|
+ for dir in $newlib_search_path; do
|
|
|
+ case "$lib_search_path " in
|
|
|
+ *" $dir "*) ;;
|
|
|
+- *) lib_search_path="$lib_search_path $dir" ;;
|
|
|
++ *) func_append lib_search_path " $dir" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ newlib_search_path=
|
|
|
+@@ -6037,10 +7161,10 @@
|
|
|
+ -L*)
|
|
|
+ case " $tmp_libs " in
|
|
|
+ *" $deplib "*) ;;
|
|
|
+- *) tmp_libs="$tmp_libs $deplib" ;;
|
|
|
++ *) func_append tmp_libs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+- *) tmp_libs="$tmp_libs $deplib" ;;
|
|
|
++ *) func_append tmp_libs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ eval $var=\"$tmp_libs\"
|
|
|
+@@ -6056,7 +7180,7 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ if test -n "$i" ; then
|
|
|
+- tmp_libs="$tmp_libs $i"
|
|
|
++ func_append tmp_libs " $i"
|
|
|
+ fi
|
|
|
+ done
|
|
|
+ dependency_libs=$tmp_libs
|
|
|
+@@ -6097,7 +7221,7 @@
|
|
|
+ # Now set the variables for building old libraries.
|
|
|
+ build_libtool_libs=no
|
|
|
+ oldlibs="$output"
|
|
|
+- objs="$objs$old_deplibs"
|
|
|
++ func_append objs "$old_deplibs"
|
|
|
+ ;;
|
|
|
+
|
|
|
+ lib)
|
|
|
+@@ -6130,10 +7254,10 @@
|
|
|
+ if test "$deplibs_check_method" != pass_all; then
|
|
|
+ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
|
|
|
+ else
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
|
|
|
+ $ECHO "*** objects $objs is not portable!"
|
|
|
+- libobjs="$libobjs $objs"
|
|
|
++ func_append libobjs " $objs"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -6198,7 +7322,7 @@
|
|
|
+ age="$number_minor"
|
|
|
+ revision="$number_revision"
|
|
|
+ ;;
|
|
|
+- freebsd-aout|freebsd-elf|sunos)
|
|
|
++ freebsd-aout|freebsd-elf|qnx|sunos)
|
|
|
+ current="$number_major"
|
|
|
+ revision="$number_minor"
|
|
|
+ age="0"
|
|
|
+@@ -6210,9 +7334,6 @@
|
|
|
+ revision="$number_minor"
|
|
|
+ lt_irix_increment=no
|
|
|
+ ;;
|
|
|
+- *)
|
|
|
+- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
|
|
|
+- ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ no)
|
|
|
+@@ -6334,7 +7455,7 @@
|
|
|
+ done
|
|
|
+
|
|
|
+ # Make executables depend on our current version.
|
|
|
+- verstring="$verstring:${current}.0"
|
|
|
++ func_append verstring ":${current}.0"
|
|
|
+ ;;
|
|
|
+
|
|
|
+ qnx)
|
|
|
+@@ -6402,10 +7523,10 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ func_generate_dlsyms "$libname" "$libname" "yes"
|
|
|
+- libobjs="$libobjs $symfileobj"
|
|
|
++ func_append libobjs " $symfileobj"
|
|
|
+ test "X$libobjs" = "X " && libobjs=
|
|
|
+
|
|
|
+- if test "$mode" != relink; then
|
|
|
++ if test "$opt_mode" != relink; then
|
|
|
+ # Remove our outputs, but don't remove object files since they
|
|
|
+ # may have been created when compiling PIC objects.
|
|
|
+ removelist=
|
|
|
+@@ -6421,7 +7542,7 @@
|
|
|
+ continue
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+- removelist="$removelist $p"
|
|
|
++ func_append removelist " $p"
|
|
|
+ ;;
|
|
|
+ *) ;;
|
|
|
+ esac
|
|
|
+@@ -6432,27 +7553,28 @@
|
|
|
+
|
|
|
+ # Now set the variables for building old libraries.
|
|
|
+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
|
|
|
+- oldlibs="$oldlibs $output_objdir/$libname.$libext"
|
|
|
++ func_append oldlibs " $output_objdir/$libname.$libext"
|
|
|
+
|
|
|
+ # Transform .lo files to .o files.
|
|
|
+- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
|
|
|
++ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
|
|
|
+ fi
|
|
|
+
|
|
|
+ # Eliminate all temporary directories.
|
|
|
+ #for path in $notinst_path; do
|
|
|
+- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
|
|
|
+- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
|
|
|
+- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
|
|
|
++ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
|
|
|
++ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
|
|
|
++ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
|
|
|
+ #done
|
|
|
+
|
|
|
+ if test -n "$xrpath"; then
|
|
|
+ # If the user specified any rpath flags, then add them.
|
|
|
+ temp_xrpath=
|
|
|
+ for libdir in $xrpath; do
|
|
|
+- temp_xrpath="$temp_xrpath -R$libdir"
|
|
|
++ func_replace_sysroot "$libdir"
|
|
|
++ func_append temp_xrpath " -R$func_replace_sysroot_result"
|
|
|
+ case "$finalize_rpath " in
|
|
|
+ *" $libdir "*) ;;
|
|
|
+- *) finalize_rpath="$finalize_rpath $libdir" ;;
|
|
|
++ *) func_append finalize_rpath " $libdir" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
|
|
|
+@@ -6466,7 +7588,7 @@
|
|
|
+ for lib in $old_dlfiles; do
|
|
|
+ case " $dlprefiles $dlfiles " in
|
|
|
+ *" $lib "*) ;;
|
|
|
+- *) dlfiles="$dlfiles $lib" ;;
|
|
|
++ *) func_append dlfiles " $lib" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+
|
|
|
+@@ -6476,19 +7598,19 @@
|
|
|
+ for lib in $old_dlprefiles; do
|
|
|
+ case "$dlprefiles " in
|
|
|
+ *" $lib "*) ;;
|
|
|
+- *) dlprefiles="$dlprefiles $lib" ;;
|
|
|
++ *) func_append dlprefiles " $lib" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+
|
|
|
+ if test "$build_libtool_libs" = yes; then
|
|
|
+ if test -n "$rpath"; then
|
|
|
+ case $host in
|
|
|
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
|
|
|
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
|
+ # these systems don't actually have a c library (as such)!
|
|
|
+ ;;
|
|
|
+ *-*-rhapsody* | *-*-darwin1.[012])
|
|
|
+ # Rhapsody C library is in the System framework
|
|
|
+- deplibs="$deplibs System.ltframework"
|
|
|
++ func_append deplibs " System.ltframework"
|
|
|
+ ;;
|
|
|
+ *-*-netbsd*)
|
|
|
+ # Don't link with libc until the a.out ld.so is fixed.
|
|
|
+@@ -6505,7 +7627,7 @@
|
|
|
+ *)
|
|
|
+ # Add libc to deplibs on all other systems if necessary.
|
|
|
+ if test "$build_libtool_need_lc" = "yes"; then
|
|
|
+- deplibs="$deplibs -lc"
|
|
|
++ func_append deplibs " -lc"
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -6554,7 +7676,7 @@
|
|
|
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
+ case " $predeps $postdeps " in
|
|
|
+ *" $i "*)
|
|
|
+- newdeplibs="$newdeplibs $i"
|
|
|
++ func_append newdeplibs " $i"
|
|
|
+ i=""
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -6565,21 +7687,21 @@
|
|
|
+ set dummy $deplib_matches; shift
|
|
|
+ deplib_match=$1
|
|
|
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
|
|
+- newdeplibs="$newdeplibs $i"
|
|
|
++ func_append newdeplibs " $i"
|
|
|
+ else
|
|
|
+ droppeddeps=yes
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
|
|
|
+- $ECHO "*** I have the capability to make that library automatically link in when"
|
|
|
+- $ECHO "*** you link to this library. But I can only do this if you have a"
|
|
|
+- $ECHO "*** shared version of the library, which I believe you do not have"
|
|
|
+- $ECHO "*** because a test_compile did reveal that the linker did not use it for"
|
|
|
+- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
|
|
|
++ echo "*** I have the capability to make that library automatically link in when"
|
|
|
++ echo "*** you link to this library. But I can only do this if you have a"
|
|
|
++ echo "*** shared version of the library, which I believe you do not have"
|
|
|
++ echo "*** because a test_compile did reveal that the linker did not use it for"
|
|
|
++ echo "*** its dynamic dependency list that programs get resolved with at runtime."
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- newdeplibs="$newdeplibs $i"
|
|
|
++ func_append newdeplibs " $i"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+@@ -6597,7 +7719,7 @@
|
|
|
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
+ case " $predeps $postdeps " in
|
|
|
+ *" $i "*)
|
|
|
+- newdeplibs="$newdeplibs $i"
|
|
|
++ func_append newdeplibs " $i"
|
|
|
+ i=""
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -6608,29 +7730,29 @@
|
|
|
+ set dummy $deplib_matches; shift
|
|
|
+ deplib_match=$1
|
|
|
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
|
|
+- newdeplibs="$newdeplibs $i"
|
|
|
++ func_append newdeplibs " $i"
|
|
|
+ else
|
|
|
+ droppeddeps=yes
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
|
|
|
+- $ECHO "*** I have the capability to make that library automatically link in when"
|
|
|
+- $ECHO "*** you link to this library. But I can only do this if you have a"
|
|
|
+- $ECHO "*** shared version of the library, which you do not appear to have"
|
|
|
+- $ECHO "*** because a test_compile did reveal that the linker did not use this one"
|
|
|
+- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
|
|
|
++ echo "*** I have the capability to make that library automatically link in when"
|
|
|
++ echo "*** you link to this library. But I can only do this if you have a"
|
|
|
++ echo "*** shared version of the library, which you do not appear to have"
|
|
|
++ echo "*** because a test_compile did reveal that the linker did not use this one"
|
|
|
++ echo "*** as a dynamic dependency that programs can get resolved with at runtime."
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ droppeddeps=yes
|
|
|
+- $ECHO
|
|
|
++ 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 "*** library that it depends on before this library will be fully"
|
|
|
+- $ECHO "*** functional. Installing it before continuing would be even better."
|
|
|
++ 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
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- newdeplibs="$newdeplibs $i"
|
|
|
++ func_append newdeplibs " $i"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+@@ -6647,15 +7769,27 @@
|
|
|
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
+ case " $predeps $postdeps " in
|
|
|
+ *" $a_deplib "*)
|
|
|
+- newdeplibs="$newdeplibs $a_deplib"
|
|
|
++ func_append newdeplibs " $a_deplib"
|
|
|
+ a_deplib=""
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ if test -n "$a_deplib" ; then
|
|
|
+ libname=`eval "\\$ECHO \"$libname_spec\""`
|
|
|
++ if test -n "$file_magic_glob"; then
|
|
|
++ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
|
|
|
++ else
|
|
|
++ libnameglob=$libname
|
|
|
++ fi
|
|
|
++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
|
|
|
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
|
|
+- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
|
|
|
++ if test "$want_nocaseglob" = yes; then
|
|
|
++ shopt -s nocaseglob
|
|
|
++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
|
|
|
++ $nocaseglob
|
|
|
++ else
|
|
|
++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
|
|
|
++ fi
|
|
|
+ for potent_lib in $potential_libs; do
|
|
|
+ # Follow soft links.
|
|
|
+ if ls -lLd "$potent_lib" 2>/dev/null |
|
|
|
+@@ -6672,13 +7806,13 @@
|
|
|
+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
|
|
|
+ case $potliblink in
|
|
|
+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
|
|
|
+- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
|
|
|
++ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
|
|
|
+ $SED -e 10q |
|
|
|
+ $EGREP "$file_magic_regex" > /dev/null; then
|
|
|
+- newdeplibs="$newdeplibs $a_deplib"
|
|
|
++ func_append newdeplibs " $a_deplib"
|
|
|
+ a_deplib=""
|
|
|
+ break 2
|
|
|
+ fi
|
|
|
+@@ -6687,12 +7821,12 @@
|
|
|
+ fi
|
|
|
+ if test -n "$a_deplib" ; then
|
|
|
+ droppeddeps=yes
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
|
|
|
+- $ECHO "*** I have the capability to make that library automatically link in when"
|
|
|
+- $ECHO "*** you link to this library. But I can only do this if you have a"
|
|
|
+- $ECHO "*** shared version of the library, which you do not appear to have"
|
|
|
+- $ECHO "*** because I did check the linker path looking for a file starting"
|
|
|
++ echo "*** I have the capability to make that library automatically link in when"
|
|
|
++ echo "*** you link to this library. But I can only do this if you have a"
|
|
|
++ echo "*** shared version of the library, which you do not appear to have"
|
|
|
++ echo "*** because I did check the linker path looking for a file starting"
|
|
|
+ if test -z "$potlib" ; then
|
|
|
+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
|
|
|
+ else
|
|
|
+@@ -6703,7 +7837,7 @@
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ # Add a -L argument.
|
|
|
+- newdeplibs="$newdeplibs $a_deplib"
|
|
|
++ func_append newdeplibs " $a_deplib"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ done # Gone through all deplibs.
|
|
|
+@@ -6719,7 +7853,7 @@
|
|
|
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
+ case " $predeps $postdeps " in
|
|
|
+ *" $a_deplib "*)
|
|
|
+- newdeplibs="$newdeplibs $a_deplib"
|
|
|
++ func_append newdeplibs " $a_deplib"
|
|
|
+ a_deplib=""
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -6730,9 +7864,9 @@
|
|
|
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
|
|
|
+ for potent_lib in $potential_libs; do
|
|
|
+ potlib="$potent_lib" # see symlink-check above in file_magic test
|
|
|
+- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
|
|
|
++ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
|
|
|
+ $EGREP "$match_pattern_regex" > /dev/null; then
|
|
|
+- newdeplibs="$newdeplibs $a_deplib"
|
|
|
++ func_append newdeplibs " $a_deplib"
|
|
|
+ a_deplib=""
|
|
|
+ break 2
|
|
|
+ fi
|
|
|
+@@ -6741,12 +7875,12 @@
|
|
|
+ fi
|
|
|
+ if test -n "$a_deplib" ; then
|
|
|
+ droppeddeps=yes
|
|
|
+- $ECHO
|
|
|
++ echo
|
|
|
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
|
|
|
+- $ECHO "*** I have the capability to make that library automatically link in when"
|
|
|
+- $ECHO "*** you link to this library. But I can only do this if you have a"
|
|
|
+- $ECHO "*** shared version of the library, which you do not appear to have"
|
|
|
+- $ECHO "*** because I did check the linker path looking for a file starting"
|
|
|
++ echo "*** I have the capability to make that library automatically link in when"
|
|
|
++ echo "*** you link to this library. But I can only do this if you have a"
|
|
|
++ echo "*** shared version of the library, which you do not appear to have"
|
|
|
++ echo "*** because I did check the linker path looking for a file starting"
|
|
|
+ if test -z "$potlib" ; then
|
|
|
+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
|
|
|
+ else
|
|
|
+@@ -6757,32 +7891,32 @@
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ # Add a -L argument.
|
|
|
+- newdeplibs="$newdeplibs $a_deplib"
|
|
|
++ func_append newdeplibs " $a_deplib"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ done # Gone through all deplibs.
|
|
|
+ ;;
|
|
|
+ none | unknown | *)
|
|
|
+ newdeplibs=""
|
|
|
+- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
|
|
|
+- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
|
|
|
++ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
|
|
|
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
+ for i in $predeps $postdeps ; do
|
|
|
+ # can't use Xsed below, because $i might contain '/'
|
|
|
+- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
|
|
|
++ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
|
|
|
+ done
|
|
|
+ fi
|
|
|
+- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
|
|
|
+- $GREP . >/dev/null; then
|
|
|
+- $ECHO
|
|
|
++ case $tmp_deplibs in
|
|
|
++ *[!\ \ ]*)
|
|
|
++ echo
|
|
|
+ if test "X$deplibs_check_method" = "Xnone"; then
|
|
|
+- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
|
|
|
++ echo "*** Warning: inter-library dependencies are not supported in this platform."
|
|
|
+ else
|
|
|
+- $ECHO "*** Warning: inter-library dependencies are not known to be supported."
|
|
|
++ echo "*** Warning: inter-library dependencies are not known to be supported."
|
|
|
+ fi
|
|
|
+- $ECHO "*** All declared inter-library dependencies are being dropped."
|
|
|
++ echo "*** All declared inter-library dependencies are being dropped."
|
|
|
+ droppeddeps=yes
|
|
|
+- fi
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ versuffix=$versuffix_save
|
|
|
+@@ -6794,23 +7928,23 @@
|
|
|
+ case $host in
|
|
|
+ *-*-rhapsody* | *-*-darwin1.[012])
|
|
|
+ # On Rhapsody replace the C library with the System framework
|
|
|
+- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
|
|
|
++ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+ if test "$droppeddeps" = yes; then
|
|
|
+ if test "$module" = yes; then
|
|
|
+- $ECHO
|
|
|
+- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
|
|
|
++ echo
|
|
|
++ echo "*** Warning: libtool could not satisfy all declared inter-library"
|
|
|
+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
|
|
|
+- $ECHO "*** a static module, that should work as long as the dlopening"
|
|
|
+- $ECHO "*** application is linked with the -dlopen flag."
|
|
|
++ echo "*** a static module, that should work as long as the dlopening"
|
|
|
++ echo "*** application is linked with the -dlopen flag."
|
|
|
+ if test -z "$global_symbol_pipe"; then
|
|
|
+- $ECHO
|
|
|
+- $ECHO "*** However, this would only work if libtool was able to extract symbol"
|
|
|
+- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
|
|
|
+- $ECHO "*** not find such a program. So, this module is probably useless."
|
|
|
+- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
|
|
|
++ echo
|
|
|
++ echo "*** However, this would only work if libtool was able to extract symbol"
|
|
|
++ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
|
|
|
++ echo "*** not find such a program. So, this module is probably useless."
|
|
|
++ echo "*** \`nm' from GNU binutils and a full rebuild may help."
|
|
|
+ fi
|
|
|
+ if test "$build_old_libs" = no; then
|
|
|
+ oldlibs="$output_objdir/$libname.$libext"
|
|
|
+@@ -6820,16 +7954,16 @@
|
|
|
+ build_libtool_libs=no
|
|
|
+ fi
|
|
|
+ else
|
|
|
+- $ECHO "*** The inter-library dependencies that have been dropped here will be"
|
|
|
+- $ECHO "*** automatically added whenever a program is linked with this library"
|
|
|
+- $ECHO "*** or is declared to -dlopen it."
|
|
|
++ echo "*** The inter-library dependencies that have been dropped here will be"
|
|
|
++ echo "*** automatically added whenever a program is linked with this library"
|
|
|
++ echo "*** or is declared to -dlopen it."
|
|
|
+
|
|
|
+ if test "$allow_undefined" = no; then
|
|
|
+- $ECHO
|
|
|
+- $ECHO "*** Since this library must not contain undefined symbols,"
|
|
|
+- $ECHO "*** because either the platform does not support them or"
|
|
|
+- $ECHO "*** it was explicitly requested with -no-undefined,"
|
|
|
+- $ECHO "*** libtool will only create a static version of it."
|
|
|
++ echo
|
|
|
++ echo "*** Since this library must not contain undefined symbols,"
|
|
|
++ echo "*** because either the platform does not support them or"
|
|
|
++ echo "*** it was explicitly requested with -no-undefined,"
|
|
|
++ echo "*** libtool will only create a static version of it."
|
|
|
+ if test "$build_old_libs" = no; then
|
|
|
+ oldlibs="$output_objdir/$libname.$libext"
|
|
|
+ build_libtool_libs=module
|
|
|
+@@ -6846,9 +7980,9 @@
|
|
|
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
|
|
|
+ case $host in
|
|
|
+ *-*-darwin*)
|
|
|
+- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
+- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
+- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
++ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
++ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
++ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+@@ -6861,7 +7995,7 @@
|
|
|
+ *)
|
|
|
+ case " $deplibs " in
|
|
|
+ *" -L$path/$objdir "*)
|
|
|
+- new_libs="$new_libs -L$path/$objdir" ;;
|
|
|
++ func_append new_libs " -L$path/$objdir" ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -6871,10 +8005,10 @@
|
|
|
+ -L*)
|
|
|
+ case " $new_libs " in
|
|
|
+ *" $deplib "*) ;;
|
|
|
+- *) new_libs="$new_libs $deplib" ;;
|
|
|
++ *) func_append new_libs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+- *) new_libs="$new_libs $deplib" ;;
|
|
|
++ *) func_append new_libs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ deplibs="$new_libs"
|
|
|
+@@ -6891,10 +8025,12 @@
|
|
|
+ hardcode_libdirs=
|
|
|
+ dep_rpath=
|
|
|
+ rpath="$finalize_rpath"
|
|
|
+- test "$mode" != relink && rpath="$compile_rpath$rpath"
|
|
|
++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
|
|
|
+ for libdir in $rpath; do
|
|
|
+ if test -n "$hardcode_libdir_flag_spec"; then
|
|
|
+ if test -n "$hardcode_libdir_separator"; then
|
|
|
++ func_replace_sysroot "$libdir"
|
|
|
++ libdir=$func_replace_sysroot_result
|
|
|
+ if test -z "$hardcode_libdirs"; then
|
|
|
+ hardcode_libdirs="$libdir"
|
|
|
+ else
|
|
|
+@@ -6903,18 +8039,18 @@
|
|
|
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
|
|
|
++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
|
+- dep_rpath="$dep_rpath $flag"
|
|
|
++ func_append dep_rpath " $flag"
|
|
|
+ fi
|
|
|
+ elif test -n "$runpath_var"; then
|
|
|
+ case "$perm_rpath " in
|
|
|
+ *" $libdir "*) ;;
|
|
|
+- *) perm_rpath="$perm_rpath $libdir" ;;
|
|
|
++ *) func_apped perm_rpath " $libdir" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ done
|
|
|
+@@ -6932,7 +8068,7 @@
|
|
|
+ # We should set the runpath_var.
|
|
|
+ rpath=
|
|
|
+ for dir in $perm_rpath; do
|
|
|
+- rpath="$rpath$dir:"
|
|
|
++ func_append rpath "$dir:"
|
|
|
+ done
|
|
|
+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
|
|
|
+ fi
|
|
|
+@@ -6940,7 +8076,7 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ shlibpath="$finalize_shlibpath"
|
|
|
+- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
|
|
|
++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
|
|
|
+ if test -n "$shlibpath"; then
|
|
|
+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
|
|
|
+ fi
|
|
|
+@@ -6966,18 +8102,18 @@
|
|
|
+ linknames=
|
|
|
+ for link
|
|
|
+ do
|
|
|
+- linknames="$linknames $link"
|
|
|
++ func_append linknames " $link"
|
|
|
+ done
|
|
|
+
|
|
|
+ # Use standard objects if they are pic
|
|
|
+- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
|
|
++ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
|
|
|
+ test "X$libobjs" = "X " && libobjs=
|
|
|
+
|
|
|
+ delfiles=
|
|
|
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
|
|
|
+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
|
|
|
+ export_symbols="$output_objdir/$libname.uexp"
|
|
|
+- delfiles="$delfiles $export_symbols"
|
|
|
++ func_append delfiles " $export_symbols"
|
|
|
+ fi
|
|
|
+
|
|
|
+ orig_export_symbols=
|
|
|
+@@ -7008,13 +8144,45 @@
|
|
|
+ $opt_dry_run || $RM $export_symbols
|
|
|
+ cmds=$export_symbols_cmds
|
|
|
+ save_ifs="$IFS"; IFS='~'
|
|
|
+- for cmd in $cmds; do
|
|
|
++ for cmd1 in $cmds; do
|
|
|
+ IFS="$save_ifs"
|
|
|
+- eval cmd=\"$cmd\"
|
|
|
+- func_len " $cmd"
|
|
|
+- len=$func_len_result
|
|
|
+- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
|
|
|
++ # Take the normal branch if the nm_file_list_spec branch
|
|
|
++ # doesn't work or if tool conversion is not needed.
|
|
|
++ case $nm_file_list_spec~$to_tool_file_cmd in
|
|
|
++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
|
|
|
++ try_normal_branch=yes
|
|
|
++ eval cmd=\"$cmd1\"
|
|
|
++ func_len " $cmd"
|
|
|
++ len=$func_len_result
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ try_normal_branch=no
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ if test "$try_normal_branch" = yes \
|
|
|
++ && { test "$len" -lt "$max_cmd_len" \
|
|
|
++ || test "$max_cmd_len" -le -1; }
|
|
|
++ then
|
|
|
++ func_show_eval "$cmd" 'exit $?'
|
|
|
++ skipped_export=false
|
|
|
++ elif test -n "$nm_file_list_spec"; then
|
|
|
++ func_basename "$output"
|
|
|
++ output_la=$func_basename_result
|
|
|
++ save_libobjs=$libobjs
|
|
|
++ save_output=$output
|
|
|
++ output=${output_objdir}/${output_la}.nm
|
|
|
++ func_to_tool_file "$output"
|
|
|
++ libobjs=$nm_file_list_spec$func_to_tool_file_result
|
|
|
++ func_append delfiles " $output"
|
|
|
++ func_verbose "creating $NM input file list: $output"
|
|
|
++ for obj in $save_libobjs; do
|
|
|
++ func_to_tool_file "$obj"
|
|
|
++ $ECHO "$func_to_tool_file_result"
|
|
|
++ done > "$output"
|
|
|
++ eval cmd=\"$cmd1\"
|
|
|
+ func_show_eval "$cmd" 'exit $?'
|
|
|
++ output=$save_output
|
|
|
++ libobjs=$save_libobjs
|
|
|
+ skipped_export=false
|
|
|
+ else
|
|
|
+ # The command line is too long to execute in one step.
|
|
|
+@@ -7036,7 +8204,7 @@
|
|
|
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
|
|
|
+ tmp_export_symbols="$export_symbols"
|
|
|
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
|
|
|
+- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
|
|
|
++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
|
|
|
+@@ -7048,7 +8216,7 @@
|
|
|
+ # global variables. join(1) would be nice here, but unfortunately
|
|
|
+ # isn't a blessed tool.
|
|
|
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
|
|
|
+- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
|
|
|
++ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
|
|
|
+ export_symbols=$output_objdir/$libname.def
|
|
|
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
|
|
|
+ fi
|
|
|
+@@ -7058,7 +8226,7 @@
|
|
|
+ case " $convenience " in
|
|
|
+ *" $test_deplib "*) ;;
|
|
|
+ *)
|
|
|
+- tmp_deplibs="$tmp_deplibs $test_deplib"
|
|
|
++ func_append tmp_deplibs " $test_deplib"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+@@ -7078,21 +8246,21 @@
|
|
|
+ test "X$libobjs" = "X " && libobjs=
|
|
|
+ else
|
|
|
+ gentop="$output_objdir/${outputname}x"
|
|
|
+- generated="$generated $gentop"
|
|
|
++ func_append generated " $gentop"
|
|
|
+
|
|
|
+ func_extract_archives $gentop $convenience
|
|
|
+- libobjs="$libobjs $func_extract_archives_result"
|
|
|
++ func_append libobjs " $func_extract_archives_result"
|
|
|
+ test "X$libobjs" = "X " && libobjs=
|
|
|
+ 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"
|
|
|
++ func_append linker_flags " $flag"
|
|
|
+ fi
|
|
|
+
|
|
|
+ # Make a backup of the uninstalled library when relinking
|
|
|
+- if test "$mode" = relink; then
|
|
|
++ if test "$opt_mode" = relink; then
|
|
|
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -7137,7 +8305,8 @@
|
|
|
+ save_libobjs=$libobjs
|
|
|
+ fi
|
|
|
+ save_output=$output
|
|
|
+- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
|
|
|
++ func_basename "$output"
|
|
|
++ output_la=$func_basename_result
|
|
|
+
|
|
|
+ # Clear the reloadable object creation command queue and
|
|
|
+ # initialize k to one.
|
|
|
+@@ -7150,13 +8319,16 @@
|
|
|
+ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
|
|
|
+ output=${output_objdir}/${output_la}.lnkscript
|
|
|
+ func_verbose "creating GNU ld script: $output"
|
|
|
+- $ECHO 'INPUT (' > $output
|
|
|
++ echo 'INPUT (' > $output
|
|
|
+ for obj in $save_libobjs
|
|
|
+ do
|
|
|
+- $ECHO "$obj" >> $output
|
|
|
++ func_to_tool_file "$obj"
|
|
|
++ $ECHO "$func_to_tool_file_result" >> $output
|
|
|
+ done
|
|
|
+- $ECHO ')' >> $output
|
|
|
+- delfiles="$delfiles $output"
|
|
|
++ echo ')' >> $output
|
|
|
++ func_append delfiles " $output"
|
|
|
++ func_to_tool_file "$output"
|
|
|
++ output=$func_to_tool_file_result
|
|
|
+ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
|
|
|
+ output=${output_objdir}/${output_la}.lnk
|
|
|
+ func_verbose "creating linker input file list: $output"
|
|
|
+@@ -7170,10 +8342,12 @@
|
|
|
+ fi
|
|
|
+ for obj
|
|
|
+ do
|
|
|
+- $ECHO "$obj" >> $output
|
|
|
++ func_to_tool_file "$obj"
|
|
|
++ $ECHO "$func_to_tool_file_result" >> $output
|
|
|
+ done
|
|
|
+- delfiles="$delfiles $output"
|
|
|
+- output=$firstobj\"$file_list_spec$output\"
|
|
|
++ func_append delfiles " $output"
|
|
|
++ func_to_tool_file "$output"
|
|
|
++ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
|
|
|
+ else
|
|
|
+ if test -n "$save_libobjs"; then
|
|
|
+ func_verbose "creating reloadable object files..."
|
|
|
+@@ -7197,17 +8371,19 @@
|
|
|
+ # command to the queue.
|
|
|
+ if test "$k" -eq 1 ; then
|
|
|
+ # The first file doesn't have a previous command to add.
|
|
|
+- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
|
|
|
++ reload_objs=$objlist
|
|
|
++ eval concat_cmds=\"$reload_cmds\"
|
|
|
+ else
|
|
|
+ # All subsequent reloadable object files will link in
|
|
|
+ # the last one created.
|
|
|
+- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
|
|
|
++ reload_objs="$objlist $last_robj"
|
|
|
++ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
|
|
|
+ fi
|
|
|
+ last_robj=$output_objdir/$output_la-${k}.$objext
|
|
|
+ func_arith $k + 1
|
|
|
+ k=$func_arith_result
|
|
|
+ output=$output_objdir/$output_la-${k}.$objext
|
|
|
+- objlist=$obj
|
|
|
++ objlist=" $obj"
|
|
|
+ func_len " $last_robj"
|
|
|
+ func_arith $len0 + $func_len_result
|
|
|
+ len=$func_arith_result
|
|
|
+@@ -7217,11 +8393,12 @@
|
|
|
+ # reloadable object file. All subsequent reloadable object
|
|
|
+ # files will link in the last one created.
|
|
|
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
|
|
|
+- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
|
|
|
++ reload_objs="$objlist $last_robj"
|
|
|
++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
|
|
|
+ if test -n "$last_robj"; then
|
|
|
+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
|
|
|
+ fi
|
|
|
+- delfiles="$delfiles $output"
|
|
|
++ func_append delfiles " $output"
|
|
|
+
|
|
|
+ else
|
|
|
+ output=
|
|
|
+@@ -7255,7 +8432,7 @@
|
|
|
+ lt_exit=$?
|
|
|
+
|
|
|
+ # Restore the uninstalled library and exit
|
|
|
+- if test "$mode" = relink; then
|
|
|
++ if test "$opt_mode" = relink; then
|
|
|
+ ( cd "$output_objdir" && \
|
|
|
+ $RM "${realname}T" && \
|
|
|
+ $MV "${realname}U" "$realname" )
|
|
|
+@@ -7276,7 +8453,7 @@
|
|
|
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
|
|
|
+ tmp_export_symbols="$export_symbols"
|
|
|
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
|
|
|
+- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
|
|
|
++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test -n "$orig_export_symbols"; then
|
|
|
+@@ -7288,7 +8465,7 @@
|
|
|
+ # global variables. join(1) would be nice here, but unfortunately
|
|
|
+ # isn't a blessed tool.
|
|
|
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
|
|
|
+- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
|
|
|
++ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
|
|
|
+ export_symbols=$output_objdir/$libname.def
|
|
|
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
|
|
|
+ fi
|
|
|
+@@ -7329,10 +8506,10 @@
|
|
|
+ # Add any objects from preloaded convenience libraries
|
|
|
+ if test -n "$dlprefiles"; then
|
|
|
+ gentop="$output_objdir/${outputname}x"
|
|
|
+- generated="$generated $gentop"
|
|
|
++ func_append generated " $gentop"
|
|
|
+
|
|
|
+ func_extract_archives $gentop $dlprefiles
|
|
|
+- libobjs="$libobjs $func_extract_archives_result"
|
|
|
++ func_append libobjs " $func_extract_archives_result"
|
|
|
+ test "X$libobjs" = "X " && libobjs=
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -7348,7 +8525,7 @@
|
|
|
+ lt_exit=$?
|
|
|
+
|
|
|
+ # Restore the uninstalled library and exit
|
|
|
+- if test "$mode" = relink; then
|
|
|
++ if test "$opt_mode" = relink; then
|
|
|
+ ( cd "$output_objdir" && \
|
|
|
+ $RM "${realname}T" && \
|
|
|
+ $MV "${realname}U" "$realname" )
|
|
|
+@@ -7360,7 +8537,7 @@
|
|
|
+ IFS="$save_ifs"
|
|
|
+
|
|
|
+ # Restore the uninstalled library and exit
|
|
|
+- if test "$mode" = relink; then
|
|
|
++ if test "$opt_mode" = relink; then
|
|
|
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
|
|
|
+
|
|
|
+ if test -n "$convenience"; then
|
|
|
+@@ -7441,18 +8618,21 @@
|
|
|
+ if test -n "$convenience"; then
|
|
|
+ if test -n "$whole_archive_flag_spec"; then
|
|
|
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
|
|
+- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
|
|
|
++ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
|
|
|
+ else
|
|
|
+ gentop="$output_objdir/${obj}x"
|
|
|
+- generated="$generated $gentop"
|
|
|
++ func_append generated " $gentop"
|
|
|
+
|
|
|
+ func_extract_archives $gentop $convenience
|
|
|
+ reload_conv_objs="$reload_objs $func_extract_archives_result"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
++ # If we're not building shared, we need to use non_pic_objs
|
|
|
++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
|
|
|
++
|
|
|
+ # Create the old-style object.
|
|
|
+- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
|
|
|
++ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
|
|
|
+
|
|
|
+ output="$obj"
|
|
|
+ func_execute_cmds "$reload_cmds" 'exit $?'
|
|
|
+@@ -7512,8 +8692,8 @@
|
|
|
+ case $host in
|
|
|
+ *-*-rhapsody* | *-*-darwin1.[012])
|
|
|
+ # On Rhapsody replace the C library is the System framework
|
|
|
+- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
|
|
|
+- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
|
|
|
++ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
|
|
|
++ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+@@ -7524,14 +8704,14 @@
|
|
|
+ if test "$tagname" = CXX ; then
|
|
|
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
|
|
|
+ 10.[0123])
|
|
|
+- compile_command="$compile_command ${wl}-bind_at_load"
|
|
|
+- finalize_command="$finalize_command ${wl}-bind_at_load"
|
|
|
++ func_append compile_command " ${wl}-bind_at_load"
|
|
|
++ func_append finalize_command " ${wl}-bind_at_load"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
|
|
|
+- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
+- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
++ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
++ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+@@ -7545,7 +8725,7 @@
|
|
|
+ *)
|
|
|
+ case " $compile_deplibs " in
|
|
|
+ *" -L$path/$objdir "*)
|
|
|
+- new_libs="$new_libs -L$path/$objdir" ;;
|
|
|
++ func_append new_libs " -L$path/$objdir" ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -7555,17 +8735,17 @@
|
|
|
+ -L*)
|
|
|
+ case " $new_libs " in
|
|
|
+ *" $deplib "*) ;;
|
|
|
+- *) new_libs="$new_libs $deplib" ;;
|
|
|
++ *) func_append new_libs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+- *) new_libs="$new_libs $deplib" ;;
|
|
|
++ *) func_append new_libs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ compile_deplibs="$new_libs"
|
|
|
+
|
|
|
+
|
|
|
+- compile_command="$compile_command $compile_deplibs"
|
|
|
+- finalize_command="$finalize_command $finalize_deplibs"
|
|
|
++ func_append compile_command " $compile_deplibs"
|
|
|
++ func_append finalize_command " $finalize_deplibs"
|
|
|
+
|
|
|
+ if test -n "$rpath$xrpath"; then
|
|
|
+ # If the user specified any rpath flags, then add them.
|
|
|
+@@ -7573,7 +8753,7 @@
|
|
|
+ # This is the magic to use -rpath.
|
|
|
+ case "$finalize_rpath " in
|
|
|
+ *" $libdir "*) ;;
|
|
|
+- *) finalize_rpath="$finalize_rpath $libdir" ;;
|
|
|
++ *) func_append finalize_rpath " $libdir" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ fi
|
|
|
+@@ -7592,18 +8772,18 @@
|
|
|
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
|
|
|
++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
|
+- rpath="$rpath $flag"
|
|
|
++ func_append rpath " $flag"
|
|
|
+ fi
|
|
|
+ elif test -n "$runpath_var"; then
|
|
|
+ case "$perm_rpath " in
|
|
|
+ *" $libdir "*) ;;
|
|
|
+- *) perm_rpath="$perm_rpath $libdir" ;;
|
|
|
++ *) func_append perm_rpath " $libdir" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ case $host in
|
|
|
+@@ -7612,12 +8792,12 @@
|
|
|
+ case :$dllsearchpath: in
|
|
|
+ *":$libdir:"*) ;;
|
|
|
+ ::) dllsearchpath=$libdir;;
|
|
|
+- *) dllsearchpath="$dllsearchpath:$libdir";;
|
|
|
++ *) func_append dllsearchpath ":$libdir";;
|
|
|
+ esac
|
|
|
+ case :$dllsearchpath: in
|
|
|
+ *":$testbindir:"*) ;;
|
|
|
+ ::) dllsearchpath=$testbindir;;
|
|
|
+- *) dllsearchpath="$dllsearchpath:$testbindir";;
|
|
|
++ *) func_append dllsearchpath ":$testbindir";;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -7643,18 +8823,18 @@
|
|
|
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
|
|
|
++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
|
+- rpath="$rpath $flag"
|
|
|
++ func_append rpath " $flag"
|
|
|
+ fi
|
|
|
+ elif test -n "$runpath_var"; then
|
|
|
+ case "$finalize_perm_rpath " in
|
|
|
+ *" $libdir "*) ;;
|
|
|
+- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
|
|
|
++ *) func_append finalize_perm_rpath " $libdir" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ done
|
|
|
+@@ -7668,8 +8848,8 @@
|
|
|
+
|
|
|
+ if test -n "$libobjs" && test "$build_old_libs" = yes; then
|
|
|
+ # Transform all the library objects into standard objects.
|
|
|
+- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
|
|
+- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
|
|
++ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
|
|
|
++ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
|
|
|
+ fi
|
|
|
+
|
|
|
+ func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
|
|
|
+@@ -7681,15 +8861,15 @@
|
|
|
+
|
|
|
+ wrappers_required=yes
|
|
|
+ case $host in
|
|
|
++ *cegcc* | *mingw32ce*)
|
|
|
++ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
|
|
|
++ wrappers_required=no
|
|
|
++ ;;
|
|
|
+ *cygwin* | *mingw* )
|
|
|
+ if test "$build_libtool_libs" != yes; then
|
|
|
+ wrappers_required=no
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+- *cegcc)
|
|
|
+- # Disable wrappers for cegcc, we are cross compiling anyway.
|
|
|
+- wrappers_required=no
|
|
|
+- ;;
|
|
|
+ *)
|
|
|
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
|
|
|
+ wrappers_required=no
|
|
|
+@@ -7698,13 +8878,19 @@
|
|
|
+ esac
|
|
|
+ if test "$wrappers_required" = no; then
|
|
|
+ # Replace the output file specification.
|
|
|
+- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
|
|
|
++ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
|
|
|
+ link_command="$compile_command$compile_rpath"
|
|
|
+
|
|
|
+ # We have no uninstalled library dependencies, so finalize right now.
|
|
|
+ exit_status=0
|
|
|
+ func_show_eval "$link_command" 'exit_status=$?'
|
|
|
+
|
|
|
++ if test -n "$postlink_cmds"; then
|
|
|
++ func_to_tool_file "$output"
|
|
|
++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
|
|
|
++ func_execute_cmds "$postlink_cmds" 'exit $?'
|
|
|
++ fi
|
|
|
++
|
|
|
+ # Delete the generated files.
|
|
|
+ if test -f "$output_objdir/${outputname}S.${objext}"; then
|
|
|
+ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
|
|
|
+@@ -7727,7 +8913,7 @@
|
|
|
+ # We should set the runpath_var.
|
|
|
+ rpath=
|
|
|
+ for dir in $perm_rpath; do
|
|
|
+- rpath="$rpath$dir:"
|
|
|
++ func_append rpath "$dir:"
|
|
|
+ done
|
|
|
+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
|
|
|
+ fi
|
|
|
+@@ -7735,7 +8921,7 @@
|
|
|
+ # We should set the runpath_var.
|
|
|
+ rpath=
|
|
|
+ for dir in $finalize_perm_rpath; do
|
|
|
+- rpath="$rpath$dir:"
|
|
|
++ func_append rpath "$dir:"
|
|
|
+ done
|
|
|
+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
|
|
|
+ fi
|
|
|
+@@ -7745,11 +8931,18 @@
|
|
|
+ # We don't need to create a wrapper script.
|
|
|
+ link_command="$compile_var$compile_command$compile_rpath"
|
|
|
+ # Replace the output file specification.
|
|
|
+- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
|
|
|
++ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
|
|
|
+ # Delete the old output file.
|
|
|
+ $opt_dry_run || $RM $output
|
|
|
+ # Link the executable and exit
|
|
|
+ func_show_eval "$link_command" 'exit $?'
|
|
|
++
|
|
|
++ if test -n "$postlink_cmds"; then
|
|
|
++ func_to_tool_file "$output"
|
|
|
++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
|
|
|
++ func_execute_cmds "$postlink_cmds" 'exit $?'
|
|
|
++ fi
|
|
|
++
|
|
|
+ exit $EXIT_SUCCESS
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -7764,7 +8957,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 "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
|
|
|
+ else
|
|
|
+ # fast_install is set to needless
|
|
|
+ relink_command=
|
|
|
+@@ -7776,13 +8969,19 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ # Replace the output file specification.
|
|
|
+- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
|
|
|
++ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
|
|
|
+
|
|
|
+ # Delete the old output files.
|
|
|
+ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
|
|
|
+
|
|
|
+ func_show_eval "$link_command" 'exit $?'
|
|
|
+
|
|
|
++ if test -n "$postlink_cmds"; then
|
|
|
++ func_to_tool_file "$output_objdir/$outputname"
|
|
|
++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
|
|
|
++ func_execute_cmds "$postlink_cmds" 'exit $?'
|
|
|
++ fi
|
|
|
++
|
|
|
+ # Now create the wrapper script.
|
|
|
+ func_verbose "creating $output"
|
|
|
+
|
|
|
+@@ -7800,18 +8999,7 @@
|
|
|
+ fi
|
|
|
+ done
|
|
|
+ relink_command="(cd `pwd`; $relink_command)"
|
|
|
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
|
|
+- fi
|
|
|
+-
|
|
|
+- # Quote $ECHO for shipping.
|
|
|
+- 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
|
|
|
+- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
|
|
|
++ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
|
|
|
+ fi
|
|
|
+
|
|
|
+ # Only actually do things if not in dry run mode.
|
|
|
+@@ -7891,7 +9079,7 @@
|
|
|
+ else
|
|
|
+ oldobjs="$old_deplibs $non_pic_objects"
|
|
|
+ if test "$preload" = yes && test -f "$symfileobj"; then
|
|
|
+- oldobjs="$oldobjs $symfileobj"
|
|
|
++ func_append oldobjs " $symfileobj"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ addlibs="$old_convenience"
|
|
|
+@@ -7899,10 +9087,10 @@
|
|
|
+
|
|
|
+ if test -n "$addlibs"; then
|
|
|
+ gentop="$output_objdir/${outputname}x"
|
|
|
+- generated="$generated $gentop"
|
|
|
++ func_append generated " $gentop"
|
|
|
+
|
|
|
+ func_extract_archives $gentop $addlibs
|
|
|
+- oldobjs="$oldobjs $func_extract_archives_result"
|
|
|
++ func_append oldobjs " $func_extract_archives_result"
|
|
|
+ fi
|
|
|
+
|
|
|
+ # Do each command in the archive commands.
|
|
|
+@@ -7913,10 +9101,10 @@
|
|
|
+ # Add any objects from preloaded convenience libraries
|
|
|
+ if test -n "$dlprefiles"; then
|
|
|
+ gentop="$output_objdir/${outputname}x"
|
|
|
+- generated="$generated $gentop"
|
|
|
++ func_append generated " $gentop"
|
|
|
+
|
|
|
+ func_extract_archives $gentop $dlprefiles
|
|
|
+- oldobjs="$oldobjs $func_extract_archives_result"
|
|
|
++ func_append oldobjs " $func_extract_archives_result"
|
|
|
+ fi
|
|
|
+
|
|
|
+ # POSIX demands no paths to be encoded in archives. We have
|
|
|
+@@ -7932,9 +9120,9 @@
|
|
|
+ done | sort | sort -uc >/dev/null 2>&1); then
|
|
|
+ :
|
|
|
+ else
|
|
|
+- $ECHO "copying selected object files to avoid basename conflicts..."
|
|
|
++ echo "copying selected object files to avoid basename conflicts..."
|
|
|
+ gentop="$output_objdir/${outputname}x"
|
|
|
+- generated="$generated $gentop"
|
|
|
++ func_append generated " $gentop"
|
|
|
+ func_mkdir_p "$gentop"
|
|
|
+ save_oldobjs=$oldobjs
|
|
|
+ oldobjs=
|
|
|
+@@ -7958,9 +9146,9 @@
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
|
|
|
+- oldobjs="$oldobjs $gentop/$newobj"
|
|
|
++ func_append oldobjs " $gentop/$newobj"
|
|
|
+ ;;
|
|
|
+- *) oldobjs="$oldobjs $obj" ;;
|
|
|
++ *) func_append oldobjs " $obj" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ fi
|
|
|
+@@ -7970,6 +9158,16 @@
|
|
|
+ len=$func_len_result
|
|
|
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
|
|
|
+ cmds=$old_archive_cmds
|
|
|
++ elif test -n "$archiver_list_spec"; then
|
|
|
++ func_verbose "using command file archive linking..."
|
|
|
++ for obj in $oldobjs
|
|
|
++ do
|
|
|
++ func_to_tool_file "$obj"
|
|
|
++ $ECHO "$func_to_tool_file_result"
|
|
|
++ done > $output_objdir/$libname.libcmd
|
|
|
++ func_to_tool_file "$output_objdir/$libname.libcmd"
|
|
|
++ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
|
|
|
++ cmds=$old_archive_cmds
|
|
|
+ else
|
|
|
+ # the command line is too long to link in one step, link in parts
|
|
|
+ func_verbose "using piecewise archive linking..."
|
|
|
+@@ -8043,7 +9241,7 @@
|
|
|
+ done
|
|
|
+ # Quote the link command for shipping.
|
|
|
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
|
|
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
|
|
++ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
|
|
|
+ if test "$hardcode_automatic" = yes ; then
|
|
|
+ relink_command=
|
|
|
+ fi
|
|
|
+@@ -8066,9 +9264,19 @@
|
|
|
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
|
|
+ test -z "$libdir" && \
|
|
|
+ func_fatal_error "\`$deplib' is not a valid libtool archive"
|
|
|
+- newdependency_libs="$newdependency_libs $libdir/$name"
|
|
|
++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
|
|
|
++ ;;
|
|
|
++ -L*)
|
|
|
++ func_stripname -L '' "$deplib"
|
|
|
++ func_replace_sysroot "$func_stripname_result"
|
|
|
++ func_append newdependency_libs " -L$func_replace_sysroot_result"
|
|
|
+ ;;
|
|
|
+- *) newdependency_libs="$newdependency_libs $deplib" ;;
|
|
|
++ -R*)
|
|
|
++ func_stripname -R '' "$deplib"
|
|
|
++ func_replace_sysroot "$func_stripname_result"
|
|
|
++ func_append newdependency_libs " -R$func_replace_sysroot_result"
|
|
|
++ ;;
|
|
|
++ *) func_append newdependency_libs " $deplib" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ dependency_libs="$newdependency_libs"
|
|
|
+@@ -8082,9 +9290,9 @@
|
|
|
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
|
|
+ test -z "$libdir" && \
|
|
|
+ func_fatal_error "\`$lib' is not a valid libtool archive"
|
|
|
+- newdlfiles="$newdlfiles $libdir/$name"
|
|
|
++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
|
|
|
+ ;;
|
|
|
+- *) newdlfiles="$newdlfiles $lib" ;;
|
|
|
++ *) func_append newdlfiles " $lib" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+ dlfiles="$newdlfiles"
|
|
|
+@@ -8101,7 +9309,7 @@
|
|
|
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
|
|
+ test -z "$libdir" && \
|
|
|
+ func_fatal_error "\`$lib' is not a valid libtool archive"
|
|
|
+- newdlprefiles="$newdlprefiles $libdir/$name"
|
|
|
++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+@@ -8113,7 +9321,7 @@
|
|
|
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
|
|
+ *) abs=`pwd`"/$lib" ;;
|
|
|
+ esac
|
|
|
+- newdlfiles="$newdlfiles $abs"
|
|
|
++ func_append newdlfiles " $abs"
|
|
|
+ done
|
|
|
+ dlfiles="$newdlfiles"
|
|
|
+ newdlprefiles=
|
|
|
+@@ -8122,15 +9330,33 @@
|
|
|
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
|
|
+ *) abs=`pwd`"/$lib" ;;
|
|
|
+ esac
|
|
|
+- newdlprefiles="$newdlprefiles $abs"
|
|
|
++ func_append newdlprefiles " $abs"
|
|
|
+ done
|
|
|
+ dlprefiles="$newdlprefiles"
|
|
|
+ fi
|
|
|
+ $RM $output
|
|
|
+ # place dlname in correct position for cygwin
|
|
|
++ # In fact, it would be nice if we could use this code for all target
|
|
|
++ # systems that can't hard-code library paths into their executables
|
|
|
++ # and that have no shared library path variable independent of PATH,
|
|
|
++ # but it turns out we can't easily determine that from inspecting
|
|
|
++ # libtool variables, so we have to hard-code the OSs to which it
|
|
|
++ # applies here; at the moment, that means platforms that use the PE
|
|
|
++ # object format with DLL files. See the long comment at the top of
|
|
|
++ # tests/bindir.at for full details.
|
|
|
+ tdlname=$dlname
|
|
|
+ case $host,$output,$installed,$module,$dlname in
|
|
|
+- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
|
|
++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
|
|
|
++ # If a -bindir argument was supplied, place the dll there.
|
|
|
++ if test "x$bindir" != x ;
|
|
|
++ then
|
|
|
++ func_relative_path "$install_libdir" "$bindir"
|
|
|
++ tdlname=$func_relative_path_result$dlname
|
|
|
++ else
|
|
|
++ # Otherwise fall back on heuristic.
|
|
|
++ tdlname=../bin/$dlname
|
|
|
++ fi
|
|
|
++ ;;
|
|
|
+ esac
|
|
|
+ $ECHO > $output "\
|
|
|
+ # $outputname - a libtool library file
|
|
|
+@@ -8189,7 +9415,7 @@
|
|
|
+ exit $EXIT_SUCCESS
|
|
|
+ }
|
|
|
+
|
|
|
+-{ test "$mode" = link || test "$mode" = relink; } &&
|
|
|
++{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
|
|
|
+ func_mode_link ${1+"$@"}
|
|
|
+
|
|
|
+
|
|
|
+@@ -8209,9 +9435,9 @@
|
|
|
+ for arg
|
|
|
+ do
|
|
|
+ case $arg in
|
|
|
+- -f) RM="$RM $arg"; rmforce=yes ;;
|
|
|
+- -*) RM="$RM $arg" ;;
|
|
|
+- *) files="$files $arg" ;;
|
|
|
++ -f) func_append RM " $arg"; rmforce=yes ;;
|
|
|
++ -*) func_append RM " $arg" ;;
|
|
|
++ *) func_append files " $arg" ;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+
|
|
|
+@@ -8220,24 +9446,23 @@
|
|
|
+
|
|
|
+ rmdirs=
|
|
|
+
|
|
|
+- origobjdir="$objdir"
|
|
|
+ for file in $files; do
|
|
|
+ func_dirname "$file" "" "."
|
|
|
+ dir="$func_dirname_result"
|
|
|
+ if test "X$dir" = X.; then
|
|
|
+- objdir="$origobjdir"
|
|
|
++ odir="$objdir"
|
|
|
+ else
|
|
|
+- objdir="$dir/$origobjdir"
|
|
|
++ odir="$dir/$objdir"
|
|
|
+ fi
|
|
|
+ func_basename "$file"
|
|
|
+ name="$func_basename_result"
|
|
|
+- test "$mode" = uninstall && objdir="$dir"
|
|
|
++ test "$opt_mode" = uninstall && odir="$dir"
|
|
|
+
|
|
|
+- # Remember objdir for removal later, being careful to avoid duplicates
|
|
|
+- if test "$mode" = clean; then
|
|
|
++ # Remember odir for removal later, being careful to avoid duplicates
|
|
|
++ if test "$opt_mode" = clean; then
|
|
|
+ case " $rmdirs " in
|
|
|
+- *" $objdir "*) ;;
|
|
|
+- *) rmdirs="$rmdirs $objdir" ;;
|
|
|
++ *" $odir "*) ;;
|
|
|
++ *) func_append rmdirs " $odir" ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -8263,18 +9488,17 @@
|
|
|
+
|
|
|
+ # Delete the libtool libraries and symlinks.
|
|
|
+ for n in $library_names; do
|
|
|
+- rmfiles="$rmfiles $objdir/$n"
|
|
|
++ func_append rmfiles " $odir/$n"
|
|
|
+ done
|
|
|
+- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
|
|
|
++ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
|
|
|
+
|
|
|
+- case "$mode" in
|
|
|
++ case "$opt_mode" in
|
|
|
+ clean)
|
|
|
+- case " $library_names " in
|
|
|
+- # " " in the beginning catches empty $dlname
|
|
|
++ case " $library_names " in
|
|
|
+ *" $dlname "*) ;;
|
|
|
+- *) rmfiles="$rmfiles $objdir/$dlname" ;;
|
|
|
++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
|
|
|
+ esac
|
|
|
+- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
|
|
|
++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
|
|
|
+ ;;
|
|
|
+ uninstall)
|
|
|
+ if test -n "$library_names"; then
|
|
|
+@@ -8302,19 +9526,19 @@
|
|
|
+ # Add PIC object to the list of files to remove.
|
|
|
+ if test -n "$pic_object" &&
|
|
|
+ test "$pic_object" != none; then
|
|
|
+- rmfiles="$rmfiles $dir/$pic_object"
|
|
|
++ func_append rmfiles " $dir/$pic_object"
|
|
|
+ fi
|
|
|
+
|
|
|
+ # Add non-PIC object to the list of files to remove.
|
|
|
+ if test -n "$non_pic_object" &&
|
|
|
+ test "$non_pic_object" != none; then
|
|
|
+- rmfiles="$rmfiles $dir/$non_pic_object"
|
|
|
++ func_append rmfiles " $dir/$non_pic_object"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+
|
|
|
+ *)
|
|
|
+- if test "$mode" = clean ; then
|
|
|
++ if test "$opt_mode" = clean ; then
|
|
|
+ noexename=$name
|
|
|
+ case $file in
|
|
|
+ *.exe)
|
|
|
+@@ -8324,7 +9548,7 @@
|
|
|
+ noexename=$func_stripname_result
|
|
|
+ # $file with .exe has already been added to rmfiles,
|
|
|
+ # add $file without .exe
|
|
|
+- rmfiles="$rmfiles $file"
|
|
|
++ func_append rmfiles " $file"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ # Do a test to see if this is a libtool program.
|
|
|
+@@ -8333,7 +9557,7 @@
|
|
|
+ func_ltwrapper_scriptname "$file"
|
|
|
+ relink_command=
|
|
|
+ func_source $func_ltwrapper_scriptname_result
|
|
|
+- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
|
|
|
++ func_append rmfiles " $func_ltwrapper_scriptname_result"
|
|
|
+ else
|
|
|
+ relink_command=
|
|
|
+ func_source $dir/$noexename
|
|
|
+@@ -8341,12 +9565,12 @@
|
|
|
+
|
|
|
+ # note $name still contains .exe if it was in $file originally
|
|
|
+ # as does the version of $file that was added into $rmfiles
|
|
|
+- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
|
|
|
++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
|
|
|
+ if test "$fast_install" = yes && test -n "$relink_command"; then
|
|
|
+- rmfiles="$rmfiles $objdir/lt-$name"
|
|
|
++ func_append rmfiles " $odir/lt-$name"
|
|
|
+ fi
|
|
|
+ if test "X$noexename" != "X$name" ; then
|
|
|
+- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
|
|
|
++ func_append rmfiles " $odir/lt-${noexename}.c"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+@@ -8354,7 +9578,6 @@
|
|
|
+ esac
|
|
|
+ func_show_eval "$RM $rmfiles" 'exit_status=1'
|
|
|
+ done
|
|
|
+- objdir="$origobjdir"
|
|
|
+
|
|
|
+ # Try to remove the ${objdir}s in the directories where we deleted files
|
|
|
+ for dir in $rmdirs; do
|
|
|
+@@ -8366,16 +9589,16 @@
|
|
|
+ exit $exit_status
|
|
|
+ }
|
|
|
+
|
|
|
+-{ test "$mode" = uninstall || test "$mode" = clean; } &&
|
|
|
++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
|
|
|
+ func_mode_uninstall ${1+"$@"}
|
|
|
+
|
|
|
+-test -z "$mode" && {
|
|
|
++test -z "$opt_mode" && {
|
|
|
+ help="$generic_help"
|
|
|
+ func_fatal_help "you must specify a MODE"
|
|
|
+ }
|
|
|
+
|
|
|
+ test -z "$exec_cmd" && \
|
|
|
+- func_fatal_help "invalid operation mode \`$mode'"
|
|
|
++ func_fatal_help "invalid operation mode \`$opt_mode'"
|
|
|
+
|
|
|
+ if test -n "$exec_cmd"; then
|
|
|
+ eval exec "$exec_cmd"
|
|
|
+diff -Nur opensc-0.11.13.orig/m4/libtool.m4 opensc-0.11.13/m4/libtool.m4
|
|
|
+--- opensc-0.11.13.orig/m4/libtool.m4 2010-02-16 10:32:09.000000000 +0100
|
|
|
|
|
|
+@@ -1,7 +1,8 @@
|
|
|
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
|
|
+ #
|
|
|
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
|
|
+-# 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
|
++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
|
|
++# Inc.
|
|
|
+ # Written by Gordon Matzigkeit, 1996
|
|
|
+ #
|
|
|
+ # This file is free software; the Free Software Foundation gives
|
|
|
+@@ -10,7 +11,8 @@
|
|
|
+
|
|
|
+ m4_define([_LT_COPYING], [dnl
|
|
|
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
|
|
+-# 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
|
++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
|
|
++# Inc.
|
|
|
+ # Written by Gordon Matzigkeit, 1996
|
|
|
+ #
|
|
|
+ # This file is part of GNU Libtool.
|
|
|
+@@ -37,7 +39,7 @@
|
|
|
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
+ ])
|
|
|
+
|
|
|
+-# serial 56 LT_INIT
|
|
|
++# serial 57 LT_INIT
|
|
|
+
|
|
|
+
|
|
|
+ # LT_PREREQ(VERSION)
|
|
|
+@@ -66,6 +68,7 @@
|
|
|
+ # ------------------
|
|
|
+ AC_DEFUN([LT_INIT],
|
|
|
+ [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
|
|
|
++AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
|
|
|
+ AC_BEFORE([$0], [LT_LANG])dnl
|
|
|
+ AC_BEFORE([$0], [LT_OUTPUT])dnl
|
|
|
+ AC_BEFORE([$0], [LTDL_INIT])dnl
|
|
|
+@@ -82,6 +85,8 @@
|
|
|
+ AC_REQUIRE([LTOBSOLETE_VERSION])dnl
|
|
|
+ m4_require([_LT_PROG_LTMAIN])dnl
|
|
|
+
|
|
|
++_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
|
|
|
++
|
|
|
+ dnl Parse OPTIONS
|
|
|
+ _LT_SET_OPTIONS([$0], [$1])
|
|
|
+
|
|
|
+@@ -118,7 +123,7 @@
|
|
|
+ *) break;;
|
|
|
+ esac
|
|
|
+ done
|
|
|
+-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
|
|
|
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
|
|
+ ])
|
|
|
+
|
|
|
+
|
|
|
+@@ -138,6 +143,9 @@
|
|
|
+ m4_defun([_LT_SETUP],
|
|
|
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
|
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
|
|
++AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
|
|
|
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
|
|
|
++
|
|
|
+ _LT_DECL([], [host_alias], [0], [The host system])dnl
|
|
|
+ _LT_DECL([], [host], [0])dnl
|
|
|
+ _LT_DECL([], [host_os], [0])dnl
|
|
|
+@@ -160,10 +168,13 @@
|
|
|
+ dnl
|
|
|
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
|
|
+ m4_require([_LT_CHECK_SHELL_FEATURES])dnl
|
|
|
++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
|
|
|
+ m4_require([_LT_CMD_RELOAD])dnl
|
|
|
+ m4_require([_LT_CHECK_MAGIC_METHOD])dnl
|
|
|
++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
|
|
|
+ m4_require([_LT_CMD_OLD_ARCHIVE])dnl
|
|
|
+ m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
|
|
|
++m4_require([_LT_WITH_SYSROOT])dnl
|
|
|
+
|
|
|
+ _LT_CONFIG_LIBTOOL_INIT([
|
|
|
+ # See if we are running on zsh, and set the options which allow our
|
|
|
+@@ -179,7 +190,6 @@
|
|
|
+ _LT_CHECK_OBJDIR
|
|
|
+
|
|
|
+ m4_require([_LT_TAG_COMPILER])dnl
|
|
|
+-_LT_PROG_ECHO_BACKSLASH
|
|
|
+
|
|
|
+ case $host_os in
|
|
|
+ aix3*)
|
|
|
+@@ -193,23 +203,6 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+-# Sed substitution that helps us do robust quoting. It backslashifies
|
|
|
+-# metacharacters that are still active within double-quoted strings.
|
|
|
+-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
|
|
|
+-
|
|
|
+-# Same as above, but do not quote variable references.
|
|
|
+-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
|
|
|
+-
|
|
|
+-# Sed substitution to delay expansion of an escaped shell variable in a
|
|
|
+-# double_quote_subst'ed string.
|
|
|
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
|
|
|
+-
|
|
|
+-# Sed substitution to delay expansion of an escaped single quote.
|
|
|
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
|
|
|
+-
|
|
|
+-# Sed substitution to avoid accidental globbing in evaled expressions
|
|
|
+-no_glob_subst='s/\*/\\\*/g'
|
|
|
+-
|
|
|
+ # Global variables:
|
|
|
+ ofile=libtool
|
|
|
+ can_build_shared=yes
|
|
|
+@@ -250,6 +243,28 @@
|
|
|
+ ])# _LT_SETUP
|
|
|
+
|
|
|
+
|
|
|
++# _LT_PREPARE_SED_QUOTE_VARS
|
|
|
++# --------------------------
|
|
|
++# Define a few sed substitution that help us do robust quoting.
|
|
|
++m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
|
|
|
++[# Backslashify metacharacters that are still active within
|
|
|
++# double-quoted strings.
|
|
|
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
|
|
|
++
|
|
|
++# Same as above, but do not quote variable references.
|
|
|
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
|
|
|
++
|
|
|
++# Sed substitution to delay expansion of an escaped shell variable in a
|
|
|
++# double_quote_subst'ed string.
|
|
|
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
|
|
|
++
|
|
|
++# Sed substitution to delay expansion of an escaped single quote.
|
|
|
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
|
|
|
++
|
|
|
++# Sed substitution to avoid accidental globbing in evaled expressions
|
|
|
++no_glob_subst='s/\*/\\\*/g'
|
|
|
++])
|
|
|
++
|
|
|
+ # _LT_PROG_LTMAIN
|
|
|
+ # ---------------
|
|
|
+ # Note that this code is called both from `configure', and `config.status'
|
|
|
+@@ -408,7 +423,7 @@
|
|
|
+ # declaration there will have the same value as in `configure'. VARNAME
|
|
|
+ # must have a single quote delimited value for this to work.
|
|
|
+ m4_define([_LT_CONFIG_STATUS_DECLARE],
|
|
|
+-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
|
|
|
++[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
|
|
|
+
|
|
|
+
|
|
|
+ # _LT_CONFIG_STATUS_DECLARATIONS
|
|
|
+@@ -418,7 +433,7 @@
|
|
|
+ # embedded single quotes properly. In configure, this macro expands
|
|
|
+ # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
|
|
|
+ #
|
|
|
+-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
|
|
|
++# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
|
|
|
+ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
|
|
|
+ [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
|
|
|
+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
|
|
|
+@@ -517,12 +532,20 @@
|
|
|
+ LTCFLAGS='$LTCFLAGS'
|
|
|
+ compiler='$compiler_DEFAULT'
|
|
|
+
|
|
|
++# A function that is used when there is no print builtin or printf.
|
|
|
++func_fallback_echo ()
|
|
|
++{
|
|
|
++ eval 'cat <<_LTECHO_EOF
|
|
|
++\$[]1
|
|
|
++_LTECHO_EOF'
|
|
|
++}
|
|
|
++
|
|
|
+ # Quote evaled strings.
|
|
|
+ for var in lt_decl_all_varnames([[ \
|
|
|
+ ]], lt_decl_quote_varnames); do
|
|
|
+- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
|
|
|
++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
|
|
+ *[[\\\\\\\`\\"\\\$]]*)
|
|
|
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
|
|
|
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
|
|
|
+@@ -533,9 +556,9 @@
|
|
|
+ # Double-quote double-evaled strings.
|
|
|
+ for var in lt_decl_all_varnames([[ \
|
|
|
+ ]], lt_decl_dquote_varnames); do
|
|
|
+- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
|
|
|
++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
|
|
+ *[[\\\\\\\`\\"\\\$]]*)
|
|
|
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
|
|
|
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
|
|
|
+@@ -543,16 +566,38 @@
|
|
|
+ esac
|
|
|
+ done
|
|
|
+
|
|
|
+-# Fix-up fallback echo if it was mangled by the above quoting rules.
|
|
|
+-case \$lt_ECHO in
|
|
|
+-*'\\\[$]0 --fallback-echo"')dnl "
|
|
|
+- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
|
|
|
+- ;;
|
|
|
+-esac
|
|
|
+-
|
|
|
+ _LT_OUTPUT_LIBTOOL_INIT
|
|
|
+ ])
|
|
|
+
|
|
|
++# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
|
|
|
++# ------------------------------------
|
|
|
++# Generate a child script FILE with all initialization necessary to
|
|
|
++# reuse the environment learned by the parent script, and make the
|
|
|
++# file executable. If COMMENT is supplied, it is inserted after the
|
|
|
++# `#!' sequence but before initialization text begins. After this
|
|
|
++# macro, additional text can be appended to FILE to form the body of
|
|
|
++# the child script. The macro ends with non-zero status if the
|
|
|
++# file could not be fully written (such as if the disk is full).
|
|
|
++m4_ifdef([AS_INIT_GENERATED],
|
|
|
++[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
|
|
|
++[m4_defun([_LT_GENERATED_FILE_INIT],
|
|
|
++[m4_require([AS_PREPARE])]dnl
|
|
|
++[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
|
|
|
++[lt_write_fail=0
|
|
|
++cat >$1 <<_ASEOF || lt_write_fail=1
|
|
|
++#! $SHELL
|
|
|
++# Generated by $as_me.
|
|
|
++$2
|
|
|
++SHELL=\${CONFIG_SHELL-$SHELL}
|
|
|
++export SHELL
|
|
|
++_ASEOF
|
|
|
++cat >>$1 <<\_ASEOF || lt_write_fail=1
|
|
|
++AS_SHELL_SANITIZE
|
|
|
++_AS_PREPARE
|
|
|
++exec AS_MESSAGE_FD>&1
|
|
|
++_ASEOF
|
|
|
++test $lt_write_fail = 0 && chmod +x $1[]dnl
|
|
|
++m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
|
|
|
+
|
|
|
+ # LT_OUTPUT
|
|
|
+ # ---------
|
|
|
+@@ -562,20 +607,11 @@
|
|
|
+ AC_DEFUN([LT_OUTPUT],
|
|
|
+ [: ${CONFIG_LT=./config.lt}
|
|
|
+ AC_MSG_NOTICE([creating $CONFIG_LT])
|
|
|
+-cat >"$CONFIG_LT" <<_LTEOF
|
|
|
+-#! $SHELL
|
|
|
+-# Generated by $as_me.
|
|
|
+-# Run this file to recreate a libtool stub with the current configuration.
|
|
|
+-
|
|
|
+-lt_cl_silent=false
|
|
|
+-SHELL=\${CONFIG_SHELL-$SHELL}
|
|
|
+-_LTEOF
|
|
|
++_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
|
|
|
++[# Run this file to recreate a libtool stub with the current configuration.])
|
|
|
+
|
|
|
+ cat >>"$CONFIG_LT" <<\_LTEOF
|
|
|
+-AS_SHELL_SANITIZE
|
|
|
+-_AS_PREPARE
|
|
|
+-
|
|
|
+-exec AS_MESSAGE_FD>&1
|
|
|
++lt_cl_silent=false
|
|
|
+ exec AS_MESSAGE_LOG_FD>>config.log
|
|
|
+ {
|
|
|
+ echo
|
|
|
+@@ -601,7 +637,7 @@
|
|
|
+ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
|
|
|
+ configured by $[0], generated by m4_PACKAGE_STRING.
|
|
|
+
|
|
|
+-Copyright (C) 2008 Free Software Foundation, Inc.
|
|
|
++Copyright (C) 2010 Free Software Foundation, Inc.
|
|
|
+ This config.lt script is free software; the Free Software Foundation
|
|
|
+ gives unlimited permision to copy, distribute and modify it."
|
|
|
+
|
|
|
+@@ -646,15 +682,13 @@
|
|
|
+ # appending to config.log, which fails on DOS, as config.log is still kept
|
|
|
+ # open by configure. Here we exec the FD to /dev/null, effectively closing
|
|
|
+ # config.log, so it can be properly (re)opened and appended to by config.lt.
|
|
|
+-if test "$no_create" != yes; then
|
|
|
+- lt_cl_success=:
|
|
|
+- test "$silent" = yes &&
|
|
|
+- lt_config_lt_args="$lt_config_lt_args --quiet"
|
|
|
+- exec AS_MESSAGE_LOG_FD>/dev/null
|
|
|
+- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
|
|
|
+- exec AS_MESSAGE_LOG_FD>>config.log
|
|
|
+- $lt_cl_success || AS_EXIT(1)
|
|
|
+-fi
|
|
|
++lt_cl_success=:
|
|
|
++test "$silent" = yes &&
|
|
|
++ lt_config_lt_args="$lt_config_lt_args --quiet"
|
|
|
++exec AS_MESSAGE_LOG_FD>/dev/null
|
|
|
++$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
|
|
|
++exec AS_MESSAGE_LOG_FD>>config.log
|
|
|
++$lt_cl_success || AS_EXIT(1)
|
|
|
+ ])# LT_OUTPUT
|
|
|
+
|
|
|
+
|
|
|
+@@ -717,15 +751,12 @@
|
|
|
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
|
|
|
+ # text mode, it properly converts lines to CR/LF. This bash problem
|
|
|
+ # is reportedly fixed, but why not run on old versions too?
|
|
|
+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
|
|
|
+- || (rm -f "$cfgfile"; exit 1)
|
|
|
++ sed '$q' "$ltmain" >> "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile"; exit 1)
|
|
|
+
|
|
|
+- _LT_PROG_XSI_SHELLFNS
|
|
|
++ _LT_PROG_REPLACE_SHELLFNS
|
|
|
+
|
|
|
+- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
|
|
|
+- || (rm -f "$cfgfile"; exit 1)
|
|
|
+-
|
|
|
+- mv -f "$cfgfile" "$ofile" ||
|
|
|
++ mv -f "$cfgfile" "$ofile" ||
|
|
|
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
|
|
|
+ chmod +x "$ofile"
|
|
|
+ ],
|
|
|
+@@ -831,11 +862,13 @@
|
|
|
+ AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
|
|
|
+ AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
|
|
|
+ AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
|
|
|
++AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
|
|
|
+ dnl aclocal-1.4 backwards compatibility:
|
|
|
+ dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
|
|
|
+ dnl AC_DEFUN([AC_LIBTOOL_F77], [])
|
|
|
+ dnl AC_DEFUN([AC_LIBTOOL_FC], [])
|
|
|
+ dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
|
|
|
++dnl AC_DEFUN([AC_LIBTOOL_RC], [])
|
|
|
+
|
|
|
+
|
|
|
+ # _LT_TAG_COMPILER
|
|
|
+@@ -940,6 +973,31 @@
|
|
|
+ [lt_cv_ld_exported_symbols_list=no])
|
|
|
+ LDFLAGS="$save_LDFLAGS"
|
|
|
+ ])
|
|
|
++ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
|
|
|
++ [lt_cv_ld_force_load=no
|
|
|
++ cat > conftest.c << _LT_EOF
|
|
|
++int forced_loaded() { return 2;}
|
|
|
++_LT_EOF
|
|
|
++ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
|
|
|
++ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
|
|
|
++ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
|
|
|
++ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
|
|
|
++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
|
|
|
++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
|
|
|
++ cat > conftest.c << _LT_EOF
|
|
|
++int main() { return 0;}
|
|
|
++_LT_EOF
|
|
|
++ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
|
|
|
++ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
|
|
|
++ _lt_result=$?
|
|
|
++ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
|
|
|
++ lt_cv_ld_force_load=yes
|
|
|
++ else
|
|
|
++ cat conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
++ fi
|
|
|
++ rm -f conftest.err libconftest.a conftest conftest.c
|
|
|
++ rm -rf conftest.dSYM
|
|
|
++ ])
|
|
|
+ case $host_os in
|
|
|
+ rhapsody* | darwin1.[[012]])
|
|
|
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
|
|
|
+@@ -967,7 +1025,7 @@
|
|
|
+ else
|
|
|
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
|
|
+ fi
|
|
|
+- if test "$DSYMUTIL" != ":"; then
|
|
|
++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
|
|
|
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
|
|
|
+ else
|
|
|
+ _lt_dsymutil=
|
|
|
+@@ -987,7 +1045,11 @@
|
|
|
+ _LT_TAGVAR(hardcode_direct, $1)=no
|
|
|
+ _LT_TAGVAR(hardcode_automatic, $1)=yes
|
|
|
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
|
|
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
|
|
|
++ if test "$lt_cv_ld_force_load" = "yes"; then
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
|
|
|
++ else
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
|
|
|
++ fi
|
|
|
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
|
|
|
+ case $cc_basename in
|
|
|
+@@ -995,7 +1057,7 @@
|
|
|
+ *) _lt_dar_can_shared=$GCC ;;
|
|
|
+ esac
|
|
|
+ if test "$_lt_dar_can_shared" = "yes"; then
|
|
|
+- output_verbose_link_cmd=echo
|
|
|
++ output_verbose_link_cmd=func_echo_all
|
|
|
+ _LT_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_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
|
|
|
+ _LT_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}"
|
|
|
+@@ -1011,203 +1073,142 @@
|
|
|
+ fi
|
|
|
+ ])
|
|
|
+
|
|
|
+-# _LT_SYS_MODULE_PATH_AIX
|
|
|
+-# -----------------------
|
|
|
++# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
|
|
|
++# ----------------------------------
|
|
|
+ # Links a minimal program and checks the executable
|
|
|
+ # for the system default hardcoded library path. In most cases,
|
|
|
+ # this is /usr/lib:/lib, but when the MPI compilers are used
|
|
|
+ # the location of the communication and MPI libs are included too.
|
|
|
+ # If we don't find anything, use the default library path according
|
|
|
+ # to the aix ld manual.
|
|
|
++# Store the results from the different compilers for each TAGNAME.
|
|
|
++# Allow to override them for all tags through lt_cv_aix_libpath.
|
|
|
+ m4_defun([_LT_SYS_MODULE_PATH_AIX],
|
|
|
+ [m4_require([_LT_DECL_SED])dnl
|
|
|
+-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
|
|
|
+-lt_aix_libpath_sed='
|
|
|
+- /Import File Strings/,/^$/ {
|
|
|
+- /^0/ {
|
|
|
+- s/^0 *\(.*\)$/\1/
|
|
|
+- p
|
|
|
+- }
|
|
|
+- }'
|
|
|
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
+-# Check for a 64-bit object if we didn't find anything.
|
|
|
+-if test -z "$aix_libpath"; then
|
|
|
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
+-fi],[])
|
|
|
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
|
++if test "${lt_cv_aix_libpath+set}" = set; then
|
|
|
++ aix_libpath=$lt_cv_aix_libpath
|
|
|
++else
|
|
|
++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
|
|
|
++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
|
|
|
++ lt_aix_libpath_sed='[
|
|
|
++ /Import File Strings/,/^$/ {
|
|
|
++ /^0/ {
|
|
|
++ s/^0 *\([^ ]*\) *$/\1/
|
|
|
++ p
|
|
|
++ }
|
|
|
++ }]'
|
|
|
++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
++ # Check for a 64-bit object if we didn't find anything.
|
|
|
++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
|
|
|
++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
|
++ fi],[])
|
|
|
++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
|
|
|
++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
|
|
|
++ fi
|
|
|
++ ])
|
|
|
++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
|
|
|
++fi
|
|
|
+ ])# _LT_SYS_MODULE_PATH_AIX
|
|
|
+
|
|
|
+
|
|
|
+ # _LT_SHELL_INIT(ARG)
|
|
|
+ # -------------------
|
|
|
+ m4_define([_LT_SHELL_INIT],
|
|
|
+-[ifdef([AC_DIVERSION_NOTICE],
|
|
|
+- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
|
|
|
+- [AC_DIVERT_PUSH(NOTICE)])
|
|
|
+-$1
|
|
|
+-AC_DIVERT_POP
|
|
|
+-])# _LT_SHELL_INIT
|
|
|
++[m4_divert_text([M4SH-INIT], [$1
|
|
|
++])])# _LT_SHELL_INIT
|
|
|
++
|
|
|
+
|
|
|
+
|
|
|
+ # _LT_PROG_ECHO_BACKSLASH
|
|
|
+ # -----------------------
|
|
|
+-# Add some code to the start of the generated configure script which
|
|
|
+-# will find an echo command which doesn't interpret backslashes.
|
|
|
++# Find how we can fake an echo command that does not interpret backslash.
|
|
|
++# In particular, with Autoconf 2.60 or later we add some code to the start
|
|
|
++# of the generated configure script which will find a shell with a builtin
|
|
|
++# printf (which we can use as an echo command).
|
|
|
+ m4_defun([_LT_PROG_ECHO_BACKSLASH],
|
|
|
+-[_LT_SHELL_INIT([
|
|
|
+-# Check that we are running under the correct shell.
|
|
|
+-SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
+-
|
|
|
+-case X$lt_ECHO in
|
|
|
+-X*--fallback-echo)
|
|
|
+- # Remove one level of quotation (which was required for Make).
|
|
|
+- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
|
|
|
+- ;;
|
|
|
+-esac
|
|
|
+-
|
|
|
+-ECHO=${lt_ECHO-echo}
|
|
|
+-if test "X[$]1" = X--no-reexec; then
|
|
|
+- # Discard the --no-reexec flag, and continue.
|
|
|
+- shift
|
|
|
+-elif test "X[$]1" = X--fallback-echo; then
|
|
|
+- # Avoid inline document here, it may be left over
|
|
|
+- :
|
|
|
+-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
|
|
|
+- # Yippee, $ECHO works!
|
|
|
+- :
|
|
|
++[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
|
|
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
|
|
|
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
|
|
|
++
|
|
|
++AC_MSG_CHECKING([how to print strings])
|
|
|
++# Test print first, because it will be a builtin if present.
|
|
|
++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
|
|
|
++ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
|
|
|
++ ECHO='print -r --'
|
|
|
++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
|
|
|
++ ECHO='printf %s\n'
|
|
|
+ else
|
|
|
+- # Restart under the correct shell.
|
|
|
+- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
|
|
|
+-fi
|
|
|
+-
|
|
|
+-if test "X[$]1" = X--fallback-echo; then
|
|
|
+- # used as fallback echo
|
|
|
+- shift
|
|
|
+- cat <<_LT_EOF
|
|
|
+-[$]*
|
|
|
+-_LT_EOF
|
|
|
+- exit 0
|
|
|
++ # Use this function as a fallback that always works.
|
|
|
++ func_fallback_echo ()
|
|
|
++ {
|
|
|
++ eval 'cat <<_LTECHO_EOF
|
|
|
++$[]1
|
|
|
++_LTECHO_EOF'
|
|
|
++ }
|
|
|
++ ECHO='func_fallback_echo'
|
|
|
+ fi
|
|
|
+
|
|
|
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
|
|
|
+-# if CDPATH is set.
|
|
|
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
+-
|
|
|
+-if test -z "$lt_ECHO"; then
|
|
|
+- if test "X${echo_test_string+set}" != Xset; then
|
|
|
+- # find a string as large as possible, as long as the shell can cope with it
|
|
|
+- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
|
|
|
+- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
|
|
|
+- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
|
|
|
+- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
|
|
|
+- then
|
|
|
+- break
|
|
|
+- fi
|
|
|
+- done
|
|
|
+- fi
|
|
|
+-
|
|
|
+- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
|
|
|
+- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- :
|
|
|
+- else
|
|
|
+- # The Solaris, AIX, and Digital Unix default echo programs unquote
|
|
|
+- # backslashes. This makes it impossible to quote backslashes using
|
|
|
+- # echo "$something" | sed 's/\\/\\\\/g'
|
|
|
+- #
|
|
|
+- # So, first we look for a working echo in the user's PATH.
|
|
|
+-
|
|
|
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
|
|
+- for dir in $PATH /usr/ucb; do
|
|
|
+- IFS="$lt_save_ifs"
|
|
|
+- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
|
|
|
+- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
|
|
|
+- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- ECHO="$dir/echo"
|
|
|
+- break
|
|
|
+- fi
|
|
|
+- done
|
|
|
+- IFS="$lt_save_ifs"
|
|
|
+-
|
|
|
+- if test "X$ECHO" = Xecho; then
|
|
|
+- # We didn't find a better echo, so look for alternatives.
|
|
|
+- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
|
|
|
+- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- # This shell has a builtin print -r that does the trick.
|
|
|
+- ECHO='print -r'
|
|
|
+- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
|
|
|
+- test "X$CONFIG_SHELL" != X/bin/ksh; then
|
|
|
+- # If we have ksh, try running configure again with it.
|
|
|
+- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
+- export ORIGINAL_CONFIG_SHELL
|
|
|
+- CONFIG_SHELL=/bin/ksh
|
|
|
+- export CONFIG_SHELL
|
|
|
+- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
|
|
|
+- else
|
|
|
+- # Try using printf.
|
|
|
+- ECHO='printf %s\n'
|
|
|
+- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
|
|
|
+- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- # Cool, printf works
|
|
|
+- :
|
|
|
+- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = 'X\t' &&
|
|
|
+- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
|
|
|
+- export CONFIG_SHELL
|
|
|
+- SHELL="$CONFIG_SHELL"
|
|
|
+- export SHELL
|
|
|
+- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
|
|
|
+- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = 'X\t' &&
|
|
|
+- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
|
|
|
+- test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
|
+- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
|
|
|
+- else
|
|
|
+- # maybe with a smaller string...
|
|
|
+- prev=:
|
|
|
+-
|
|
|
+- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
|
|
|
+- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
|
|
|
+- then
|
|
|
+- break
|
|
|
+- fi
|
|
|
+- prev="$cmd"
|
|
|
+- done
|
|
|
++# func_echo_all arg...
|
|
|
++# Invoke $ECHO with all args, space-separated.
|
|
|
++func_echo_all ()
|
|
|
++{
|
|
|
++ $ECHO "$*"
|
|
|
++}
|
|
|
+
|
|
|
+- if test "$prev" != 'sed 50q "[$]0"'; then
|
|
|
+- echo_test_string=`eval $prev`
|
|
|
+- export echo_test_string
|
|
|
+- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
|
|
|
+- else
|
|
|
+- # Oops. We lost completely, so just stick with echo.
|
|
|
+- ECHO=echo
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+- fi
|
|
|
+-fi
|
|
|
++case "$ECHO" in
|
|
|
++ printf*) AC_MSG_RESULT([printf]) ;;
|
|
|
++ print*) AC_MSG_RESULT([print -r]) ;;
|
|
|
++ *) AC_MSG_RESULT([cat]) ;;
|
|
|
++esac
|
|
|
+
|
|
|
+-# Copy echo and quote the copy suitably for passing to libtool from
|
|
|
+-# the Makefile, instead of quoting the original, which is used later.
|
|
|
+-lt_ECHO=$ECHO
|
|
|
+-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
|
|
|
+- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
|
|
|
+-fi
|
|
|
++m4_ifdef([_AS_DETECT_SUGGESTED],
|
|
|
++[_AS_DETECT_SUGGESTED([
|
|
|
++ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
|
|
|
++ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
|
|
++ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
|
|
|
++ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
|
|
|
++ PATH=/empty FPATH=/empty; export PATH FPATH
|
|
|
++ test "X`printf %s $ECHO`" = "X$ECHO" \
|
|
|
++ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
|
|
|
+
|
|
|
+-AC_SUBST(lt_ECHO)
|
|
|
+-])
|
|
|
+ _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
|
|
|
+-_LT_DECL([], [ECHO], [1],
|
|
|
+- [An echo program that does not interpret backslashes])
|
|
|
++_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
|
|
|
+ ])# _LT_PROG_ECHO_BACKSLASH
|
|
|
+
|
|
|
+
|
|
|
++# _LT_WITH_SYSROOT
|
|
|
++# ----------------
|
|
|
++AC_DEFUN([_LT_WITH_SYSROOT],
|
|
|
++[AC_MSG_CHECKING([for sysroot])
|
|
|
++AC_ARG_WITH([sysroot],
|
|
|
++[ --with-sysroot[=DIR] Search for dependent libraries within DIR
|
|
|
++ (or the compiler's sysroot if not specified).],
|
|
|
++[], [with_sysroot=no])
|
|
|
++
|
|
|
++dnl lt_sysroot will always be passed unquoted. We quote it here
|
|
|
++dnl in case the user passed a directory name.
|
|
|
++lt_sysroot=
|
|
|
++case ${with_sysroot} in #(
|
|
|
++ yes)
|
|
|
++ if test "$GCC" = yes; then
|
|
|
++ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
|
|
++ fi
|
|
|
++ ;; #(
|
|
|
++ /*)
|
|
|
++ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
|
|
++ ;; #(
|
|
|
++ no|'')
|
|
|
++ ;; #(
|
|
|
++ *)
|
|
|
++ AC_MSG_RESULT([${with_sysroot}])
|
|
|
++ AC_MSG_ERROR([The sysroot must be an absolute path.])
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++
|
|
|
++ AC_MSG_RESULT([${lt_sysroot:-no}])
|
|
|
++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
|
|
|
++[dependent libraries, and in which our libraries should be installed.])])
|
|
|
++
|
|
|
+ # _LT_ENABLE_LOCK
|
|
|
+ # ---------------
|
|
|
+ m4_defun([_LT_ENABLE_LOCK],
|
|
|
+@@ -1236,7 +1237,7 @@
|
|
|
+ ;;
|
|
|
+ *-*-irix6*)
|
|
|
+ # Find out which ABI we are using.
|
|
|
+- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
|
++ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
|
|
|
+ if AC_TRY_EVAL(ac_compile); then
|
|
|
+ if test "$lt_cv_prog_gnu_ld" = yes; then
|
|
|
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
|
+@@ -1354,14 +1355,47 @@
|
|
|
+ ])# _LT_ENABLE_LOCK
|
|
|
+
|
|
|
+
|
|
|
++# _LT_PROG_AR
|
|
|
++# -----------
|
|
|
++m4_defun([_LT_PROG_AR],
|
|
|
++[AC_CHECK_TOOLS(AR, [ar], false)
|
|
|
++: ${AR=ar}
|
|
|
++: ${AR_FLAGS=cru}
|
|
|
++_LT_DECL([], [AR], [1], [The archiver])
|
|
|
++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
|
|
|
++
|
|
|
++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
|
|
|
++ [lt_cv_ar_at_file=no
|
|
|
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
|
|
|
++ [echo conftest.$ac_objext > conftest.lst
|
|
|
++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
|
|
|
++ AC_TRY_EVAL([lt_ar_try])
|
|
|
++ if test "$ac_status" -eq 0; then
|
|
|
++ # Ensure the archiver fails upon bogus file names.
|
|
|
++ rm -f conftest.$ac_objext libconftest.a
|
|
|
++ AC_TRY_EVAL([lt_ar_try])
|
|
|
++ if test "$ac_status" -ne 0; then
|
|
|
++ lt_cv_ar_at_file=@
|
|
|
++ fi
|
|
|
++ fi
|
|
|
++ rm -f conftest.* libconftest.a
|
|
|
++ ])
|
|
|
++ ])
|
|
|
++
|
|
|
++if test "x$lt_cv_ar_at_file" = xno; then
|
|
|
++ archiver_list_spec=
|
|
|
++else
|
|
|
++ archiver_list_spec=$lt_cv_ar_at_file
|
|
|
++fi
|
|
|
++_LT_DECL([], [archiver_list_spec], [1],
|
|
|
++ [How to feed a file listing to the archiver])
|
|
|
++])# _LT_PROG_AR
|
|
|
++
|
|
|
++
|
|
|
+ # _LT_CMD_OLD_ARCHIVE
|
|
|
+ # -------------------
|
|
|
+ m4_defun([_LT_CMD_OLD_ARCHIVE],
|
|
|
+-[AC_CHECK_TOOL(AR, ar, false)
|
|
|
+-test -z "$AR" && AR=ar
|
|
|
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
|
|
|
+-_LT_DECL([], [AR], [1], [The archiver])
|
|
|
+-_LT_DECL([], [AR_FLAGS], [1])
|
|
|
++[_LT_PROG_AR
|
|
|
+
|
|
|
+ AC_CHECK_TOOL(STRIP, strip, :)
|
|
|
+ test -z "$STRIP" && STRIP=:
|
|
|
+@@ -1388,10 +1422,19 @@
|
|
|
+ esac
|
|
|
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
|
|
+ fi
|
|
|
++
|
|
|
++case $host_os in
|
|
|
++ darwin*)
|
|
|
++ lock_old_archive_extraction=yes ;;
|
|
|
++ *)
|
|
|
++ lock_old_archive_extraction=no ;;
|
|
|
++esac
|
|
|
+ _LT_DECL([], [old_postinstall_cmds], [2])
|
|
|
+ _LT_DECL([], [old_postuninstall_cmds], [2])
|
|
|
+ _LT_TAGDECL([], [old_archive_cmds], [2],
|
|
|
+ [Commands used to build an old-style archive])
|
|
|
++_LT_DECL([], [lock_old_archive_extraction], [0],
|
|
|
++ [Whether to use a lock for old archive extraction])
|
|
|
+ ])# _LT_CMD_OLD_ARCHIVE
|
|
|
+
|
|
|
+
|
|
|
+@@ -1416,15 +1459,15 @@
|
|
|
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
+ -e 's:$: $lt_compiler_flag:'`
|
|
|
+- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
|
|
|
+ (eval "$lt_compile" 2>conftest.err)
|
|
|
+ ac_status=$?
|
|
|
+ cat conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
+- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
|
|
|
++ echo "$as_me:$LINENO: \$? = $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
|
|
|
+ # So say no if there are warnings other than the usual output.
|
|
|
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
|
|
|
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
|
|
|
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
|
|
|
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
|
|
|
+ $2=yes
|
|
|
+@@ -1464,7 +1507,7 @@
|
|
|
+ if test -s conftest.err; then
|
|
|
+ # Append any errors to the config.log.
|
|
|
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
|
|
|
+- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
|
|
|
++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
|
|
|
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
|
|
|
+ if diff conftest.exp conftest.er2 >/dev/null; then
|
|
|
+ $2=yes
|
|
|
+@@ -1527,6 +1570,11 @@
|
|
|
+ lt_cv_sys_max_cmd_len=8192;
|
|
|
+ ;;
|
|
|
+
|
|
|
++ mint*)
|
|
|
++ # On MiNT this can take a long time and run out of memory.
|
|
|
++ lt_cv_sys_max_cmd_len=8192;
|
|
|
++ ;;
|
|
|
++
|
|
|
+ amigaos*)
|
|
|
+ # On AmigaOS with pdksh, this test takes hours, literally.
|
|
|
+ # So we just punt and use a minimum line length of 8192.
|
|
|
+@@ -1591,8 +1639,8 @@
|
|
|
+ # 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"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
|
|
|
+- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
|
|
|
++ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
|
|
|
++ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
|
|
|
+ test $i != 17 # 1/2 MB should be enough
|
|
|
+ do
|
|
|
+ i=`expr $i + 1`
|
|
|
+@@ -1643,7 +1691,7 @@
|
|
|
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
|
+ lt_status=$lt_dlunknown
|
|
|
+ cat > conftest.$ac_ext <<_LT_EOF
|
|
|
+-[#line __oline__ "configure"
|
|
|
++[#line $LINENO "configure"
|
|
|
+ #include "confdefs.h"
|
|
|
+
|
|
|
+ #if HAVE_DLFCN_H
|
|
|
+@@ -1684,7 +1732,13 @@
|
|
|
+ # endif
|
|
|
+ #endif
|
|
|
+
|
|
|
+-void fnord() { int i=42;}
|
|
|
++/* When -fvisbility=hidden is used, assume the code has been annotated
|
|
|
++ correspondingly for the symbols needed. */
|
|
|
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
|
|
++int fnord () __attribute__((visibility("default")));
|
|
|
++#endif
|
|
|
++
|
|
|
++int fnord () { return 42; }
|
|
|
+ int main ()
|
|
|
+ {
|
|
|
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
|
|
+@@ -1693,7 +1747,11 @@
|
|
|
+ if (self)
|
|
|
+ {
|
|
|
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
|
|
|
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
|
|
|
++ else
|
|
|
++ {
|
|
|
++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
|
|
|
++ else puts (dlerror ());
|
|
|
++ }
|
|
|
+ /* dlclose (self); */
|
|
|
+ }
|
|
|
+ else
|
|
|
+@@ -1869,16 +1927,16 @@
|
|
|
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
+ -e 's:$: $lt_compiler_flag:'`
|
|
|
+- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
|
|
|
+ (eval "$lt_compile" 2>out/conftest.err)
|
|
|
+ ac_status=$?
|
|
|
+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
+- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
|
|
|
++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
|
|
|
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
|
+ then
|
|
|
+ # The compiler can only warn and ignore the option if not recognized
|
|
|
+ # So say no if there are warnings
|
|
|
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
|
|
|
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
|
|
|
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
|
|
|
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
|
|
|
+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
|
|
|
+@@ -2037,6 +2095,7 @@
|
|
|
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
|
|
+ m4_require([_LT_DECL_OBJDUMP])dnl
|
|
|
+ m4_require([_LT_DECL_SED])dnl
|
|
|
++m4_require([_LT_CHECK_SHELL_FEATURES])dnl
|
|
|
+ AC_MSG_CHECKING([dynamic linker characteristics])
|
|
|
+ m4_if([$1],
|
|
|
+ [], [
|
|
|
+@@ -2045,16 +2104,23 @@
|
|
|
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
|
|
|
+ *) lt_awk_arg="/^libraries:/" ;;
|
|
|
+ esac
|
|
|
+- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
+- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
|
|
|
++ case $host_os in
|
|
|
++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
|
|
|
++ *) lt_sed_strip_eq="s,=/,/,g" ;;
|
|
|
++ esac
|
|
|
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
|
|
|
++ case $lt_search_path_spec in
|
|
|
++ *\;*)
|
|
|
+ # if the path contains ";" then we assume it to be the separator
|
|
|
+ # otherwise default to the standard path separator (i.e. ":") - it is
|
|
|
+ # assumed that no part of a normal pathname contains ";" but that should
|
|
|
+ # okay in the real world where ";" in dirpaths is itself problematic.
|
|
|
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
+- else
|
|
|
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
+- fi
|
|
|
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ # 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=
|
|
|
+@@ -2067,7 +2133,7 @@
|
|
|
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
|
|
+ fi
|
|
|
+ done
|
|
|
+- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
|
|
|
++ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
|
|
|
+ BEGIN {RS=" "; FS="/|\n";} {
|
|
|
+ lt_foo="";
|
|
|
+ lt_count=0;
|
|
|
+@@ -2087,7 +2153,13 @@
|
|
|
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
|
|
|
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
|
|
|
+ }'`
|
|
|
+- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
|
|
|
++ # AWK program above erroneously prepends '/' to C:/dos/paths
|
|
|
++ # for these hosts.
|
|
|
++ case $host_os in
|
|
|
++ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
|
|
|
++ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
|
|
|
++ esac
|
|
|
++ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
|
|
|
+ else
|
|
|
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
|
+ fi])
|
|
|
+@@ -2175,7 +2247,7 @@
|
|
|
+ m68k)
|
|
|
+ library_names_spec='$libname.ixlibrary $libname.a'
|
|
|
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
|
|
|
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
|
|
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+@@ -2206,8 +2278,9 @@
|
|
|
+ need_version=no
|
|
|
+ need_lib_prefix=no
|
|
|
+
|
|
|
+- case $GCC,$host_os in
|
|
|
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
|
++ case $GCC,$cc_basename in
|
|
|
++ yes,*)
|
|
|
++ # gcc
|
|
|
+ library_names_spec='$libname.dll.a'
|
|
|
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
|
+ postinstall_cmds='base_file=`basename \${file}`~
|
|
|
+@@ -2228,36 +2301,83 @@
|
|
|
+ cygwin*)
|
|
|
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
|
|
+- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
|
|
++m4_if([$1], [],[
|
|
|
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
|
|
|
+ ;;
|
|
|
+ mingw* | cegcc*)
|
|
|
+ # MinGW DLLs use traditional 'lib' prefix
|
|
|
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
|
|
+- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
+- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
|
|
|
+- # It is most probably a Windows format PATH printed by
|
|
|
+- # mingw gcc, but we are running on Cygwin. Gcc prints its search
|
|
|
+- # path with ; separators, and with drive letters. We can handle the
|
|
|
+- # drive letters (cygwin fileutils understands them), so leave them,
|
|
|
+- # especially as we might pass files found there to a mingw objdump,
|
|
|
+- # which wouldn't understand a cygwinified path. Ahh.
|
|
|
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
+- else
|
|
|
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
+- fi
|
|
|
+ ;;
|
|
|
+ pw32*)
|
|
|
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
|
|
|
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
++ dynamic_linker='Win32 ld.exe'
|
|
|
++ ;;
|
|
|
++
|
|
|
++ *,cl*)
|
|
|
++ # Native MSVC
|
|
|
++ libname_spec='$name'
|
|
|
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
|
|
++ library_names_spec='${libname}.dll.lib'
|
|
|
++
|
|
|
++ case $build_os in
|
|
|
++ mingw*)
|
|
|
++ sys_lib_search_path_spec=
|
|
|
++ lt_save_ifs=$IFS
|
|
|
++ IFS=';'
|
|
|
++ for lt_path in $LIB
|
|
|
++ do
|
|
|
++ IFS=$lt_save_ifs
|
|
|
++ # Let DOS variable expansion print the short 8.3 style file name.
|
|
|
++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
|
|
|
++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
|
|
|
++ done
|
|
|
++ IFS=$lt_save_ifs
|
|
|
++ # Convert to MSYS style.
|
|
|
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
|
|
|
++ ;;
|
|
|
++ cygwin*)
|
|
|
++ # Convert to unix form, then to dos form, then back to unix form
|
|
|
++ # but this time dos style (no spaces!) so that the unix form looks
|
|
|
++ # like /cygdrive/c/PROGRA~1:/cygdr...
|
|
|
++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
|
|
|
++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
|
|
|
++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ sys_lib_search_path_spec="$LIB"
|
|
|
++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
|
|
|
++ # It is most probably a Windows format PATH.
|
|
|
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
++ else
|
|
|
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
++ fi
|
|
|
++ # FIXME: find the short name or the path components, as spaces are
|
|
|
++ # common. (e.g. "Program Files" -> "PROGRA~1")
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++
|
|
|
++ # DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
|
++ postinstall_cmds='base_file=`basename \${file}`~
|
|
|
++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
|
|
|
++ dldir=$destdir/`dirname \$dlpath`~
|
|
|
++ test -d \$dldir || mkdir -p \$dldir~
|
|
|
++ $install_prog $dir/$dlname \$dldir/$dlname'
|
|
|
++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
|
|
|
++ dlpath=$dir/\$dldll~
|
|
|
++ $RM \$dlpath'
|
|
|
++ shlibpath_overrides_runpath=yes
|
|
|
++ dynamic_linker='Win32 link.exe'
|
|
|
+ ;;
|
|
|
+
|
|
|
+ *)
|
|
|
++ # Assume MSVC wrapper
|
|
|
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
|
|
|
++ dynamic_linker='Win32 ld.exe'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+- dynamic_linker='Win32 ld.exe'
|
|
|
+ # FIXME: first we should search . and the directory the executable is in
|
|
|
+ shlibpath_var=PATH
|
|
|
+ ;;
|
|
|
+@@ -2344,6 +2464,19 @@
|
|
|
+ hardcode_into_libs=yes
|
|
|
+ ;;
|
|
|
+
|
|
|
++haiku*)
|
|
|
++ version_type=linux
|
|
|
++ need_lib_prefix=no
|
|
|
++ need_version=no
|
|
|
++ dynamic_linker="$host_os runtime_loader"
|
|
|
++ 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=LIBRARY_PATH
|
|
|
++ shlibpath_overrides_runpath=yes
|
|
|
++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
|
|
|
++ hardcode_into_libs=yes
|
|
|
++ ;;
|
|
|
++
|
|
|
+ hpux9* | hpux10* | hpux11*)
|
|
|
+ # Give a soname corresponding to the major version so that dld.sl refuses to
|
|
|
+ # link against other versions.
|
|
|
+@@ -2386,8 +2519,10 @@
|
|
|
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
|
|
|
++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
|
|
|
+ postinstall_cmds='chmod 555 $lib'
|
|
|
++ # or fails outright, so override atomically:
|
|
|
++ install_override_mode=555
|
|
|
+ ;;
|
|
|
+
|
|
|
+ interix[[3-9]]*)
|
|
|
+@@ -2445,7 +2580,7 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ # This must be Linux ELF.
|
|
|
+-linux* | k*bsd*-gnu)
|
|
|
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ version_type=linux
|
|
|
+ need_lib_prefix=no
|
|
|
+ need_version=no
|
|
|
+@@ -2454,16 +2589,21 @@
|
|
|
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
|
|
+ shlibpath_var=LD_LIBRARY_PATH
|
|
|
+ shlibpath_overrides_runpath=no
|
|
|
++
|
|
|
+ # Some binutils ld are patched to set DT_RUNPATH
|
|
|
+- save_LDFLAGS=$LDFLAGS
|
|
|
+- save_libdir=$libdir
|
|
|
+- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
|
|
|
+- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
|
|
|
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
|
|
|
+- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
|
|
|
+- [shlibpath_overrides_runpath=yes])])
|
|
|
+- LDFLAGS=$save_LDFLAGS
|
|
|
+- libdir=$save_libdir
|
|
|
++ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
|
|
|
++ [lt_cv_shlibpath_overrides_runpath=no
|
|
|
++ save_LDFLAGS=$LDFLAGS
|
|
|
++ save_libdir=$libdir
|
|
|
++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
|
|
|
++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
|
|
|
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
|
|
|
++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
|
|
|
++ [lt_cv_shlibpath_overrides_runpath=yes])])
|
|
|
++ LDFLAGS=$save_LDFLAGS
|
|
|
++ libdir=$save_libdir
|
|
|
++ ])
|
|
|
++ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
|
|
|
+
|
|
|
+ # This implies no fast_install, which is unacceptable.
|
|
|
+ # Some rework will be needed to allow for fast_install
|
|
|
+@@ -2472,7 +2612,7 @@
|
|
|
+
|
|
|
+ # 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' ' '`
|
|
|
++ 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;s/"//g;/^$/d' | tr '\n' ' '`
|
|
|
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -2485,18 +2625,6 @@
|
|
|
+ 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'
|
|
|
+- ;;
|
|
|
+-
|
|
|
+ netbsd*)
|
|
|
+ version_type=sunos
|
|
|
+ need_lib_prefix=no
|
|
|
+@@ -2717,6 +2845,8 @@
|
|
|
+ The last name is the one that the linker finds with -lNAME]])
|
|
|
+ _LT_DECL([], [soname_spec], [1],
|
|
|
+ [[The coded name of the library, if different from the real name]])
|
|
|
++_LT_DECL([], [install_override_mode], [1],
|
|
|
++ [Permission mode override for installation of shared libraries])
|
|
|
+ _LT_DECL([], [postinstall_cmds], [2],
|
|
|
+ [Command to use after installation of a shared archive])
|
|
|
+ _LT_DECL([], [postuninstall_cmds], [2],
|
|
|
+@@ -2829,6 +2959,7 @@
|
|
|
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
|
|
+ m4_require([_LT_DECL_SED])dnl
|
|
|
+ m4_require([_LT_DECL_EGREP])dnl
|
|
|
++m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
|
|
|
+
|
|
|
+ AC_ARG_WITH([gnu-ld],
|
|
|
+ [AS_HELP_STRING([--with-gnu-ld],
|
|
|
+@@ -2950,6 +3081,11 @@
|
|
|
+ esac
|
|
|
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
|
+ case $host_os in
|
|
|
++ cygwin* | mingw* | pw32* | cegcc*)
|
|
|
++ if test "$GCC" != yes; then
|
|
|
++ reload_cmds=false
|
|
|
++ fi
|
|
|
++ ;;
|
|
|
+ darwin*)
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
|
|
|
+@@ -2958,8 +3094,8 @@
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
|
|
|
+-_LT_DECL([], [reload_cmds], [2])dnl
|
|
|
++_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
|
|
|
++_LT_TAGDECL([], [reload_cmds], [2])dnl
|
|
|
+ ])# _LT_CMD_RELOAD
|
|
|
+
|
|
|
+
|
|
|
+@@ -3011,16 +3147,18 @@
|
|
|
+ # Base MSYS/MinGW do not provide the 'file' command needed by
|
|
|
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
|
|
|
+ # unless we find 'file', for example because we are cross-compiling.
|
|
|
+- if ( file / ) >/dev/null 2>&1; then
|
|
|
++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
|
|
|
++ if ( test "$lt_cv_nm_interface" = "BSD nm" && 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)?'
|
|
|
++ # Keep this pattern in sync with the one in func_win32_libid.
|
|
|
++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
|
|
|
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+
|
|
|
+-cegcc)
|
|
|
++cegcc*)
|
|
|
+ # use the weaker test based on 'objdump'. See mingw*.
|
|
|
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
|
|
|
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
|
|
|
+@@ -3050,6 +3188,10 @@
|
|
|
+ lt_cv_deplibs_check_method=pass_all
|
|
|
+ ;;
|
|
|
+
|
|
|
++haiku*)
|
|
|
++ lt_cv_deplibs_check_method=pass_all
|
|
|
++ ;;
|
|
|
++
|
|
|
+ hpux10.20* | hpux11*)
|
|
|
+ lt_cv_file_magic_cmd=/usr/bin/file
|
|
|
+ case $host_cpu in
|
|
|
+@@ -3058,11 +3200,11 @@
|
|
|
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
|
|
|
+ ;;
|
|
|
+ hppa*64*)
|
|
|
+- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
|
|
|
++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
|
|
|
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
|
|
|
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
|
|
|
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -3084,11 +3226,11 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ # This must be Linux ELF.
|
|
|
+-linux* | k*bsd*-gnu)
|
|
|
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ lt_cv_deplibs_check_method=pass_all
|
|
|
+ ;;
|
|
|
+
|
|
|
+-netbsd* | netbsdelf*-gnu)
|
|
|
++netbsd*)
|
|
|
+ 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
|
|
|
+@@ -3162,6 +3304,21 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ])
|
|
|
++
|
|
|
++file_magic_glob=
|
|
|
++want_nocaseglob=no
|
|
|
++if test "$build" = "$host"; then
|
|
|
++ case $host_os in
|
|
|
++ mingw* | pw32*)
|
|
|
++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
|
|
|
++ want_nocaseglob=yes
|
|
|
++ else
|
|
|
++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
|
|
|
++ fi
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++fi
|
|
|
++
|
|
|
+ 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
|
|
|
+@@ -3169,7 +3326,11 @@
|
|
|
+ _LT_DECL([], [deplibs_check_method], [1],
|
|
|
+ [Method to check whether dependent libraries are shared objects])
|
|
|
+ _LT_DECL([], [file_magic_cmd], [1],
|
|
|
+- [Command to use when deplibs_check_method == "file_magic"])
|
|
|
++ [Command to use when deplibs_check_method = "file_magic"])
|
|
|
++_LT_DECL([], [file_magic_glob], [1],
|
|
|
++ [How to find potential files when deplibs_check_method = "file_magic"])
|
|
|
++_LT_DECL([], [want_nocaseglob], [1],
|
|
|
++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
|
|
|
+ ])# _LT_CHECK_MAGIC_METHOD
|
|
|
+
|
|
|
+
|
|
|
+@@ -3226,7 +3387,19 @@
|
|
|
+ NM="$lt_cv_path_NM"
|
|
|
+ else
|
|
|
+ # Didn't find any BSD compatible name lister, look for dumpbin.
|
|
|
+- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
|
|
|
++ if test -n "$DUMPBIN"; then :
|
|
|
++ # Let the user override the test.
|
|
|
++ else
|
|
|
++ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
|
|
|
++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
|
|
|
++ *COFF*)
|
|
|
++ DUMPBIN="$DUMPBIN -symbols"
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ DUMPBIN=:
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ fi
|
|
|
+ AC_SUBST([DUMPBIN])
|
|
|
+ if test "$DUMPBIN" != ":"; then
|
|
|
+ NM="$DUMPBIN"
|
|
|
+@@ -3239,13 +3412,13 @@
|
|
|
+ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
|
|
|
+ [lt_cv_nm_interface="BSD nm"
|
|
|
+ echo "int some_variable = 0;" > conftest.$ac_ext
|
|
|
+- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
|
|
|
+ (eval "$ac_compile" 2>conftest.err)
|
|
|
+ cat conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
+- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
|
|
|
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
|
|
+ cat conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
+- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
|
|
|
++ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
|
|
|
+ cat conftest.out >&AS_MESSAGE_LOG_FD
|
|
|
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
|
|
+ lt_cv_nm_interface="MS dumpbin"
|
|
|
+@@ -3260,23 +3433,84 @@
|
|
|
+ dnl AC_DEFUN([AM_PROG_NM], [])
|
|
|
+ dnl AC_DEFUN([AC_PROG_NM], [])
|
|
|
+
|
|
|
++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
|
|
|
++# --------------------------------
|
|
|
++# how to determine the name of the shared library
|
|
|
++# associated with a specific link library.
|
|
|
++# -- PORTME fill in with the dynamic library characteristics
|
|
|
++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
|
|
|
++[m4_require([_LT_DECL_EGREP])
|
|
|
++m4_require([_LT_DECL_OBJDUMP])
|
|
|
++m4_require([_LT_DECL_DLLTOOL])
|
|
|
++AC_CACHE_CHECK([how to associate runtime and link libraries],
|
|
|
++lt_cv_sharedlib_from_linklib_cmd,
|
|
|
++[lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
+
|
|
|
+-# LT_LIB_M
|
|
|
+-# --------
|
|
|
+-# check for math library
|
|
|
+-AC_DEFUN([LT_LIB_M],
|
|
|
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
|
+-LIBM=
|
|
|
+-case $host in
|
|
|
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
|
|
+- # These system don't have libm, or don't need it
|
|
|
+- ;;
|
|
|
+-*-ncr-sysv4.3*)
|
|
|
+- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
|
|
|
+- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
|
|
|
++case $host_os in
|
|
|
++cygwin* | mingw* | pw32* | cegcc*)
|
|
|
++ # two different shell functions defined in ltmain.sh
|
|
|
++ # decide which to use based on capabilities of $DLLTOOL
|
|
|
++ case `$DLLTOOL --help 2>&1` in
|
|
|
++ *--identify-strict*)
|
|
|
++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- AC_CHECK_LIB(m, cos, LIBM="-lm")
|
|
|
++ # fallback: assume linklib IS sharedlib
|
|
|
++ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++])
|
|
|
++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
|
|
|
++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
|
|
|
++
|
|
|
++_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
|
|
|
++ [Command to associate shared and link libraries])
|
|
|
++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
|
|
|
++
|
|
|
++
|
|
|
++# _LT_PATH_MANIFEST_TOOL
|
|
|
++# ----------------------
|
|
|
++# locate the manifest tool
|
|
|
++m4_defun([_LT_PATH_MANIFEST_TOOL],
|
|
|
++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
|
|
|
++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
|
|
|
++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
|
|
|
++ [lt_cv_path_mainfest_tool=no
|
|
|
++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
|
|
|
++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
|
|
|
++ cat conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
|
|
|
++ lt_cv_path_mainfest_tool=yes
|
|
|
++ fi
|
|
|
++ rm -f conftest*])
|
|
|
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
|
|
|
++ MANIFEST_TOOL=:
|
|
|
++fi
|
|
|
++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
|
|
|
++])# _LT_PATH_MANIFEST_TOOL
|
|
|
++
|
|
|
++
|
|
|
++# LT_LIB_M
|
|
|
++# --------
|
|
|
++# check for math library
|
|
|
++AC_DEFUN([LT_LIB_M],
|
|
|
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
|
++LIBM=
|
|
|
++case $host in
|
|
|
++*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
|
++ # These system don't have libm, or don't need it
|
|
|
++ ;;
|
|
|
++*-ncr-sysv4.3*)
|
|
|
++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
|
|
|
++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
|
|
|
++ ;;
|
|
|
++*)
|
|
|
++ AC_CHECK_LIB(m, cos, LIBM="-lm")
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ AC_SUBST([LIBM])
|
|
|
+@@ -3296,7 +3530,12 @@
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
|
|
|
+
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
|
|
|
++ case $cc_basename in
|
|
|
++ nvcc*)
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
|
|
|
++ *)
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
|
|
|
++ esac
|
|
|
+
|
|
|
+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
|
|
|
+ lt_cv_prog_compiler_rtti_exceptions,
|
|
|
+@@ -3313,6 +3552,7 @@
|
|
|
+ m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
|
|
|
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
|
+ AC_REQUIRE([AC_PROG_CC])dnl
|
|
|
++AC_REQUIRE([AC_PROG_AWK])dnl
|
|
|
+ AC_REQUIRE([LT_PATH_NM])dnl
|
|
|
+ AC_REQUIRE([LT_PATH_LD])dnl
|
|
|
+ m4_require([_LT_DECL_SED])dnl
|
|
|
+@@ -3380,8 +3620,8 @@
|
|
|
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
|
|
|
+
|
|
|
+ # Transform an extracted symbol line into symbol name and symbol address
|
|
|
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
|
|
|
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
|
|
|
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
|
|
|
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
|
|
|
+
|
|
|
+ # Handle CRLF in mingw tool chain
|
|
|
+ opt_cr=
|
|
|
+@@ -3417,6 +3657,7 @@
|
|
|
+ else
|
|
|
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
|
|
|
+ fi
|
|
|
++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
|
|
|
+
|
|
|
+ # Check to see that the pipe works correctly.
|
|
|
+ pipe_works=no
|
|
|
+@@ -3438,7 +3679,7 @@
|
|
|
+ if AC_TRY_EVAL(ac_compile); then
|
|
|
+ # Now try to grab the symbols.
|
|
|
+ nlist=conftest.nm
|
|
|
+- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
|
|
|
++ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
|
|
|
+ # Try sorting and uniquifying the output.
|
|
|
+ if sort "$nlist" | uniq > "$nlist"T; then
|
|
|
+ mv -f "$nlist"T "$nlist"
|
|
|
+@@ -3450,6 +3691,18 @@
|
|
|
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
|
|
|
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
|
|
|
+ cat <<_LT_EOF > conftest.$ac_ext
|
|
|
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
|
|
|
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
|
|
|
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
|
|
|
++ relocations are performed -- see ld's documentation on pseudo-relocs. */
|
|
|
++# define LT@&t@_DLSYM_CONST
|
|
|
++#elif defined(__osf__)
|
|
|
++/* This system does not cope well with relocations in const data. */
|
|
|
++# define LT@&t@_DLSYM_CONST
|
|
|
++#else
|
|
|
++# define LT@&t@_DLSYM_CONST const
|
|
|
++#endif
|
|
|
++
|
|
|
+ #ifdef __cplusplus
|
|
|
+ extern "C" {
|
|
|
+ #endif
|
|
|
+@@ -3461,7 +3714,7 @@
|
|
|
+ cat <<_LT_EOF >> conftest.$ac_ext
|
|
|
+
|
|
|
+ /* The mapping between symbol names and symbols. */
|
|
|
+-const struct {
|
|
|
++LT@&t@_DLSYM_CONST struct {
|
|
|
+ const char *name;
|
|
|
+ void *address;
|
|
|
+ }
|
|
|
+@@ -3487,15 +3740,15 @@
|
|
|
+ _LT_EOF
|
|
|
+ # Now try linking the two files.
|
|
|
+ mv conftest.$ac_objext conftstm.$ac_objext
|
|
|
+- lt_save_LIBS="$LIBS"
|
|
|
+- lt_save_CFLAGS="$CFLAGS"
|
|
|
++ lt_globsym_save_LIBS=$LIBS
|
|
|
++ lt_globsym_save_CFLAGS=$CFLAGS
|
|
|
+ LIBS="conftstm.$ac_objext"
|
|
|
+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
|
|
|
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
|
|
|
+ pipe_works=yes
|
|
|
+ fi
|
|
|
+- LIBS="$lt_save_LIBS"
|
|
|
+- CFLAGS="$lt_save_CFLAGS"
|
|
|
++ LIBS=$lt_globsym_save_LIBS
|
|
|
++ CFLAGS=$lt_globsym_save_CFLAGS
|
|
|
+ else
|
|
|
+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
|
|
|
+ fi
|
|
|
+@@ -3528,6 +3781,13 @@
|
|
|
+ AC_MSG_RESULT(ok)
|
|
|
+ fi
|
|
|
+
|
|
|
++# Response file support.
|
|
|
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
|
|
|
++ nm_file_list_spec='@'
|
|
|
++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
|
|
|
++ nm_file_list_spec='@'
|
|
|
++fi
|
|
|
++
|
|
|
+ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
|
|
|
+ [Take the output of nm and produce a listing of raw symbols and C names])
|
|
|
+ _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
|
|
|
+@@ -3538,6 +3798,8 @@
|
|
|
+ _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
|
|
|
+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
|
|
|
+ [Transform the output of nm in a C name address pair when lib prefix is needed])
|
|
|
++_LT_DECL([], [nm_file_list_spec], [1],
|
|
|
++ [Specify filename containing input files for $NM])
|
|
|
+ ]) # _LT_CMD_GLOBAL_SYMBOLS
|
|
|
+
|
|
|
+
|
|
|
+@@ -3549,7 +3811,6 @@
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
|
|
|
+
|
|
|
+-AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
|
+ m4_if([$1], [CXX], [
|
|
|
+ # C++ specific cases for pic, static, wl, etc.
|
|
|
+ if test "$GXX" = yes; then
|
|
|
+@@ -3600,6 +3861,11 @@
|
|
|
+ # DJGPP does not support shared libraries at all
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
|
|
|
+ ;;
|
|
|
++ haiku*)
|
|
|
++ # PIC is the default for Haiku.
|
|
|
++ # The "-static" flag exists, but is broken.
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_static, $1)=
|
|
|
++ ;;
|
|
|
+ interix[[3-9]]*)
|
|
|
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
|
|
|
+ # Instead, we relocate shared libraries at runtime.
|
|
|
+@@ -3649,6 +3915,12 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
++ mingw* | cygwin* | os2* | pw32* | cegcc*)
|
|
|
++ # This hack is so that the source file can tell whether it is being
|
|
|
++ # built for inclusion in a dll (and should export symbols for example).
|
|
|
++ m4_if([$1], [GCJ], [],
|
|
|
++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
|
|
++ ;;
|
|
|
+ dgux*)
|
|
|
+ case $cc_basename in
|
|
|
+ ec++*)
|
|
|
+@@ -3705,7 +3977,7 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+- linux* | k*bsd*-gnu)
|
|
|
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ case $cc_basename in
|
|
|
+ KCC*)
|
|
|
+ # KAI C++ Compiler
|
|
|
+@@ -3738,8 +4010,8 @@
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
|
|
+ ;;
|
|
|
+- xlc* | xlC*)
|
|
|
+- # IBM XL 8.0 on PPC
|
|
|
++ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
|
|
|
++ # IBM XL 8.0, 9.0 on PPC and BlueGene
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
|
|
|
+@@ -3769,7 +4041,7 @@
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+- netbsd* | netbsdelf*-gnu)
|
|
|
++ netbsd*)
|
|
|
+ ;;
|
|
|
+ *qnx* | *nto*)
|
|
|
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
|
|
|
+@@ -3801,7 +4073,7 @@
|
|
|
+ ;;
|
|
|
+ solaris*)
|
|
|
+ case $cc_basename in
|
|
|
+- CC*)
|
|
|
++ CC* | sunCC*)
|
|
|
+ # Sun C++ 4.2, 5.x and Centerline C++
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
|
|
+@@ -3905,6 +4177,12 @@
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
|
|
|
+ ;;
|
|
|
+
|
|
|
++ haiku*)
|
|
|
++ # PIC is the default for Haiku.
|
|
|
++ # The "-static" flag exists, but is broken.
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_static, $1)=
|
|
|
++ ;;
|
|
|
++
|
|
|
+ hpux*)
|
|
|
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
|
|
|
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
|
|
|
+@@ -3947,6 +4225,13 @@
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
++
|
|
|
++ case $cc_basename in
|
|
|
++ nvcc*) # Cuda Compiler Driver 2.2
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ else
|
|
|
+ # PORTME Check for flag to pass linker flags through the system compiler.
|
|
|
+ case $host_os in
|
|
|
+@@ -3989,7 +4274,7 @@
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
|
|
+ ;;
|
|
|
+
|
|
|
+- linux* | k*bsd*-gnu)
|
|
|
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ case $cc_basename in
|
|
|
+ # old Intel for x86_64 which still supported -KPIC.
|
|
|
+ ecc*)
|
|
|
+@@ -4010,7 +4295,13 @@
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
|
|
|
+ ;;
|
|
|
+- pgcc* | pgf77* | pgf90* | pgf95*)
|
|
|
++ nagfor*)
|
|
|
++ # NAG Fortran compiler
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
|
|
++ ;;
|
|
|
++ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
|
|
|
+ # Portland Group compilers (*not* the Pentium gcc compiler,
|
|
|
+ # which looks to be a dead project)
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
|
|
+@@ -4022,25 +4313,25 @@
|
|
|
+ # All Alpha code is PIC.
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
|
|
+ ;;
|
|
|
+- xl*)
|
|
|
+- # IBM XL C 8.0/Fortran 10.1 on PPC
|
|
|
++ xl* | bgxl* | bgf* | mpixl*)
|
|
|
++ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ case `$CC -V 2>&1 | sed 5q` in
|
|
|
+- *Sun\ C*)
|
|
|
+- # Sun C 5.9
|
|
|
++ *Sun\ F* | *Sun*Fortran*)
|
|
|
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
|
|
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
|
|
|
+ ;;
|
|
|
+- *Sun\ F*)
|
|
|
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
|
|
|
++ *Sun\ C*)
|
|
|
++ # Sun C 5.9
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
|
|
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
|
|
|
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ ;;
|
|
|
+@@ -4072,7 +4363,7 @@
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
|
|
+ case $cc_basename in
|
|
|
+- f77* | f90* | f95*)
|
|
|
++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
|
|
|
+ *)
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
|
|
|
+@@ -4129,9 +4420,11 @@
|
|
|
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
|
|
|
+-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
|
|
|
+- [How to pass a linker flag through the compiler])
|
|
|
++
|
|
|
++AC_CACHE_CHECK([for $compiler option to produce PIC],
|
|
|
++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
|
|
|
++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
|
|
|
++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
|
|
|
+
|
|
|
+ #
|
|
|
+ # Check to make sure the PIC flag actually works.
|
|
|
+@@ -4150,6 +4443,8 @@
|
|
|
+ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
|
|
|
+ [Additional compiler flags for building library objects])
|
|
|
+
|
|
|
++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
|
|
|
++ [How to pass a linker flag through the compiler])
|
|
|
+ #
|
|
|
+ # Check to make sure the static flag actually works.
|
|
|
+ #
|
|
|
+@@ -4170,6 +4465,7 @@
|
|
|
+ m4_defun([_LT_LINKER_SHLIBS],
|
|
|
+ [AC_REQUIRE([LT_PATH_LD])dnl
|
|
|
+ AC_REQUIRE([LT_PATH_NM])dnl
|
|
|
++m4_require([_LT_PATH_MANIFEST_TOOL])dnl
|
|
|
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
|
|
+ m4_require([_LT_DECL_EGREP])dnl
|
|
|
+ m4_require([_LT_DECL_SED])dnl
|
|
|
+@@ -4178,30 +4474,35 @@
|
|
|
+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
|
|
|
+ m4_if([$1], [CXX], [
|
|
|
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
|
|
++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
|
|
|
+ case $host_os in
|
|
|
+ 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
|
|
|
++ # Also, AIX nm treats weak defined symbols like other global defined
|
|
|
++ # symbols, whereas GNU nm marks them as "W".
|
|
|
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
|
|
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
|
|
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
|
|
+ else
|
|
|
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+ pw32*)
|
|
|
+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
|
|
|
+- ;;
|
|
|
++ ;;
|
|
|
+ cygwin* | mingw* | cegcc*)
|
|
|
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
|
|
|
+- ;;
|
|
|
+- linux* | k*bsd*-gnu)
|
|
|
+- _LT_TAGVAR(link_all_deplibs, $1)=no
|
|
|
+- ;;
|
|
|
++ case $cc_basename in
|
|
|
++ cl*) ;;
|
|
|
++ *)
|
|
|
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
|
|
|
++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ ;;
|
|
|
+ *)
|
|
|
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
|
|
+- ;;
|
|
|
++ ;;
|
|
|
+ esac
|
|
|
+- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
|
|
|
+ ], [
|
|
|
+ runpath_var=
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=
|
|
|
+@@ -4261,13 +4562,36 @@
|
|
|
+ openbsd*)
|
|
|
+ with_gnu_ld=no
|
|
|
+ ;;
|
|
|
+- linux* | k*bsd*-gnu)
|
|
|
+- _LT_TAGVAR(link_all_deplibs, $1)=no
|
|
|
+- ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+ _LT_TAGVAR(ld_shlibs, $1)=yes
|
|
|
++
|
|
|
++ # On some targets, GNU ld is compatible enough with the native linker
|
|
|
++ # that we're better off using the native interface for both.
|
|
|
++ lt_use_gnu_ld_interface=no
|
|
|
+ if test "$with_gnu_ld" = yes; then
|
|
|
++ case $host_os in
|
|
|
++ aix*)
|
|
|
++ # The AIX port of GNU ld has always aspired to compatibility
|
|
|
++ # with the native linker. However, as the warning in the GNU ld
|
|
|
++ # block says, versions before 2.19.5* couldn't really create working
|
|
|
++ # shared libraries, regardless of the interface used.
|
|
|
++ case `$LD -v 2>&1` in
|
|
|
++ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
|
|
|
++ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
|
|
|
++ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
|
|
|
++ *)
|
|
|
++ lt_use_gnu_ld_interface=yes
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ lt_use_gnu_ld_interface=yes
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ fi
|
|
|
++
|
|
|
++ if test "$lt_use_gnu_ld_interface" = yes; then
|
|
|
+ # If archive_cmds runs LD, not CC, wlarc should be empty
|
|
|
+ wlarc='${wl}'
|
|
|
+
|
|
|
+@@ -4285,6 +4609,7 @@
|
|
|
+ fi
|
|
|
+ supports_anon_versioning=no
|
|
|
+ case `$LD -v 2>&1` in
|
|
|
++ *GNU\ gold*) supports_anon_versioning=yes ;;
|
|
|
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
|
|
|
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
|
|
|
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
|
|
|
+@@ -4300,11 +4625,12 @@
|
|
|
+ _LT_TAGVAR(ld_shlibs, $1)=no
|
|
|
+ cat <<_LT_EOF 1>&2
|
|
|
+
|
|
|
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
|
|
|
++*** Warning: the GNU linker, at least up to release 2.19, is reported
|
|
|
+ *** to be unable to reliably create shared libraries on AIX.
|
|
|
+ *** Therefore, libtool is disabling shared libraries support. If you
|
|
|
+-*** really care for shared libraries, you may want to modify your PATH
|
|
|
+-*** so that a non-GNU linker is found, and then restart.
|
|
|
++*** really care for shared libraries, you may want to install binutils
|
|
|
++*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
|
|
|
++*** You will then need to restart the configuration process.
|
|
|
+
|
|
|
+ _LT_EOF
|
|
|
+ fi
|
|
|
+@@ -4340,10 +4666,12 @@
|
|
|
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
|
|
+ # as there is no search path for DLLs.
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
|
+ _LT_TAGVAR(always_export_symbols, $1)=no
|
|
|
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
|
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
|
|
|
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
|
|
|
++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
|
|
|
+
|
|
|
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
|
|
+@@ -4361,6 +4689,11 @@
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+
|
|
|
++ haiku*)
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ _LT_TAGVAR(link_all_deplibs, $1)=yes
|
|
|
++ ;;
|
|
|
++
|
|
|
+ interix[[3-9]]*)
|
|
|
+ _LT_TAGVAR(hardcode_direct, $1)=no
|
|
|
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
|
|
+@@ -4376,7 +4709,7 @@
|
|
|
+ _LT_TAGVAR(archive_expsym_cmds, $1)='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'
|
|
|
+ ;;
|
|
|
+
|
|
|
+- gnu* | linux* | tpf* | k*bsd*-gnu)
|
|
|
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ tmp_diet=no
|
|
|
+ if test "$host_os" = linux-dietlibc; then
|
|
|
+ case $cc_basename in
|
|
|
+@@ -4386,15 +4719,16 @@
|
|
|
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
|
|
|
+ && test "$tmp_diet" = no
|
|
|
+ then
|
|
|
+- tmp_addflag=
|
|
|
++ tmp_addflag=' $pic_flag'
|
|
|
+ tmp_sharedflag='-shared'
|
|
|
+ case $cc_basename,$host_cpu in
|
|
|
+ pgcc*) # Portland Group C compiler
|
|
|
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
+ tmp_addflag=' $pic_flag'
|
|
|
+ ;;
|
|
|
+- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
|
|
|
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ pgf77* | pgf90* | pgf95* | pgfortran*)
|
|
|
++ # Portland Group f77 and f90 compilers
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
+ tmp_addflag=' $pic_flag -Mnomain' ;;
|
|
|
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
|
|
|
+ tmp_addflag=' -i_dynamic' ;;
|
|
|
+@@ -4405,13 +4739,17 @@
|
|
|
+ lf95*) # Lahey Fortran 8.1
|
|
|
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
|
|
|
+ tmp_sharedflag='--shared' ;;
|
|
|
+- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
|
|
|
++ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
|
|
|
+ tmp_sharedflag='-qmkshrobj'
|
|
|
+ tmp_addflag= ;;
|
|
|
++ nvcc*) # Cuda Compiler Driver 2.2
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ _LT_TAGVAR(compiler_needs_object, $1)=yes
|
|
|
++ ;;
|
|
|
+ esac
|
|
|
+ case `$CC -V 2>&1 | sed 5q` in
|
|
|
+ *Sun\ C*) # Sun C 5.9
|
|
|
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
|
|
|
+ tmp_sharedflag='-G' ;;
|
|
|
+ *Sun\ F*) # Sun Fortran 8.3
|
|
|
+@@ -4427,17 +4765,17 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ case $cc_basename in
|
|
|
+- xlf*)
|
|
|
++ xlf* | bgf* | bgxlf* | mpixlf*)
|
|
|
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
|
|
|
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
|
|
|
+ if test "x$supports_anon_versioning" = xyes; then
|
|
|
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
|
|
|
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
|
|
+ echo "local: *; };" >> $output_objdir/$libname.ver~
|
|
|
+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
|
|
|
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -4446,13 +4784,13 @@
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+
|
|
|
+- netbsd* | netbsdelf*-gnu)
|
|
|
++ netbsd*)
|
|
|
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
|
|
+ wlarc=
|
|
|
+ else
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
+
|
|
|
+@@ -4470,8 +4808,8 @@
|
|
|
+
|
|
|
+ _LT_EOF
|
|
|
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
+ else
|
|
|
+ _LT_TAGVAR(ld_shlibs, $1)=no
|
|
|
+ fi
|
|
|
+@@ -4517,8 +4855,8 @@
|
|
|
+
|
|
|
+ *)
|
|
|
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
+ else
|
|
|
+ _LT_TAGVAR(ld_shlibs, $1)=no
|
|
|
+ fi
|
|
|
+@@ -4558,8 +4896,10 @@
|
|
|
+ else
|
|
|
+ # 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
|
|
|
++ # Also, AIX nm treats weak defined symbols like other global
|
|
|
++ # defined symbols, whereas GNU nm marks them as "W".
|
|
|
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
|
|
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
|
|
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
|
|
+ else
|
|
|
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
|
|
+ fi
|
|
|
+@@ -4621,7 +4961,6 @@
|
|
|
+ if test "$aix_use_runtimelinking" = yes; then
|
|
|
+ shared_flag="$shared_flag "'${wl}-G'
|
|
|
+ fi
|
|
|
+- _LT_TAGVAR(link_all_deplibs, $1)=no
|
|
|
+ else
|
|
|
+ # not using gcc
|
|
|
+ if test "$host_cpu" = ia64; then
|
|
|
+@@ -4647,9 +4986,9 @@
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
|
|
|
+ # Determine the default libpath from the value encoded in an
|
|
|
+ # empty executable.
|
|
|
+- _LT_SYS_MODULE_PATH_AIX
|
|
|
++ _LT_SYS_MODULE_PATH_AIX([$1])
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
|
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
|
+ else
|
|
|
+ if test "$host_cpu" = ia64; then
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
|
|
|
+@@ -4658,14 +4997,19 @@
|
|
|
+ else
|
|
|
+ # Determine the default libpath from the value encoded in an
|
|
|
+ # empty executable.
|
|
|
+- _LT_SYS_MODULE_PATH_AIX
|
|
|
++ _LT_SYS_MODULE_PATH_AIX([$1])
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
|
+ # Warning - without using the other run time loading flags,
|
|
|
+ # -berok will link without error, but may produce a broken library.
|
|
|
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
|
|
|
+- # Exported symbols can be pulled into shared objects from archives
|
|
|
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
|
|
|
++ if test "$with_gnu_ld" = yes; then
|
|
|
++ # We only use this code for GNU lds that support --whole-archive.
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
|
|
++ else
|
|
|
++ # Exported symbols can be pulled into shared objects from archives
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
|
|
|
++ fi
|
|
|
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
|
|
|
+ # This is similar to how AIX traditionally builds its shared libraries.
|
|
|
+ _LT_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'
|
|
|
+@@ -4697,20 +5041,63 @@
|
|
|
+ # Microsoft Visual C++.
|
|
|
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
|
+ # no search path for DLLs.
|
|
|
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
|
|
|
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
|
+- # Tell ltmain to make .lib files, not .a files.
|
|
|
+- libext=lib
|
|
|
+- # Tell ltmain to make .dll files, not .so files.
|
|
|
+- shrext_cmds=".dll"
|
|
|
+- # FIXME: Setting linknames here is a bad hack.
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
|
|
|
+- # The linker will automatically build a .lib file if we build a DLL.
|
|
|
+- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
|
|
|
+- # FIXME: Should let the user specify the lib program.
|
|
|
+- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
|
|
|
+- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
|
|
|
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
|
++ case $cc_basename in
|
|
|
++ cl*)
|
|
|
++ # Native MSVC
|
|
|
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
|
|
|
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
|
++ _LT_TAGVAR(always_export_symbols, $1)=yes
|
|
|
++ _LT_TAGVAR(file_list_spec, $1)='@'
|
|
|
++ # Tell ltmain to make .lib files, not .a files.
|
|
|
++ libext=lib
|
|
|
++ # Tell ltmain to make .dll files, not .so files.
|
|
|
++ shrext_cmds=".dll"
|
|
|
++ # FIXME: Setting linknames here is a bad hack.
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
|
|
|
++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
|
|
|
++ else
|
|
|
++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
|
|
|
++ fi~
|
|
|
++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
|
|
|
++ linknames='
|
|
|
++ # The linker will not automatically build a static lib if we build a DLL.
|
|
|
++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
|
|
|
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
|
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
|
|
|
++ # Don't use ranlib
|
|
|
++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
|
|
|
++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
|
|
|
++ lt_tool_outputfile="@TOOL_OUTPUT@"~
|
|
|
++ case $lt_outputfile in
|
|
|
++ *.exe|*.EXE) ;;
|
|
|
++ *)
|
|
|
++ lt_outputfile="$lt_outputfile.exe"
|
|
|
++ lt_tool_outputfile="$lt_tool_outputfile.exe"
|
|
|
++ ;;
|
|
|
++ esac~
|
|
|
++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
|
|
|
++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
|
|
|
++ $RM "$lt_outputfile.manifest";
|
|
|
++ fi'
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ # Assume MSVC wrapper
|
|
|
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
|
|
|
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
|
++ # Tell ltmain to make .lib files, not .a files.
|
|
|
++ libext=lib
|
|
|
++ # Tell ltmain to make .dll files, not .so files.
|
|
|
++ shrext_cmds=".dll"
|
|
|
++ # FIXME: Setting linknames here is a bad hack.
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
|
|
|
++ # The linker will automatically build a .lib file if we build a DLL.
|
|
|
++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
|
|
|
++ # FIXME: Should let the user specify the lib program.
|
|
|
++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
|
|
|
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ ;;
|
|
|
+
|
|
|
+ darwin* | rhapsody*)
|
|
|
+@@ -4748,7 +5135,7 @@
|
|
|
+
|
|
|
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
|
|
+ freebsd* | dragonfly*)
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
|
|
+ _LT_TAGVAR(hardcode_direct, $1)=yes
|
|
|
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
|
|
+@@ -4756,7 +5143,7 @@
|
|
|
+
|
|
|
+ hpux9*)
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
|
|
|
+ else
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
|
|
|
+ fi
|
|
|
+@@ -4771,8 +5158,8 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ hpux10*)
|
|
|
+- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ else
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
|
|
|
+ fi
|
|
|
+@@ -4790,16 +5177,16 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ hpux11*)
|
|
|
+- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
|
|
|
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
|
|
|
+ case $host_cpu in
|
|
|
+ hppa*64*)
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ ;;
|
|
|
+ ia64*)
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ else
|
|
|
+@@ -4811,7 +5198,14 @@
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ m4_if($1, [], [
|
|
|
++ # Older versions of the 11.00 compiler do not understand -b yet
|
|
|
++ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
|
|
|
++ _LT_LINKER_OPTION([if $CC understands -b],
|
|
|
++ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
|
|
|
++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
|
|
|
++ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
|
|
|
++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+@@ -4839,19 +5233,34 @@
|
|
|
+
|
|
|
+ irix5* | irix6* | nonstopux*)
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
+ # Try to use the -exported_symbol ld option, if it does not
|
|
|
+ # work, assume that -exports_file does not work either and
|
|
|
+ # implicitly export all symbols.
|
|
|
+- save_LDFLAGS="$LDFLAGS"
|
|
|
+- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
|
|
|
+- AC_LINK_IFELSE(int foo(void) {},
|
|
|
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
|
|
|
+- )
|
|
|
+- LDFLAGS="$save_LDFLAGS"
|
|
|
++ # This should be the same for all languages, so no per-tag cache variable.
|
|
|
++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
|
|
|
++ [lt_cv_irix_exported_symbol],
|
|
|
++ [save_LDFLAGS="$LDFLAGS"
|
|
|
++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
|
|
|
++ AC_LINK_IFELSE(
|
|
|
++ [AC_LANG_SOURCE(
|
|
|
++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
|
|
|
++ [C++], [[int foo (void) { return 0; }]],
|
|
|
++ [Fortran 77], [[
|
|
|
++ subroutine foo
|
|
|
++ end]],
|
|
|
++ [Fortran], [[
|
|
|
++ subroutine foo
|
|
|
++ end]])])],
|
|
|
++ [lt_cv_irix_exported_symbol=yes],
|
|
|
++ [lt_cv_irix_exported_symbol=no])
|
|
|
++ LDFLAGS="$save_LDFLAGS"])
|
|
|
++ if test "$lt_cv_irix_exported_symbol" = yes; then
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
|
|
|
++ fi
|
|
|
+ else
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
|
|
|
+ fi
|
|
|
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
|
|
+@@ -4860,7 +5269,7 @@
|
|
|
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
|
|
|
+ ;;
|
|
|
+
|
|
|
+- netbsd* | netbsdelf*-gnu)
|
|
|
++ netbsd*)
|
|
|
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
|
|
+ else
|
|
|
+@@ -4913,17 +5322,17 @@
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
|
|
|
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
|
|
|
+ ;;
|
|
|
+
|
|
|
+ osf3*)
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
+ else
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
+ fi
|
|
|
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
|
|
+@@ -4933,13 +5342,13 @@
|
|
|
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
|
|
+ else
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
|
|
|
+- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
|
|
|
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
|
|
|
+
|
|
|
+ # Both c and cxx compiler support -rpath directly
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
|
|
|
+@@ -4952,9 +5361,9 @@
|
|
|
+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
|
|
|
+ if test "$GCC" = yes; then
|
|
|
+ wlarc='${wl}'
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
|
|
+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
|
|
|
++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
|
|
|
+ else
|
|
|
+ case `$CC -V 2>&1` in
|
|
|
+ *"Compilers 5.0"*)
|
|
|
+@@ -5130,36 +5539,38 @@
|
|
|
+ # 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.
|
|
|
+- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
|
|
|
+- $RM conftest*
|
|
|
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
|
|
+-
|
|
|
+- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
|
|
|
+- soname=conftest
|
|
|
+- lib=conftest
|
|
|
+- libobjs=conftest.$ac_objext
|
|
|
+- deplibs=
|
|
|
+- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
|
|
|
+- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
|
|
|
+- compiler_flags=-v
|
|
|
+- linker_flags=-v
|
|
|
+- verstring=
|
|
|
+- output_objdir=.
|
|
|
+- libname=conftest
|
|
|
+- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
|
|
|
+- _LT_TAGVAR(allow_undefined_flag, $1)=
|
|
|
+- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
|
|
|
+- then
|
|
|
+- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
|
|
+- else
|
|
|
+- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
|
|
|
+- fi
|
|
|
+- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
|
|
|
+- else
|
|
|
+- cat conftest.err 1>&5
|
|
|
+- fi
|
|
|
+- $RM conftest*
|
|
|
+- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
|
|
|
++ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
|
|
|
++ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
|
|
|
++ [$RM conftest*
|
|
|
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
|
|
++
|
|
|
++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
|
|
|
++ soname=conftest
|
|
|
++ lib=conftest
|
|
|
++ libobjs=conftest.$ac_objext
|
|
|
++ deplibs=
|
|
|
++ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
|
|
|
++ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
|
|
|
++ compiler_flags=-v
|
|
|
++ linker_flags=-v
|
|
|
++ verstring=
|
|
|
++ output_objdir=.
|
|
|
++ libname=conftest
|
|
|
++ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
|
|
|
++ _LT_TAGVAR(allow_undefined_flag, $1)=
|
|
|
++ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
|
|
|
++ then
|
|
|
++ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
|
|
++ else
|
|
|
++ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
|
|
|
++ fi
|
|
|
++ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
|
|
|
++ else
|
|
|
++ cat conftest.err 1>&5
|
|
|
++ fi
|
|
|
++ $RM conftest*
|
|
|
++ ])
|
|
|
++ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+@@ -5224,8 +5635,6 @@
|
|
|
+ to runtime path list])
|
|
|
+ _LT_TAGDECL([], [link_all_deplibs], [0],
|
|
|
+ [Whether libtool must link a program against all its dependency libraries])
|
|
|
+-_LT_TAGDECL([], [fix_srcfile_path], [1],
|
|
|
+- [Fix the shell variable $srcfile for the compiler])
|
|
|
+ _LT_TAGDECL([], [always_export_symbols], [0],
|
|
|
+ [Set to "yes" if exported symbols are required])
|
|
|
+ _LT_TAGDECL([], [export_symbols_cmds], [2],
|
|
|
+@@ -5236,6 +5645,8 @@
|
|
|
+ [Symbols that must always be exported])
|
|
|
+ _LT_TAGDECL([], [prelink_cmds], [2],
|
|
|
+ [Commands necessary for linking programs (against libraries) with templates])
|
|
|
++_LT_TAGDECL([], [postlink_cmds], [2],
|
|
|
++ [Commands necessary for finishing linking programs])
|
|
|
+ _LT_TAGDECL([], [file_list_spec], [1],
|
|
|
+ [Specify filename containing input files])
|
|
|
+ dnl FIXME: Not yet implemented
|
|
|
+@@ -5329,37 +5740,22 @@
|
|
|
+ ])# _LT_LANG_C_CONFIG
|
|
|
+
|
|
|
+
|
|
|
+-# _LT_PROG_CXX
|
|
|
+-# ------------
|
|
|
+-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
|
|
|
+-# compiler, we have our own version here.
|
|
|
+-m4_defun([_LT_PROG_CXX],
|
|
|
+-[
|
|
|
+-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
|
|
|
+-AC_PROG_CXX
|
|
|
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
|
|
|
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
|
|
|
+- (test "X$CXX" != "Xg++"))) ; then
|
|
|
+- AC_PROG_CXXCPP
|
|
|
+-else
|
|
|
+- _lt_caught_CXX_error=yes
|
|
|
+-fi
|
|
|
+-popdef([AC_MSG_ERROR])
|
|
|
+-])# _LT_PROG_CXX
|
|
|
+-
|
|
|
+-dnl aclocal-1.4 backwards compatibility:
|
|
|
+-dnl AC_DEFUN([_LT_PROG_CXX], [])
|
|
|
+-
|
|
|
+-
|
|
|
+ # _LT_LANG_CXX_CONFIG([TAG])
|
|
|
+ # --------------------------
|
|
|
+ # Ensure that the configuration variables for a C++ compiler are suitably
|
|
|
+ # defined. These variables are subsequently used by _LT_CONFIG to write
|
|
|
+ # the compiler configuration to `libtool'.
|
|
|
+ m4_defun([_LT_LANG_CXX_CONFIG],
|
|
|
+-[AC_REQUIRE([_LT_PROG_CXX])dnl
|
|
|
+-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
|
|
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
|
|
+ m4_require([_LT_DECL_EGREP])dnl
|
|
|
++m4_require([_LT_PATH_MANIFEST_TOOL])dnl
|
|
|
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
|
|
|
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
|
|
|
++ (test "X$CXX" != "Xg++"))) ; then
|
|
|
++ AC_PROG_CXXCPP
|
|
|
++else
|
|
|
++ _lt_caught_CXX_error=yes
|
|
|
++fi
|
|
|
+
|
|
|
+ AC_LANG_PUSH(C++)
|
|
|
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
|
|
+@@ -5381,6 +5777,8 @@
|
|
|
+ _LT_TAGVAR(module_expsym_cmds, $1)=
|
|
|
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
|
|
|
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
|
|
|
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
|
|
|
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
|
|
|
+ _LT_TAGVAR(no_undefined_flag, $1)=
|
|
|
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
|
|
|
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
|
|
|
+@@ -5412,6 +5810,7 @@
|
|
|
+
|
|
|
+ # Allow CC to be a program name with arguments.
|
|
|
+ lt_save_CC=$CC
|
|
|
++ lt_save_CFLAGS=$CFLAGS
|
|
|
+ lt_save_LD=$LD
|
|
|
+ lt_save_GCC=$GCC
|
|
|
+ GCC=$GXX
|
|
|
+@@ -5429,6 +5828,7 @@
|
|
|
+ fi
|
|
|
+ test -z "${LDCXX+set}" || LD=$LDCXX
|
|
|
+ CC=${CXX-"c++"}
|
|
|
++ CFLAGS=$CXXFLAGS
|
|
|
+ compiler=$CC
|
|
|
+ _LT_TAGVAR(compiler, $1)=$CC
|
|
|
+ _LT_CC_BASENAME([$compiler])
|
|
|
+@@ -5450,8 +5850,8 @@
|
|
|
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
|
|
|
+ # archiving commands below assume that GNU ld is being used.
|
|
|
+ if test "$with_gnu_ld" = yes; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
+
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
|
|
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
|
|
+@@ -5483,7 +5883,7 @@
|
|
|
+ # Commands to make compiler produce verbose output that lists
|
|
|
+ # what "hidden" libraries, object files and flags are used when
|
|
|
+ # linking a shared library.
|
|
|
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
|
|
|
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
|
|
+
|
|
|
+ else
|
|
|
+ GXX=no
|
|
|
+@@ -5592,10 +5992,10 @@
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
|
|
|
+ # Determine the default libpath from the value encoded in an empty
|
|
|
+ # executable.
|
|
|
+- _LT_SYS_MODULE_PATH_AIX
|
|
|
++ _LT_SYS_MODULE_PATH_AIX([$1])
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
|
+
|
|
|
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
|
+ else
|
|
|
+ if test "$host_cpu" = ia64; then
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
|
|
|
+@@ -5604,14 +6004,19 @@
|
|
|
+ else
|
|
|
+ # Determine the default libpath from the value encoded in an
|
|
|
+ # empty executable.
|
|
|
+- _LT_SYS_MODULE_PATH_AIX
|
|
|
++ _LT_SYS_MODULE_PATH_AIX([$1])
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
|
+ # Warning - without using the other run time loading flags,
|
|
|
+ # -berok will link without error, but may produce a broken library.
|
|
|
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
|
|
|
+- # Exported symbols can be pulled into shared objects from archives
|
|
|
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
|
|
|
++ if test "$with_gnu_ld" = yes; then
|
|
|
++ # We only use this code for GNU lds that support --whole-archive.
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
|
|
++ else
|
|
|
++ # Exported symbols can be pulled into shared objects from archives
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
|
|
|
++ fi
|
|
|
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
|
|
|
+ # This is similar to how AIX traditionally builds its shared
|
|
|
+ # libraries.
|
|
|
+@@ -5641,28 +6046,75 @@
|
|
|
+ ;;
|
|
|
+
|
|
|
+ cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
|
|
+- # as there is no search path for DLLs.
|
|
|
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
|
+- _LT_TAGVAR(always_export_symbols, $1)=no
|
|
|
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
|
+-
|
|
|
+- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
|
|
+- # If the export-symbols file already is a .def file (1st line
|
|
|
+- # is EXPORTS), use it as is; otherwise, prepend...
|
|
|
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
|
|
|
+- cp $export_symbols $output_objdir/$soname.def;
|
|
|
+- else
|
|
|
+- echo EXPORTS > $output_objdir/$soname.def;
|
|
|
+- cat $export_symbols >> $output_objdir/$soname.def;
|
|
|
+- fi~
|
|
|
+- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
|
|
+- else
|
|
|
+- _LT_TAGVAR(ld_shlibs, $1)=no
|
|
|
+- fi
|
|
|
+- ;;
|
|
|
++ case $GXX,$cc_basename in
|
|
|
++ ,cl* | no,cl*)
|
|
|
++ # Native MSVC
|
|
|
++ # hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
|
++ # no search path for DLLs.
|
|
|
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
|
|
|
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
|
++ _LT_TAGVAR(always_export_symbols, $1)=yes
|
|
|
++ _LT_TAGVAR(file_list_spec, $1)='@'
|
|
|
++ # Tell ltmain to make .lib files, not .a files.
|
|
|
++ libext=lib
|
|
|
++ # Tell ltmain to make .dll files, not .so files.
|
|
|
++ shrext_cmds=".dll"
|
|
|
++ # FIXME: Setting linknames here is a bad hack.
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
|
|
|
++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
|
|
|
++ else
|
|
|
++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
|
|
|
++ fi~
|
|
|
++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
|
|
|
++ linknames='
|
|
|
++ # The linker will not automatically build a static lib if we build a DLL.
|
|
|
++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
|
|
|
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
|
++ # Don't use ranlib
|
|
|
++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
|
|
|
++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
|
|
|
++ lt_tool_outputfile="@TOOL_OUTPUT@"~
|
|
|
++ case $lt_outputfile in
|
|
|
++ *.exe|*.EXE) ;;
|
|
|
++ *)
|
|
|
++ lt_outputfile="$lt_outputfile.exe"
|
|
|
++ lt_tool_outputfile="$lt_tool_outputfile.exe"
|
|
|
++ ;;
|
|
|
++ esac~
|
|
|
++ func_to_tool_file "$lt_outputfile"~
|
|
|
++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
|
|
|
++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
|
|
|
++ $RM "$lt_outputfile.manifest";
|
|
|
++ fi'
|
|
|
++ ;;
|
|
|
++ *)
|
|
|
++ # g++
|
|
|
++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
|
|
++ # as there is no search path for DLLs.
|
|
|
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
|
|
|
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
|
++ _LT_TAGVAR(always_export_symbols, $1)=no
|
|
|
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
|
++
|
|
|
++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
|
|
++ # If the export-symbols file already is a .def file (1st line
|
|
|
++ # is EXPORTS), use it as is; otherwise, prepend...
|
|
|
++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
|
|
|
++ cp $export_symbols $output_objdir/$soname.def;
|
|
|
++ else
|
|
|
++ echo EXPORTS > $output_objdir/$soname.def;
|
|
|
++ cat $export_symbols >> $output_objdir/$soname.def;
|
|
|
++ fi~
|
|
|
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
|
|
++ else
|
|
|
++ _LT_TAGVAR(ld_shlibs, $1)=no
|
|
|
++ fi
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ ;;
|
|
|
+ darwin* | rhapsody*)
|
|
|
+ _LT_DARWIN_LINKER_FEATURES($1)
|
|
|
+ ;;
|
|
|
+@@ -5704,6 +6156,11 @@
|
|
|
+ gnu*)
|
|
|
+ ;;
|
|
|
+
|
|
|
++ haiku*)
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
++ _LT_TAGVAR(link_all_deplibs, $1)=yes
|
|
|
++ ;;
|
|
|
++
|
|
|
+ hpux9*)
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
|
|
|
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
|
|
+@@ -5728,11 +6185,11 @@
|
|
|
+ # 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.
|
|
|
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
|
|
|
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ if test "$GXX" = yes; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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'
|
|
|
+ else
|
|
|
+ # FIXME: insert proper C++ library support
|
|
|
+ _LT_TAGVAR(ld_shlibs, $1)=no
|
|
|
+@@ -5793,7 +6250,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.
|
|
|
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
|
|
|
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ if test "$GXX" = yes; then
|
|
|
+@@ -5803,10 +6260,10 @@
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
|
|
+ ;;
|
|
|
+ ia64*)
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- _LT_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'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+@@ -5836,7 +6293,7 @@
|
|
|
+ case $cc_basename in
|
|
|
+ CC*)
|
|
|
+ # SGI C++
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
+
|
|
|
+ # Archives containing C++ object files must be created using
|
|
|
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
|
|
|
+@@ -5847,9 +6304,9 @@
|
|
|
+ *)
|
|
|
+ if test "$GXX" = yes; then
|
|
|
+ if test "$with_gnu_ld" = no; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
+ else
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
|
|
|
+@@ -5860,7 +6317,7 @@
|
|
|
+ _LT_TAGVAR(inherit_rpath, $1)=yes
|
|
|
+ ;;
|
|
|
+
|
|
|
+- linux* | k*bsd*-gnu)
|
|
|
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
+ case $cc_basename in
|
|
|
+ KCC*)
|
|
|
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
|
|
|
+@@ -5878,7 +6335,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.
|
|
|
+- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
|
|
|
++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
|
|
+
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
|
|
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
|
|
+@@ -5915,26 +6372,26 @@
|
|
|
+ pgCC* | pgcpp*)
|
|
|
+ # Portland Group C++ compiler
|
|
|
+ case `$CC -V` in
|
|
|
+- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
|
|
|
++ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
|
|
|
+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
|
|
|
+ rm -rf $tpldir~
|
|
|
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
|
+- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
|
++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
|
+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
|
|
|
+ rm -rf $tpldir~
|
|
|
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
|
+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
|
++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
|
+ $RANLIB $oldlib'
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
|
|
|
+ rm -rf $tpldir~
|
|
|
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
|
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
|
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
|
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
|
|
|
+ rm -rf $tpldir~
|
|
|
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
|
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
|
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
|
+ ;;
|
|
|
+- *) # Version 6 will use weak symbols
|
|
|
++ *) # Version 6 and above use weak symbols
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
|
+ _LT_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'
|
|
|
+ ;;
|
|
|
+@@ -5942,7 +6399,7 @@
|
|
|
+
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
|
|
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
|
|
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
+ ;;
|
|
|
+ cxx*)
|
|
|
+ # Compaq C++
|
|
|
+@@ -5961,9 +6418,9 @@
|
|
|
+ # 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.
|
|
|
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
|
|
|
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$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; func_echo_all "X$list" | $Xsed'
|
|
|
+ ;;
|
|
|
+- xl*)
|
|
|
++ xl* | mpixl* | bgxl*)
|
|
|
+ # IBM XL 8.0 on PPC, with GNU ld
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
|
|
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
|
|
+@@ -5983,13 +6440,13 @@
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
|
|
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
|
|
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
|
|
|
+
|
|
|
+ # Not sure whether something based on
|
|
|
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
|
|
|
+ # would be better.
|
|
|
+- output_verbose_link_cmd='echo'
|
|
|
++ output_verbose_link_cmd='func_echo_all'
|
|
|
+
|
|
|
+ # Archives containing C++ object files must be created using
|
|
|
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
|
|
|
+@@ -6058,7 +6515,7 @@
|
|
|
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
|
|
+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
|
|
+ fi
|
|
|
+- output_verbose_link_cmd=echo
|
|
|
++ output_verbose_link_cmd=func_echo_all
|
|
|
+ else
|
|
|
+ _LT_TAGVAR(ld_shlibs, $1)=no
|
|
|
+ fi
|
|
|
+@@ -6093,15 +6550,15 @@
|
|
|
+ case $host in
|
|
|
+ osf3*)
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
|
+ _LT_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~
|
|
|
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
|
|
|
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
|
|
|
+ $RM $lib.exp'
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
|
|
|
+ ;;
|
|
|
+@@ -6117,17 +6574,17 @@
|
|
|
+ # 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.
|
|
|
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
|
|
|
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$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; func_echo_all "$list"'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
|
|
+ case $host in
|
|
|
+ osf3*)
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+
|
|
|
+@@ -6137,7 +6594,7 @@
|
|
|
+ # Commands to make compiler produce verbose output that lists
|
|
|
+ # what "hidden" libraries, object files and flags are used when
|
|
|
+ # linking a shared library.
|
|
|
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
|
|
|
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
|
|
+
|
|
|
+ else
|
|
|
+ # FIXME: insert proper C++ library support
|
|
|
+@@ -6173,7 +6630,7 @@
|
|
|
+
|
|
|
+ solaris*)
|
|
|
+ case $cc_basename in
|
|
|
+- CC*)
|
|
|
++ CC* | sunCC*)
|
|
|
+ # Sun C++ 4.2, 5.x and Centerline C++
|
|
|
+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
|
|
|
+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
|
|
|
+@@ -6194,7 +6651,7 @@
|
|
|
+ esac
|
|
|
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
|
|
|
+
|
|
|
+- output_verbose_link_cmd='echo'
|
|
|
++ output_verbose_link_cmd='func_echo_all'
|
|
|
+
|
|
|
+ # Archives containing C++ object files must be created using
|
|
|
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
|
|
|
+@@ -6214,14 +6671,14 @@
|
|
|
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
|
|
|
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
|
|
|
+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then
|
|
|
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
|
|
|
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
|
|
|
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
|
|
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
|
|
|
++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
|
|
|
+
|
|
|
+ # Commands to make compiler produce verbose output that lists
|
|
|
+ # what "hidden" libraries, object files and flags are used when
|
|
|
+ # linking a shared library.
|
|
|
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
|
|
|
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
|
|
+ else
|
|
|
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
|
|
|
+ # platform.
|
|
|
+@@ -6232,7 +6689,7 @@
|
|
|
+ # Commands to make compiler produce verbose output that lists
|
|
|
+ # what "hidden" libraries, object files and flags are used when
|
|
|
+ # linking a shared library.
|
|
|
+- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
|
|
|
++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
|
|
+ fi
|
|
|
+
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
|
|
|
+@@ -6286,6 +6743,10 @@
|
|
|
+ CC*)
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
|
|
|
++ '"$_LT_TAGVAR(old_archive_cmds, $1)"
|
|
|
++ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
|
|
|
++ '"$_LT_TAGVAR(reload_cmds, $1)"
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
|
|
+@@ -6341,6 +6802,7 @@
|
|
|
+ fi # test -n "$compiler"
|
|
|
+
|
|
|
+ CC=$lt_save_CC
|
|
|
++ CFLAGS=$lt_save_CFLAGS
|
|
|
+ LDCXX=$LD
|
|
|
+ LD=$lt_save_LD
|
|
|
+ GCC=$lt_save_GCC
|
|
|
+@@ -6355,6 +6817,29 @@
|
|
|
+ ])# _LT_LANG_CXX_CONFIG
|
|
|
+
|
|
|
+
|
|
|
++# _LT_FUNC_STRIPNAME_CNF
|
|
|
++# ----------------------
|
|
|
++# func_stripname_cnf prefix suffix name
|
|
|
++# strip PREFIX and SUFFIX off of NAME.
|
|
|
++# PREFIX and SUFFIX must not contain globbing or regex special
|
|
|
++# characters, hashes, percent signs, but SUFFIX may contain a leading
|
|
|
++# dot (in which case that matches only a dot).
|
|
|
++#
|
|
|
++# This function is identical to the (non-XSI) version of func_stripname,
|
|
|
++# except this one can be used by m4 code that may be executed by configure,
|
|
|
++# rather than the libtool script.
|
|
|
++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
|
|
|
++AC_REQUIRE([_LT_DECL_SED])
|
|
|
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
|
|
|
++func_stripname_cnf ()
|
|
|
++{
|
|
|
++ case ${2} in
|
|
|
++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
|
|
|
++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
|
|
|
++ esac
|
|
|
++} # func_stripname_cnf
|
|
|
++])# _LT_FUNC_STRIPNAME_CNF
|
|
|
++
|
|
|
+ # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
|
|
|
+ # ---------------------------------
|
|
|
+ # Figure out "hidden" library dependencies from verbose
|
|
|
+@@ -6363,6 +6848,7 @@
|
|
|
+ # objects, libraries and library flags.
|
|
|
+ m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
|
|
|
+ [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
|
|
++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
|
|
|
+ # Dependencies to place before and after the object being linked:
|
|
|
+ _LT_TAGVAR(predep_objects, $1)=
|
|
|
+ _LT_TAGVAR(postdep_objects, $1)=
|
|
|
+@@ -6413,6 +6899,13 @@
|
|
|
+ };
|
|
|
+ _LT_EOF
|
|
|
+ ])
|
|
|
++
|
|
|
++_lt_libdeps_save_CFLAGS=$CFLAGS
|
|
|
++case "$CC $CFLAGS " in #(
|
|
|
++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
|
|
|
++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
|
|
|
++esac
|
|
|
++
|
|
|
+ dnl Parse the compiler output and extract the necessary
|
|
|
+ dnl objects, libraries and library flags.
|
|
|
+ if AC_TRY_EVAL(ac_compile); then
|
|
|
+@@ -6424,7 +6917,7 @@
|
|
|
+ pre_test_object_deps_done=no
|
|
|
+
|
|
|
+ for p in `eval "$output_verbose_link_cmd"`; do
|
|
|
+- case $p in
|
|
|
++ case ${prev}${p} in
|
|
|
+
|
|
|
+ -L* | -R* | -l*)
|
|
|
+ # Some compilers place space between "-{L,R}" and the path.
|
|
|
+@@ -6433,13 +6926,22 @@
|
|
|
+ test $p = "-R"; then
|
|
|
+ prev=$p
|
|
|
+ continue
|
|
|
+- else
|
|
|
+- prev=
|
|
|
+ fi
|
|
|
+
|
|
|
++ # Expand the sysroot to ease extracting the directories later.
|
|
|
++ if test -z "$prev"; then
|
|
|
++ case $p in
|
|
|
++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
|
|
|
++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
|
|
|
++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
|
|
|
++ esac
|
|
|
++ fi
|
|
|
++ case $p in
|
|
|
++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
|
|
|
++ esac
|
|
|
+ if test "$pre_test_object_deps_done" = no; then
|
|
|
+- case $p in
|
|
|
+- -L* | -R*)
|
|
|
++ case ${prev} in
|
|
|
++ -L | -R)
|
|
|
+ # Internal compiler library paths should come after those
|
|
|
+ # provided the user. The postdeps already come after the
|
|
|
+ # user supplied libs so there is no need to process them.
|
|
|
+@@ -6459,8 +6961,10 @@
|
|
|
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
++ prev=
|
|
|
+ ;;
|
|
|
+
|
|
|
++ *.lto.$objext) ;; # Ignore GCC LTO objects
|
|
|
+ *.$objext)
|
|
|
+ # This assumes that the test object file only shows up
|
|
|
+ # once in the compiler output.
|
|
|
+@@ -6496,6 +7000,7 @@
|
|
|
+ fi
|
|
|
+
|
|
|
+ $RM -f confest.$objext
|
|
|
++CFLAGS=$_lt_libdeps_save_CFLAGS
|
|
|
+
|
|
|
+ # PORTME: override above test on systems where it is broken
|
|
|
+ m4_if([$1], [CXX],
|
|
|
+@@ -6532,7 +7037,7 @@
|
|
|
+
|
|
|
+ solaris*)
|
|
|
+ case $cc_basename in
|
|
|
+- CC*)
|
|
|
++ CC* | sunCC*)
|
|
|
+ # The more standards-conforming stlport4 library is
|
|
|
+ # incompatible with the Cstd library. Avoid specifying
|
|
|
+ # it if it's in CXXFLAGS. Ignore libCrun as
|
|
|
+@@ -6576,32 +7081,16 @@
|
|
|
+ ])# _LT_SYS_HIDDEN_LIBDEPS
|
|
|
+
|
|
|
+
|
|
|
+-# _LT_PROG_F77
|
|
|
+-# ------------
|
|
|
+-# Since AC_PROG_F77 is broken, in that it returns the empty string
|
|
|
+-# if there is no fortran compiler, we have our own version here.
|
|
|
+-m4_defun([_LT_PROG_F77],
|
|
|
+-[
|
|
|
+-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
|
|
|
+-AC_PROG_F77
|
|
|
+-if test -z "$F77" || test "X$F77" = "Xno"; then
|
|
|
+- _lt_disable_F77=yes
|
|
|
+-fi
|
|
|
+-popdef([AC_MSG_ERROR])
|
|
|
+-])# _LT_PROG_F77
|
|
|
+-
|
|
|
+-dnl aclocal-1.4 backwards compatibility:
|
|
|
+-dnl AC_DEFUN([_LT_PROG_F77], [])
|
|
|
+-
|
|
|
+-
|
|
|
+ # _LT_LANG_F77_CONFIG([TAG])
|
|
|
+ # --------------------------
|
|
|
+ # Ensure that the configuration variables for a Fortran 77 compiler are
|
|
|
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
|
|
|
+ # to write the compiler configuration to `libtool'.
|
|
|
+ m4_defun([_LT_LANG_F77_CONFIG],
|
|
|
+-[AC_REQUIRE([_LT_PROG_F77])dnl
|
|
|
+-AC_LANG_PUSH(Fortran 77)
|
|
|
++[AC_LANG_PUSH(Fortran 77)
|
|
|
++if test -z "$F77" || test "X$F77" = "Xno"; then
|
|
|
++ _lt_disable_F77=yes
|
|
|
++fi
|
|
|
+
|
|
|
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=
|
|
|
+@@ -6620,6 +7109,8 @@
|
|
|
+ _LT_TAGVAR(module_expsym_cmds, $1)=
|
|
|
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
|
|
|
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
|
|
|
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
|
|
|
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
|
|
|
+ _LT_TAGVAR(no_undefined_flag, $1)=
|
|
|
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
|
|
|
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
|
|
|
+@@ -6659,7 +7150,9 @@
|
|
|
+ # Allow CC to be a program name with arguments.
|
|
|
+ lt_save_CC="$CC"
|
|
|
+ lt_save_GCC=$GCC
|
|
|
++ lt_save_CFLAGS=$CFLAGS
|
|
|
+ CC=${F77-"f77"}
|
|
|
++ CFLAGS=$FFLAGS
|
|
|
+ compiler=$CC
|
|
|
+ _LT_TAGVAR(compiler, $1)=$CC
|
|
|
+ _LT_CC_BASENAME([$compiler])
|
|
|
+@@ -6713,38 +7206,24 @@
|
|
|
+
|
|
|
+ GCC=$lt_save_GCC
|
|
|
+ CC="$lt_save_CC"
|
|
|
++ CFLAGS="$lt_save_CFLAGS"
|
|
|
+ fi # test "$_lt_disable_F77" != yes
|
|
|
+
|
|
|
+ AC_LANG_POP
|
|
|
+ ])# _LT_LANG_F77_CONFIG
|
|
|
+
|
|
|
+
|
|
|
+-# _LT_PROG_FC
|
|
|
+-# -----------
|
|
|
+-# Since AC_PROG_FC is broken, in that it returns the empty string
|
|
|
+-# if there is no fortran compiler, we have our own version here.
|
|
|
+-m4_defun([_LT_PROG_FC],
|
|
|
+-[
|
|
|
+-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
|
|
|
+-AC_PROG_FC
|
|
|
+-if test -z "$FC" || test "X$FC" = "Xno"; then
|
|
|
+- _lt_disable_FC=yes
|
|
|
+-fi
|
|
|
+-popdef([AC_MSG_ERROR])
|
|
|
+-])# _LT_PROG_FC
|
|
|
+-
|
|
|
+-dnl aclocal-1.4 backwards compatibility:
|
|
|
+-dnl AC_DEFUN([_LT_PROG_FC], [])
|
|
|
+-
|
|
|
+-
|
|
|
+ # _LT_LANG_FC_CONFIG([TAG])
|
|
|
+ # -------------------------
|
|
|
+ # Ensure that the configuration variables for a Fortran compiler are
|
|
|
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
|
|
|
+ # to write the compiler configuration to `libtool'.
|
|
|
+ m4_defun([_LT_LANG_FC_CONFIG],
|
|
|
+-[AC_REQUIRE([_LT_PROG_FC])dnl
|
|
|
+-AC_LANG_PUSH(Fortran)
|
|
|
++[AC_LANG_PUSH(Fortran)
|
|
|
++
|
|
|
++if test -z "$FC" || test "X$FC" = "Xno"; then
|
|
|
++ _lt_disable_FC=yes
|
|
|
++fi
|
|
|
+
|
|
|
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
|
|
+ _LT_TAGVAR(allow_undefined_flag, $1)=
|
|
|
+@@ -6763,6 +7242,8 @@
|
|
|
+ _LT_TAGVAR(module_expsym_cmds, $1)=
|
|
|
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
|
|
|
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
|
|
|
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
|
|
|
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
|
|
|
+ _LT_TAGVAR(no_undefined_flag, $1)=
|
|
|
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
|
|
|
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
|
|
|
+@@ -6802,7 +7283,9 @@
|
|
|
+ # Allow CC to be a program name with arguments.
|
|
|
+ lt_save_CC="$CC"
|
|
|
+ lt_save_GCC=$GCC
|
|
|
++ lt_save_CFLAGS=$CFLAGS
|
|
|
+ CC=${FC-"f95"}
|
|
|
++ CFLAGS=$FCFLAGS
|
|
|
+ compiler=$CC
|
|
|
+ GCC=$ac_cv_fc_compiler_gnu
|
|
|
+
|
|
|
+@@ -6858,7 +7341,8 @@
|
|
|
+ fi # test -n "$compiler"
|
|
|
+
|
|
|
+ GCC=$lt_save_GCC
|
|
|
+- CC="$lt_save_CC"
|
|
|
++ CC=$lt_save_CC
|
|
|
++ CFLAGS=$lt_save_CFLAGS
|
|
|
+ fi # test "$_lt_disable_FC" != yes
|
|
|
+
|
|
|
+ AC_LANG_POP
|
|
|
+@@ -6895,10 +7379,12 @@
|
|
|
+ _LT_LINKER_BOILERPLATE
|
|
|
+
|
|
|
+ # Allow CC to be a program name with arguments.
|
|
|
+-lt_save_CC="$CC"
|
|
|
++lt_save_CC=$CC
|
|
|
++lt_save_CFLAGS=$CFLAGS
|
|
|
+ lt_save_GCC=$GCC
|
|
|
+ GCC=yes
|
|
|
+ CC=${GCJ-"gcj"}
|
|
|
++CFLAGS=$GCJFLAGS
|
|
|
+ compiler=$CC
|
|
|
+ _LT_TAGVAR(compiler, $1)=$CC
|
|
|
+ _LT_TAGVAR(LD, $1)="$LD"
|
|
|
+@@ -6908,6 +7394,8 @@
|
|
|
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
|
|
+
|
|
|
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
|
|
|
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
|
|
|
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
|
|
|
+
|
|
|
+ ## CAVEAT EMPTOR:
|
|
|
+ ## There is no encapsulation within the following macros, do not change
|
|
|
+@@ -6927,7 +7415,8 @@
|
|
|
+ AC_LANG_RESTORE
|
|
|
+
|
|
|
+ GCC=$lt_save_GCC
|
|
|
+-CC="$lt_save_CC"
|
|
|
++CC=$lt_save_CC
|
|
|
++CFLAGS=$lt_save_CFLAGS
|
|
|
+ ])# _LT_LANG_GCJ_CONFIG
|
|
|
+
|
|
|
+
|
|
|
+@@ -6962,9 +7451,11 @@
|
|
|
+
|
|
|
+ # Allow CC to be a program name with arguments.
|
|
|
+ lt_save_CC="$CC"
|
|
|
++lt_save_CFLAGS=$CFLAGS
|
|
|
+ lt_save_GCC=$GCC
|
|
|
+ GCC=
|
|
|
+ CC=${RC-"windres"}
|
|
|
++CFLAGS=
|
|
|
+ compiler=$CC
|
|
|
+ _LT_TAGVAR(compiler, $1)=$CC
|
|
|
+ _LT_CC_BASENAME([$compiler])
|
|
|
+@@ -6977,7 +7468,8 @@
|
|
|
+
|
|
|
+ GCC=$lt_save_GCC
|
|
|
+ AC_LANG_RESTORE
|
|
|
+-CC="$lt_save_CC"
|
|
|
++CC=$lt_save_CC
|
|
|
++CFLAGS=$lt_save_CFLAGS
|
|
|
+ ])# _LT_LANG_RC_CONFIG
|
|
|
+
|
|
|
+
|
|
|
+@@ -7036,6 +7528,15 @@
|
|
|
+ AC_SUBST([OBJDUMP])
|
|
|
+ ])
|
|
|
+
|
|
|
++# _LT_DECL_DLLTOOL
|
|
|
++# ----------------
|
|
|
++# Ensure DLLTOOL variable is set.
|
|
|
++m4_defun([_LT_DECL_DLLTOOL],
|
|
|
++[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
|
|
++test -z "$DLLTOOL" && DLLTOOL=dlltool
|
|
|
++_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
|
|
|
++AC_SUBST([DLLTOOL])
|
|
|
++])
|
|
|
+
|
|
|
+ # _LT_DECL_SED
|
|
|
+ # ------------
|
|
|
+@@ -7129,8 +7630,8 @@
|
|
|
+ # Try some XSI features
|
|
|
+ xsi_shell=no
|
|
|
+ ( _lt_dummy="a/b/c"
|
|
|
+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
|
|
|
+- = c,a/b,, \
|
|
|
++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
|
|
|
++ = c,a/b,b/c, \
|
|
|
+ && eval 'test $(( 1 + 1 )) -eq 2 \
|
|
|
+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
|
|
|
+ && xsi_shell=yes
|
|
|
+@@ -7169,208 +7670,162 @@
|
|
|
+ ])# _LT_CHECK_SHELL_FEATURES
|
|
|
+
|
|
|
+
|
|
|
+-# _LT_PROG_XSI_SHELLFNS
|
|
|
+-# ---------------------
|
|
|
+-# Bourne and XSI compatible variants of some useful shell functions.
|
|
|
+-m4_defun([_LT_PROG_XSI_SHELLFNS],
|
|
|
+-[case $xsi_shell in
|
|
|
+- yes)
|
|
|
+- cat << \_LT_EOF >> "$cfgfile"
|
|
|
+-
|
|
|
+-# func_dirname file append nondir_replacement
|
|
|
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
|
|
|
+-# otherwise set result to NONDIR_REPLACEMENT.
|
|
|
+-func_dirname ()
|
|
|
+-{
|
|
|
+- case ${1} in
|
|
|
+- */*) func_dirname_result="${1%/*}${2}" ;;
|
|
|
+- * ) func_dirname_result="${3}" ;;
|
|
|
+- esac
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_basename file
|
|
|
+-func_basename ()
|
|
|
+-{
|
|
|
+- func_basename_result="${1##*/}"
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_dirname_and_basename file append nondir_replacement
|
|
|
+-# perform func_basename and func_dirname in a single function
|
|
|
+-# call:
|
|
|
+-# dirname: Compute the dirname of FILE. If nonempty,
|
|
|
+-# add APPEND to the result, otherwise set result
|
|
|
+-# to NONDIR_REPLACEMENT.
|
|
|
+-# value returned in "$func_dirname_result"
|
|
|
+-# basename: Compute filename of FILE.
|
|
|
+-# value retuned in "$func_basename_result"
|
|
|
+-# Implementation must be kept synchronized with func_dirname
|
|
|
+-# and func_basename. For efficiency, we do not delegate to
|
|
|
+-# those functions but instead duplicate the functionality here.
|
|
|
+-func_dirname_and_basename ()
|
|
|
+-{
|
|
|
+- case ${1} in
|
|
|
+- */*) func_dirname_result="${1%/*}${2}" ;;
|
|
|
+- * ) func_dirname_result="${3}" ;;
|
|
|
+- esac
|
|
|
+- func_basename_result="${1##*/}"
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_stripname prefix suffix name
|
|
|
+-# strip PREFIX and SUFFIX off of NAME.
|
|
|
+-# PREFIX and SUFFIX must not contain globbing or regex special
|
|
|
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
|
|
|
+-# dot (in which case that matches only a dot).
|
|
|
+-func_stripname ()
|
|
|
+-{
|
|
|
+- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
|
|
|
+- # positional parameters, so assign one to ordinary parameter first.
|
|
|
+- func_stripname_result=${3}
|
|
|
+- func_stripname_result=${func_stripname_result#"${1}"}
|
|
|
+- func_stripname_result=${func_stripname_result%"${2}"}
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_opt_split
|
|
|
+-func_opt_split ()
|
|
|
+-{
|
|
|
+- func_opt_split_opt=${1%%=*}
|
|
|
+- func_opt_split_arg=${1#*=}
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_lo2o object
|
|
|
+-func_lo2o ()
|
|
|
+-{
|
|
|
+- case ${1} in
|
|
|
+- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
|
|
|
+- *) func_lo2o_result=${1} ;;
|
|
|
+- esac
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_xform libobj-or-source
|
|
|
+-func_xform ()
|
|
|
+-{
|
|
|
+- func_xform_result=${1%.*}.lo
|
|
|
+-}
|
|
|
++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
|
|
|
++# ------------------------------------------------------
|
|
|
++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
|
|
|
++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
|
|
|
++m4_defun([_LT_PROG_FUNCTION_REPLACE],
|
|
|
++[dnl {
|
|
|
++sed -e '/^$1 ()$/,/^} # $1 /c\
|
|
|
++$1 ()\
|
|
|
++{\
|
|
|
++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
|
|
|
++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++])
|
|
|
+
|
|
|
+-# func_arith arithmetic-term...
|
|
|
+-func_arith ()
|
|
|
+-{
|
|
|
+- func_arith_result=$(( $[*] ))
|
|
|
+-}
|
|
|
+
|
|
|
+-# func_len string
|
|
|
+-# STRING may not start with a hyphen.
|
|
|
+-func_len ()
|
|
|
+-{
|
|
|
+- func_len_result=${#1}
|
|
|
+-}
|
|
|
++# _LT_PROG_REPLACE_SHELLFNS
|
|
|
++# -------------------------
|
|
|
++# Replace existing portable implementations of several shell functions with
|
|
|
++# equivalent extended shell implementations where those features are available..
|
|
|
++m4_defun([_LT_PROG_REPLACE_SHELLFNS],
|
|
|
++[if test x"$xsi_shell" = xyes; then
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
|
|
|
++ case ${1} in
|
|
|
++ */*) func_dirname_result="${1%/*}${2}" ;;
|
|
|
++ * ) func_dirname_result="${3}" ;;
|
|
|
++ esac])
|
|
|
++
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
|
|
|
++ func_basename_result="${1##*/}"])
|
|
|
++
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
|
|
|
++ case ${1} in
|
|
|
++ */*) func_dirname_result="${1%/*}${2}" ;;
|
|
|
++ * ) func_dirname_result="${3}" ;;
|
|
|
++ esac
|
|
|
++ func_basename_result="${1##*/}"])
|
|
|
+
|
|
|
+-_LT_EOF
|
|
|
+- ;;
|
|
|
+- *) # Bourne compatible functions.
|
|
|
+- cat << \_LT_EOF >> "$cfgfile"
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
|
|
|
++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
|
|
|
++ # positional parameters, so assign one to ordinary parameter first.
|
|
|
++ func_stripname_result=${3}
|
|
|
++ func_stripname_result=${func_stripname_result#"${1}"}
|
|
|
++ func_stripname_result=${func_stripname_result%"${2}"}])
|
|
|
+
|
|
|
+-# func_dirname file append nondir_replacement
|
|
|
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
|
|
|
+-# otherwise set result to NONDIR_REPLACEMENT.
|
|
|
+-func_dirname ()
|
|
|
+-{
|
|
|
+- # Extract subdirectory from the argument.
|
|
|
+- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
|
|
|
+- if test "X$func_dirname_result" = "X${1}"; then
|
|
|
+- func_dirname_result="${3}"
|
|
|
+- else
|
|
|
+- func_dirname_result="$func_dirname_result${2}"
|
|
|
+- fi
|
|
|
+-}
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
|
|
|
++ func_split_long_opt_name=${1%%=*}
|
|
|
++ func_split_long_opt_arg=${1#*=}])
|
|
|
+
|
|
|
+-# func_basename file
|
|
|
+-func_basename ()
|
|
|
+-{
|
|
|
+- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
|
|
|
+-}
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
|
|
|
++ func_split_short_opt_arg=${1#??}
|
|
|
++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
|
|
|
+
|
|
|
+-dnl func_dirname_and_basename
|
|
|
+-dnl A portable version of this function is already defined in general.m4sh
|
|
|
+-dnl so there is no need for it here.
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
|
|
|
++ case ${1} in
|
|
|
++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
|
|
|
++ *) func_lo2o_result=${1} ;;
|
|
|
++ esac])
|
|
|
+
|
|
|
+-# func_stripname prefix suffix name
|
|
|
+-# strip PREFIX and SUFFIX off of NAME.
|
|
|
+-# PREFIX and SUFFIX must not contain globbing or regex special
|
|
|
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
|
|
|
+-# dot (in which case that matches only a dot).
|
|
|
+-# func_strip_suffix prefix name
|
|
|
+-func_stripname ()
|
|
|
+-{
|
|
|
+- case ${2} in
|
|
|
+- .*) func_stripname_result=`$ECHO "X${3}" \
|
|
|
+- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
|
|
|
+- *) func_stripname_result=`$ECHO "X${3}" \
|
|
|
+- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
|
|
|
+- esac
|
|
|
+-}
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
|
|
|
+
|
|
|
+-# sed scripts:
|
|
|
+-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
|
|
|
+-my_sed_long_arg='1s/^-[[^=]]*=//'
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
|
|
|
+
|
|
|
+-# func_opt_split
|
|
|
+-func_opt_split ()
|
|
|
+-{
|
|
|
+- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
|
|
|
+- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
|
|
|
+-}
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
|
|
|
++fi
|
|
|
+
|
|
|
+-# func_lo2o object
|
|
|
+-func_lo2o ()
|
|
|
+-{
|
|
|
+- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
|
|
|
+-}
|
|
|
++if test x"$lt_shell_append" = xyes; then
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
|
|
|
+
|
|
|
+-# func_xform libobj-or-source
|
|
|
+-func_xform ()
|
|
|
+-{
|
|
|
+- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
|
|
|
+-}
|
|
|
++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
|
|
|
++ func_quote_for_eval "${2}"
|
|
|
++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
|
|
|
++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
|
|
|
+
|
|
|
+-# func_arith arithmetic-term...
|
|
|
+-func_arith ()
|
|
|
+-{
|
|
|
+- func_arith_result=`expr "$[@]"`
|
|
|
+-}
|
|
|
+-
|
|
|
+-# func_len string
|
|
|
+-# STRING may not start with a hyphen.
|
|
|
+-func_len ()
|
|
|
+-{
|
|
|
+- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
|
|
|
+-}
|
|
|
++ # Save a `func_append' function call where possible by direct use of '+='
|
|
|
++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++ test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++else
|
|
|
++ # Save a `func_append' function call even when '+=' is not available
|
|
|
++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
|
|
|
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
|
|
|
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
|
|
++ test 0 -eq $? || _lt_function_replace_fail=:
|
|
|
++fi
|
|
|
+
|
|
|
+-_LT_EOF
|
|
|
+-esac
|
|
|
++if test x"$_lt_function_replace_fail" = x":"; then
|
|
|
++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
|
|
|
++fi
|
|
|
++])
|
|
|
+
|
|
|
+-case $lt_shell_append in
|
|
|
+- yes)
|
|
|
+- cat << \_LT_EOF >> "$cfgfile"
|
|
|
+-
|
|
|
+-# func_append var value
|
|
|
+-# Append VALUE to the end of shell variable VAR.
|
|
|
+-func_append ()
|
|
|
+-{
|
|
|
+- eval "$[1]+=\$[2]"
|
|
|
+-}
|
|
|
+-_LT_EOF
|
|
|
++# _LT_PATH_CONVERSION_FUNCTIONS
|
|
|
++# -----------------------------
|
|
|
++# Determine which file name conversion functions should be used by
|
|
|
++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
|
|
|
++# for certain cross-compile configurations and native mingw.
|
|
|
++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
|
|
|
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
|
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
|
|
++AC_MSG_CHECKING([how to convert $build file names to $host format])
|
|
|
++AC_CACHE_VAL(lt_cv_to_host_file_cmd,
|
|
|
++[case $host in
|
|
|
++ *-*-mingw* )
|
|
|
++ case $build in
|
|
|
++ *-*-mingw* ) # actually msys
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
|
++ ;;
|
|
|
++ *-*-cygwin* )
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
|
++ ;;
|
|
|
++ * ) # otherwise, assume *nix
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ ;;
|
|
|
+- *)
|
|
|
+- cat << \_LT_EOF >> "$cfgfile"
|
|
|
+-
|
|
|
+-# func_append var value
|
|
|
+-# Append VALUE to the end of shell variable VAR.
|
|
|
+-func_append ()
|
|
|
+-{
|
|
|
+- eval "$[1]=\$$[1]\$[2]"
|
|
|
+-}
|
|
|
+-
|
|
|
+-_LT_EOF
|
|
|
++ *-*-cygwin* )
|
|
|
++ case $build in
|
|
|
++ *-*-mingw* ) # actually msys
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
|
++ ;;
|
|
|
++ *-*-cygwin* )
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
|
++ ;;
|
|
|
++ * ) # otherwise, assume *nix
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
+ ;;
|
|
|
+- esac
|
|
|
++ * ) # unhandled hosts (and "normal" native builds)
|
|
|
++ lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
|
++ ;;
|
|
|
++esac
|
|
|
++])
|
|
|
++to_host_file_cmd=$lt_cv_to_host_file_cmd
|
|
|
++AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
|
|
|
++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
|
|
|
++ [0], [convert $build file names to $host format])dnl
|
|
|
++
|
|
|
++AC_MSG_CHECKING([how to convert $build file names to toolchain format])
|
|
|
++AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
|
|
|
++[#assume ordinary cross tools, or native build.
|
|
|
++lt_cv_to_tool_file_cmd=func_convert_file_noop
|
|
|
++case $host in
|
|
|
++ *-*-mingw* )
|
|
|
++ case $build in
|
|
|
++ *-*-mingw* ) # actually msys
|
|
|
++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
|
|
|
++ ;;
|
|
|
++ esac
|
|
|
++ ;;
|
|
|
++esac
|
|
|
+ ])
|
|
|
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
|
|
|
++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
|
|
|
++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
|
|
|
++ [0], [convert $build files to toolchain format])dnl
|
|
|
++])# _LT_PATH_CONVERSION_FUNCTIONS
|
|
|
+diff -Nur opensc-0.11.13.orig/m4/ltoptions.m4 opensc-0.11.13/m4/ltoptions.m4
|
|
|
+--- opensc-0.11.13.orig/m4/ltoptions.m4 2010-02-16 10:32:09.000000000 +0100
|
|
|
|
|
|
+@@ -1,13 +1,14 @@
|
|
|
+ # Helper functions for option handling. -*- Autoconf -*-
|
|
|
+ #
|
|
|
+-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
|
|
|
++# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
|
|
|
++# Inc.
|
|
|
+ # Written by Gary V. Vaughan, 2004
|
|
|
+ #
|
|
|
+ # 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 6 ltoptions.m4
|
|
|
++# serial 7 ltoptions.m4
|
|
|
+
|
|
|
+ # This is to help aclocal find these macros, as it can't see m4_define.
|
|
|
+ AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
|
|
|
+@@ -125,7 +126,7 @@
|
|
|
+ [enable_win32_dll=yes
|
|
|
+
|
|
|
+ case $host in
|
|
|
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
|
|
|
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
|
+ AC_CHECK_TOOL(AS, as, false)
|
|
|
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
|
|
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
|
|
+@@ -133,13 +134,13 @@
|
|
|
+ esac
|
|
|
+
|
|
|
+ test -z "$AS" && AS=as
|
|
|
+-_LT_DECL([], [AS], [0], [Assembler program])dnl
|
|
|
++_LT_DECL([], [AS], [1], [Assembler program])dnl
|
|
|
+
|
|
|
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
|
|
|
+-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
|
|
|
++_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
|
|
|
+
|
|
|
+ test -z "$OBJDUMP" && OBJDUMP=objdump
|
|
|
+-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
|
|
|
++_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
|
|
|
+ ])# win32-dll
|
|
|
+
|
|
|
+ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
|
|
|
+diff -Nur opensc-0.11.13.orig/m4/ltversion.m4 opensc-0.11.13/m4/ltversion.m4
|
|
|
+--- opensc-0.11.13.orig/m4/ltversion.m4 2010-02-16 10:32:10.000000000 +0100
|
|
|
|
|
|
+@@ -7,17 +7,17 @@
|
|
|
+ # unlimited permission to copy and/or distribute it, with or without
|
|
|
+ # modifications, as long as this notice is preserved.
|
|
|
+
|
|
|
+-# Generated from ltversion.in.
|
|
|
++# @configure_input@
|
|
|
+
|
|
|
+-# serial 3012 ltversion.m4
|
|
|
++# serial 3293 ltversion.m4
|
|
|
+ # This file is part of GNU Libtool
|
|
|
+
|
|
|
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
|
|
|
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
|
|
|
++m4_define([LT_PACKAGE_VERSION], [2.4])
|
|
|
++m4_define([LT_PACKAGE_REVISION], [1.3293])
|
|
|
+
|
|
|
+ AC_DEFUN([LTVERSION_VERSION],
|
|
|
+-[macro_version='2.2.6'
|
|
|
+-macro_revision='1.3012'
|
|
|
++[macro_version='2.4'
|
|
|
++macro_revision='1.3293'
|
|
|
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
|
|
+ _LT_DECL(, macro_revision, 0)
|
|
|
+ ])
|
|
|
+diff -Nur opensc-0.11.13.orig/m4/lt~obsolete.m4 opensc-0.11.13/m4/lt~obsolete.m4
|
|
|
+--- opensc-0.11.13.orig/m4/lt~obsolete.m4 2010-02-16 10:32:10.000000000 +0100
|
|
|
|
|
|
+@@ -1,13 +1,13 @@
|
|
|
+ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
|
|
|
+ #
|
|
|
+-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
|
|
|
++# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
|
|
|
+ # Written by Scott James Remnant, 2004.
|
|
|
+ #
|
|
|
+ # 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 4 lt~obsolete.m4
|
|
|
++# serial 5 lt~obsolete.m4
|
|
|
+
|
|
|
+ # These exist entirely to fool aclocal when bootstrapping libtool.
|
|
|
+ #
|
|
|
+@@ -77,7 +77,6 @@
|
|
|
+ m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
|
|
|
+ m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
|
|
|
+ m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
|
|
|
+-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
|
|
|
+ m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
|
|
|
+ m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
|
|
|
+ m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
|
|
|
+@@ -90,3 +89,10 @@
|
|
|
+ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
|
|
|
+ m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
|
|
|
+ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
|
|
|
++m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
|
|
|
++m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
|
|
|
++m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
|
|
|
++m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
|
|
|
++m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
|
|
|
++m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
|
|
|
++m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
|
|
|
+diff -Nur opensc-0.11.13.orig/src/Makefile.in opensc-0.11.13/src/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/Makefile.in 2010-02-16 10:32:17.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -138,6 +138,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -178,6 +179,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -202,6 +205,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -235,7 +239,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+@@ -261,7 +264,7 @@
|
|
|
+
|
|
|
+ # Order IS important
|
|
|
+ SUBDIRS = common include scconf libopensc pkcs15init pkcs11 \
|
|
|
+- tests tools openssh signer
|
|
|
++ tools openssh
|
|
|
+
|
|
|
+ all: all-recursive
|
|
|
+
|
|
|
+@@ -310,7 +313,7 @@
|
|
|
+ # (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):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+@@ -335,7 +338,7 @@
|
|
|
+ fi; test -z "$$fail"
|
|
|
+
|
|
|
+ $(RECURSIVE_CLEAN_TARGETS):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+diff -Nur opensc-0.11.13.orig/src/common/Makefile.in opensc-0.11.13/src/common/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/common/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -122,6 +122,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -162,6 +163,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -186,6 +189,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -219,7 +223,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/src/include/Makefile.in opensc-0.11.13/src/include/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/include/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -141,6 +141,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -181,6 +182,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -205,6 +208,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -238,7 +242,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+@@ -314,7 +317,7 @@
|
|
|
+ # (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):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+@@ -339,7 +342,7 @@
|
|
|
+ fi; test -z "$$fail"
|
|
|
+
|
|
|
+ $(RECURSIVE_CLEAN_TARGETS):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+diff -Nur opensc-0.11.13.orig/src/include/opensc/Makefile.in opensc-0.11.13/src/include/opensc/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/include/opensc/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -98,6 +98,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -138,6 +139,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -162,6 +165,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -195,7 +199,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/src/libopensc/Makefile.in opensc-0.11.13/src/libopensc/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/libopensc/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -205,6 +205,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -245,6 +246,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -269,6 +272,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -302,7 +306,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/src/openssh/Makefile.in opensc-0.11.13/src/openssh/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/openssh/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -101,6 +101,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -141,6 +142,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -165,6 +168,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -198,7 +202,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/src/pkcs11/Makefile.in opensc-0.11.13/src/pkcs11/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/pkcs11/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -204,6 +204,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -244,6 +245,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -268,6 +271,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -301,7 +305,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/src/pkcs15init/Makefile.in opensc-0.11.13/src/pkcs15init/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/pkcs15init/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -174,6 +174,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -214,6 +215,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -238,6 +241,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -271,7 +275,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/src/scconf/Makefile.in opensc-0.11.13/src/scconf/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/scconf/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -165,6 +165,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -205,6 +206,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -229,6 +232,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -262,7 +266,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/src/signer/Makefile.in opensc-0.11.13/src/signer/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/signer/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -194,6 +194,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -234,6 +235,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -258,6 +261,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -291,7 +295,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+@@ -500,7 +503,7 @@
|
|
|
+ # (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):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+@@ -525,7 +528,7 @@
|
|
|
+ fi; test -z "$$fail"
|
|
|
+
|
|
|
+ $(RECURSIVE_CLEAN_TARGETS):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+diff -Nur opensc-0.11.13.orig/src/signer/npinclude/Makefile.in opensc-0.11.13/src/signer/npinclude/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/signer/npinclude/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -103,6 +103,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -143,6 +144,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -167,6 +170,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -200,7 +204,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/src/tests/Makefile.in opensc-0.11.13/src/tests/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/tests/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -203,6 +203,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -243,6 +244,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -267,6 +270,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -300,7 +304,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+@@ -451,7 +454,7 @@
|
|
|
+ # (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):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+@@ -476,7 +479,7 @@
|
|
|
+ fi; test -z "$$fail"
|
|
|
+
|
|
|
+ $(RECURSIVE_CLEAN_TARGETS):
|
|
|
+- @failcom='exit 1'; \
|
|
|
++ @fail= failcom='exit 1'; \
|
|
|
+ for f in x $$MAKEFLAGS; do \
|
|
|
+ case $$f in \
|
|
|
+ *=* | --[!k]*);; \
|
|
|
+diff -Nur opensc-0.11.13.orig/src/tests/regression/Makefile.in opensc-0.11.13/src/tests/regression/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/tests/regression/Makefile.in 2010-02-16 10:32:18.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -103,6 +103,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -143,6 +144,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -167,6 +170,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -200,7 +204,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/src/tools/Makefile.in opensc-0.11.13/src/tools/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/src/tools/Makefile.in 2010-02-16 10:32:19.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -258,6 +258,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -298,6 +299,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -322,6 +325,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -355,7 +359,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
|
|
+diff -Nur opensc-0.11.13.orig/win32/Makefile.in opensc-0.11.13/win32/Makefile.in
|
|
|
+--- opensc-0.11.13.orig/win32/Makefile.in 2010-02-16 10:32:19.000000000 +0100
|
|
|
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
|
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
|
+ # @configure_input@
|
|
|
+
|
|
|
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
|
+@@ -124,6 +124,7 @@
|
|
|
+ LTLIB_CFLAGS = @LTLIB_CFLAGS@
|
|
|
+ LTLIB_LIBS = @LTLIB_LIBS@
|
|
|
+ MAKEINFO = @MAKEINFO@
|
|
|
++MANIFEST_TOOL = @MANIFEST_TOOL@
|
|
|
+ MKDIR_P = @MKDIR_P@
|
|
|
+ NM = @NM@
|
|
|
+ NMEDIT = @NMEDIT@
|
|
|
+@@ -164,6 +165,8 @@
|
|
|
+ PCSC_CFLAGS = @PCSC_CFLAGS@
|
|
|
+ PCSC_LIBS = @PCSC_LIBS@
|
|
|
+ PKG_CONFIG = @PKG_CONFIG@
|
|
|
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
|
|
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
|
|
+ PTHREAD_CC = @PTHREAD_CC@
|
|
|
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
|
|
+ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|
|
+@@ -188,6 +191,7 @@
|
|
|
+ abs_srcdir = @abs_srcdir@
|
|
|
+ abs_top_builddir = @abs_top_builddir@
|
|
|
+ abs_top_srcdir = @abs_top_srcdir@
|
|
|
++ac_ct_AR = @ac_ct_AR@
|
|
|
+ ac_ct_CC = @ac_ct_CC@
|
|
|
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
|
|
+ acx_pthread_config = @acx_pthread_config@
|
|
|
+@@ -221,7 +225,6 @@
|
|
|
+ libexecdir = @libexecdir@
|
|
|
+ localedir = @localedir@
|
|
|
+ localstatedir = @localstatedir@
|
|
|
+-lt_ECHO = @lt_ECHO@
|
|
|
+ mandir = @mandir@
|
|
|
+ mkdir_p = @mkdir_p@
|
|
|
+ oldincludedir = @oldincludedir@
|
Waldemar Brodkorb