diff -Nru libexosip2-3.3.0/aclocal.m4 libexosip2-3.6.0/aclocal.m4 --- libexosip2-3.3.0/aclocal.m4 2009-03-04 11:05:34.000000000 +0000 +++ libexosip2-3.6.0/aclocal.m4 2011-10-05 14:27:25.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,102 +11,196 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# 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. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +]) -# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL +# serial 56 LT_INIT -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +LIBTOOL_DEPS="$ltmain" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL)dnl -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL +_LT_SETUP +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +m4_defun([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + +_LT_CHECK_OBJDIR -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH +m4_require([_LT_TAG_COMPILER])dnl +_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -122,116 +216,653 @@ # 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='s/\([\\"\\`$\\\\]\)/\\\1/g'] +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' # Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +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' -# Constants: -rm="rm -f" - # Global variables: -default_ofile=libtool +ofile=libtool can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) +with_gnu_ld="$lt_cv_prog_gnu_ld" old_CC="$CC" old_CFLAGS="$CFLAGS" # Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - _LT_CC_BASENAME([$compiler]) # Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC + _LT_PATH_MAGIC fi ;; esac -_LT_REQUIRED_DARWIN_CHECKS +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from `configure', and `config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# `config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain="$ac_aux_dir/ltmain.sh" +])# _LT_PROG_LTMAIN -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP -# _LT_AC_SYS_COMPILER +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the `libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) + + + + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) + + +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to `config.status' so that its +# 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"`']) + + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "X$" | $Xsed -e "$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)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags="_LT_TAGS"dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS # ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into `config.status', and then the shell code to quote escape them in +# for loops in `config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# 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 + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + 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_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +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 + +cat >>"$CONFIG_LT" <<\_LTEOF +AS_SHELL_SANITIZE +_AS_PREPARE + +exec AS_MESSAGE_FD>&1 +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +\`$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2008 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test $[#] != 0 +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try \`$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try \`$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# 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_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +_LT_COPYING +_LT_LIBTOOL_TAGS + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # 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) + + _LT_PROG_XSI_SHELLFNS + + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +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)]) +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], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], [AC_REQUIRE([AC_PROG_CC])dnl +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} @@ -240,36 +871,20 @@ # Allow CC to be a program name with arguments. compiler=$CC -])# _LT_AC_SYS_COMPILER - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) +])# _LT_TAG_COMPILER # _LT_COMPILER_BOILERPLATE # ------------------------ # Check for compiler boilerplate output or warnings with # the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +$RM conftest* ])# _LT_COMPILER_BOILERPLATE @@ -277,39 +892,57 @@ # ---------------------- # Check for linker boilerplate output or warnings with # the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* +$RM -r conftest* ])# _LT_LINKER_BOILERPLATE # _LT_REQUIRED_DARWIN_CHECKS -# -------------------------- -# Check for some things on darwin -AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ case $host_os in rhapsody* | darwin*) AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - echo "int foo(void){return 1;}" > conftest.c - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then - lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* - fi - rm conftest.c + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* fi]) AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], @@ -318,26 +951,26 @@ echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" ]) case $host_os in - rhapsody* | darwin1.[[0123]]) + rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -347,10 +980,10 @@ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' else - _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi if test "$DSYMUTIL" != ":"; then - _lt_dsymutil="~$DSYMUTIL \$lib || :" + _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= fi @@ -358,16 +991,51 @@ esac ]) -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, + +# _LT_DARWIN_LINKER_FEATURES +# -------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _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)='' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + _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}" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + m4_if([$1], [CXX], +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX +# ----------------------- +# 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. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +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/,/^$/ { @@ -382,45 +1050,45 @@ 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 -])# _LT_AC_SYS_LIBPATH_AIX +])# _LT_SYS_MODULE_PATH_AIX -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], +# _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_AC_SHELL_INIT +])# _LT_SHELL_INIT -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- +# _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. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ +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$ECHO in +case X$lt_ECHO in X*--fallback-echo) # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ;; esac -echo=${ECHO-echo} +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! +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! : else # Restart under the correct shell. @@ -430,9 +1098,9 @@ if test "X[$]1" = X--fallback-echo; then # used as fallback echo shift - cat </dev/null 2>&1 && unset CDPATH -if test -z "$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 && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi +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. + 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 + 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 -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" + 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 - # maybe with a smaller string... - prev=: + # 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 + 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 + 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 -fi # Copy echo and quote the copy suitably for passing to libtool from # the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" fi -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH +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_PROG_ECHO_BACKSLASH -# _LT_AC_LOCK -# ----------- -AC_DEFUN([_LT_AC_LOCK], +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], [AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -568,12 +1239,12 @@ echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; esac fi rm -rf conftest* @@ -582,79 +1253,79 @@ # Find out which ABI we are using. echo '[#]line __oline__ "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 - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi fi rm -rf conftest* ;; x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; esac fi rm -rf conftest* @@ -666,7 +1337,7 @@ CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -682,7 +1353,7 @@ case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" fi ;; @@ -692,30 +1363,63 @@ fi rm -rf conftest* ;; - -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; - ]) esac need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK + + +# _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]) + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= -])# _LT_AC_LOCK +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi +_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_CMD_OLD_ARCHIVE -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, # [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) # ---------------------------------------------------------------- # Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED]) +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or @@ -735,29 +1439,35 @@ 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi - $rm conftest* + $RM conftest* ]) if test x"[$]$2" = xyes; then - ifelse([$5], , :, [$5]) + m4_if([$5], , :, [$5]) else - ifelse([$6], , :, [$6]) + m4_if([$6], , :, [$6]) fi -])# AC_LIBTOOL_COMPILER_OPTION - +])# _LT_COMPILER_OPTION -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" @@ -769,7 +1479,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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -778,22 +1488,28 @@ $2=yes fi fi - $rm -r conftest* + $RM -r conftest* LDFLAGS="$save_LDFLAGS" ]) if test x"[$]$2" = xyes; then - ifelse([$4], , :, [$4]) + m4_if([$4], , :, [$4]) else - ifelse([$5], , :, [$5]) + m4_if([$5], , :, [$5]) fi -])# AC_LIBTOOL_LINKER_OPTION +])# _LT_LINKER_OPTION +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# find the maximum length of command line arguments + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 @@ -815,7 +1531,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, @@ -870,7 +1586,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -881,20 +1597,28 @@ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && + # 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 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` fi ;; @@ -905,27 +1629,35 @@ else AC_MSG_RESULT(none) fi -])# AC_LIBTOOL_SYS_MAX_CMD_LEN +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) -# _LT_AC_CHECK_DLFCN -# ------------------ -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h)dnl -])# _LT_AC_CHECK_DLFCN + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# --------------------------------------------------------------------- -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl if test "$cross_compiling" = yes; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF [#line __oline__ "configure" #include "confdefs.h" @@ -967,10 +1699,6 @@ # endif #endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif - void fnord() { int i=42;} int main () { @@ -986,9 +1714,9 @@ else puts (dlerror ()); - exit (status); + return status; }] -EOF +_LT_EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? @@ -1003,13 +1731,13 @@ fi fi rm -fr conftest* -])# _LT_AC_TRY_DLOPEN_SELF +])# _LT_TRY_DLOPEN_SELF -# AC_LIBTOOL_DLOPEN_SELF -# ---------------------- -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -1025,15 +1753,15 @@ lt_cv_dlopen_self=yes ;; - mingw* | pw32*) + mingw* | pw32* | cegcc*) lt_cv_dlopen="LoadLibrary" lt_cv_dlopen_libs= - ;; + ;; cygwin*) lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= - ;; + ;; darwin*) # if libdl is installed we need to link against it @@ -1043,7 +1771,7 @@ lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) - ;; + ;; *) AC_CHECK_FUNC([shl_load], @@ -1085,7 +1813,7 @@ AC_CACHE_CHECK([whether a program can dlopen itself], lt_cv_dlopen_self, [dnl - _LT_AC_TRY_DLOPEN_SELF( + _LT_TRY_DLOPEN_SELF( lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) @@ -1093,8 +1821,8 @@ if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_AC_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ]) @@ -1116,19 +1844,32 @@ *) enable_dlopen_self_static=unknown ;; esac fi -])# AC_LIBTOOL_DLOPEN_SELF +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $rm -r conftest 2>/dev/null + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null mkdir conftest cd conftest mkdir out @@ -1152,37 +1893,41 @@ 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi chmod u+w . 2>&AS_MESSAGE_LOG_FD - $rm conftest* + $RM conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out cd .. - rmdir conftest - $rm conftest* + $RM -r conftest + $RM conftest* ]) -])# AC_LIBTOOL_PROG_CC_C_O +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- # Check to see if we can do hard links to lock some files if needed -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) hard_links="nottested" -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes - $rm conftest* + $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no @@ -1195,12 +1940,13 @@ else need_locks=no fi -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS -# AC_LIBTOOL_OBJDIR -# ----------------- -AC_DEFUN([AC_LIBTOOL_OBJDIR], +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], [AC_CACHE_CHECK([for objdir], [lt_cv_objdir], [rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -1212,40 +1958,46 @@ fi rmdir .libs 2>/dev/null]) objdir=$lt_cv_objdir -])# AC_LIBTOOL_OBJDIR +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", + [Define to the sub-directory in which libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- # Check hardcoding attributes. -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], [AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_AC_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && + # We can hardcode non-existent directories. + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then # Linking always hardcodes the temporary library directory. - _LT_AC_TAGVAR(hardcode_action, $1)=relink + _LT_TAGVAR(hardcode_action, $1)=relink else # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_AC_TAGVAR(hardcode_action, $1)=immediate + _LT_TAGVAR(hardcode_action, $1)=immediate fi else # We cannot hardcode anything, or else we can only hardcode existing # directories. - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported + _LT_TAGVAR(hardcode_action, $1)=unsupported fi -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then # Fast installation is not supported enable_fast_install=no elif test "$shlibpath_overrides_runpath" = yes || @@ -1253,73 +2005,70 @@ # Fast installation is not necessary enable_fast_install=needless fi -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -[striplib= +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" AC_MSG_RESULT([yes]) else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -fi - ;; - *) - AC_MSG_RESULT([no]) + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) ;; esac fi -])# AC_LIBTOOL_SYS_LIB_STRIP +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB -# AC_LIBTOOL_SYS_DYNAMIC_LINKER +# _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl AC_MSG_CHECKING([dynamic linker characteristics]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -m4_if($1,[],[ +m4_if([$1], + [], [ if test "$GCC" = yes; then case $host_os in 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 + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then # 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'` + 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"` + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. @@ -1333,7 +2082,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; @@ -1353,10 +2102,23 @@ 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` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" need_lib_prefix=unknown hardcode_into_libs=no @@ -1393,7 +2155,7 @@ aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then : else can_build_shared=no @@ -1419,9 +2181,18 @@ ;; amigaos*) - 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' + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + 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' + ;; + esac ;; beos*) @@ -1444,25 +2215,28 @@ # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) version_type=windows shrext_cmds=".dll" need_version=no need_lib_prefix=no case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # 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'\''`~ + 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~ - chmod a+x \$dldir/$dlname' + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ - $rm \$dlpath' + $RM \$dlpath' shlibpath_overrides_runpath=yes case $host_os in @@ -1471,20 +2245,20 @@ 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" ;; - mingw*) + 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 + 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'` + 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"` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi ;; pw32*) @@ -1508,13 +2282,13 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1607,18 +2381,18 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH @@ -1686,7 +2460,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 @@ -1695,6 +2469,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_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 + # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. @@ -1702,7 +2487,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;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -1731,7 +2516,7 @@ version_type=sunos need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' @@ -1752,14 +2537,16 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) - version_type=linux +*nto* | *qnx*) + version_type=qnx need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' ;; openbsd*) @@ -1768,13 +2555,13 @@ need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in openbsd2.[[89]] | openbsd2.[[89]].*) shlibpath_overrides_runpath=no @@ -1846,7 +2633,6 @@ sni) shlibpath_overrides_runpath=no need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' runpath_var=LD_RUN_PATH ;; siemens) @@ -1877,13 +2663,12 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes hardcode_into_libs=yes if test "$with_gnu_ld" = yes; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes case $host_os in sco3.2v5*) sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" @@ -1893,6 +2678,17 @@ sys_lib_dlsearch_path_spec='/usr/lib' ;; +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1907,288 +2703,58 @@ AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no -AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - - -# _LT_AC_TAGCONFIG -# ---------------- -AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - AC_MSG_WARN([output file `$ofile' does not exist]) - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in - "") ;; - *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], + [Run-time system search path for libraries]) +])# _LT_SYS_DYNAMIC_LINKER - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - 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_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - AC_LIBTOOL_LANG_F77_CONFIG - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - AC_LIBTOOL_LANG_GCJ_CONFIG - else - tagname="" - fi - ;; - - RC) - AC_LIBTOOL_LANG_RC_CONFIG - ;; - - *) - AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi -fi -])# _LT_AC_TAGCONFIG - - -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_DLOPEN - - -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 DLLs -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_WIN32_DLL - - -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -])# AC_ENABLE_SHARED - - -# AC_DISABLE_SHARED -# ----------------- -# set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no) -])# AC_DISABLE_SHARED - - -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]AC_ENABLE_STATIC_DEFAULT) -])# AC_ENABLE_STATIC - - -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no) -])# AC_DISABLE_STATIC - - -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -])# AC_ENABLE_FAST_INSTALL - - -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no) -])# AC_DISABLE_FAST_INSTALL - - -# AC_LIBTOOL_PICMODE([MODE]) +# _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default) -])# AC_LIBTOOL_PICMODE - - -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) - - -# AC_PATH_TOOL_PREFIX -# ------------------- # find a file program which can recognize shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in @@ -2201,7 +2767,7 @@ dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" + ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. @@ -2216,7 +2782,7 @@ $EGREP "$file_magic_regex" > /dev/null; then : else - cat <&2 + cat <<_LT_EOF 1>&2 *** Warning: the command libtool uses to detect shared libraries, *** $file_magic_cmd, produces output that libtool cannot recognize. @@ -2227,7 +2793,7 @@ *** may want to report the problem to your system manager and/or to *** bug-libtool@gnu.org -EOF +_LT_EOF fi ;; esac fi @@ -2244,37 +2810,47 @@ else AC_MSG_RESULT(no) fi -])# AC_PATH_TOOL_PREFIX +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) -# AC_PATH_MAGIC -# ------------- + +# _LT_PATH_MAGIC +# -------------- # find a file program which can recognize a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) else MAGIC_CMD=: fi fi -])# AC_PATH_MAGIC +])# _LT_PATH_MAGIC -# AC_PROG_LD +# LT_PATH_LD # ---------- # find the pathname to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH([gnu-ld], - [AC_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no]) -AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -2291,9 +2867,9 @@ [[\\/]]* | ?:[[\\/]]*) re_direlt='/[[^/]][[^/]]*/\.\./' # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -2343,15 +2919,24 @@ AC_MSG_RESULT(no) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_PROG_LD_GNU -])# AC_PROG_LD +_LT_PATH_LD_GNU +AC_SUBST([LD]) +_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) +])# LT_PATH_LD -# AC_PROG_LD_GNU -# -------------- -AC_DEFUN([AC_PROG_LD_GNU], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, +# Old names: +AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) +AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_LD], []) +dnl AC_DEFUN([AC_PROG_LD], []) + + +# _LT_PATH_LD_GNU +#- -------------- +m4_defun([_LT_PATH_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 /dev/null; then + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. @@ -2504,12 +3099,12 @@ ;; # 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) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + 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 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' @@ -2522,12 +3117,12 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; -nto-qnx*) - lt_cv_deplibs_check_method=unknown +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all ;; openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -2546,6 +3141,10 @@ lt_cv_deplibs_check_method=pass_all ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + sysv4 | sysv4.3*) case $host_vendor in motorola) @@ -2573,7 +3172,7 @@ esac ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +tpf*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -2581,14 +3180,20 @@ 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 -])# AC_DEPLIBS_CHECK_METHOD +_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"]) +])# _LT_CHECK_MAGIC_METHOD -# AC_PROG_NM + +# LT_PATH_NM # ---------- -# find the pathname to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" @@ -2630,16 +3235,51 @@ done IFS="$lt_save_ifs" done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + : ${lt_cv_path_NM=no} fi]) -NM="$lt_cv_path_NM" -])# AC_PROG_NM +if test "$lt_cv_path_NM" != "no"; then + 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"], :) + AC_SUBST([DUMPBIN]) + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl +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 "$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 "$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) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) -# AC_CHECK_LIBM -# ------------- + +# LT_LIB_M +# -------- # check for math library -AC_DEFUN([AC_CHECK_LIBM], +AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in @@ -2654,4016 +3294,4699 @@ AC_CHECK_LIB(m, cos, LIBM="-lm") ;; esac -])# AC_CHECK_LIBM - - -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -# (note the single quotes!). If your package is not flat and you're not -# using automake, define top_builddir and top_srcdir appropriately in -# the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE - +AC_SUBST([LIBM]) +])# LT_LIB_M -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# and an installed libltdl is not found, it is assumed to be `libltdl'. -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and top_srcdir -# appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, lt_dlinit, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= - fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_INSTALLABLE +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) -])# AC_LIBTOOL_CXX +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -# _LT_AC_LANG_CXX -# --------------- -AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -])# _LT_AC_LANG_CXX +if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -# _LT_AC_PROG_CXXCPP -# ------------------ -AC_DEFUN([_LT_AC_PROG_CXXCPP], -[ -AC_REQUIRE([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 + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) fi -])# _LT_AC_PROG_CXXCPP +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI -# AC_LIBTOOL_F77 -# -------------- -# enable support for Fortran 77 libraries -AC_DEFUN([AC_LIBTOOL_F77], -[AC_REQUIRE([_LT_AC_LANG_F77]) -])# AC_LIBTOOL_F77 +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl -# _LT_AC_LANG_F77 -# --------------- -AC_DEFUN([_LT_AC_LANG_F77], -[AC_REQUIRE([AC_PROG_F77]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -])# _LT_AC_LANG_F77 +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' -# AC_LIBTOOL_GCJ -# -------------- -# enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) -])# AC_LIBTOOL_GCJ +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac -# _LT_AC_LANG_GCJ -# --------------- -AC_DEFUN([_LT_AC_LANG_GCJ], -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -])# _LT_AC_LANG_GCJ +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -# AC_LIBTOOL_RC -# ------------- -# enable support for Windows resource files -AC_DEFUN([AC_LIBTOOL_RC], -[AC_REQUIRE([LT_AC_PROG_RC]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -])# AC_LIBTOOL_RC +# 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'" +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac -# AC_LIBTOOL_LANG_C_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -AC_DEFUN([_LT_AC_LANG_C_CONFIG], -[lt_save_CC="$CC" -AC_LANG_PUSH(C) +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do -# Source file extension for C test sources. -ac_ext=c + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" -# Object file extension for compiled C test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" + # Check to see that the pipe works correctly. + pipe_works=no -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF - -# Report which library types will actually be built -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_C_CONFIG - - -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Dependencies to place before and after the object being linked: -_LT_AC_TAGVAR(predep_objects, $1)= -_LT_AC_TAGVAR(postdep_objects, $1)= -_LT_AC_TAGVAR(predeps, $1)= -_LT_AC_TAGVAR(postdeps, $1)= -_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - $as_unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX -else - $as_unset lt_cv_path_LD -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -else - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -fi + 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 + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi -if test "$GXX" = yes; then - # Set up default GNU C++ configuration + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif - AC_PROG_LD +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - # 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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_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' + cat <<_LT_EOF >> conftest.$ac_ext - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_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" + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD fi else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 fi + rm -rf conftest* conftst* - # 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"' - + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) else - GXX=no - with_gnu_ld=no - wlarc= + AC_MSG_RESULT(ok) fi -# PORTME: fill in a description of your system's C++ link characteristics -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -_LT_AC_TAGVAR(ld_shlibs, $1)=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - 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], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_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_CMD_GLOBAL_SYMBOLS - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +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 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - _LT_AC_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 "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else + case $host_os in + aix*) + # All AIX code is PIC. if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi - fi - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; + ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_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_AC_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_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - darwin* | rhapsody*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - ;; - gnu*) - ;; - hpux9*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. ;; - aCC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $list' + 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). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; - *) - if test "$GXX" = yes; then - _LT_AC_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' - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic fi ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $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 + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) ;; + hppa*64*) + ;; *) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ;; *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $list' ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + hppa*64*|ia64*) + # +Z the default ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ;; esac - fi - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_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' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -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 - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + ;; + esac ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? ;; - esac - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_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' - ;; - cxx*) - # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_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' - - # 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' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC*) + # IBM XL 8.0 on PPC + _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 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; esac ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - osf3*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + lynxos*) ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_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 ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # 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"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + m88k*) ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_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` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # 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"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + netbsd* | netbsdelf*-gnu) ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + psos*) ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + solaris*) + case $cc_basename in + CC*) + # 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' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_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' - - # 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\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -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 -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; - esac - fi - ;; - esac - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + esac ;; - esac - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + vxworks*) ;; *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ;; esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -esac -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$GXX" -_LT_AC_TAGVAR(LD, $1)="$LD" + fi +], +[ + if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -AC_LIBTOOL_POSTDEP_PREDEP($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; -AC_LIBTOOL_CONFIG($1) + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; -AC_LANG_POP -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -])# AC_LIBTOOL_LANG_CXX_CONFIG + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&1 | sed 5q` in + *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)='-Wl,' + ;; + *Sun\ F*) + # 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)='' + ;; + esac + ;; + esac + ;; -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# PORTME: override above test on systems where it is broken -ifelse([$1],[CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_AC_TAGVAR(predep_objects,$1)= - _LT_AC_TAGVAR(postdep_objects,$1)= - _LT_AC_TAGVAR(postdeps,$1)= - ;; + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - esac - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - esac - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) -case " $_LT_AC_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac -])# AC_LIBTOOL_POSTDEP_PREDEP + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; -# AC_LIBTOOL_LANG_F77_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -[AC_REQUIRE([AC_PROG_F77]) -AC_LANG_PUSH(Fortran 77) + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# Source file extension for f77 test sources. -ac_ext=f + sysv4*MP*) + if test -d /usr/nec ;then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; -# Object file extension for compiled f77 test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="\ - subroutine t - return - end -" + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; -# Code to be used in simple link tests -lt_simple_link_test_code="\ - program t - end -" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _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]) -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +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' + 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 + 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' + 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" ;; -aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi + 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' ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -_LT_AC_TAGVAR(GCC, $1)="$G77" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + *) + _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)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= -AC_LIBTOOL_CONFIG($1) + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + esac -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_F77_CONFIG + _LT_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + 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 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -# AC_LIBTOOL_LANG_GCJ_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -[AC_LANG_SAVE + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 -# Source file extension for Java test sources. -ac_ext=java +*** Warning: the GNU linker, at least up to release 2.9.1, 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. -# Object file extension for compiled Java test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext +_LT_EOF + fi + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER + 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 + _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' -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE + 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' + # 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _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' + ;; -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag= + 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' + 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' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + 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) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + 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(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + 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~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + case $cc_basename in + xlf*) + # 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' + 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' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -AC_LIBTOOL_CONFIG($1) + netbsd* | netbsdelf*-gnu) + 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' + fi + ;; -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_GCJ_CONFIG + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -# AC_LIBTOOL_LANG_RC_CONFIG -# ------------------------- -# Ensure that the configuration vars for the Windows resource compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -[AC_LANG_SAVE +_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' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Source file extension for RC test sources. -ac_ext=rc + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 -# Object file extension for compiled RC test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _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' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_RC_CONFIG - - -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then create an initial libtool script -# with a default configuration from the untagged config vars. Otherwise -# add code to config.status for appending the configuration named by -# TAGNAME from the matching tagged config vars. -AC_DEFUN([AC_LIBTOOL_CONFIG], -[# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - _LT_AC_TAGVAR(compiler, $1) \ - _LT_AC_TAGVAR(CC, $1) \ - _LT_AC_TAGVAR(LD, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ - _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ - _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ - _LT_AC_TAGVAR(old_archive_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ - _LT_AC_TAGVAR(predep_objects, $1) \ - _LT_AC_TAGVAR(postdep_objects, $1) \ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ - _LT_AC_TAGVAR(postuninstall_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ - _LT_AC_TAGVAR(allow_undefined_flag, $1) \ - _LT_AC_TAGVAR(no_undefined_flag, $1) \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ - _LT_AC_TAGVAR(hardcode_automatic, $1) \ - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ - _LT_AC_TAGVAR(fix_srcfile_path, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in - _LT_AC_TAGVAR(old_archive_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ - _LT_AC_TAGVAR(archive_cmds, $1) | \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + 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' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi ;; esac - done - - case $lt_echo in - *'\[$]0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` - ;; - esac -ifelse([$1], [], - [cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - AC_MSG_NOTICE([creating $ofile])], - [cfgfile="$ofile"]) + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; - cat <<__EOF__ >> "$cfgfile" -ifelse([$1], [], -[#! $SHELL + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + 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 + 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' + 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 + aix_use_runtimelinking=no -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac -# A sed program that does not truncate output. -SED=$lt_SED + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -# 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 + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -# The names of the tagged configurations supported by this script. -available_tags= + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + 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 + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi -# ### BEGIN LIBTOOL CONFIG], -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _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_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" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _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' + _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' + fi + fi + ;; -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # 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 + ;; -# Whether or not to build static libraries. -build_old_libs=$enable_static + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) + freebsd1*) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os + # 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(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# An echo program that does not interpret backslashes. -echo=$lt_echo + 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' + 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 + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; -# A C compiler. -LTCC=$lt_LTCC + 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' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS + hpux11*) + if test "$GCC" = yes -a "$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 -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _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' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# A language-specific compiler. -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -# Is the compiler the GNU C compiler? -with_gcc=$_LT_AC_TAGVAR(GCC, $1) + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; -# An ERE matcher. -EGREP=$lt_EGREP + 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' + # 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" + 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' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -# The linker used to build libraries. -LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + netbsd* | netbsdelf*-gnu) + 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 + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Whether we need hard or soft links. -LN_S=$lt_LN_S + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# A BSD-compatible nm program. -NM=$lt_NM + *nto* | *qnx*) + ;; -# A symbol stripping program -STRIP=$lt_STRIP + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + os2*) + _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(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -# Object file suffix (normally "o"). -objext="$ac_objext" + 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' + 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' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -# Old archive suffix (normally "a"). -libext="$libext" + 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(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_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' -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -# Executable file suffix (normally ""). -exeext="$exeext" + solaris*) + _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_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' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $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 -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -# Additional compiler flags for building library objects. -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -pic_mode=$pic_mode + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; -# Must we lock files when doing compilation? -need_locks=$lt_need_locks + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' -# Do we need a version for libraries? -need_version=$need_version + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _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' + fi + ;; -# Whether dlopen is supported. -dlopen_support=$enable_dlopen + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _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' + fi + ;; -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -# Library versioning type. -version_type=$version_type + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # 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 -# Format of library name prefix. -libname_spec=$lt_libname_spec + 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)]) + ;; + esac + fi + ;; +esac -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], + [[If ld is used when linking, flag to hardcode $libdir into a binary + during linking. This must work even if $libdir does not exist]]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting ${shlibpath_var} if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + 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], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds +# _LT_LANG_C_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_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC="$CC" +AC_LANG_PUSH(C) -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) +# Source file extension for C test sources. +ac_ext=c -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -# Commands used to build and install a shared archive. -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method + _LT_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) +# _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 -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_CXX], []) -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval +# _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_DECL_EGREP])dnl + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +# Source file extension for C++ test sources. +ac_ext=cpp -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) -# This is the shared library runtime path variable. -runpath_var=$runpath_var + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi -# This is the shared library path variable. -shlibpath_var=$shlibpath_var + if test "$GXX" = yes; then + # Set up default GNU C++ configuration -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath + LT_PATH_LD -# How to hardcode a shared library path into an executable. -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) + # 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) + # 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"' -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) + else + GXX=no + with_gnu_ld=no + wlarc= + fi -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" + _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" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _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' + _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' + fi + fi + ;; -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + 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 + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# Set to yes if exported symbols are required. -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) + freebsd[[12]]*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# The commands to list exported symbols. -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) + gnu*) + ;; -# Symbols that must always be exported. -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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' + ;; + *) + 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' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -ifelse([$1],[], -[# ### END LIBTOOL CONFIG], -[# ### END LIBTOOL TAG CONFIG: $tagname]) + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _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 -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -__EOF__ + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _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' + ;; + irix5* | irix6*) + 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' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + 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' + 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' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; -ifelse([$1],[], [ - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *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`"' + _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`~ + $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' + _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' + ;; + *) # Version 6 will 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' + ;; + esac -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac + _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' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - # We use sed instead of cat because bash on DJGPP gets confused if - # 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 '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -]) -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi -])# AC_LIBTOOL_CONFIG + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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' + ;; + xl*) + # 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' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$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~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _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(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' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _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 + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([LT_AC_PROG_SED]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + 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(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_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~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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' + ;; + *) + 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}-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' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # 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"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# 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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[[ABCDGIRSTW]]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _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)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac + output_verbose_link_cmd='echo' -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + 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_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' + + # 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"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -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 -G -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 -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + case $cc_basename in + 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(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; - # Check to see that the pipe works correctly. - pipe_works=no + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' - rm -f conftest* - cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[[]] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_AC_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" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF ]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case $p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + else + prev= + fi + + if test "$pre_test_object_deps_done" = no; then + case $p 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. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)="${prev}${p}" + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi + ;; + + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)="$p" + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)="$p" + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe else - AC_MSG_RESULT(ok) + echo "libtool.m4: error: problem compiling $1 test program" fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +$RM -f confest.$objext -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; -AC_MSG_CHECKING([for $compiler option to produce PIC]) - ifelse([$1],[CXX],[ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + esac + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes ;; esac - else + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _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) + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_F77" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + CC=${F77-"f77"} + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc* | ecpc*) - # Intel C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; + ;; esac - fi -], + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$G77" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" +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], [ - if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +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) + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_FC" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + CC=${FC-"f95"} + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" +fi # test "$_lt_disable_FC" != yes - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; +AC_LANG_POP +])# _LT_LANG_FC_CONFIG - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; +# Source file extension for Java test sources. +ac_ext=java - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC="$lt_save_CC" +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; +# Source file extension for RC test sources. +ac_ext=rc - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - hpux9* | hpux10* | hpux11*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" - irix5* | irix6* | nonstopux*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER - newsos6) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; - esac - ;; +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - osf3* | osf4* | osf5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi - rdos*) - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC="$lt_save_CC" +])# _LT_LANG_RC_CONFIG - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - sunos4*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - sysv4*MP*) - if test -d /usr/nec ;then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) - unicos*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) ]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" - ;; -esac -# -# Check to make sure the static flag actually works. -# -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) ]) -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_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' - else - _LT_AC_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_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_AC_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_AC_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)= - _LT_AC_TAGVAR(archive_expsym_cmds, $1)= - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_AC_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +AC_MSG_RESULT([$xsi_shell]) +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) + +AC_MSG_CHECKING([whether the shell understands "+="]) +lt_shell_append=no +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +AC_MSG_RESULT([$lt_shell_append]) +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _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 +} - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [[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 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac +# 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##*/}" +} - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 +# 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}"} +} -*** Warning: the GNU linker, at least up to release 2.9.1, 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. +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} -EOF - fi - ;; +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $[*] )) +} - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $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_AC_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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +_LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_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' - ;; +# 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 +} - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_AC_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' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_AC_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' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_AC_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' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} - if test $supports_anon_versioning = yes; then - _LT_AC_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~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +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. + +# 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 +} - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; +# sed scripts: +my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[[^=]]*=//' - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 +# 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"` +} -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` +} - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "$[@]"` +} -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +# 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 - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; +esac - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +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" - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]=\$$[1]\$[2]" +} - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; +_LT_EOF + ;; + esac +]) - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - 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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_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' - else - _LT_AC_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 - aix_use_runtimelinking=no +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004, 2005, 2007, 2008 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. - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac +# serial 6 ltoptions.m4 - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_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 "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option `$2'])])[]dnl +]) + - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - # see comment about different semantics on the GNU ld section - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - bsdi[[45]]*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi - ;; - dgux*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + ]) +])# _LT_SET_OPTIONS - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - hpux9*) - if test "$GCC" = yes; then - _LT_AC_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' - else - _LT_AC_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 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `dlopen' option into LT_INIT's first parameter.]) +]) - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; +test -z "$AS" && AS=as +_LT_DECL([], [AS], [0], [Assembler program])dnl - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl - newsos6) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +])# win32-dll - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `win32-dll' option into LT_INIT's first parameter.]) +]) - os2*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_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_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED - # Both c and cxx compiler support -rpath directly - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - solaris*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes fi - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + done + IFS="$lt_save_ifs" ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - sysv4) - case $host_vendor in - sni) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `fast-install' option into LT_INIT's first parameter.]) +]) - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `disable-fast-install' option into LT_INIT's first parameter.]) +]) - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - fi - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# LT_INIT options. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC - uts4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `pic-only' option into LT_INIT's first parameter.]) ]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) + +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Do we need to explicitly link libc? +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 # -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +# 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. - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_AC_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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 +# serial 6 ltsugar.m4 - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac -])# AC_LIBTOOL_PROG_LD_SHLIBS +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include -# #undef WIN32_LEAN_AND_MEAN -# #include -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ -])# _LT_AC_FILE_LTDLL_C +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) -AC_DEFUN([LT_AC_PROG_RC], -[AC_CHECK_TOOL(RC, windres, no) -]) +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) -# Cheap backport of AS_EXECUTABLE_P and required macros -# from Autoconf 2.59; we should not use $as_executable_p directly. +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) -# _AS_TEST_PREPARE -# ---------------- -m4_ifndef([_AS_TEST_PREPARE], -[m4_defun([_AS_TEST_PREPARE], -[if test -x / >/dev/null 2>&1; then - as_executable_p='test -x' -else - as_executable_p='test -f' -fi -])])# _AS_TEST_PREPARE -# AS_EXECUTABLE_P -# --------------- -# Check whether a file is executable. -m4_ifndef([AS_EXECUTABLE_P], -[m4_defun([AS_EXECUTABLE_P], -[AS_REQUIRE([_AS_TEST_PREPARE])dnl -$as_executable_p $1[]dnl -])])# AS_EXECUTABLE_P +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl ]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) + +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004 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. + +# Generated from ltversion.in. + +# serial 3017 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.2.6b' +macro_revision='1.3017' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) ]) +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007 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 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +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])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +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])]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -6691,7 +8014,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 @@ -6704,7 +8030,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -6713,34 +8038,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 @@ -6782,16 +8104,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 @@ -6799,29 +8122,28 @@ 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 .])], - [$4]) +To get pkg-config, see .])[]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 -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6831,14 +8153,31 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[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.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# 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.9.6])]) +[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]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6895,14 +8234,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -6911,8 +8250,11 @@ [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -6926,15 +8268,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -6962,6 +8303,7 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -6990,6 +8332,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -7007,7 +8359,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -7017,18 +8379,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -7079,61 +8446,74 @@ AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -7150,28 +8530,16 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 16 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7188,16 +8556,20 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.62])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -7217,6 +8589,9 @@ AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -7232,8 +8607,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -7241,20 +8616,37 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header @@ -7265,18 +8657,19 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7287,7 +8680,14 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -7313,13 +8713,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -7328,7 +8728,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -7338,24 +8738,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -7365,14 +8765,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -7388,7 +8788,15 @@ # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -7398,7 +8806,7 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7406,70 +8814,33 @@ # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -7486,7 +8857,7 @@ # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- @@ -7496,14 +8867,14 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_SANITY_CHECK # --------------- @@ -7512,16 +8883,29 @@ # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -7571,9 +8955,28 @@ if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff -Nru libexosip2-3.3.0/ChangeLog libexosip2-3.6.0/ChangeLog --- libexosip2-3.3.0/ChangeLog 2009-03-04 11:01:57.000000000 +0000 +++ libexosip2-3.6.0/ChangeLog 2011-10-05 14:35:05.000000000 +0000 @@ -1,3 +1,32 @@ +eXosip2 (3.6.0) + * use optionnal c-ares DNS library for non blocking DNS access + as well as improvments over DNS operation such as NAPTR and + SRV records. + * again, so many minor change/fix/improvments, sorry for not + being able to have an history here... The git on savannah + will bring you all details! + +eXosip2 (3.5.0) + * iphone with TCP/TLS background support. + * android support. + * a lot of minor change/fix/improvments, sorry for not being + able to have an history here... + +eXosip2 (3.4.0) + * modification to allow using "windows certificate store" for TLS. + * handle keep alive for TCP/TLS. + * fix when receiving additionnal CRLF on reliable transport. + * modification to allow non-blocking socket for reliable transport. (TLS/TCP) + * fix tag issue with application where tag is missing. + * fix compilation for mingw + * fix Contact header in request within dialog for non-udp protocol. + * fix some DNS issue with vista? + * remove 481 auto answer for unsolicited NOTIFY. + * fix static id range. + * initial code for TCP fragmentation. + * osip_list prototypes and warnings fix + * fix transport matching for redirection using other transport than udp + eXosip2 (3.3.0) * Fix when 200ok include a contact with an empty line parameter. * Fix for replaces header longuer than 256 char. diff -Nru libexosip2-3.3.0/config.h.in libexosip2-3.6.0/config.h.in --- libexosip2-3.3.0/config.h.in 2009-03-04 11:06:52.000000000 +0000 +++ libexosip2-3.6.0/config.h.in 2011-10-05 14:27:39.000000000 +0000 @@ -3,6 +3,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_NAMESER_COMPAT_H + /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_NAMESER_H @@ -30,6 +33,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the header file. */ +#undef HAVE_NAMESER8_COMPAT_H + /* Define to 1 if you have the header file. */ #undef HAVE_NETDB_H @@ -39,9 +45,6 @@ /* Define if you have POSIX threads libraries and header files. */ #undef HAVE_PTHREAD -/* Define to 1 if you have the header file. */ -#undef HAVE_RESOLV8_COMPAT_H - /* Define to 1 if you have the header file. */ #undef HAVE_RESOLV_H @@ -96,6 +99,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_VARARGS_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE @@ -111,6 +118,9 @@ /* 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 diff -Nru libexosip2-3.3.0/configure libexosip2-3.6.0/configure --- libexosip2-3.3.0/configure 2009-03-04 11:05:39.000000000 +0000 +++ libexosip2-3.6.0/configure 2011-10-05 14:27:30.000000000 +0000 @@ -1,61 +1,84 @@ #! /bin/sh # From configure.in Revision: 1.62 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. +# Generated by GNU Autoconf 2.67. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 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. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -64,20 +87,18 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -88,32 +109,270 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + 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" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + # 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. + 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+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + 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" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# 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. +as_fn_error () +{ + 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: $2" >&2 + as_fn_exit $as_status +} # as_fn_error -# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -127,13 +386,17 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -148,428 +411,142 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO 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'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit } -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null fi - -if as_func_ret_success; then - : +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi else - exitcode=1 - echo as_func_ret_success failed. + as_ln_s='cp -p' fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - exitcode=1 - echo positional parameters were not saved. + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi +as_executable_p=$as_test_x -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac -fi +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; +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 -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# 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$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -echo=${ECHO-echo} +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! +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! : else # Restart under the correct shell. @@ -579,9 +556,9 @@ if test "X$1" = X--fallback-echo; then # used as fallback echo shift - cat </dev/null 2>&1 && unset CDPATH -if test -z "$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 && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi +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. + 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 + 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 -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" + 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 - # maybe with a smaller string... - prev=: + # 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 + 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 + 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 -fi # Copy echo and quote the copy suitably for passing to libtool from # the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -tagnames=${tagnames+${tagnames},}CXX - -tagnames=${tagnames+${tagnames},}F77 - -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &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` @@ -722,7 +695,6 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -730,6 +702,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="include/eXosip2/eXosip.h" # Factoring default headers for most tests. @@ -768,130 +741,158 @@ # include #endif" -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -LIBEXOSIP_SO_VERSION -EXOSIP_VERSION -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar -INSIDE_GNOME_COMMON_TRUE -INSIDE_GNOME_COMMON_FALSE -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -ac_aux_dir -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -CPP -CXX -CXXFLAGS -ac_ct_CXX -CXXDEPMODE -am__fastdepCXX_TRUE -am__fastdepCXX_FALSE -SED -GREP -EGREP -LN_S -ECHO -AR -RANLIB -DSYMUTIL -NMEDIT -CXXCPP -F77 -FFLAGS -ac_ct_F77 -LIBTOOL -PTHREAD_CC -PTHREAD_LIBS -PTHREAD_CFLAGS -COMPILE_TOOLS_TRUE +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +EXOSIP_LIB +EXOSIP_FLAGS +TOOLS_LIBS +OSIP_LIBS +OSIP_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG COMPILE_TOOLS_FALSE -BUILD_MAXSIZE_TRUE +COMPILE_TOOLS_TRUE BUILD_MAXSIZE_FALSE -PKG_CONFIG -OSIP_CFLAGS -OSIP_LIBS -TOOLS_LIBS -EXOSIP_FLAGS -EXOSIP_LIB -LIBOBJS -LTLIBOBJS' +BUILD_MAXSIZE_TRUE +PTHREAD_CFLAGS +PTHREAD_LIBS +PTHREAD_CC +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +lt_ECHO +RANLIB +AR +OBJDUMP +LN_S +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +EGREP +GREP +LIBTOOL +SED +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +ac_aux_dir +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +INSIDE_GNOME_COMMON_FALSE +INSIDE_GNOME_COMMON_TRUE +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +EXOSIP_VERSION +LIBEXOSIP_SO_VERSION +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_dependency_tracking +enable_shared +enable_static +with_pic +enable_fast_install +with_gnu_ld +enable_libtool_lock +enable_tools +enable_debug +enable_trace +enable_mpatrol +enable_gprof +enable_pthread +enable_semaphore +enable_sysv +enable_minisize +enable_mt +enable_openssl +enable_srvrec +' ac_precious_vars='build_alias host_alias target_alias @@ -901,13 +902,9 @@ LIBS CPPFLAGS CPP -CXX -CXXFLAGS -CCC -CXXCPP -F77 -FFLAGS PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR OSIP_CFLAGS OSIP_LIBS' @@ -915,6 +912,8 @@ # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -970,8 +969,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. @@ -1013,13 +1013,20 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + 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 + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -1032,13 +1039,20 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + 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 + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1229,22 +1243,36 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + 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 + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + 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 + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1264,25 +1292,25 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1291,23 +1319,36 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi -# Be sure to have absolute directory names. +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + 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' @@ -1321,8 +1362,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - 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 @@ -1337,23 +1378,21 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1380,13 +1419,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + 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" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1426,7 +1463,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 @@ -1434,9 +1471,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1446,25 +1483,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1485,6 +1522,7 @@ cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build @@ -1510,10 +1548,9 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] include additional configurations [automatic] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] Some influential environment variables: CC C compiler command @@ -1521,21 +1558,21 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags 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 OSIP_CFLAGS C compiler flags for OSIP, overriding pkg-config OSIP_LIBS linker flags for OSIP, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1543,15 +1580,17 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1587,7 +1626,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1597,58 +1636,409 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.67 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 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 exit fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ -_ACEOF -exec 5>>config.log +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +} # ac_fn_c_try_compile -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -_ASUNAME + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do +} # ac_fn_c_try_cpp + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # 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;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + 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 eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +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;} + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { 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; } && { ac_try='./conftest$ac_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 : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + 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;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + 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 eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +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;} + +} # ac_fn_c_check_func + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +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; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $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;} + +} # ac_fn_c_check_header_mongrel +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by $as_me, which was +generated by GNU Autoconf 2.67. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1682,12 +2072,12 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1703,13 +2093,13 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1721,11 +2111,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1734,12 +2122,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1758,128 +2147,136 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$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 - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + test "x$ac_site_file" = xNONE && continue + 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 - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + # 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 [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1893,60 +2290,56 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$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 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1957,16 +2350,16 @@ -{ echo "$as_me:$LINENO: eXosip2 The Extended Open SIP library." >&5 -echo "$as_me: eXosip2 The Extended Open SIP library." >&6;} -{ echo "$as_me:$LINENO: Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Aymeric MOIZARD - " >&5 -echo "$as_me: Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Aymeric MOIZARD - " >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: eXosip2 The Extended Open SIP library." >&5 +$as_echo "$as_me: eXosip2 The Extended Open SIP library." >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Aymeric MOIZARD - " >&5 +$as_echo "$as_me: Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Aymeric MOIZARD - " >&6;} EXOSIP_MAJOR_VERSION=3 -EXOSIP_MINOR_VERSION=3 +EXOSIP_MINOR_VERSION=6 EXOSIP_MICRO_VERSION=0 -SONAME_MAJOR_VERSION=6 +SONAME_MAJOR_VERSION=9 SONAME_MINOR_VERSION=0 SONAME_MICRO_VERSION=2 @@ -1986,11 +2379,11 @@ PACKAGE=libeXosip2 -{ echo "$as_me:$LINENO: result: Configuring ${PACKAGE} ${VERSION}" >&5 -echo "${ECHO_T}Configuring ${PACKAGE} ${VERSION}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Configuring ${PACKAGE} ${VERSION}" >&5 +$as_echo "Configuring ${PACKAGE} ${VERSION}" >&6; } OS=`uname|sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` -{ echo "$as_me:$LINENO: result: Building Package on ${OS}" >&5 -echo "${ECHO_T}Building Package on ${OS}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building Package on ${OS}" >&5 +$as_echo "Building Package on ${OS}" >&6; } ac_aux_dir= for ac_dir in scripts "$srcdir"/scripts; do @@ -2009,9 +2402,7 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in scripts \"$srcdir\"/scripts" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2025,7 +2416,8 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version="1.9" +am__api_version='1.11' + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2039,22 +2431,23 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +# Reject install programs that cannot install multiple files. +{ $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 - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2072,17 +2465,29 @@ # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac -done + + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -2095,8 +2500,8 @@ INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2106,21 +2511,34 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + 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 ;; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2130,11 +2548,8 @@ # 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". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2143,127 +2558,253 @@ # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. +# Double any \ or $. # By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac fi -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $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 : + $as_echo_n "(cached) " >&6 else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # 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 + 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_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - test -n "$AWK" && break +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_STRIP="strip" + $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 -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`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 - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - cat >conftest.make <<\_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + 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 + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $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 : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # 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. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + +for ac_prog in gawk mawk nawk awk +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_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog" + $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 +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$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 eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF SHELL = /bin/sh 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;; @@ -2273,12 +2814,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2291,12 +2832,14 @@ fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi fi # test whether we have cygpath @@ -2339,112 +2882,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # 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_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. @@ -2458,9 +2895,7 @@ - - -if false; then + if false; then INSIDE_GNOME_COMMON_TRUE= INSIDE_GNOME_COMMON_FALSE='#' else @@ -2476,35 +2911,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + 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 : + $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 && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + 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` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2520,28 +2947,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $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` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2569,10 +2992,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2582,25 +3005,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2609,10 +3032,10 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2622,25 +3045,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2648,12 +3071,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 CC=$ac_ct_CC @@ -2666,10 +3085,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2679,25 +3098,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2706,10 +3125,10 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2720,18 +3139,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2750,11 +3169,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2765,10 +3184,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2778,25 +3197,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2809,10 +3228,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2822,25 +3241,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2852,12 +3271,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 CC=$ac_ct_CC @@ -2867,51 +3282,37 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +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 ; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2923,42 +3324,38 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.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. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $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: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2968,14 +3365,14 @@ do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2994,78 +3391,41 @@ else ac_file='' fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - +if test -z "$ac_file"; then : + { $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_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. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.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. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" +{ $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" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3073,37 +3433,90 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&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 $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } +fi +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 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_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 : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3115,51 +3528,46 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ { $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 ; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3173,54 +3581,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3231,34 +3619,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3269,35 +3634,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3308,42 +3650,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3359,18 +3677,14 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3427,31 +3741,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3462,17 +3754,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3487,44 +3781,44 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -3532,9 +3826,7 @@ am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -3544,13 +3836,12 @@ - depcc="$CC" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -3575,6 +3866,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -3592,7 +3888,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -3602,18 +3908,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -3637,13 +3948,11 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -3659,15 +3968,15 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -3681,11 +3990,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3694,76 +3999,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # 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. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. 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 -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -3775,8 +4038,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3786,11 +4049,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3799,83 +4058,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # 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. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. 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 -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $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 ; } fi ac_ext=c @@ -3884,730 +4100,218 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # 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_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +{ $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 : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + 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_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } + $ac_path_SED_found && break 3 + done + done + 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 + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + ac_cv_path_SED=$SED fi - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed - fi -fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +macro_version='2.2.6b' +macro_revision='1.3017' - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -depcc="$CXX" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +ltmain="$ac_aux_dir/ltmain.sh" - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi +{ $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 : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + 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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac - cd .. - rm -rf conftest.dir + $ac_path_SED_found && break 3 + done + done + 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 + fi else - am_cv_CXX_dependencies_compiler_type=none + ac_cv_path_SED=$SED fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL 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. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -if test "${lt_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else - # Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done - -fi - -SED=$lt_cv_path_SED - -{ echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6; } - -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi - - -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi - - -# Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes -fi - - -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -4619,77 +4323,61 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + 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 + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -4701,39 +4389,114 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done done -done - -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 + fi +else + ac_cv_path_EGREP=$EGREP fi -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + +{ $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 : + $as_echo_n "(cached) " >&6 else - ac_cv_path_EGREP=$EGREP -fi + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_FGREP_found && break 3 + done + done + 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 + fi +else + ac_cv_path_FGREP=$FGREP +fi fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +test -z "$GREP" && GREP=grep + + + + + + + + + + + + + + + + # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -4742,8 +4505,8 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -4756,9 +4519,9 @@ [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -4772,14 +4535,14 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + { $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 - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR @@ -4809,19 +4572,17 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 : + $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$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 - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac -{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + + + + + +{ $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 : + $as_echo_n "(cached) " >&6 else if test -n "$NM"; then # Let the user override the test. @@ -4909,626 +4652,480 @@ done IFS="$lt_save_ifs" done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + : ${lt_cv_path_NM=no} fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6; } -NM="$lt_cv_path_NM" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test "$lt_cv_path_NM" != "no"; then + 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" + 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 : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # 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_DUMPBIN="$ac_tool_prefix$ac_prog" + $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 -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in "dumpbin -symbols" "link -dump -symbols" +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 : + $as_echo_n "(cached) " >&6 else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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_DUMPBIN="$ac_prog" + $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 -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -beos*) - lt_cv_deplibs_check_method=pass_all - ;; -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; + test -n "$ac_ct_DUMPBIN" && break +done -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + 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 + DUMPBIN=$ac_ct_DUMPBIN fi - ;; +fi -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" fi - ;; +fi +test -z "$NM" && NM=nm -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - 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_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_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; -netbsd* | netbsdelf*-gnu) - 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 - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' +{ $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 : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:4783: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:4786: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:4789: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" fi - ;; + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; +# 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 : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring="ABCD" -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ;; - ncr) - lt_cv_deplibs_check_method=pass_all + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 ;; - siemens) - lt_cv_deplibs_check_method=pass_all + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi ;; - pc) - lt_cv_deplibs_check_method=pass_all + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # 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 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac - ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac +fi +if test -n $lt_cv_sys_max_cmd_len ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } -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 +max_cmd_len=$lt_cv_sys_max_cmd_len -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* + + + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 5166 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' ;; +esac -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - lt_cv_cc_needs_belf=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - lt_cv_cc_needs_belf=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -fi -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; +{ $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_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 + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; esac - -need_locks="$enable_libtool_lock" -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 else - ac_cv_header_stdc=no -fi -rm -f conftest* + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_OBJDUMP="${ac_tool_prefix}objdump" + $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 - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } else - ac_cv_header_stdc=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest* -fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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_OBJDUMP="objdump" + $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 -( exit $ac_status ) -ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="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 + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. +test -z "$OBJDUMP" && OBJDUMP=objdump @@ -5538,831 +5135,587 @@ -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; - eval "$as_ac_Header=no" -fi +beos*) + lt_cv_deplibs_check_method=pass_all + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; -fi +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; -done +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +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' + ;; +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; - ac_header_compiler=no -fi +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + 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_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_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; - ac_header_preproc=no -fi +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +# This must be Linux ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +netbsd* | netbsdelf*-gnu) + 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 + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } +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 + -fi -done -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + + + + + +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 +{ $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 : + $as_echo_n "(cached) " >&6 else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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_AR="${ac_tool_prefix}ar" + $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 - # Broken: fails on valid input. -continue fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break fi - - done - ac_cv_prog_CXXCPP=$CXXCPP +if test -z "$ac_cv_prog_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 +{ $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 : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="ar" + $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 - CXXCPP=$ac_cv_prog_CXXCPP +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - ac_cv_prog_CXXCPP=$CXXCPP + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + + if test "x$ac_ct_AR" = x; then + AR="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 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : + AR=$ac_ct_AR + fi else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue + AR="$ac_cv_prog_AR" fi -rm -f conftest.err conftest.$ac_ext +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru + + + - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -fi -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $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 : + $as_echo_n "(cached) " >&6 else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # 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 + 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_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - { echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6; } +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - test -n "$F77" && break - done fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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 + 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_F77="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6; } +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - test -n "$ac_ct_F77" && break -done - - if test "x$ac_ct_F77" = x; then - F77="" + if test "x$ac_ct_STRIP" = x; then + STRIP=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 - F77=$ac_ct_F77 + STRIP=$ac_ct_STRIP fi +else + STRIP="$ac_cv_prog_STRIP" fi +test -z "$STRIP" && STRIP=: -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } -if test "${ac_cv_f77_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif - end -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu -fi -{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } -ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} -ac_save_FFLAGS=$FFLAGS -FFLAGS= -{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_f77_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - FFLAGS=-g -cat >conftest.$ac_ext <<_ACEOF - program main - end -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_g=yes +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $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 : + $as_echo_n "(cached) " >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + 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_RANLIB="${ac_tool_prefix}ranlib" + $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 - ac_cv_prog_f77_g=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -G77=`test $ac_compiler_gnu = yes && echo yes` -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $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 : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + 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_RANLIB="ranlib" + $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_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -# find the maximum length of command line arguments -{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + 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 + RANLIB=$ac_ct_RANLIB + fi else - i=0 - teststring="ABCD" + RANLIB="$ac_cv_prog_RANLIB" +fi - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; +test -z "$RANLIB" && RANLIB=: - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - 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. - lt_cv_sys_max_cmd_len=8192; - ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -if test -n $lt_cv_sys_max_cmd_len ; then - { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } -else - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } -fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + # Check for command to grab the raw symbol name followed by C symbol from nm. -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 : + $as_echo_n "(cached) " >&6 else # These are sane defaults that work on at least a few old systems. @@ -6374,33 +5727,18 @@ # Regexp to match symbols that can be accessed directly from C. sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -# 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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - # Define system-specific variables. case $host_os in aix*) symcode='[BCDT]' ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) symcode='[ABCDGISTW]' ;; -hpux*) # Its linker distinguishes data from code symbols +hpux*) if test "$host_cpu" = ia64; then symcode='[ABCDEGRST]' fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[ABCDGIRSTW]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi ;; irix* | nonstopux*) symcode='[BCDEGRST]' @@ -6425,57 +5763,85 @@ ;; esac +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +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'" + # Handle CRLF in mingw tool chain opt_cr= case $build_os in mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ;; esac -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Try without a prefix undercore, then with it. +# Try without a prefix underscore, then with it. for ac_symprfx in "" "_"; do # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. symxfrm="\\1 $ac_symprfx\\2 \\2" # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi # Check to see that the pipe works correctly. pipe_works=no rm -f conftest* - cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF #ifdef __cplusplus extern "C" { #endif char nm_test_var; -void nm_test_func(){} +void nm_test_func(void); +void nm_test_func(void){} #ifdef __cplusplus } #endif int main(){nm_test_var='a';nm_test_func();return(0);} -EOF +_LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -6484,53 +5850,55 @@ fi # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext #ifdef __cplusplus extern "C" { #endif -EOF +_LT_EOF # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif + cat <<_LT_EOF >> conftest.$ac_ext -/* The mapping between symbol names and symbols. */ +/* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr_t address; + void *address; } -lt_preloaded_symbols[] = +lt__PROGRAM__LTX_preloaded_symbols[] = { -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} }; +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + #ifdef __cplusplus } #endif -EOF +_LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext lt_save_LIBS="$LIBS" lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" @@ -6564,783 +5932,756 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi -{ echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } -if test "${lt_cv_objdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac -# 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='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 avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -# Constants: -rm="rm -f" -# Global variables: -default_ofile=libtool -can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" -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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + + + + + + + + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + 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; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line 5995 "configure"' > conftest.$ac_ext + 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; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + 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; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + 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 : + $as_echo_n "(cached) " >&6 else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes +else + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + 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; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $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 : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $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 : + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6; } +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x$ac_ct_AR" = x; then - AR="false" + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 - AR=$ac_ct_AR + DSYMUTIL=$ac_ct_DSYMUTIL fi else - AR="$ac_cv_prog_AR" + DSYMUTIL="$ac_cv_prog_DSYMUTIL" fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $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 : + $as_echo_n "(cached) " >&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $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 : + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 - RANLIB=$ac_ct_RANLIB + NMEDIT=$ac_ct_NMEDIT fi else - RANLIB="$ac_cv_prog_RANLIB" + NMEDIT="$ac_cv_prog_NMEDIT" fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # 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 + 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_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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 + 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_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x$ac_ct_STRIP" = x; then - STRIP=":" + if test "x$ac_ct_LIPO" = x; then + LIPO=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 - STRIP=$ac_ct_STRIP + LIPO=$ac_ct_LIPO fi else - STRIP="$ac_cv_prog_STRIP" -fi - - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - else - MAGIC_CMD=: - fi + LIPO="$ac_cv_prog_LIPO" fi - fi - ;; -esac - - - case $host_os in - rhapsody* | darwin*) if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -echo "${ECHO_T}$DSYMUTIL" >&6; } +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 - DSYMUTIL=$ac_ct_DSYMUTIL + OTOOL=$ac_ct_OTOOL fi else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" + OTOOL="$ac_cv_prog_OTOOL" fi if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -echo "${ECHO_T}$NMEDIT" >&6; } +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 - NMEDIT=$ac_ct_NMEDIT + OTOOL64=$ac_ct_OTOOL64 fi else - NMEDIT="$ac_cv_prog_NMEDIT" + OTOOL64="$ac_cv_prog_OTOOL64" fi - { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + + + + + + + + + + + + + + + + + + + + + + + + + { $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 : + $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - echo "int foo(void){return 1;}" > conftest.c - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then - lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* - fi - rm conftest.c + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } - { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$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 : + $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7351,55 +6692,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no + lt_cv_ld_exported_symbols_list=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in - rhapsody* | darwin1.[0123]) + rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -7409,10 +6729,10 @@ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' else - _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi if test "$DSYMUTIL" != ":"; then - _lt_dsymutil="~$DSYMUTIL \$lib || :" + _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= fi @@ -7420,9326 +6740,593 @@ esac -enable_dlopen=no -enable_win32_dll=no +{ $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 : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" else - pic_mode=default + ac_cv_header_stdc=no fi +rm -f conftest* -test -z "$pic_mode" && pic_mode=default +fi -# Use C for the default configuration in the libtool script -tagname= -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : -# Source file extension for C test sources. -ac_ext=c +else + ac_cv_header_stdc=no +fi +rm -f conftest* -# Object file extension for compiled C test sources. -objext=o -objext=$objext +fi -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +$as_echo "#define STDC_HEADERS 1" >>confdefs.h -# Allow CC to be a program name with arguments. -compiler=$CC +fi +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + 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 +" +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 -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +fi -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* +done +for ac_header in dlfcn.h +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 : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF -lt_prog_compiler_no_builtin_flag= +fi -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' +done -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:7516: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:7520: \$? = $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 - $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 - fi - fi - $rm conftest* -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } +# Set options -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi -fi -lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= + enable_dlopen=no -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' + enable_win32_dll=no - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" ;; + esac +else + enable_shared=yes +fi - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; + + # Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic='-qnocommon' - lt_prog_compiler_wl='-Wl,' - ;; - esac - ;; + esac +else + enable_static=yes +fi - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Sun\ F*) - # 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='' - ;; - esac - ;; - esac - ;; - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" +else + pic_mode=default +fi + + +test -z "$pic_mode" && pic_mode=default + - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; *) - lt_prog_compiler_can_build_shared=no + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" ;; esac - fi +else + enable_fast_install=yes +fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:7806: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:7810: \$? = $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 - $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 - fi - fi - $rm conftest* -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - 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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -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:7910: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:7914: \$? = $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 - $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 - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - runpath_var= - allow_undefined_flag= - enable_shared_with_static_runtimes=no - archive_cmds= - archive_expsym_cmds= - old_archive_From_new_cmds= - old_archive_from_expsyms_cmds= - export_dynamic_flag_spec= - whole_archive_flag_spec= - thread_safe_flag_spec= - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_direct=no - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - link_all_deplibs=unknown - hardcode_automatic=no - module_cmds= - module_expsym_cmds= - always_export_symbols=no - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [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 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <&2 -*** Warning: the GNU linker, at least up to release 2.9.1, 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. -EOF - fi - ;; - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - 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/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - 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' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='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* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - 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' - 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' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - 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' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test $supports_anon_versioning = yes; 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~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - netbsd* | netbsdelf*-gnu) - 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' - fi - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <&2 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -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' - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +test -z "$LN_S" && LN_S="ln -s" -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - *) - 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' - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - 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 - 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' - 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 - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - archive_cmds='' - hardcode_direct=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then -lt_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"` +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +{ $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 : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 "${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' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} + +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then -lt_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 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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' - 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' - fi - fi - ;; - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # 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 "$deplibs" | $SED -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 - ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - 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' - 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 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - 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' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$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 ${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' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - 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' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld='-rpath $libdir' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - - os2*) - 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' - 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 ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - 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 ${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='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_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' - fi - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared ${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}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 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:$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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - 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* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6; } - ;; - esac - fi - ;; -esac - -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -if test "$GCC" = yes; then - case $host_os in - 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 - # 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 - # 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= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - 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 ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - 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` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - 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' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # 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~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - 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" - ;; - mingw*) - # 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -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 - 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. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi - -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi - -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6; } - -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - ;; - *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ;; - esac -fi - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - { echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - { echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - -# Report which library types will actually be built -{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6; } - -{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } - -{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -{ echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6; } - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler \ - CC \ - LD \ - lt_prog_compiler_wl \ - lt_prog_compiler_pic \ - lt_prog_compiler_static \ - lt_prog_compiler_no_builtin_flag \ - export_dynamic_flag_spec \ - thread_safe_flag_spec \ - whole_archive_flag_spec \ - enable_shared_with_static_runtimes \ - old_archive_cmds \ - old_archive_from_new_cmds \ - predep_objects \ - postdep_objects \ - predeps \ - postdeps \ - compiler_lib_search_path \ - compiler_lib_search_dirs \ - archive_cmds \ - archive_expsym_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - old_archive_from_expsyms_cmds \ - allow_undefined_flag \ - no_undefined_flag \ - export_symbols_cmds \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ - hardcode_automatic \ - module_cmds \ - module_expsym_cmds \ - lt_cv_prog_compiler_c_o \ - fix_srcfile_path \ - exclude_expsyms \ - include_expsyms; do - - case $var in - old_archive_cmds | \ - old_archive_from_new_cmds | \ - archive_cmds | \ - archive_expsym_cmds | \ - module_cmds | \ - module_expsym_cmds | \ - old_archive_from_expsyms_cmds | \ - export_symbols_cmds | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - { echo "$as_me:$LINENO: creating $ofile" >&5 -echo "$as_me: creating $ofile" >&6;} - - cat <<__EOF__ >> "$cfgfile" -#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags= - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler - -# Is the compiler the GNU C compiler? -with_gcc=$GCC - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# ### END LIBTOOL CONFIG - -__EOF__ - - - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - # We use sed instead of cat because bash on DJGPP gets confused if - # 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 '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - -# Check whether --with-tags was given. -if test "${with_tags+set}" = set; then - withval=$with_tags; tagnames="$withval" -fi - - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} - else - { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in - "") ;; - *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -echo "$as_me: error: invalid tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} - { (exit 1); exit 1; }; } - fi - - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - 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_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= -compiler_lib_search_dirs_CXX= - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* - - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - $as_unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX -else - $as_unset lt_cv_path_LD -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -compiler_CXX=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -else - lt_prog_compiler_no_builtin_flag_CXX= -fi - -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -echo "${ECHO_T}$LD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - # 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 - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # 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"' - -else - GXX=no - with_gnu_ld=no - wlarc= -fi - -# PORTME: fill in a description of your system's C++ link characteristics -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -ld_shlibs_CXX=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; 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 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${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_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; 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 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${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_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$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... - archive_expsym_cmds_CXX='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 - ld_shlibs_CXX=no - fi - ;; - darwin* | rhapsody*) - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_CXX=no - ;; - esac - fi - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - ld_shlibs_CXX=no - ;; - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - gnu*) - ;; - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $list' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$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' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='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' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -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 - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $list' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${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' - - # 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' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - ld_shlibs_CXX=no - fi - ;; - osf3*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # 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"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='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 -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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 $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$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` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # 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"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$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' - - # 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\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -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 -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -esac -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -GCC_CXX="$GXX" -LD_CXX="$LD" - -cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` - - for p in `eval $output_verbose_link_cmd`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" \ - || test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p 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. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; - - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$rm -f confest.$objext - -compiler_lib_search_dirs_CXX= -if test -n "$compiler_lib_search_path_CXX"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi - -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - -lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - else - case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_CXX='-qnocommon' - lt_prog_compiler_wl_CXX='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - icpc* | ecpc*) - # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:12788: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:12792: \$? = $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 - $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_CXX=yes - fi - fi - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - 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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -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:12892: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:12896: \$? = $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 - $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_CXX=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - 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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) - export_symbols_cmds_CXX='$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) - link_all_deplibs_CXX=no - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } - ;; - esac - fi - ;; -esac - -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - 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' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # 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~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - 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" - ;; - mingw*) - # 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -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 - 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. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi - -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi - -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6; } - -if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_CXX \ - CC_CXX \ - LD_CXX \ - lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ - lt_prog_compiler_static_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ - export_dynamic_flag_spec_CXX \ - thread_safe_flag_spec_CXX \ - whole_archive_flag_spec_CXX \ - enable_shared_with_static_runtimes_CXX \ - old_archive_cmds_CXX \ - old_archive_from_new_cmds_CXX \ - predep_objects_CXX \ - postdep_objects_CXX \ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ - compiler_lib_search_dirs_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ - postuninstall_cmds_CXX \ - old_archive_from_expsyms_cmds_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - export_symbols_cmds_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ - hardcode_automatic_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do - - case $var in - old_archive_cmds_CXX | \ - old_archive_from_new_cmds_CXX | \ - archive_cmds_CXX | \ - archive_expsym_cmds_CXX | \ - module_cmds_CXX | \ - module_expsym_cmds_CXX | \ - old_archive_from_expsyms_cmds_CXX | \ - export_symbols_cmds_CXX | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_CXX - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_CXX -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_CXX - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_CXX - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# ### END LIBTOOL TAG CONFIG: $tagname - -__EOF__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld - - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu - - -archive_cmds_need_lc_F77=no -allow_undefined_flag_F77= -always_export_symbols_F77=no -archive_expsym_cmds_F77= -export_dynamic_flag_spec_F77= -hardcode_direct_F77=no -hardcode_libdir_flag_spec_F77= -hardcode_libdir_flag_spec_ld_F77= -hardcode_libdir_separator_F77= -hardcode_minus_L_F77=no -hardcode_automatic_F77=no -module_cmds_F77= -module_expsym_cmds_F77= -link_all_deplibs_F77=unknown -old_archive_cmds_F77=$old_archive_cmds -no_undefined_flag_F77= -whole_archive_flag_spec_F77= -enable_shared_with_static_runtimes_F77=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -objext_F77=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="\ - subroutine t - return - end -" - -# Code to be used in simple link tests -lt_simple_link_test_code="\ - program t - end -" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -compiler_F77=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6; } - -{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } - -{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -{ echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6; } - -GCC_F77="$G77" -LD_F77="$LD" - -lt_prog_compiler_wl_F77= -lt_prog_compiler_pic_F77= -lt_prog_compiler_static_F77= - -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_static_F77='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_F77='-fno-common' - ;; - - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared_F77=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_F77=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - ;; - - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_F77='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - else - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_F77='-qnocommon' - lt_prog_compiler_wl_F77='-Wl,' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_F77='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static_F77='-non_shared' - ;; - - newsos6) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-fpic' - lt_prog_compiler_static_F77='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl_F77='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='' - ;; - esac - ;; - esac - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_F77='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static_F77='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_F77='-Qoption ld ';; - *) - lt_prog_compiler_wl_F77='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl_F77='-Qoption ld ' - lt_prog_compiler_pic_F77='-PIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_F77='-Kconform_pic' - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_can_build_shared_F77=no - ;; - - uts4*) - lt_prog_compiler_pic_F77='-pic' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared_F77=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_F77"; then - -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:14490: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:14494: \$? = $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 - $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_F77=yes - fi - fi - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; - esac -else - lt_prog_compiler_pic_F77= - lt_prog_compiler_can_build_shared_F77=no -fi - -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_F77= - ;; - *) - lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - 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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_F77=yes - fi - else - lt_cv_prog_compiler_static_works_F77=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : -else - lt_prog_compiler_static_F77= -fi - - -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_F77=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -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:14594: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:14598: \$? = $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 - $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_F77=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag_F77= - enable_shared_with_static_runtimes_F77=no - archive_cmds_F77= - archive_expsym_cmds_F77= - old_archive_From_new_cmds_F77= - old_archive_from_expsyms_cmds_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - thread_safe_flag_spec_F77= - hardcode_libdir_flag_spec_F77= - hardcode_libdir_flag_spec_ld_F77= - hardcode_libdir_separator_F77= - hardcode_direct_F77=no - hardcode_minus_L_F77=no - hardcode_shlibpath_var_F77=unsupported - link_all_deplibs_F77=unknown - hardcode_automatic_F77=no - module_cmds_F77= - module_expsym_cmds_F77= - always_export_symbols_F77=no - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_F77= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs_F77=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [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 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, 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. - -EOF - fi - ;; - - amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_F77=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_F77=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_F77='-L$libdir' - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $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... - archive_expsym_cmds_F77='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_F77=no - fi - ;; - - interix[3-9]*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_F77='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* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_F77='${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' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_F77=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_F77=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - - if test "$ld_shlibs_F77" = no; then - runpath_var= - hardcode_libdir_flag_spec_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=yes - archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_F77=unsupported - fi - ;; - - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - 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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_F77='' - hardcode_direct_F77=yes - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_F77=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_F77=yes - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_libdir_separator_F77= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_F77=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_F77='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; 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 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${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_F77='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; 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 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_F77='${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_F77=' ${wl}-bernotok' - allow_undefined_flag_F77=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77='$convenience' - archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_F77=no - ;; - - bsdi[45]*) - export_dynamic_flag_spec_F77=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_F77=' ' - allow_undefined_flag_F77=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_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_F77='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_F77=yes - ;; - - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_F77=no - hardcode_direct_F77=no - hardcode_automatic_F77=yes - hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='' - link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_F77=no - ;; - esac - fi - ;; - - dgux*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - - freebsd1*) - ld_shlibs_F77=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds_F77='$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' - else - archive_cmds_F77='$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 - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_F77='+b $libdir' - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - ;; - *) - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' - fi - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - link_all_deplibs_F77=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - newsos6) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_shlibpath_var_F77=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs_F77=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - allow_undefined_flag_F77=unsupported - archive_cmds_F77='$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_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_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_F77='-rpath $libdir' - fi - hardcode_libdir_separator_F77=: - ;; - - solaris*) - no_undefined_flag_F77=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_shlibpath_var_F77=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs_F77=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_F77='$CC -r -o $output$reload_objs' - hardcode_direct_F77=no - ;; - motorola) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no - ;; - - sysv4.3*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_F77=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_F77='${wl}-z,text' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_F77='${wl}-z,text' - allow_undefined_flag_F77='${wl}-z,nodefs' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - - *) - ld_shlibs_F77=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6; } -test "$ld_shlibs_F77" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_F77" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_F77=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_F77 in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_F77 - pic_flag=$lt_prog_compiler_pic_F77 - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_F77 - allow_undefined_flag_F77= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_F77=no - else - archive_cmds_need_lc_F77=yes - fi - allow_undefined_flag_F77=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } - ;; - esac - fi - ;; -esac - -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - 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' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # 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~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - 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" - ;; - mingw*) - # 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -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 - 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. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -*) - dynamic_linker=no +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi ;; esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi - -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi - -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var_F77" || \ - test "X$hardcode_automatic_F77" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6; } - -if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_F77 \ - CC_F77 \ - LD_F77 \ - lt_prog_compiler_wl_F77 \ - lt_prog_compiler_pic_F77 \ - lt_prog_compiler_static_F77 \ - lt_prog_compiler_no_builtin_flag_F77 \ - export_dynamic_flag_spec_F77 \ - thread_safe_flag_spec_F77 \ - whole_archive_flag_spec_F77 \ - enable_shared_with_static_runtimes_F77 \ - old_archive_cmds_F77 \ - old_archive_from_new_cmds_F77 \ - predep_objects_F77 \ - postdep_objects_F77 \ - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ - compiler_lib_search_dirs_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ - postuninstall_cmds_F77 \ - old_archive_from_expsyms_cmds_F77 \ - allow_undefined_flag_F77 \ - no_undefined_flag_F77 \ - export_symbols_cmds_F77 \ - hardcode_libdir_flag_spec_F77 \ - hardcode_libdir_flag_spec_ld_F77 \ - hardcode_libdir_separator_F77 \ - hardcode_automatic_F77 \ - module_cmds_F77 \ - module_expsym_cmds_F77 \ - lt_cv_prog_compiler_c_o_F77 \ - fix_srcfile_path_F77 \ - exclude_expsyms_F77 \ - include_expsyms_F77; do - - case $var in - old_archive_cmds_F77 | \ - old_archive_from_new_cmds_F77 | \ - archive_cmds_F77 | \ - archive_expsym_cmds_F77 | \ - module_cmds_F77 | \ - module_expsym_cmds_F77 | \ - old_archive_from_expsyms_cmds_F77 | \ - export_symbols_cmds_F77 | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_F77 - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler_F77 - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_F77 - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_F77 - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_F77 - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_F77 -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_F77 - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_F77 -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_F77 -archive_expsym_cmds=$lt_archive_expsym_cmds_F77 -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_F77 -module_expsym_cmds=$lt_module_expsym_cmds_F77 - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_F77 - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_F77 - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_F77 - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_F77 -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +# 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 a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' -# This is the shared library runtime path variable. -runpath_var=$runpath_var +# Global variables: +ofile=libtool +can_build_shared=yes -# This is the shared library path variable. -shlibpath_var=$shlibpath_var +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath +with_gnu_ld="$lt_cv_prog_gnu_ld" -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_F77 +old_CC="$CC" +old_CFLAGS="$CFLAGS" -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_F77 - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_F77 - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_F77 -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + 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 : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_F77 +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# 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_F77 -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_F77 -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_F77 +if test -z "$lt_cv_path_MAGIC_CMD"; then + 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 : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_F77 +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org -# ### END LIBTOOL TAG CONFIG: $tagname +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi -__EOF__ +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" + else + MAGIC_CMD=: fi fi + fi + ;; +esac + +# Use C for the default configuration in the libtool script +lt_save_CC="$CC" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" - - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +# Source file extension for C test sources. +ac_ext=c -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. +# Object file extension for compiled C test sources. objext=o -objext_GCJ=$objext +objext=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' +lt_simple_link_test_code='int main(){return(0);}' + + + + + -# ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} @@ -16750,56 +7337,38 @@ # Allow CC to be a program name with arguments. compiler=$CC +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +$RM conftest* ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -compiler_GCJ=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - +$RM -r conftest* -# GCJ did not exist at the time GCC didn't implicitly link libc in. -archive_cmds_need_lc_GCJ=no -old_archive_cmds_GCJ=$old_archive_cmds +if test -n "$compiler"; then - -lt_prog_compiler_no_builtin_flag_GCJ= +lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - + lt_prog_compiler_no_builtin_flag=' -fno-builtin' -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext + ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or @@ -16811,77 +7380,104 @@ -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:16814: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7383: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16818: \$? = $ac_status" >&5 + echo "$as_me:7387: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi - $rm conftest* + $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : fi fi -lt_prog_compiler_wl_GCJ= -lt_prog_compiler_pic_GCJ= -lt_prog_compiler_static_GCJ= -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + + + + lt_prog_compiler_wl= +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_GCJ='-Wl,' - lt_prog_compiler_static_GCJ='-static' + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_static='-Bstatic' fi ;; amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - + lt_prog_compiler_pic='-DDLL_EXPORT' ;; darwin* | rhapsody*) # PIC is the default on this platform # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_GCJ='-fno-common' + lt_prog_compiler_pic='-fno-common' + ;; + + 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 + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac ;; interix[3-9]*) @@ -16892,64 +7488,47 @@ msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. - lt_prog_compiler_can_build_shared_GCJ=no + lt_prog_compiler_can_build_shared=no enable_shared=no ;; + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + sysv4*MP*) if test -d /usr/nec; then - lt_prog_compiler_pic_GCJ=-Kconform_pic + lt_prog_compiler_pic=-Kconform_pic fi ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - ;; - *) - lt_prog_compiler_pic_GCJ='-fPIC' + lt_prog_compiler_pic='-fPIC' ;; esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in aix*) - lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_wl='-Wl,' if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_static='-Bstatic' else - lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' fi ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_GCJ='-qnocommon' - lt_prog_compiler_wl_GCJ='-Wl,' - ;; - esac - ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - + lt_prog_compiler_pic='-DDLL_EXPORT' ;; hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_wl='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case $host_cpu in @@ -16957,141 +7536,180 @@ # +Z the default ;; *) - lt_prog_compiler_pic_GCJ='+Z' + lt_prog_compiler_pic='+Z' ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' + lt_prog_compiler_static='${wl}-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_wl='-Wl,' # PIC (with -KPIC) is the default. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - - newsos6) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-static' + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-fpic' - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' ;; ccc*) - lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' + lt_prog_compiler_static='-non_shared' ;; + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' ;; *Sun\ F*) # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - lt_prog_compiler_wl_GCJ='' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' ;; esac ;; esac ;; + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) - lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_wl='-Wl,' # All OSF/1 code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' + lt_prog_compiler_static='-non_shared' ;; rdos*) - lt_prog_compiler_static_GCJ='-non_shared' + lt_prog_compiler_static='-non_shared' ;; solaris*) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' case $cc_basename in f77* | f90* | f95*) - lt_prog_compiler_wl_GCJ='-Qoption ld ';; + lt_prog_compiler_wl='-Qoption ld ';; *) - lt_prog_compiler_wl_GCJ='-Wl,';; + lt_prog_compiler_wl='-Wl,';; esac ;; sunos4*) - lt_prog_compiler_wl_GCJ='-Qoption ld ' - lt_prog_compiler_pic_GCJ='-PIC' - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' ;; sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' ;; sysv4*MP*) if test -d /usr/nec ;then - lt_prog_compiler_pic_GCJ='-Kconform_pic' - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' fi ;; sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' ;; unicos*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_can_build_shared_GCJ=no + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no ;; uts4*) - lt_prog_compiler_pic_GCJ='-pic' - lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' ;; *) - lt_prog_compiler_can_build_shared_GCJ=no + lt_prog_compiler_can_build_shared=no ;; esac fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + 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; } + + + + + # # Check to make sure the PIC flag actually works. # -if test -n "$lt_prog_compiler_pic_GCJ"; then - -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 : + $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -17101,57 +7719,53 @@ -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:17104: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7722: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17108: \$? = $ac_status" >&5 + echo "$as_me:7726: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_GCJ=yes + lt_cv_prog_compiler_pic_works=yes fi fi - $rm conftest* + $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; esac else - lt_prog_compiler_pic_GCJ= - lt_prog_compiler_can_build_shared_GCJ=no + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no fi fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_GCJ= - ;; - *) - lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" - ;; -esac + + + + + # # Check to make sure the static flag actually works. # -wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 : + $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_static_works_GCJ=no + lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -17161,36 +7775,96 @@ 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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works=yes fi else - lt_cv_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works=yes fi fi - $rm -r conftest* + $RM -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_static_works" = xyes; then : else - lt_prog_compiler_static_GCJ= + lt_prog_compiler_static= +fi + + + + + + + + { $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 : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:7827: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:7831: \$? = $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 + $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 + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + { $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 : + $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_c_o_GCJ=no - $rm -r conftest 2>/dev/null + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null mkdir conftest cd conftest mkdir out @@ -17205,91 +7879,101 @@ -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:17208: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7882: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17212: \$? = $ac_status" >&5 + echo "$as_me:7886: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_GCJ=yes + lt_cv_prog_compiler_c_o=yes fi fi chmod u+w . 2>&5 - $rm conftest* + $RM conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out cd .. - rmdir conftest - $rm conftest* + $RM -r conftest + $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes - $rm conftest* + $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else need_locks=no fi -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= - allow_undefined_flag_GCJ= - enable_shared_with_static_runtimes_GCJ=no - archive_cmds_GCJ= - archive_expsym_cmds_GCJ= - old_archive_From_new_cmds_GCJ= - old_archive_from_expsyms_cmds_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= - thread_safe_flag_spec_GCJ= - hardcode_libdir_flag_spec_GCJ= - hardcode_libdir_flag_spec_ld_GCJ= - hardcode_libdir_separator_GCJ= - hardcode_direct_GCJ=no - hardcode_minus_L_GCJ=no - hardcode_shlibpath_var_GCJ=unsupported - link_all_deplibs_GCJ=unknown - hardcode_automatic_GCJ=no - module_cmds_GCJ= - module_expsym_cmds_GCJ= - always_export_symbols_GCJ=no - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= # include_expsyms should be a list of space-separated symbols to be *always* # included in the symbol list - include_expsyms_GCJ= + include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot @@ -17297,19 +7981,9 @@ # preloaded symbol tables. # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -17324,9 +7998,12 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + link_all_deplibs=no + ;; esac - ld_shlibs_GCJ=yes + ld_shlibs=yes if test "$with_gnu_ld" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -17335,16 +8012,17 @@ # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_GCJ= + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>/dev/null` in + 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 ... @@ -17357,8 +8035,8 @@ aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then - ld_shlibs_GCJ=no - cat <&2 + ld_shlibs=no + cat <<_LT_EOF 1>&2 *** Warning: the GNU linker, at least up to release 2.9.1, is reported *** to be unable to reliably create shared libraries on AIX. @@ -17366,49 +8044,50 @@ *** really care for shared libraries, you may want to modify your PATH *** so that a non-GNU linker is found, and then restart. -EOF +_LT_EOF fi ;; amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_GCJ=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_GCJ=unsupported + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else - ld_shlibs_GCJ=no + ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. - hardcode_libdir_flag_spec_GCJ='-L$libdir' - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=no - enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + hardcode_libdir_flag_spec='-L$libdir' + 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' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + 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' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname.def; else echo EXPORTS > $output_objdir/$soname.def; @@ -17416,80 +8095,109 @@ fi~ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs_GCJ=no + ld_shlibs=no fi ;; interix[3-9]*) - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='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* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then tmp_addflag= + tmp_sharedflag='-shared' case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + 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' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_GCJ='${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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 tmp_addflag=' -i_dynamic -nofor_main' ;; ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; + 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) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_GCJ='${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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; esac - archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - link_all_deplibs_GCJ=no + 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~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf*) + # 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' + 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' + fi + ;; + esac else - ld_shlibs_GCJ=no + ld_shlibs=no fi ;; netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + 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' fi ;; solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_GCJ=no - cat <&2 + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 *** Warning: The releases 2.8.* of the GNU linker cannot reliably *** create shared libraries on Solaris systems. Therefore, libtool @@ -17498,19 +8206,19 @@ *** your PATH or compiler configuration so that the native linker is *** used, and then restart. -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +_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' else - ld_shlibs_GCJ=no + ld_shlibs=no fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_GCJ=no + ld_shlibs=no cat <<_LT_EOF 1>&2 *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not @@ -17523,54 +8231,58 @@ _LT_EOF ;; *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + 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' else - ld_shlibs_GCJ=no + ld_shlibs=no fi ;; esac ;; sunos4*) - archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no + hardcode_direct=yes + hardcode_shlibpath_var=no ;; *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + 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' else - ld_shlibs_GCJ=no + ld_shlibs=no fi ;; esac - if test "$ld_shlibs_GCJ" = no; then + if test "$ld_shlibs" = no; then runpath_var= - hardcode_libdir_flag_spec_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= fi else # PORTME fill in a description of your system's linker (not GNU ld) case $host_os in aix3*) - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=yes - archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. - hardcode_minus_L_GCJ=yes + hardcode_minus_L=yes if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. - hardcode_direct_GCJ=unsupported + hardcode_direct=unsupported fi ;; @@ -17584,10 +8296,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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + 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' else - export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + 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 aix_use_runtimelinking=no @@ -17596,10 +8308,10 @@ # need to do runtime linking. case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi done ;; esac @@ -17614,30 +8326,32 @@ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - archive_cmds_GCJ='' - hardcode_direct_GCJ=yes - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' if test "$GCC" = yes; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null then - # We have reworked collect2 - : + # We have reworked collect2 + : else - # We have old collect2 - hardcode_direct_GCJ=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_GCJ=yes - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_libdir_separator_GCJ= + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= fi ;; esac @@ -17645,11 +8359,12 @@ 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 - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else if test "$aix_use_runtimelinking" = yes; then @@ -17660,19 +8375,17 @@ fi fi + export_dynamic_flag_spec='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_GCJ=yes + always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - allow_undefined_flag_GCJ='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -17683,24 +8396,7 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -17714,31 +8410,22 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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 - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else + 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" + else if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + # Determine the default libpath from the value encoded in an + # empty executable. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -17747,26 +8434,9 @@ ; return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -17780,121 +8450,100 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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 - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" + 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_GCJ=' ${wl}-bernotok' - allow_undefined_flag_GCJ=' ${wl}-berok' + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ='$convenience' - archive_cmds_need_lc_GCJ=yes + whole_archive_flag_spec='$convenience' + archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_GCJ="\$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' + 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' fi fi ;; amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_GCJ=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) - export_dynamic_flag_spec_GCJ=-rdynamic + export_dynamic_flag_spec=-rdynamic ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec_GCJ=' ' - allow_undefined_flag_GCJ=unsupported + 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_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + 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_GCJ='true' + old_archive_from_new_cmds='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_GCJ=yes + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_GCJ=no - hardcode_direct_GCJ=no - hardcode_automatic_GCJ=yes - hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='' - link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_GCJ=no - ;; - esac - fi + + + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='' + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + + else + ld_shlibs=no + fi + ;; dgux*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no ;; freebsd1*) - ld_shlibs_GCJ=no + ld_shlibs=no ;; # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor @@ -17902,60 +8551,60 @@ # does not break anything, and helps significantly (at the cost of a little # extra space). freebsd2.2*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. freebsd2*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ;; hpux9*) if test "$GCC" = yes; then - archive_cmds_GCJ='$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 -fPIC ${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_GCJ='$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' + 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 - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=yes + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. - hardcode_minus_L_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' ;; hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -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' else - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. - hardcode_minus_L_GCJ=yes + hardcode_minus_L=yes fi ;; @@ -17963,45 +8612,45 @@ if test "$GCC" = yes -a "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -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' ;; esac else case $host_cpu in hppa*64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -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' ;; esac fi if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: case $host_cpu in hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no + hardcode_direct=no + hardcode_shlibpath_var=no ;; *) - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. - hardcode_minus_L_GCJ=yes + hardcode_minus_L=yes ;; esac fi @@ -18009,1872 +8658,1247 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + 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' + # 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 +/* end confdefs.h. */ +int foo(void) {} +_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' + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" else - archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' + 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' fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - link_all_deplibs_GCJ=yes + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes ;; netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else - archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ;; newsos6) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_shlibpath_var_GCJ=no + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) ;; openbsd*) if test -f /usr/libexec/ld.so; then - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' else case $host_os in openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' ;; *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac - fi + fi else - ld_shlibs_GCJ=no + ld_shlibs=no fi ;; os2*) - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - allow_undefined_flag_GCJ=unsupported - archive_cmds_GCJ='$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_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + 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' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + 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' else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + 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' fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + 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' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + 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_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' # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_GCJ='-rpath $libdir' + hardcode_libdir_flag_spec='-rpath $libdir' fi - hardcode_libdir_separator_GCJ=: + archive_cmds_need_lc='no' + hardcode_libdir_separator=: ;; solaris*) - no_undefined_flag_GCJ=' -z text' + no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + archive_cmds='$CC -shared ${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' else - wlarc='' - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $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 -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, # but understands `-z linker_flag'. GCC discards it without `$wl', # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) + # Supported since Solaris 2.6 (maybe 2.5.1?) if test "$GCC" = yes; then - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' else - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi ;; esac - link_all_deplibs_GCJ=yes + link_all_deplibs=yes ;; sunos4*) if test "x$host_vendor" = xsequent; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no ;; sysv4) case $host_vendor in sni) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes # is this really true??? + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? ;; siemens) ## LD is ld it makes a PLAMLIB ## CC just makes a GrossModule. - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_GCJ='$CC -r -o $output$reload_objs' - hardcode_direct_GCJ=no + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no ;; motorola) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie ;; esac runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_GCJ=no + hardcode_shlibpath_var=no ;; sysv4.3*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - export_dynamic_flag_spec_GCJ='-Bexport' + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' ;; sysv4*MP*) if test -d /usr/nec; then - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes - ld_shlibs_GCJ=yes + ld_shlibs=yes fi ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_GCJ='${wl}-z,text' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_GCJ='${wl}-z,text' - allow_undefined_flag_GCJ='${wl}-z,nodefs' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-Bexport' + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no - ;; - - *) - ld_shlibs_GCJ=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } -test "$ld_shlibs_GCJ" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_GCJ" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_GCJ=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_GCJ in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_GCJ - pic_flag=$lt_prog_compiler_pic_GCJ - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ - allow_undefined_flag_GCJ= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_GCJ=no - else - archive_cmds_need_lc_GCJ=yes - fi - allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - cat conftest.err 1>&5 + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ;; - esac - fi - ;; -esac - -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - can_build_shared=no + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac fi - shlibpath_var=LIBPATH fi - ;; -amigaos*) - 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' - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; +with_gnu_ld=$with_gnu_ld -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # 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~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - case $host_os in - 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" - ;; - mingw*) - # 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 - ;; - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; -dgux*) - 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 - ;; -freebsd1*) - dynamic_linker=no - ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; -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 - 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. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # 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. + { $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 { { 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 + (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; } + ;; esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes + fi ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; -rdos*) - dynamic_linker=no - ;; -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ - test "X$hardcode_automatic_GCJ" = "Xyes" ; then - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6; } -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_GCJ \ - CC_GCJ \ - LD_GCJ \ - lt_prog_compiler_wl_GCJ \ - lt_prog_compiler_pic_GCJ \ - lt_prog_compiler_static_GCJ \ - lt_prog_compiler_no_builtin_flag_GCJ \ - export_dynamic_flag_spec_GCJ \ - thread_safe_flag_spec_GCJ \ - whole_archive_flag_spec_GCJ \ - enable_shared_with_static_runtimes_GCJ \ - old_archive_cmds_GCJ \ - old_archive_from_new_cmds_GCJ \ - predep_objects_GCJ \ - postdep_objects_GCJ \ - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ - compiler_lib_search_dirs_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ - postuninstall_cmds_GCJ \ - old_archive_from_expsyms_cmds_GCJ \ - allow_undefined_flag_GCJ \ - no_undefined_flag_GCJ \ - export_symbols_cmds_GCJ \ - hardcode_libdir_flag_spec_GCJ \ - hardcode_libdir_flag_spec_ld_GCJ \ - hardcode_libdir_separator_GCJ \ - hardcode_automatic_GCJ \ - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ - fix_srcfile_path_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - - case $var in - old_archive_cmds_GCJ | \ - old_archive_from_new_cmds_GCJ | \ - archive_cmds_GCJ | \ - archive_expsym_cmds_GCJ | \ - module_cmds_GCJ | \ - module_expsym_cmds_GCJ | \ - old_archive_from_expsyms_cmds_GCJ | \ - export_symbols_cmds_GCJ | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac -cfgfile="$ofile" - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_GCJ -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os -# An echo program that does not interpret backslashes. -echo=$lt_echo -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS -# A C compiler. -LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS -# A language-specific compiler. -CC=$lt_compiler_GCJ -# Is the compiler the GNU C compiler? -with_gcc=$GCC_GCJ -# An ERE matcher. -EGREP=$lt_EGREP -# The linker used to build libraries. -LD=$lt_LD_GCJ -# Whether we need hard or soft links. -LN_S=$lt_LN_S -# A BSD-compatible nm program. -NM=$lt_NM -# A symbol stripping program -STRIP=$lt_STRIP -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" -# Used on cygwin: assembler. -AS="$AS" -# The name of the directory that contains temporary libtool files. -objdir=$objdir -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_GCJ -# Object file suffix (normally "o"). -objext="$ac_objext" -# Old archive suffix (normally "a"). -libext="$libext" -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' -# Executable file suffix (normally ""). -exeext="$exeext" -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_GCJ -pic_mode=$pic_mode -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation? -need_locks=$lt_need_locks -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix -# Do we need a version for libraries? -need_version=$need_version -# Whether dlopen is supported. -dlopen_support=$enable_dlopen -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_GCJ -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ -# Library versioning type. -version_type=$version_type -# Format of library name prefix. -libname_spec=$lt_libname_spec -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_GCJ -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_GCJ -archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_GCJ -module_expsym_cmds=$lt_module_expsym_cmds_GCJ -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_GCJ - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_GCJ - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_GCJ -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_GCJ -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -# This is the shared library runtime path variable. -runpath_var=$runpath_var -# This is the shared library path variable. -shlibpath_var=$shlibpath_var -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_GCJ -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_GCJ - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_GCJ - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_GCJ -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_GCJ -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_GCJ -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_GCJ -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_GCJ -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_GCJ -# ### END LIBTOOL TAG CONFIG: $tagname -__EOF__ -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +if test "$GCC" = yes; then + case $host_os in + 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 + # 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 + # 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= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + 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 ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + 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` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH - else - tagname="" - fi - ;; + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; - RC) +aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + 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' + ;; + esac + ;; -# Source file extension for RC test sources. -ac_ext=rc +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -# Object file extension for compiled RC test sources. -objext=o -objext_RC=$objext +bsdi[45]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # 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~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes -# ltmain only uses $CC for tagged configurations so make sure $CC is set. + case $host_os in + 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" + ;; + 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 + ;; -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -# Allow CC to be a program name with arguments. -compiler=$CC + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; +dgux*) + 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 + ;; -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +freebsd1*) + dynamic_linker=no + ;; -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; +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 + hardcode_into_libs=yes + ;; -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; -lt_cv_prog_compiler_c_o_RC=yes +interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_RC \ - CC_RC \ - LD_RC \ - lt_prog_compiler_wl_RC \ - lt_prog_compiler_pic_RC \ - lt_prog_compiler_static_RC \ - lt_prog_compiler_no_builtin_flag_RC \ - export_dynamic_flag_spec_RC \ - thread_safe_flag_spec_RC \ - whole_archive_flag_spec_RC \ - enable_shared_with_static_runtimes_RC \ - old_archive_cmds_RC \ - old_archive_from_new_cmds_RC \ - predep_objects_RC \ - postdep_objects_RC \ - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ - compiler_lib_search_dirs_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ - postuninstall_cmds_RC \ - old_archive_from_expsyms_cmds_RC \ - allow_undefined_flag_RC \ - no_undefined_flag_RC \ - export_symbols_cmds_RC \ - hardcode_libdir_flag_spec_RC \ - hardcode_libdir_flag_spec_ld_RC \ - hardcode_libdir_separator_RC \ - hardcode_automatic_RC \ - module_cmds_RC \ - module_expsym_cmds_RC \ - lt_cv_prog_compiler_c_o_RC \ - fix_srcfile_path_RC \ - exclude_expsyms_RC \ - include_expsyms_RC; do - - case $var in - old_archive_cmds_RC | \ - old_archive_from_new_cmds_RC | \ - archive_cmds_RC | \ - archive_expsym_cmds_RC | \ - module_cmds_RC | \ - module_expsym_cmds_RC | \ - old_archive_from_expsyms_cmds_RC | \ - export_symbols_cmds_RC | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` ;; esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_RC - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler_RC - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_RC - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_RC - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" +# This must be Linux ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # 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 +/* end confdefs.h. */ -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" +int +main () +{ -# Used on cygwin: assembler. -AS="$AS" + ; + return 0; +} +_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 +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir -# The name of the directory that contains temporary libtool files. -objdir=$objdir + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_RC + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; -# Object file suffix (normally "o"). -objext="$ac_objext" +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' + ;; -# Old archive suffix (normally "a"). -libext="$libext" +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -# Executable file suffix (normally ""). -exeext="$exeext" +*nto* | *qnx*) + version_type=qnx + 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='ldqnx.so' + ;; -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_RC -pic_mode=$pic_mode +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; -# Must we lock files when doing compilation? -need_locks=$lt_need_locks +rdos*) + dynamic_linker=no + ;; -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; -# Do we need a version for libraries? -need_version=$need_version +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; -# Whether dlopen is supported. -dlopen_support=$enable_dlopen +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_RC +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi -# Library versioning type. -version_type=$version_type -# Format of library name prefix. -libname_spec=$lt_libname_spec -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_RC -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_RC -archive_expsym_cmds=$lt_archive_expsym_cmds_RC -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_RC -module_expsym_cmds=$lt_module_expsym_cmds_RC -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_RC - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_RC - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_RC -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_RC -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -# This is the shared library runtime path variable. -runpath_var=$runpath_var -# This is the shared library path variable. -shlibpath_var=$shlibpath_var -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_RC -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_RC - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_RC - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_RC - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_RC -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_RC -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_RC -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_RC -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_RC -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_RC -# ### END LIBTOOL TAG CONFIG: $tagname -__EOF__ -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" - ;; - *) - { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -echo "$as_me: error: Unsupported tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -echo "$as_me: error: unable to update list of available tagged configurations." >&2;} - { (exit 1); exit 1; }; } - fi -fi -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -# Prevent multiple expansion @@ -19896,118 +9920,97 @@ -#AC_ENABLE_SHARED(yes) -# Check whether --enable-tools was given. -if test "${enable_tools+set}" = set; then - enableval=$enable_tools; enable_tools=$enableval -else - enable_tools="yes" -fi -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; enable_debug=$enableval -else - enable_debug="yes" -fi -# Check whether --enable-trace was given. -if test "${enable_trace+set}" = set; then - enableval=$enable_trace; enable_trace=$enableval -else - enable_trace="yes" -fi -# Check whether --enable-mpatrol was given. -if test "${enable_mpatrol+set}" = set; then - enableval=$enable_mpatrol; enable_mpatrol=$enableval -else - enable_mpatrol="no" -fi -# Check whether --enable-gprof was given. -if test "${enable_gprof+set}" = set; then - enableval=$enable_gprof; enable_gprof=$enableval -else - enable_gprof="no" -fi -# Check whether --enable-pthread was given. -if test "${enable_pthread+set}" = set; then - enableval=$enable_pthread; enable_pthread=$enableval -else - enable_pthread="no" -fi + { $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= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then -# Check whether --enable-semaphore was given. -if test "${enable_semaphore+set}" = set; then - enableval=$enable_semaphore; enable_semaphore=$enableval + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi else - enable_semaphore="no" + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } - -# Check whether --enable-sysv was given. -if test "${enable_sysv+set}" = set; then - enableval=$enable_sysv; enable_sysv=$enableval -else - enable_sysv="no" +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless fi -# Check whether --enable-minisize was given. -if test "${enable_minisize+set}" = set; then - enableval=$enable_minisize; enable_minisize=$enableval -else - enable_minisize="no" -fi -# Check whether --enable-mt was given. -if test "${enable_mt+set}" = set; then - enableval=$enable_mt; enable_mt=$enableval -else - enable_mt="yes" -fi -if test "x$enable_mt" = "xyes"; then - if test "x$enable_pthread" = "xyes"; then - EXOSIP_FLAGS="-DOSIP_MT -DHAVE_PTHREAD" - SIP_FSM_FLAGS="-DHAVE_PTHREAD" - else - EXOSIP_FLAGS="$EXOSIP_FLAGS -DOSIP_MT" + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; -acx_pthread_ok=no + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + darwin*) + # 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 : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -20016,1432 +10019,682 @@ #ifdef __cplusplus extern "C" #endif -char pthread_join (); +char dlopen (); int main () { -return pthread_join (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - acx_pthread_ok=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + ac_cv_lib_dl_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6; } - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS 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 : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# pthread: Linux, etcetera -# --thread-safe: KAI C++ - -case "${host_cpu}-${host_os}" in - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthread or - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 -echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; } - ;; - - -*) - { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 -echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; } - PTHREAD_CFLAGS="$flag" - ;; + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes - *) - { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5 -echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; } - PTHREAD_LIBS="-l$flag" - ;; - esac +fi - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + ;; - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = x""yes; 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 : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); int main () { -pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); +return shl_load (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - acx_pthread_ok=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + ac_cv_lib_dld_shl_load=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6; } - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS 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 : + 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 : + 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 : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: threads are created detached by default - # and the JOINABLE attribute has a nonstandard name (UNDETACHED). - { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5 -echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +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 : + 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 : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); int main () { -int attr=PTHREAD_CREATE_JOINABLE; +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ok=PTHREAD_CREATE_JOINABLE +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ok=unknown + ac_cv_lib_svld_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test x"$ok" = xunknown; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +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 : + 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 : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); int main () { -int attr=PTHREAD_CREATE_UNDETACHED; +return dld_link (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ok=PTHREAD_CREATE_UNDETACHED +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ok=unknown + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +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 : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi - if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then - -cat >>confdefs.h <<\_ACEOF -#define PTHREAD_CREATE_JOINABLE $ok -_ACEOF - fi - { echo "$as_me:$LINENO: result: ${ok}" >&5 -echo "${ECHO_T}${ok}" >&6; } - if test x"$ok" = xunknown; then - { echo "$as_me:$LINENO: WARNING: we do not know how to create joinable pthreads" >&5 -echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;} - fi +fi - { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 -echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; } - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; - *solaris* | alpha*-osf*) flag="-D_REENTRANT";; - esac - { echo "$as_me:$LINENO: result: ${flag}" >&5 -echo "${ECHO_T}${flag}" >&6; } - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" +fi - # More AIX lossage: must compile with cc_r - # Extract the first word of "cc_r", so it can be a program name with args. -set dummy cc_r; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$PTHREAD_CC"; then - ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # 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_PTHREAD_CC="cc_r" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - test -z "$ac_cv_prog_PTHREAD_CC" && ac_cv_prog_PTHREAD_CC="${CC}" fi + + fi -PTHREAD_CC=$ac_cv_prog_PTHREAD_CC -if test -n "$PTHREAD_CC"; then - { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5 -echo "${ECHO_T}$PTHREAD_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + + fi + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + { $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 : + $as_echo_n "(cached) " >&6 else - PTHREAD_CC="$CC" -fi + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 10266 "configure" +#include "confdefs.h" +#if HAVE_DLFCN_H +#include +#endif +#include +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD 1 -_ACEOF + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* - : -else - acx_pthread_ok=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + 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 : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 10362 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no fi fi +rm -fr conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac -if test "x$enable_tools" = "xyes"; then - COMPILE_TOOLS_TRUE= - COMPILE_TOOLS_FALSE='#' -else - COMPILE_TOOLS_TRUE='#' - COMPILE_TOOLS_FALSE= + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac fi -if test "x$enable_semaphore" = "xyes"; then - EXOSIP_FLAGS="$EXOSIP_FLAGS -DHAVE_SEMAPHORE_H" - -for ac_header in semaphore.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -elif test "x$enable_sysv" = "xyes"; then - EXOSIP_FLAGS="$EXOSIP_FLAGS -UHAVE_SEMAPHORE_H -DHAVE_SYS_SEM_H" -for ac_header in sys/sem.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -else -for ac_header in semaphore.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } -done -for ac_header in sys/sem.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +CC="$lt_save_CC" -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -fi -if test "x$host_cpu" = "x$build_cpu"; then - case $OS in - linux*) - EXOSIP_FLAGS="$EXOSIP_FLAGS -pedantic" - ;; - irix*) - ;; - hpux* | hp-ux*) - ;; - aix*) - ;; - osf*) - { echo "$as_me:$LINENO: checking for sem_open in -lrt" >&5 -echo $ECHO_N "checking for sem_open in -lrt... $ECHO_C" >&6; } -if test "${ac_cv_lib_rt_sem_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sem_open (); -int -main () -{ -return sem_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_rt_sem_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_rt_sem_open=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_sem_open" >&5 -echo "${ECHO_T}$ac_cv_lib_rt_sem_open" >&6; } -if test $ac_cv_lib_rt_sem_open = yes; then - EXOSIP_LIB="$EXOSIP_LIB -lrt" -fi + ac_config_commands="$ac_config_commands libtool" - ;; - sunos*) - ;; - darwin*) - EXOSIP_FLAGS="$EXOSIP_FLAGS -pedantic" - ;; - *) - ;; - esac -else - { echo "$as_me:$LINENO: Cross compiling exosip." >&5 -echo "$as_me: Cross compiling exosip." >&6;} -fi -if test "x$enable_debug" = "xyes"; then - EXOSIP_FLAGS="$EXOSIP_FLAGS -DENABLE_DEBUG -g" - CFLAGS=`echo $CFLAGS | sed 's/-O.//'` -fi -if test "x$enable_trace" = "xyes"; then - EXOSIP_FLAGS="$EXOSIP_FLAGS -DENABLE_TRACE" -fi -if test "x$enable_mpatrol" = "xyes"; then - EXOSIP_FLAGS="$EXOSIP_FLAGS -DENABLE_MPATROL" - EXOSIP_LIB="$EXOSIP_LIB -lmpatrolmt -lelf" -fi +# Only expand once: -if test "x$enable_gprof" = "xyes"; then - EXOSIP_FLAGS="$EXOSIP_FLAGS -pg" -fi -if test "x$enable_minisize" = "xyes"; then - EXOSIP_FLAGS="$EXOSIP_FLAGS -DMINISIZE" -fi +#AC_ENABLE_SHARED(yes) -if test x$enable_minisize = xno; then - BUILD_MAXSIZE_TRUE= - BUILD_MAXSIZE_FALSE='#' + +# Check whether --enable-tools was given. +if test "${enable_tools+set}" = set; then : + enableval=$enable_tools; enable_tools=$enableval else - BUILD_MAXSIZE_TRUE='#' - BUILD_MAXSIZE_FALSE= + enable_tools="yes" fi -{ echo "$as_me:$LINENO: checking for sem_open in -lposix4" >&5 -echo $ECHO_N "checking for sem_open in -lposix4... $ECHO_C" >&6; } -if test "${ac_cv_lib_posix4_sem_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sem_open (); -int -main () -{ -return sem_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_posix4_sem_open=yes +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; enable_debug=$enableval else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_posix4_sem_open=no + enable_debug="yes" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sem_open" >&5 -echo "${ECHO_T}$ac_cv_lib_posix4_sem_open" >&6; } -if test $ac_cv_lib_posix4_sem_open = yes; then - EXOSIP_LIB="$EXOSIP_LIB -lposix4 -mt" -fi -{ echo "$as_me:$LINENO: checking for nis_add in -lnsl" >&5 -echo $ECHO_N "checking for nis_add in -lnsl... $ECHO_C" >&6; } -if test "${ac_cv_lib_nsl_nis_add+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-trace was given. +if test "${enable_trace+set}" = set; then : + enableval=$enable_trace; enable_trace=$enableval else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + enable_trace="yes" +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char nis_add (); -int -main () -{ -return nis_add (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_nsl_nis_add=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_nsl_nis_add=no +# Check whether --enable-mpatrol was given. +if test "${enable_mpatrol+set}" = set; then : + enableval=$enable_mpatrol; enable_mpatrol=$enableval +else + enable_mpatrol="no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_nis_add" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_nis_add" >&6; } -if test $ac_cv_lib_nsl_nis_add = yes; then - EXOSIP_LIB="$EXOSIP_LIB -lnsl" -fi -{ echo "$as_me:$LINENO: checking for sendto in -lsocket" >&5 -echo $ECHO_N "checking for sendto in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_sendto+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-gprof was given. +if test "${enable_gprof+set}" = set; then : + enableval=$enable_gprof; enable_gprof=$enableval else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + enable_gprof="no" +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sendto (); -int -main () -{ -return sendto (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_sendto=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_socket_sendto=no +# Check whether --enable-pthread was given. +if test "${enable_pthread+set}" = set; then : + enableval=$enable_pthread; enable_pthread=$enableval +else + enable_pthread="no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_sendto" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_sendto" >&6; } -if test $ac_cv_lib_socket_sendto = yes; then - EXOSIP_LIB="$EXOSIP_LIB -lsocket" -fi -{ echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5 -echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6; } -if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-semaphore was given. +if test "${enable_semaphore+set}" = set; then : + enableval=$enable_semaphore; enable_semaphore=$enableval else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + enable_semaphore="no" +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char clock_gettime (); -int -main () -{ -return clock_gettime (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_rt_clock_gettime=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_rt_clock_gettime=no +# Check whether --enable-sysv was given. +if test "${enable_sysv+set}" = set; then : + enableval=$enable_sysv; enable_sysv=$enableval +else + enable_sysv="no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5 -echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6; } -if test $ac_cv_lib_rt_clock_gettime = yes; then - EXOSIP_LIB="$EXOSIP_LIB -lrt" + +# Check whether --enable-minisize was given. +if test "${enable_minisize+set}" = set; then : + enableval=$enable_minisize; enable_minisize=$enableval +else + enable_minisize="no" fi -{ echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5 -echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6; } -if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-mt was given. +if test "${enable_mt+set}" = set; then : + enableval=$enable_mt; enable_mt=$enableval else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + enable_mt="yes" +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SSL_CTX_new (); -int -main () -{ -return SSL_CTX_new (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ssl_SSL_CTX_new=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ssl_SSL_CTX_new=no -fi +if test "x$enable_mt" = "xyes"; then + if test "x$enable_pthread" = "xyes"; then + EXOSIP_FLAGS="-DOSIP_MT -DHAVE_PTHREAD" + SIP_FSM_FLAGS="-DHAVE_PTHREAD" + else + EXOSIP_FLAGS="$EXOSIP_FLAGS -DOSIP_MT" -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6; } -if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then - EXOSIP_LIB="$EXOSIP_LIB -lssl" -fi +acx_pthread_ok=no -case $OS in - openbsd*) - ;; - *) - { echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5 -echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6; } -if test "${ac_cv_lib_resolv_res_query+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21450,2710 +10703,1645 @@ #ifdef __cplusplus extern "C" #endif -char res_query (); +char pthread_join (); int main () { -return res_query (); +return pthread_join (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +if ac_fn_c_try_link "$LINENO"; then : + acx_pthread_ok=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } + if test x"$acx_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all. + +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# pthread: Linux, etcetera +# --thread-safe: KAI C++ + +case "${host_cpu}-${host_os}" in + *solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthread or + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_resolv_res_query=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_resolv_res_query=no -fi +if test x"$acx_pthread_ok" = xno; then +for flag in $acx_pthread_flags; do -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6; } -if test $ac_cv_lib_resolv_res_query = yes; then - EXOSIP_LIB="$EXOSIP_LIB -lresolv" -fi + case $flag in + none) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +$as_echo_n "checking whether pthreads work without any flags... " >&6; } + ;; - { echo "$as_me:$LINENO: checking for __res_query in -lresolv" >&5 -echo $ECHO_N "checking for __res_query in -lresolv... $ECHO_C" >&6; } -if test "${ac_cv_lib_resolv___res_query+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + -*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +$as_echo_n "checking whether pthreads work with $flag... " >&6; } + PTHREAD_CFLAGS="$flag" + ;; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char __res_query (); + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; } + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include int main () { -return __res_query (); +pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_resolv___res_query=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_resolv___res_query=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_query" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv___res_query" >&6; } -if test $ac_cv_lib_resolv___res_query = yes; then - EXOSIP_LIB="$EXOSIP_LIB -lresolv" +if ac_fn_c_try_link "$LINENO"; then : + acx_pthread_ok=yes fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext - ;; -esac - + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } + if test "x$acx_pthread_ok" = xyes; then + break; + fi -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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" done -IFS=$as_save_IFS +fi - ;; -esac +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: threads are created detached by default + # and the JOINABLE attribute has a nonstandard name (UNDETACHED). + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +$as_echo_n "checking for joinable pthread attribute... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int attr=PTHREAD_CREATE_JOINABLE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ok=PTHREAD_CREATE_JOINABLE +else + ok=unknown fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test x"$ok" = xunknown; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int attr=PTHREAD_CREATE_UNDETACHED; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ok=PTHREAD_CREATE_UNDETACHED else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + ok=unknown fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then +$as_echo "#define PTHREAD_CREATE_JOINABLE \$ok" >>confdefs.h -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ok}" >&5 +$as_echo "${ok}" >&6; } + if test x"$ok" = xunknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: we do not know how to create joinable pthreads" >&5 +$as_echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;} + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; } + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; + *solaris* | alpha*-osf*) flag="-D_REENTRANT";; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +$as_echo "${flag}" >&6; } + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: must compile with cc_r + # Extract the first word of "cc_r", so it can be a program name with args. +set dummy cc_r; 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 : + $as_echo_n "(cached) " >&6 else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$PTHREAD_CC"; then + ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # 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 + 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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_PTHREAD_CC="cc_r" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - PKG_CONFIG="" - fi - -fi - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for OSIP" >&5 -echo $ECHO_N "checking for OSIP... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$OSIP_CFLAGS"; then - pkg_cv_OSIP_CFLAGS="$OSIP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libosip2 >= 3.1\"") >&5 - ($PKG_CONFIG --exists --print-errors "libosip2 >= 3.1") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_OSIP_CFLAGS=`$PKG_CONFIG --cflags "libosip2 >= 3.1" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried + test -z "$ac_cv_prog_PTHREAD_CC" && ac_cv_prog_PTHREAD_CC="${CC}" fi -if test -n "$PKG_CONFIG"; then - if test -n "$OSIP_LIBS"; then - pkg_cv_OSIP_LIBS="$OSIP_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libosip2 >= 3.1\"") >&5 - ($PKG_CONFIG --exists --print-errors "libosip2 >= 3.1") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_OSIP_LIBS=`$PKG_CONFIG --libs "libosip2 >= 3.1" 2>/dev/null` -else - pkg_failed=yes fi - fi +PTHREAD_CC=$ac_cv_prog_PTHREAD_CC +if test -n "$PTHREAD_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +$as_echo "$PTHREAD_CC" >&6; } else - pkg_failed=untried + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes else - _pkg_short_errors_supported=no + PTHREAD_CC="$CC" fi - if test $_pkg_short_errors_supported = yes; then - OSIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libosip2 >= 3.1"` - else - OSIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libosip2 >= 3.1"` - fi - # Put the nasty error message in config.log where it belongs - echo "$OSIP_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -{ echo "$as_me:$LINENO: WARNING: assuming osip can be found in -I$includedir and -L$libdir" >&5 -echo "$as_me: WARNING: assuming osip can be found in -I$includedir and -L$libdir" >&2;} -OSIP_CFLAGS='-I$(includedir) -I$(prefix)/include' -OSIP_LIBS='-L$(libdir) -L$(prefix)/lib -losip2 -losipparser2' - -elif test $pkg_failed = untried; then - -{ echo "$as_me:$LINENO: WARNING: assuming osip can be found in -I$includedir and -L$libdir" >&5 -echo "$as_me: WARNING: assuming osip can be found in -I$includedir and -L$libdir" >&2;} -OSIP_CFLAGS='-I$(includedir) -I$(prefix)/include' -OSIP_LIBS='-L$(libdir) -L$(prefix)/lib -losip2 -losipparser2' - -else - OSIP_CFLAGS=$pkg_cv_OSIP_CFLAGS - OSIP_LIBS=$pkg_cv_OSIP_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi -EXOSIP_FLAGS="$EXOSIP_FLAGS" -{ echo "$as_me:$LINENO: checking whether -Wall works" >&5 -echo $ECHO_N "checking whether -Wall works... $ECHO_C" >&6; } -if test "${Wall_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wall" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_pthread_ok" = xyes; then -int -main () -{ +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - Wall_flag=yes + : else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + acx_pthread_ok=no - Wall_flag=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$saved_CPPFLAGS - -fi -{ echo "$as_me:$LINENO: result: $Wall_flag" >&5 -echo "${ECHO_T}$Wall_flag" >&6; } -if test "x$Wall_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wall" + fi fi -{ echo "$as_me:$LINENO: checking whether -Wcast-align works" >&5 -echo $ECHO_N "checking whether -Wcast-align works... $ECHO_C" >&6; } -if test "${Wcast_align_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wcast-align" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} +if test "x$enable_semaphore" = "xyes"; then + EXOSIP_FLAGS="$EXOSIP_FLAGS -DHAVE_SEMAPHORE_H" + for ac_header in semaphore.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "semaphore.h" "ac_cv_header_semaphore_h" "$ac_includes_default" +if test "x$ac_cv_header_semaphore_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SEMAPHORE_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - Wcast_align_flag=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - Wcast_align_flag=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$saved_CPPFLAGS +done -fi -{ echo "$as_me:$LINENO: result: $Wcast_align_flag" >&5 -echo "${ECHO_T}$Wcast_align_flag" >&6; } +elif test "x$enable_sysv" = "xyes"; then + EXOSIP_FLAGS="$EXOSIP_FLAGS -UHAVE_SEMAPHORE_H -DHAVE_SYS_SEM_H" + for ac_header in sys/sem.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/sem.h" "ac_cv_header_sys_sem_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sem_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SEM_H 1 +_ACEOF -if test "x$Wcast_align_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wcast-align" fi -{ echo "$as_me:$LINENO: checking whether -Wchar-subscripts works" >&5 -echo $ECHO_N "checking whether -Wchar-subscripts works... $ECHO_C" >&6; } -if test "${Wchar_subscripts_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +done - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wchar-subscripts" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +else + for ac_header in semaphore.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "semaphore.h" "ac_cv_header_semaphore_h" "$ac_includes_default" +if test "x$ac_cv_header_semaphore_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SEMAPHORE_H 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ +fi - ; - return 0; -} +done + + for ac_header in sys/sem.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/sem.h" "ac_cv_header_sys_sem_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sem_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SEM_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - Wchar_subscripts_flag=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - Wchar_subscripts_flag=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$saved_CPPFLAGS - -fi -{ echo "$as_me:$LINENO: result: $Wchar_subscripts_flag" >&5 -echo "${ECHO_T}$Wchar_subscripts_flag" >&6; } +done -if test "x$Wchar_subscripts_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wchar-subscripts" fi -{ echo "$as_me:$LINENO: checking whether -Wformat works" >&5 -echo $ECHO_N "checking whether -Wformat works... $ECHO_C" >&6; } -if test "${Wformat_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wformat" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if test "x$host_cpu" = "x$build_cpu"; then + case $OS in + linux*) + EXOSIP_FLAGS="$EXOSIP_FLAGS -pedantic" + ;; + irix*) + ;; + hpux* | hp-ux*) + ;; + aix*) + ;; + osf*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_open in -lrt" >&5 +$as_echo_n "checking for sem_open in -lrt... " >&6; } +if test "${ac_cv_lib_rt_sem_open+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sem_open (); int main () { - +return sem_open (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - Wformat_flag=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_sem_open=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_rt_sem_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sem_open" >&5 +$as_echo "$ac_cv_lib_rt_sem_open" >&6; } +if test "x$ac_cv_lib_rt_sem_open" = x""yes; then : + EXOSIP_LIB="$EXOSIP_LIB -lrt" +fi + + ;; + sunos*) + ;; + darwin*) + EXOSIP_FLAGS="$EXOSIP_FLAGS -pedantic" + ;; + *mingw*) + EXOSIP_FLAGS="$EXOSIP_FLAGS -D_WIN32_WINNT=0x0501" + EXOSIP_LIB="EXOSIP_LIB -lws2_32 -liphlpapi -ldnsapi" + enable_tools=no + ;; + *) + ;; + esac +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling exosip." >&5 +$as_echo "$as_me: Cross compiling exosip." >&6;} +fi - Wformat_flag=no +if test "x$enable_debug" = "xyes"; then + EXOSIP_FLAGS="$EXOSIP_FLAGS -DENABLE_DEBUG -g" + CFLAGS=`echo $CFLAGS | sed 's/-O.//'` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$saved_CPPFLAGS +if test "x$enable_trace" = "xyes"; then + EXOSIP_FLAGS="$EXOSIP_FLAGS -DENABLE_TRACE" +fi +if test "x$enable_mpatrol" = "xyes"; then + EXOSIP_FLAGS="$EXOSIP_FLAGS -DENABLE_MPATROL" + EXOSIP_LIB="$EXOSIP_LIB -lmpatrolmt -lelf" fi -{ echo "$as_me:$LINENO: result: $Wformat_flag" >&5 -echo "${ECHO_T}$Wformat_flag" >&6; } -if test "x$Wformat_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wformat" +if test "x$enable_gprof" = "xyes"; then + EXOSIP_FLAGS="$EXOSIP_FLAGS -pg" fi -{ echo "$as_me:$LINENO: checking whether -Winline works" >&5 -echo $ECHO_N "checking whether -Winline works... $ECHO_C" >&6; } -if test "${Winline_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "x$enable_minisize" = "xyes"; then + EXOSIP_FLAGS="$EXOSIP_FLAGS -DMINISIZE" +fi + if test x$enable_minisize = xno; then + BUILD_MAXSIZE_TRUE= + BUILD_MAXSIZE_FALSE='#' else + BUILD_MAXSIZE_TRUE='#' + BUILD_MAXSIZE_FALSE= +fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Winline" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "x$enable_tools" = "xyes"; then + COMPILE_TOOLS_TRUE= + COMPILE_TOOLS_FALSE='#' +else + COMPILE_TOOLS_TRUE='#' + COMPILE_TOOLS_FALSE= +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_open in -lposix4" >&5 +$as_echo_n "checking for sem_open in -lposix4... " >&6; } +if test "${ac_cv_lib_posix4_sem_open+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix4 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sem_open (); int main () { - +return sem_open (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - Winline_flag=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_posix4_sem_open=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - Winline_flag=no + ac_cv_lib_posix4_sem_open=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$saved_CPPFLAGS - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $Winline_flag" >&5 -echo "${ECHO_T}$Winline_flag" >&6; } - -if test "x$Winline_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Winline" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sem_open" >&5 +$as_echo "$ac_cv_lib_posix4_sem_open" >&6; } +if test "x$ac_cv_lib_posix4_sem_open" = x""yes; then : + EXOSIP_LIB="$EXOSIP_LIB -lposix4 -mt" fi -{ echo "$as_me:$LINENO: checking whether -Wmissing-declarations works" >&5 -echo $ECHO_N "checking whether -Wmissing-declarations works... $ECHO_C" >&6; } -if test "${Wmissing_declarations_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nis_add in -lnsl" >&5 +$as_echo_n "checking for nis_add in -lnsl... " >&6; } +if test "${ac_cv_lib_nsl_nis_add+set}" = set; then : + $as_echo_n "(cached) " >&6 else - - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wmissing-declarations" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char nis_add (); int main () { - +return nis_add (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - Wmissing_declarations_flag=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_nis_add=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - Wmissing_declarations_flag=no + ac_cv_lib_nsl_nis_add=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$saved_CPPFLAGS - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $Wmissing_declarations_flag" >&5 -echo "${ECHO_T}$Wmissing_declarations_flag" >&6; } - -if test "x$Wmissing_declarations_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wmissing-declarations" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_nis_add" >&5 +$as_echo "$ac_cv_lib_nsl_nis_add" >&6; } +if test "x$ac_cv_lib_nsl_nis_add" = x""yes; then : + EXOSIP_LIB="$EXOSIP_LIB -lnsl" fi -{ echo "$as_me:$LINENO: checking whether -Wmissing-prototypes works" >&5 -echo $ECHO_N "checking whether -Wmissing-prototypes works... $ECHO_C" >&6; } -if test "${Wmissing_prototypes_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendto in -lsocket" >&5 +$as_echo_n "checking for sendto in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_sendto+set}" = set; then : + $as_echo_n "(cached) " >&6 else - - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wmissing-prototypes" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sendto (); int main () { - +return sendto (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - Wmissing_prototypes_flag=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_sendto=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - Wmissing_prototypes_flag=no + ac_cv_lib_socket_sendto=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$saved_CPPFLAGS - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $Wmissing_prototypes_flag" >&5 -echo "${ECHO_T}$Wmissing_prototypes_flag" >&6; } - -if test "x$Wmissing_prototypes_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wmissing-prototypes" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_sendto" >&5 +$as_echo "$ac_cv_lib_socket_sendto" >&6; } +if test "x$ac_cv_lib_socket_sendto" = x""yes; then : + EXOSIP_LIB="$EXOSIP_LIB -lsocket" fi -{ echo "$as_me:$LINENO: checking whether -Wnested-externs works" >&5 -echo $ECHO_N "checking whether -Wnested-externs works... $ECHO_C" >&6; } -if test "${Wnested_externs_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 +$as_echo_n "checking for clock_gettime in -lrt... " >&6; } +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : + $as_echo_n "(cached) " >&6 else - - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wnested-externs" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clock_gettime (); int main () { - +return clock_gettime (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - Wnested_externs_flag=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_gettime=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - Wnested_externs_flag=no + ac_cv_lib_rt_clock_gettime=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$saved_CPPFLAGS - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $Wnested_externs_flag" >&5 -echo "${ECHO_T}$Wnested_externs_flag" >&6; } - -if test "x$Wnested_externs_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wnested-externs" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 +$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } +if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : + EXOSIP_LIB="$EXOSIP_LIB -lrt" fi -{ echo "$as_me:$LINENO: checking whether -Wpointer-arith works" >&5 -echo $ECHO_N "checking whether -Wpointer-arith works... $ECHO_C" >&6; } -if test "${Wpointer_arith_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wpointer-arith" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +case $OS in + openbsd*) + ;; + *) + { $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 : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_query (); int main () { - +return res_query (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - Wpointer_arith_flag=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv_res_query=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - Wpointer_arith_flag=no + ac_cv_lib_resolv_res_query=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$saved_CPPFLAGS - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $Wpointer_arith_flag" >&5 -echo "${ECHO_T}$Wpointer_arith_flag" >&6; } - -if test "x$Wpointer_arith_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wpointer-arith" +{ $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 : + EXOSIP_LIB="$EXOSIP_LIB -lresolv" fi -TOOLS_LIBS=$TOOLS_LIBS - - - - - - - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#include -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __res_query (); int main () { - +return __res_query (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv___res_query=yes else - ac_cv_header_stdc=no + ac_cv_lib_resolv___res_query=no fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no +{ $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 : + EXOSIP_LIB="$EXOSIP_LIB -lresolv" fi -rm -f conftest* -fi + ;; +esac -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ares_init in -lcares" >&5 +$as_echo_n "checking for ares_init in -lcares... " >&6; } +if test "${ac_cv_lib_cares_ares_init+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcares $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ares_init (); int main () { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; +return ares_init (); + ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cares_ares_init=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no + ac_cv_lib_cares_ares_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cares_ares_init" >&5 +$as_echo "$ac_cv_lib_cares_ares_init" >&6; } +if test "x$ac_cv_lib_cares_ares_init" = x""yes; then : + ac_fn_c_check_header_mongrel "$LINENO" "ares.h" "ac_cv_header_ares_h" "$ac_includes_default" +if test "x$ac_cv_header_ares_h" = x""yes; then : + EXOSIP_LIB="$EXOSIP_LIB -lcares" + EXOSIP_FLAGS="$EXOSIP_FLAGS -DHAVE_CARES_H" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: c-ares header files are not installed" >&5 +$as_echo "$as_me: WARNING: c-ares header files are not installed" >&2;} fi -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: c-ares library is not installed" >&5 +$as_echo "$as_me: WARNING: c-ares library is not installed" >&2;} fi -for ac_header in ctype.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +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 : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $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 - ;; + ;; esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - eval "$as_ac_Header=\$ac_header_preproc" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF fi - +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +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 : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $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 - -for ac_header in string.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + 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 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSIP" >&5 +$as_echo_n "checking for OSIP... " >&6; } - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -n "$OSIP_CFLAGS"; then + pkg_cv_OSIP_CFLAGS="$OSIP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosip2 >= 3.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libosip2 >= 3.5") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OSIP_CFLAGS=`$PKG_CONFIG --cflags "libosip2 >= 3.5" 2>/dev/null` else - eval "$as_ac_Header=\$ac_header_preproc" + pkg_failed=yes fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - + else + pkg_failed=untried fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +if test -n "$OSIP_LIBS"; then + pkg_cv_OSIP_LIBS="$OSIP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libosip2 >= 3.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libosip2 >= 3.5") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OSIP_LIBS=`$PKG_CONFIG --libs "libosip2 >= 3.5" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -done -for ac_header in strings.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - ac_header_compiler=no +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + OSIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libosip2 >= 3.5" 2>&1` + else + OSIP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libosip2 >= 3.5" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$OSIP_PKG_ERRORS" >&5 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: assuming osip can be found in -I$includedir and -L$libdir" >&5 +$as_echo "$as_me: WARNING: assuming osip can be found in -I$includedir and -L$libdir" >&2;} +OSIP_CFLAGS='-I$(includedir) -I$(prefix)/include' +OSIP_LIBS='-L$(libdir) -L$(prefix)/lib -losip2 -losipparser2' + +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}: WARNING: assuming osip can be found in -I$includedir and -L$libdir" >&5 +$as_echo "$as_me: WARNING: assuming osip can be found in -I$includedir and -L$libdir" >&2;} +OSIP_CFLAGS='-I$(includedir) -I$(prefix)/include' +OSIP_LIBS='-L$(libdir) -L$(prefix)/lib -losip2 -losipparser2' + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + OSIP_CFLAGS=$pkg_cv_OSIP_CFLAGS + OSIP_LIBS=$pkg_cv_OSIP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +EXOSIP_FLAGS="$EXOSIP_FLAGS" -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wall works" >&5 +$as_echo_n "checking whether -Wall works... " >&6; } +if test "${Wall_cv_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 +else - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wall" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + Wall_cv_flag=yes else - eval "$as_ac_Header=\$ac_header_preproc" + Wall_cv_flag=no fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$saved_CPPFLAGS fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Wall_cv_flag" >&5 +$as_echo "$Wall_cv_flag" >&6; } +if test "x$Wall_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wall" fi -done - - -for ac_header in stdio.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wcast-align works" >&5 +$as_echo_n "checking whether -Wcast-align works... " >&6; } +if test "${Wcast_align_cv_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wcast-align" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> + +int +main () +{ + + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_compile "$LINENO"; then : + Wcast_align_cv_flag=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + Wcast_align_cv_flag=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } + CPPFLAGS=$saved_CPPFLAGS -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Wcast_align_cv_flag" >&5 +$as_echo "$Wcast_align_cv_flag" >&6; } - ac_header_preproc=no +if test "x$Wcast_align_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wcast-align" fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wchar-subscripts works" >&5 +$as_echo_n "checking whether -Wchar-subscripts works... " >&6; } +if test "${Wchar_subscripts_cv_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 +else -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wchar-subscripts" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + Wchar_subscripts_cv_flag=yes else - eval "$as_ac_Header=\$ac_header_preproc" + Wchar_subscripts_cv_flag=no fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$saved_CPPFLAGS fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Wchar_subscripts_cv_flag" >&5 +$as_echo "$Wchar_subscripts_cv_flag" >&6; } +if test "x$Wchar_subscripts_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wchar-subscripts" fi -done - - -for ac_header in stdlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wformat works" >&5 +$as_echo_n "checking whether -Wformat works... " >&6; } +if test "${Wformat_cv_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wformat" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> + +int +main () +{ + + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_compile "$LINENO"; then : + Wformat_cv_flag=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + Wformat_cv_flag=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$saved_CPPFLAGS - ac_header_compiler=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Wformat_cv_flag" >&5 +$as_echo "$Wformat_cv_flag" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +if test "x$Wformat_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wformat" +fi -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Winline works" >&5 +$as_echo_n "checking whether -Winline works... " >&6; } +if test "${Winline_cv_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Winline" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <$ac_header> + +int +main () +{ + + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if ac_fn_c_try_compile "$LINENO"; then : + Winline_cv_flag=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + Winline_cv_flag=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$saved_CPPFLAGS - ac_header_preproc=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Winline_cv_flag" >&5 +$as_echo "$Winline_cv_flag" >&6; } -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +if test "x$Winline_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Winline" +fi -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wmissing-declarations works" >&5 +$as_echo_n "checking whether -Wmissing-declarations works... " >&6; } +if test "${Wmissing_declarations_cv_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 +else - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wmissing-declarations" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + Wmissing_declarations_cv_flag=yes else - eval "$as_ac_Header=\$ac_header_preproc" + Wmissing_declarations_cv_flag=no fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$saved_CPPFLAGS fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Wmissing_declarations_cv_flag" >&5 +$as_echo "$Wmissing_declarations_cv_flag" >&6; } +if test "x$Wmissing_declarations_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wmissing-declarations" fi -done - - -for ac_header in unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wmissing-prototypes works" >&5 +$as_echo_n "checking whether -Wmissing-prototypes works... " >&6; } +if test "${Wmissing_prototypes_cv_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wmissing-prototypes" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> + +int +main () +{ + + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_compile "$LINENO"; then : + Wmissing_prototypes_cv_flag=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + Wmissing_prototypes_cv_flag=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$saved_CPPFLAGS - ac_header_compiler=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Wmissing_prototypes_cv_flag" >&5 +$as_echo "$Wmissing_prototypes_cv_flag" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +if test "x$Wmissing_prototypes_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wmissing-prototypes" +fi -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wnested-externs works" >&5 +$as_echo_n "checking whether -Wnested-externs works... " >&6; } +if test "${Wnested_externs_cv_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wnested-externs" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <$ac_header> + +int +main () +{ + + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if ac_fn_c_try_compile "$LINENO"; then : + Wnested_externs_cv_flag=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + Wnested_externs_cv_flag=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$saved_CPPFLAGS - ac_header_preproc=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Wnested_externs_cv_flag" >&5 +$as_echo "$Wnested_externs_cv_flag" >&6; } -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +if test "x$Wnested_externs_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wnested-externs" +fi -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wpointer-arith works" >&5 +$as_echo_n "checking whether -Wpointer-arith works... " >&6; } +if test "${Wpointer_arith_cv_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 +else - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wpointer-arith" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + Wpointer_arith_cv_flag=yes else - eval "$as_ac_Header=\$ac_header_preproc" + Wpointer_arith_cv_flag=no fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$saved_CPPFLAGS fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Wpointer_arith_cv_flag" >&5 +$as_echo "$Wpointer_arith_cv_flag" >&6; } +if test "x$Wpointer_arith_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wpointer-arith" fi -done +TOOLS_LIBS=$TOOLS_LIBS -for ac_header in stdarg.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + + + + + +{ $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 : + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <$ac_header> +#include + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_stdc=no +fi +rm -f conftest* - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +for ac_header in ctype.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "ctype.h" "ac_cv_header_ctype_h" "$ac_includes_default" +if test "x$ac_cv_header_ctype_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_CTYPE_H 1 _ACEOF fi done - -for ac_header in varargs.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +for ac_header in string.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRING_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +done -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +for ac_header in strings.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" +if test "x$ac_cv_header_strings_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRINGS_H 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +done -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +for ac_header in stdio.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" +if test "x$ac_cv_header_stdio_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDIO_H 1 +_ACEOF - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +done + +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_STDLIB_H 1 _ACEOF fi done - -for ac_header in sys/time.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +for ac_header in unistd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UNISTD_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +done -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +for ac_header in stdarg.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default" +if test "x$ac_cv_header_stdarg_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDARG_H 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +done -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +for ac_header in varargs.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "varargs.h" "ac_cv_header_varargs_h" "$ac_includes_default" +if test "x$ac_cv_header_varargs_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VARARGS_H 1 +_ACEOF - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +done + +for ac_header in sys/time.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_time_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_SYS_TIME_H 1 _ACEOF fi done - for ac_header in assert.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +do : + ac_fn_c_check_header_mongrel "$LINENO" "assert.h" "ac_cv_header_assert_h" "$ac_includes_default" +if test "x$ac_cv_header_assert_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ASSERT_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +done -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +for ac_header in signal.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "signal.h" "ac_cv_header_signal_h" "$ac_includes_default" +if test "x$ac_cv_header_signal_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SIGNAL_H 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +done -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +for ac_header in sys/signal.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/signal.h" "ac_cv_header_sys_signal_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_signal_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SIGNAL_H 1 +_ACEOF - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +done + +for ac_header in malloc.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default" +if test "x$ac_cv_header_malloc_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_MALLOC_H 1 _ACEOF fi done - -for ac_header in signal.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +for ac_header in sys/select.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_select_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SELECT_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +done -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +for ac_header in sys/types.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_types_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_TYPES_H 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +done -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +for ac_header in fcntl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FCNTL_H 1 +_ACEOF - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +done + +for ac_header in sys/soundcard.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_SYS_SOUNDCARD_H 1 _ACEOF fi done - -for ac_header in sys/signal.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +for ac_header in arpa/inet.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" +if test "x$ac_cv_header_arpa_inet_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ARPA_INET_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +done -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +for ac_header in arpa/nameser.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "arpa/nameser.h" "ac_cv_header_arpa_nameser_h" "$ac_includes_default" +if test "x$ac_cv_header_arpa_nameser_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ARPA_NAMESER_H 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +done -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +for ac_header in netdb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default" +if test "x$ac_cv_header_netdb_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NETDB_H 1 +_ACEOF - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + +done + +for ac_header in nameser8_compat.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "nameser8_compat.h" "ac_cv_header_nameser8_compat_h" "$ac_includes_default" +if test "x$ac_cv_header_nameser8_compat_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NAMESER8_COMPAT_H 1 +_ACEOF fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + +done + +for ac_header in arpa/nameser_compat.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "arpa/nameser_compat.h" "ac_cv_header_arpa_nameser_compat_h" "$ac_includes_default" +if test "x$ac_cv_header_arpa_nameser_compat_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_ARPA_NAMESER_COMPAT_H 1 _ACEOF fi @@ -24161,3009 +12349,2491 @@ done -for ac_header in malloc.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +for ac_header in resolv.h +do : + ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "#if HAVE_SYS_TYPES_H +#include +#endif +#if HAVE_NETINET_IN_H +#include +#endif +#if HAVE_ARPA_NAMESER_H +#include +#endif + +" +if test "x$ac_cv_header_resolv_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_RESOLV_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +done -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> + +for ac_func in getifaddrs +do : + ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs" +if test "x$ac_cv_func_getifaddrs" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETIFADDRS 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi +done -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-openssl was given. +if test "${enable_openssl+set}" = set; then : + enableval=$enable_openssl; enable_openssl=$enableval else - eval "$as_ac_Header=\$ac_header_preproc" + enable_openssl="yes" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + +if test "$enable_openssl" = "yes" ; then + for ac_header in openssl/ssl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_OPENSSL_SSL_H 1 _ACEOF fi done - -for ac_header in sys/select.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 +$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } +if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then : + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_new (); +int +main () +{ +return SSL_CTX_new (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_CTX_new=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + ac_cv_lib_ssl_SSL_CTX_new=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; } +if test "x$ac_cv_lib_ssl_SSL_CTX_new" = x""yes; then : + EXOSIP_LIB="$EXOSIP_LIB -lssl" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_get_issuer_name in -lcrypto" >&5 +$as_echo_n "checking for X509_get_issuer_name in -lcrypto... " >&6; } +if test "${ac_cv_lib_crypto_X509_get_issuer_name+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <$ac_header> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char X509_get_issuer_name (); +int +main () +{ +return X509_get_issuer_name (); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_X509_get_issuer_name=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + ac_cv_lib_crypto_X509_get_issuer_name=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_X509_get_issuer_name" >&5 +$as_echo "$ac_cv_lib_crypto_X509_get_issuer_name" >&6; } +if test "x$ac_cv_lib_crypto_X509_get_issuer_name" = x""yes; then : + EXOSIP_LIB="$EXOSIP_LIB -lcrypto" fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +fi - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-srvrec was given. +if test "${enable_srvrec+set}" = set; then : + enableval=$enable_srvrec; enable_srvrec=$enableval else - eval "$as_ac_Header=\$ac_header_preproc" + enable_srvrec="yes" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +if test "x$enable_srvrec" = "xyes" ; then + CPPFLAGS="$CPPFLAGS -DSRV_RECORD" fi -done +ac_config_files="$ac_config_files Makefile scripts/Makefile platform/Makefile platform/vsnet/Makefile platform/wince/Makefile include/Makefile include/eXosip2/Makefile src/Makefile tools/Makefile help/Makefile help/doxygen/Makefile help/doxygen/doxygen.dox" +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. -for ac_header in sys/types.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :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" && + { $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 + 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;} + fi fi +rm -f confcache -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +DEFS=-DHAVE_CONFIG_H + +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$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi - ac_header_preproc=no +if test -z "${INSIDE_GNOME_COMMON_TRUE}" && test -z "${INSIDE_GNOME_COMMON_FALSE}"; then + as_fn_error $? "conditional \"INSIDE_GNOME_COMMON\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + 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. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${BUILD_MAXSIZE_TRUE}" && test -z "${BUILD_MAXSIZE_FALSE}"; then + as_fn_error $? "conditional \"BUILD_MAXSIZE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${COMPILE_TOOLS_TRUE}" && test -z "${COMPILE_TOOLS_FALSE}"; then + as_fn_error $? "conditional \"COMPILE_TOOLS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +: ${CONFIG_STATUS=./config.status} +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST else - eval "$as_ac_Header=\$ac_header_preproc" + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi -done +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" -for ac_header in fcntl.h +# Find who we are. Look in the path if we contain no directory separator. +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS - ac_header_compiler=no + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE - ac_header_preproc=no -fi +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +# 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. +as_fn_error () +{ + 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: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false fi -done - - -for ac_header in sys/soundcard.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + as_basename=false fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + as_dirname=false fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - ;; +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' fi - -done +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -for ac_header in arpa/inet.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ - ac_header_compiler=no -fi + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + 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" -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + test -d ./-p && rmdir ./-p + as_mkdir_p=false fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - eval "$as_ac_Header=\$ac_header_preproc" + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +as_executable_p=$as_test_x -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -fi +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -done +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -for ac_header in arpa/nameser.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by $as_me, which was +generated by GNU Autoconf 2.67. Invocation command line was - ac_header_compiler=no -fi + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -fi +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -done +Usage: $0 [OPTION]... [TAG]... + -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 + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE -for ac_header in netdb.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +Configuration files: +$config_files - ac_header_compiler=no -fi +Configuration headers: +$config_headers -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +Configuration commands: +$config_commands + +Report bugs to the package provider." -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +config.status +configured by $0, generated by GNU Autoconf 2.67, + with options \\"\$ac_cs_config\\" - ac_header_preproc=no -fi +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." -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + 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;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; -fi + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; -done + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + esac + shift +done -for ac_header in resolv8_compat.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +ac_configure_extra_args= - ac_header_compiler=no +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +# 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 -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +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"`' +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"`' +OBJDUMP='`$ECHO "X$OBJDUMP" | $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"`' + +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# Quote evaled strings. +for var in SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ +AR \ +AR_FLAGS \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +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 \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_wl \ +lt_prog_compiler_pic \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ +hardcode_libdir_separator \ +fix_srcfile_path \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +finish_eval \ +old_striplib \ +striplib; do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done - ;; +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +sys_lib_dlsearch_path_spec; do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + 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 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_aux_dir='$ac_aux_dir' +xsi_shell='$xsi_shell' +lt_shell_append='$lt_shell_append' +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST fi -done + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' -for ac_header in resolv.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_ARPA_NAMESER_H -#include -#endif -#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; + "platform/Makefile") CONFIG_FILES="$CONFIG_FILES platform/Makefile" ;; + "platform/vsnet/Makefile") CONFIG_FILES="$CONFIG_FILES platform/vsnet/Makefile" ;; + "platform/wince/Makefile") CONFIG_FILES="$CONFIG_FILES platform/wince/Makefile" ;; + "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "include/eXosip2/Makefile") CONFIG_FILES="$CONFIG_FILES include/eXosip2/Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; + "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; + "help/doxygen/Makefile") CONFIG_FILES="$CONFIG_FILES help/doxygen/Makefile" ;; + "help/doxygen/doxygen.dox") CONFIG_FILES="$CONFIG_FILES help/doxygen/doxygen.dox" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + esac +done + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi -done +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then -for ac_func in getifaddrs -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + 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 '^'` +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 -#undef $ac_func + 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 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" -int -main () +} { -return $ac_func (); - ; - return 0; + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line } + +_ACAWK _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF - eval "$as_ac_var=no" +# 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[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# 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 || +BEGIN { _ACEOF -fi +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# 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 + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi done +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$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 `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + 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'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac -# Check whether --enable-openssl was given. -if test "${enable_openssl+set}" = set; then - enableval=$enable_openssl; enable_openssl=$enableval -else - enable_openssl="yes" -fi + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. -if test "$enable_openssl" = "yes" ; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix -for ac_header in openssl/ssl.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } + case $ac_mode in + :F) + # + # CONFIG_FILE + # -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +_ACEOF - ac_header_preproc=no -fi +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +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 -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +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"; } && + { $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 +$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;} -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + 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 + { $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 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$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" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} + ;; + "libtool":C) -done + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi -fi + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" -# Check whether --enable-srvrec was given. -if test "${enable_srvrec+set}" = set; then - enableval=$enable_srvrec; enable_srvrec=$enableval -else - enable_srvrec="yes" -fi + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# 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. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -if test "x$enable_srvrec" = "xyes" ; then - CPPFLAGS="$CPPFLAGS -DSRV_RECORD" -fi -ac_config_files="$ac_config_files Makefile scripts/Makefile platform/Makefile platform/vsnet/Makefile platform/wince/Makefile include/Makefile include/eXosip2/Makefile src/Makefile tools/Makefile help/Makefile help/doxygen/Makefile help/doxygen/doxygen.dox" +# The names of the tagged configurations supported by this script. +available_tags="" -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. +# ### BEGIN LIBTOOL CONFIG -_ACEOF +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :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" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache +# Whether or not to build static libraries. +build_old_libs=$enable_static -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +# What type of objects to build. +pic_mode=$pic_mode -DEFS=-DHAVE_CONFIG_H +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install -ac_libobjs= -ac_ltlibobjs= -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$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os -LTLIBOBJS=$ac_ltlibobjs +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os +# A sed program that does not truncate output. +SED=$lt_SED -if test -z "${INSIDE_GNOME_COMMON_TRUE}" && test -z "${INSIDE_GNOME_COMMON_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"INSIDE_GNOME_COMMON\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"INSIDE_GNOME_COMMON\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${COMPILE_TOOLS_TRUE}" && test -z "${COMPILE_TOOLS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"COMPILE_TOOLS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"COMPILE_TOOLS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${BUILD_MAXSIZE_TRUE}" && test -z "${BUILD_MAXSIZE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_MAXSIZE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_MAXSIZE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. +# A grep program that handles long lines. +GREP=$lt_GREP -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF +# An ERE matcher. +EGREP=$lt_EGREP -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +# A literal string matcher. +FGREP=$lt_FGREP -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac +# A BSD- or MS-compatible name lister. +NM=$lt_NM -fi +# Whether we need soft or hard links. +LN_S=$lt_LN_S +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len +# Object file suffix (normally "o"). +objext=$ac_objext +# Executable file suffix (normally ""). +exeext=$exeext -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +# whether the shell understands "unset". +lt_unset=$lt_unset -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi +# Command to use when deplibs_check_method == "file_magic". +file_magic_cmd=$lt_file_magic_cmd -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +# A symbol stripping program. +STRIP=$lt_STRIP -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi +# A C compiler. +LTCC=$lt_CC +# LTCC compiler flags. +LTCFLAGS=$lt_CFLAGS -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# CDPATH. -$as_unset CDPATH +# Transform the output of nm in a proper C declaration. +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm in a C name address pair. +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +# 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 - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } +# The name of the directory that contains temporary libtool files. +objdir=$objdir - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL +# An echo program that does not interpret backslashes. +ECHO=$lt_ECHO -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Used to examine libraries when file_magic_cmd begins with "file". +MAGIC_CMD=$MAGIC_CMD -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac +# Must we lock files when doing compilation? +need_locks=$lt_need_locks -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +# Tool to change global to local symbols on Mac OS X. +NMEDIT=$lt_NMEDIT -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi +# Tool to manipulate fat objects and archives on Mac OS X. +LIPO=$lt_LIPO -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +# ldd/readelf like tool for Mach-O binaries on Mac OS X. +OTOOL=$lt_OTOOL -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +OTOOL64=$lt_OTOOL64 -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +# Old archive suffix (normally "a"). +libext=$libext +# Shared library suffix (normally ".so"). +shrext_cmds=$lt_shrext_cmds -exec 6>&1 +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was +# Variables whose values should be saved in libtool wrapper scripts and +# restored at link time. +variables_saved_for_relink=$lt_variables_saved_for_relink - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ +# Do we need the "lib" prefix for modules? +need_lib_prefix=$need_lib_prefix -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" +# Do we need a version for libraries? +need_version=$need_version -_ACEOF +# Library versioning type. +version_type=$version_type -cat >>$CONFIG_STATUS <<_ACEOF -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +# Shared library runtime path variable. +runpath_var=$runpath_var -_ACEOF +# Shared library path variable. +shlibpath_var=$shlibpath_var -cat >>$CONFIG_STATUS <<\_ACEOF -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath -Usage: $0 [OPTIONS] [FILE]... +# Format of library name prefix. +libname_spec=$lt_libname_spec - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME +library_names_spec=$lt_library_names_spec -Configuration files: -$config_files +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -Configuration headers: -$config_headers +# Command to use after installation of a shared archive. +postinstall_cmds=$lt_postinstall_cmds -Configuration commands: -$config_commands +# Command to use after uninstallation of a shared archive. +postuninstall_cmds=$lt_postuninstall_cmds -Report bugs to ." +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -config.status -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +# As "finish_cmds", except a single script fragment to be evaled but +# not shown. +finish_eval=$lt_finish_eval -Copyright (C) 2006 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -_ACEOF +# Compile-time system search path for libraries. +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac +# Run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; +# Whether dlopen is supported. +dlopen_support=$enable_dlopen - # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static - esac - shift -done +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -ac_configure_extra_args= -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi +# The linker used to build libraries. +LD=$lt_LD -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 +# A language specific compiler. +CC=$lt_compiler -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +# Is the compiler the GNU compiler? +with_gcc=$GCC -_ACEOF +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -cat >>$CONFIG_STATUS <<\_ACEOF +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; - "platform/Makefile") CONFIG_FILES="$CONFIG_FILES platform/Makefile" ;; - "platform/vsnet/Makefile") CONFIG_FILES="$CONFIG_FILES platform/vsnet/Makefile" ;; - "platform/wince/Makefile") CONFIG_FILES="$CONFIG_FILES platform/wince/Makefile" ;; - "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "include/eXosip2/Makefile") CONFIG_FILES="$CONFIG_FILES include/eXosip2/Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; - "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; - "help/doxygen/Makefile") CONFIG_FILES="$CONFIG_FILES help/doxygen/Makefile" ;; - "help/doxygen/doxygen.dox") CONFIG_FILES="$CONFIG_FILES help/doxygen/doxygen.dox" ;; +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -# -# Set up the sed scripts for CONFIG_FILES section. -# +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object -_ACEOF +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -LIBEXOSIP_SO_VERSION!$LIBEXOSIP_SO_VERSION$ac_delim -EXOSIP_VERSION!$EXOSIP_VERSION$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -INSIDE_GNOME_COMMON_TRUE!$INSIDE_GNOME_COMMON_TRUE$ac_delim -INSIDE_GNOME_COMMON_FALSE!$INSIDE_GNOME_COMMON_FALSE$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -ac_aux_dir!$ac_aux_dir$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -DEPDIR!$DEPDIR$ac_delim -am__include!$am__include$ac_delim -am__quote!$am__quote$ac_delim -AMDEP_TRUE!$AMDEP_TRUE$ac_delim -AMDEP_FALSE!$AMDEP_FALSE$ac_delim -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -CPP!$CPP$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -CXXDEPMODE!$CXXDEPMODE$ac_delim -am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -SED!$SED$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -_ACEOF +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -LN_S!$LN_S$ac_delim -ECHO!$ECHO$ac_delim -AR!$AR$ac_delim -RANLIB!$RANLIB$ac_delim -DSYMUTIL!$DSYMUTIL$ac_delim -NMEDIT!$NMEDIT$ac_delim -CXXCPP!$CXXCPP$ac_delim -F77!$F77$ac_delim -FFLAGS!$FFLAGS$ac_delim -ac_ct_F77!$ac_ct_F77$ac_delim -LIBTOOL!$LIBTOOL$ac_delim -PTHREAD_CC!$PTHREAD_CC$ac_delim -PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim -PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim -COMPILE_TOOLS_TRUE!$COMPILE_TOOLS_TRUE$ac_delim -COMPILE_TOOLS_FALSE!$COMPILE_TOOLS_FALSE$ac_delim -BUILD_MAXSIZE_TRUE!$BUILD_MAXSIZE_TRUE$ac_delim -BUILD_MAXSIZE_FALSE!$BUILD_MAXSIZE_FALSE$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -OSIP_CFLAGS!$OSIP_CFLAGS$ac_delim -OSIP_LIBS!$OSIP_LIBS$ac_delim -TOOLS_LIBS!$TOOLS_LIBS$ac_delim -EXOSIP_FLAGS!$EXOSIP_FLAGS$ac_delim -EXOSIP_LIB!$EXOSIP_LIB$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ 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/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L -cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$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 `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - ac_file_inputs="$ac_file_inputs $ac_f" - done +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - fi +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action + +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac - case $ac_mode in - :F) - # - # CONFIG_FILE - # +ltmain="$ac_aux_dir/ltmain.sh" - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + + # We use sed instead of cat because bash on DJGPP gets confused if + # 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 -_ACEOF +} -cat >>$CONFIG_STATUS <<\_ACEOF -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} -case `sed -n '/datarootdir/ { - p - q +# 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##*/}" } -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' $ac_file_inputs` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out +# 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}"} +} -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"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -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;} +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; esac - ;; - :H) - # - # CONFIG_HEADER - # -_ACEOF +} -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $* )) +} -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF - if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f $ac_file - mv "$tmp/config.h" $ac_file - fi +_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 - echo "/* $configure_input */" - cat "$ac_result" + func_dirname_result="$func_dirname_result${2}" fi - rm -f "$tmp/out12" -# Compute $ac_file's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $ac_file | $ac_file:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; +} - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} - ;; +# 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/^-[^=]*=//' - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; +# 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 - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done + + + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + ;; esac done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -27183,7 +14853,11 @@ 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 || { (exit 1); exit 1; } + $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 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff -Nru libexosip2-3.3.0/configure.in libexosip2-3.6.0/configure.in --- libexosip2-3.3.0/configure.in 2009-03-04 10:50:58.000000000 +0000 +++ libexosip2-3.6.0/configure.in 2011-10-05 14:26:42.000000000 +0000 @@ -12,10 +12,10 @@ dnl ********************************************************************* dnl Source packaging numbers EXOSIP_MAJOR_VERSION=3 -EXOSIP_MINOR_VERSION=3 +EXOSIP_MINOR_VERSION=6 EXOSIP_MICRO_VERSION=0 -SONAME_MAJOR_VERSION=6 +SONAME_MAJOR_VERSION=9 SONAME_MINOR_VERSION=0 SONAME_MICRO_VERSION=2 @@ -42,7 +42,7 @@ dnl ********************************************************************* dnl Initialize automake stuff AC_CONFIG_AUX_DIR(scripts) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_ACLOCAL_INCLUDE(scripts) @@ -54,7 +54,6 @@ AC_PROG_CC AC_PROG_CPP -AC_PROG_CXX AC_PROG_INSTALL dnl enable --enable-shared and --disable-shared options @@ -124,8 +123,6 @@ -AM_CONDITIONAL(COMPILE_TOOLS, test "x$enable_tools" = "xyes") - if test "x$enable_semaphore" = "xyes"; then EXOSIP_FLAGS="$EXOSIP_FLAGS -DHAVE_SEMAPHORE_H" AC_CHECK_HEADERS(semaphore.h) @@ -156,6 +153,12 @@ darwin*) EXOSIP_FLAGS="$EXOSIP_FLAGS -pedantic" ;; + *mingw*) + EXOSIP_FLAGS="$EXOSIP_FLAGS -D_WIN32_WINNT=0x0501" + EXOSIP_LIB="EXOSIP_LIB -lws2_32 -liphlpapi -ldnsapi" +dnl tools are not ported to win32 + enable_tools=no + ;; *) ;; esac @@ -185,6 +188,7 @@ EXOSIP_FLAGS="$EXOSIP_FLAGS -DMINISIZE" fi AM_CONDITIONAL(BUILD_MAXSIZE, test x$enable_minisize = xno) +AM_CONDITIONAL(COMPILE_TOOLS, test "x$enable_tools" = "xyes") dnl Checks for libraries. AC_CHECK_LIB(posix4,sem_open,[EXOSIP_LIB="$EXOSIP_LIB -lposix4 -mt"]) @@ -192,8 +196,6 @@ AC_CHECK_LIB(socket,sendto,[EXOSIP_LIB="$EXOSIP_LIB -lsocket"]) AC_CHECK_LIB(rt,clock_gettime,[EXOSIP_LIB="$EXOSIP_LIB -lrt"]) -AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"]) - case $OS in openbsd*) ;; @@ -203,7 +205,16 @@ ;; esac -PKG_CHECK_MODULES(OSIP, libosip2 >= 3.1, [], [ +AC_CHECK_LIB([cares], [ares_init], + [AC_CHECK_HEADER(ares.h, + [EXOSIP_LIB="$EXOSIP_LIB -lcares" + EXOSIP_FLAGS="$EXOSIP_FLAGS -DHAVE_CARES_H"], + [AC_MSG_WARN([c-ares header files are not installed])]) + ], + [AC_MSG_WARN([c-ares library is not installed])] +) + +PKG_CHECK_MODULES(OSIP, libosip2 >= 3.5, [], [ AC_MSG_WARN([assuming osip can be found in -I$includedir and -L$libdir]) OSIP_CFLAGS='-I$(includedir) -I$(prefix)/include' OSIP_LIBS='-L$(libdir) -L$(prefix)/lib -losip2 -losipparser2' @@ -211,102 +222,102 @@ EXOSIP_FLAGS="$EXOSIP_FLAGS" -AC_CACHE_CHECK([whether -Wall works], Wall_flag, [ +AC_CACHE_CHECK([whether -Wall works], Wall_cv_flag, [ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wall" - AC_TRY_COMPILE(, , Wall_flag=yes, Wall_flag=no) + AC_TRY_COMPILE(, , Wall_cv_flag=yes, Wall_cv_flag=no) CPPFLAGS=$saved_CPPFLAGS ]) -if test "x$Wall_flag" = xyes; then +if test "x$Wall_cv_flag" = xyes; then CPPFLAGS="$CPPFLAGS -Wall" fi -AC_CACHE_CHECK([whether -Wcast-align works], Wcast_align_flag, [ +AC_CACHE_CHECK([whether -Wcast-align works], Wcast_align_cv_flag, [ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wcast-align" - AC_TRY_COMPILE(, , Wcast_align_flag=yes, Wcast_align_flag=no) + AC_TRY_COMPILE(, , Wcast_align_cv_flag=yes, Wcast_align_cv_flag=no) CPPFLAGS=$saved_CPPFLAGS ]) -if test "x$Wcast_align_flag" = xyes; then +if test "x$Wcast_align_cv_flag" = xyes; then CPPFLAGS="$CPPFLAGS -Wcast-align" fi -AC_CACHE_CHECK([whether -Wchar-subscripts works], Wchar_subscripts_flag, [ +AC_CACHE_CHECK([whether -Wchar-subscripts works], Wchar_subscripts_cv_flag, [ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wchar-subscripts" - AC_TRY_COMPILE(, , Wchar_subscripts_flag=yes, Wchar_subscripts_flag=no) + AC_TRY_COMPILE(, , Wchar_subscripts_cv_flag=yes, Wchar_subscripts_cv_flag=no) CPPFLAGS=$saved_CPPFLAGS ]) -if test "x$Wchar_subscripts_flag" = xyes; then +if test "x$Wchar_subscripts_cv_flag" = xyes; then CPPFLAGS="$CPPFLAGS -Wchar-subscripts" fi -AC_CACHE_CHECK([whether -Wformat works], Wformat_flag, [ +AC_CACHE_CHECK([whether -Wformat works], Wformat_cv_flag, [ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wformat" - AC_TRY_COMPILE(, , Wformat_flag=yes, Wformat_flag=no) + AC_TRY_COMPILE(, , Wformat_cv_flag=yes, Wformat_cv_flag=no) CPPFLAGS=$saved_CPPFLAGS ]) -if test "x$Wformat_flag" = xyes; then +if test "x$Wformat_cv_flag" = xyes; then CPPFLAGS="$CPPFLAGS -Wformat" fi -AC_CACHE_CHECK([whether -Winline works], Winline_flag, [ +AC_CACHE_CHECK([whether -Winline works], Winline_cv_flag, [ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Winline" - AC_TRY_COMPILE(, , Winline_flag=yes, Winline_flag=no) + AC_TRY_COMPILE(, , Winline_cv_flag=yes, Winline_cv_flag=no) CPPFLAGS=$saved_CPPFLAGS ]) -if test "x$Winline_flag" = xyes; then +if test "x$Winline_cv_flag" = xyes; then CPPFLAGS="$CPPFLAGS -Winline" fi -AC_CACHE_CHECK([whether -Wmissing-declarations works], Wmissing_declarations_flag, [ +AC_CACHE_CHECK([whether -Wmissing-declarations works], Wmissing_declarations_cv_flag, [ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wmissing-declarations" - AC_TRY_COMPILE(, , Wmissing_declarations_flag=yes, Wmissing_declarations_flag=no) + AC_TRY_COMPILE(, , Wmissing_declarations_cv_flag=yes, Wmissing_declarations_cv_flag=no) CPPFLAGS=$saved_CPPFLAGS ]) -if test "x$Wmissing_declarations_flag" = xyes; then +if test "x$Wmissing_declarations_cv_flag" = xyes; then CPPFLAGS="$CPPFLAGS -Wmissing-declarations" fi -AC_CACHE_CHECK([whether -Wmissing-prototypes works], Wmissing_prototypes_flag, [ +AC_CACHE_CHECK([whether -Wmissing-prototypes works], Wmissing_prototypes_cv_flag, [ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wmissing-prototypes" - AC_TRY_COMPILE(, , Wmissing_prototypes_flag=yes, Wmissing_prototypes_flag=no) + AC_TRY_COMPILE(, , Wmissing_prototypes_cv_flag=yes, Wmissing_prototypes_cv_flag=no) CPPFLAGS=$saved_CPPFLAGS ]) -if test "x$Wmissing_prototypes_flag" = xyes; then +if test "x$Wmissing_prototypes_cv_flag" = xyes; then CPPFLAGS="$CPPFLAGS -Wmissing-prototypes" fi -AC_CACHE_CHECK([whether -Wnested-externs works], Wnested_externs_flag, [ +AC_CACHE_CHECK([whether -Wnested-externs works], Wnested_externs_cv_flag, [ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wnested-externs" - AC_TRY_COMPILE(, , Wnested_externs_flag=yes, Wnested_externs_flag=no) + AC_TRY_COMPILE(, , Wnested_externs_cv_flag=yes, Wnested_externs_cv_flag=no) CPPFLAGS=$saved_CPPFLAGS ]) -if test "x$Wnested_externs_flag" = xyes; then +if test "x$Wnested_externs_cv_flag" = xyes; then CPPFLAGS="$CPPFLAGS -Wnested-externs" fi -AC_CACHE_CHECK([whether -Wpointer-arith works], Wpointer_arith_flag, [ +AC_CACHE_CHECK([whether -Wpointer-arith works], Wpointer_arith_cv_flag, [ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wpointer-arith" - AC_TRY_COMPILE(, , Wpointer_arith_flag=yes, Wpointer_arith_flag=no) + AC_TRY_COMPILE(, , Wpointer_arith_cv_flag=yes, Wpointer_arith_cv_flag=no) CPPFLAGS=$saved_CPPFLAGS ]) -if test "x$Wpointer_arith_flag" = xyes; then +if test "x$Wpointer_arith_cv_flag" = xyes; then CPPFLAGS="$CPPFLAGS -Wpointer-arith" fi @@ -340,7 +351,8 @@ AC_CHECK_HEADERS(arpa/inet.h) AC_CHECK_HEADERS(arpa/nameser.h) AC_CHECK_HEADERS(netdb.h) -AC_CHECK_HEADERS(resolv8_compat.h) +AC_CHECK_HEADERS(nameser8_compat.h) +AC_CHECK_HEADERS(arpa/nameser_compat.h) AC_CHECK_HEADERS([resolv.h], [], [], [#if HAVE_SYS_TYPES_H @@ -363,6 +375,8 @@ if test "$enable_openssl" = "yes" ; then AC_CHECK_HEADERS(openssl/ssl.h) + AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"]) + AC_CHECK_LIB(crypto,X509_get_issuer_name,[EXOSIP_LIB="$EXOSIP_LIB -lcrypto"]) fi AC_ARG_ENABLE(srvrec, diff -Nru libexosip2-3.3.0/debian/changelog libexosip2-3.6.0/debian/changelog --- libexosip2-3.3.0/debian/changelog 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/changelog 2012-07-13 13:22:36.000000000 +0000 @@ -1,24 +1,68 @@ -libexosip2 (3.3.0-1.1ubuntu1) precise; urgency=low +libexosip2 (3.6.0-4~precise1) precise; urgency=low - * Merge from Debian testing, remaining changes: - - Build-depend on 3.3.0-1ubuntu1 for guaranteed ABI - - Add libexosip2-4.symbols to ensure ABI stability + * backport to precise; no source changes - -- Felix Geyer Fri, 06 Jan 2012 23:23:39 +0100 + -- Philipp Edelmann Fri, 13 Jul 2012 15:22:24 +0200 -libexosip2 (3.3.0-1.1) unstable; urgency=low +libexosip2 (3.6.0-4) unstable; urgency=low - * Non-maintainer upload. - * Fix FTBFS -Werror=format-security (Closes: #646448) + * wheezey polish + * Update Standards-Version: 3.9.3 + * Fix variable.diff quilt-patch-missing-description + * Fix spelling-error-in-binary usr/bin/sip_reg-3.6.0 recieved received + * Fix libexosip2-dev extended-description-is-probably-too-short + * Fix spelling-error-in-manpage + * debian/compat -> 9 - multiarch & hardening - -- Simon Paillard Tue, 06 Dec 2011 20:48:18 +0100 + -- Mark Purcell Sun, 24 Jun 2012 20:42:02 +1000 -libexosip2 (3.3.0-1ubuntu1) maverick; urgency=low +libexosip2 (3.6.0-3) unstable; urgency=low - * Build-depend on 3.3.0-1ubuntu1 for guaranteed ABI - * Add libexosip2-4.symbols to ensure ABI stability, LP: #595173 + * Added variable.diff patch from pinotree - thks + - Fixes libexosip2: FTBFS on hurd-i386: (Closes: #661321) - -- Jonathan Riddell Tue, 21 Sep 2010 13:14:57 +0100 + -- Mark Purcell Sun, 26 Feb 2012 21:37:34 +1100 + +libexosip2 (3.6.0-2) unstable; urgency=low + + * Upload to unstable - debian-release endorsed + * Added --with autotools_dev + * Fix "[libexosip2] "OSIP" completely uppercase in short description" + Updated debian/control - note upstream uppercase X (Closes: #644864) + + -- Mark Purcell Sun, 26 Feb 2012 08:06:14 +1100 + +libexosip2 (3.6.0-1) experimental; urgency=low + + * New upstream release + - NEW package libeXosip2-7 - soname bump + * Switch to dpkg-source 3.0 (quilt) format + * Switch to dh + * Update to Standards Version 3.9.2 + * Fix "Getting rid of unneeded *.la / emptying dependency_libs" + debian/rules sed -i (Closes: #633180) + * Fix "[libexosip2-4] typo "establishement" in extended description" + Updated debian/control (Closes: #583519) + * Drop binary-control-field-duplicates-source + * cleanup debian/watch - debian-watch-contains-dh_make-template + * Update debian/copyright GPL2 - copyright-refers-to-symlink-license + + -- Mark Purcell Sat, 08 Oct 2011 15:20:31 +1100 + +libexosip2 (3.5.0-1) experimental; urgency=low + + * New upstream release + + [ Kilian Krause ] + * Remove -N from wget args in get-orig-source target as -O is already + used. + + [ Mark Purcell ] + * NEW package libexosip2-6 - soname bump + * Include html docs in -dev package + * Build-Depends: libosip2-dev (>= 3.5) + + -- Mark Purcell Sat, 29 Jan 2011 15:37:37 +1000 libexosip2 (3.3.0-1) unstable; urgency=low diff -Nru libexosip2-3.3.0/debian/compat libexosip2-3.6.0/debian/compat --- libexosip2-3.3.0/debian/compat 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/compat 2012-06-24 10:37:48.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru libexosip2-3.3.0/debian/control libexosip2-3.6.0/debian/control --- libexosip2-3.3.0/debian/control 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/control 2012-06-24 10:37:48.000000000 +0000 @@ -1,12 +1,11 @@ Source: libexosip2 Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian VoIP Team +Maintainer: Debian VoIP Team Uploaders: Mark Purcell , Kilian Krause , Rene Mayorga -Build-Depends: debhelper (>= 5), autotools-dev, cdbs (>= 0.4.39), libncurses5-dev, libosip2-dev (>= 3.3.0-1ubuntu1), dpkg-dev (>= 1.13.19), doxygen +Build-Depends: debhelper (>= 9), autotools-dev, libncurses5-dev, libosip2-dev (>= 3.6), dpkg-dev (>= 1.13.19), doxygen Build-Conflicts: libssl-dev Section: libs -Standards-Version: 3.8.0 +Standards-Version: 3.9.3 Homepage: http://savannah.gnu.org/projects/exosip/ Vcs-Svn: svn://svn.debian.org/pkg-voip/libexosip2/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libexosip2/?op=log @@ -14,17 +13,23 @@ Package: libexosip2-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libexosip2-4 (= ${binary:Version}), libosip2-dev (>= 3.1) -Description: eXtended OSIP library development files - Development files for the eXtended OSIP library +Depends: ${misc:Depends}, libexosip2-7 (= ${binary:Version}), libosip2-dev +Description: eXtended osip library development files + Hides the complexity of using the SIP protocol for multimedia + session establishment. This protocol is mainly to be used by VoIP + telephony applications (endpoints or conference server) but might be + also useful for any application that wish to establish sessions like + multi-player games. + . + Development files for the eXtended osip library -Package: libexosip2-4 -Section: libs +Package: libexosip2-7 Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: eXtended OSIP library - Library that hides the complexity of using the SIP protocol for multimedia - session establishement. This protocol is mainly to be used by VoIP +Description: eXtended osip library + Hides the complexity of using the SIP protocol for multimedia + session establishment. This protocol is mainly to be used by VoIP telephony applications (endpoints or conference server) but might be also useful for any application that wish to establish sessions like - multiplayer games. + multi-player games. diff -Nru libexosip2-3.3.0/debian/copyright libexosip2-3.6.0/debian/copyright --- libexosip2-3.3.0/debian/copyright 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/copyright 2011-10-08 04:32:38.000000000 +0000 @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL-2'. src/inet_ntop.c diff -Nru libexosip2-3.3.0/debian/libexosip2-4.install libexosip2-3.6.0/debian/libexosip2-4.install --- libexosip2-3.3.0/debian/libexosip2-4.install 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/libexosip2-4.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/lib*.so.* -debian/tmp/usr/bin/* diff -Nru libexosip2-3.3.0/debian/libexosip2-4.manpages libexosip2-3.6.0/debian/libexosip2-4.manpages --- libexosip2-3.3.0/debian/libexosip2-4.manpages 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/libexosip2-4.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/manpages/* diff -Nru libexosip2-3.3.0/debian/libexosip2-4.symbols libexosip2-3.6.0/debian/libexosip2-4.symbols --- libexosip2-3.3.0/debian/libexosip2-4.symbols 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/libexosip2-4.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,223 +0,0 @@ -libeXosip2.so.4 libexosip2-4 #MINVER# - ComputeOPc@Base 3.3.0 - CvtHex@Base 3.3.0 - OP@Base 3.3.0 - RijndaelEncrypt@Base 3.3.0 - RijndaelKeySchedule@Base 3.3.0 - __eXosip_call_remove_dialog_reference_in_call@Base 3.3.0 - __eXosip_create_authorization_header@Base 3.3.0 - __eXosip_create_proxy_authorization_header@Base 3.3.0 - __eXosip_delete_jinfo@Base 3.3.0 - __eXosip_new_jinfo@Base 3.3.0 - __eXosip_wakeup@Base 3.3.0 - __eXosip_wakeup_event@Base 3.3.0 - _eXosip_answer_invite_123456xx@Base 3.3.0 - _eXosip_build_request_within_dialog@Base 3.3.0 - _eXosip_build_response_default@Base 3.3.0 - _eXosip_call_retry_request@Base 3.3.0 - _eXosip_call_transaction_find@Base 3.3.0 - _eXosip_delete_nonce@Base 3.3.0 - _eXosip_dialog_add_contact@Base 3.3.0 - _eXosip_find_protocol@Base 3.3.0 - _eXosip_get_local_sdp@Base 3.3.0 - _eXosip_get_remote_sdp@Base 3.3.0 - _eXosip_handle_incoming_message@Base 3.3.0 - _eXosip_insubscription_answer_1xx@Base 3.3.0 - _eXosip_insubscription_answer_3456xx@Base 3.3.0 - _eXosip_insubscription_auto_send_notify@Base 3.3.0 - _eXosip_insubscription_send_request_with_credential@Base 3.3.0 - _eXosip_insubscription_transaction_find@Base 3.3.0 - _eXosip_notify_add_expires_in_2XX_for_subscribe@Base 3.3.0 - _eXosip_notify_set_refresh_interval@Base 3.3.0 - _eXosip_pub_find_by_aor@Base 3.3.0 - _eXosip_pub_find_by_tid@Base 3.3.0 - _eXosip_pub_free@Base 3.3.0 - _eXosip_pub_init@Base 3.3.0 - _eXosip_pub_update@Base 3.3.0 - _eXosip_reg_find@Base 3.3.0 - _eXosip_request_add_via@Base 3.3.0 - _eXosip_srv_lookup@Base 3.3.0 - _eXosip_store_nonce@Base 3.3.0 - _eXosip_subscribe_automatic_refresh@Base 3.3.0 - _eXosip_subscribe_send_request_with_credential@Base 3.3.0 - _eXosip_subscribe_set_refresh_interval@Base 3.3.0 - _eXosip_subscribe_transaction_find@Base 3.3.0 - _eXosip_transaction_init@Base 3.3.0 - _eXosip_transport_protocol@Base 3.3.0 - amf@Base 3.3.0 - amfstar@Base 3.3.0 - base64@Base 3.3.0 - cb_snd_message@Base 3.3.0 - complete_answer_that_establish_a_dialog@Base 3.3.0 - eXosip@Base 3.3.0 - eXosip_add_authentication_info@Base 3.3.0 - eXosip_add_authentication_information@Base 3.3.0 - eXosip_automatic_action@Base 3.3.0 - eXosip_automatic_refresh@Base 3.3.0 - eXosip_build_publish@Base 3.3.0 - eXosip_call_build_ack@Base 3.3.0 - eXosip_call_build_answer@Base 3.3.0 - eXosip_call_build_info@Base 3.3.0 - eXosip_call_build_initial_invite@Base 3.3.0 - eXosip_call_build_notify@Base 3.3.0 - eXosip_call_build_options@Base 3.3.0 - eXosip_call_build_prack@Base 3.3.0 - eXosip_call_build_refer@Base 3.3.0 - eXosip_call_build_request@Base 3.3.0 - eXosip_call_build_update@Base 3.3.0 - eXosip_call_dialog_find@Base 3.3.0 - eXosip_call_find@Base 3.3.0 - eXosip_call_find_by_replaces@Base 3.3.0 - eXosip_call_free@Base 3.3.0 - eXosip_call_get_reference@Base 3.3.0 - eXosip_call_get_referto@Base 3.3.0 - eXosip_call_init@Base 3.3.0 - eXosip_call_send_ack@Base 3.3.0 - eXosip_call_send_answer@Base 3.3.0 - eXosip_call_send_initial_invite@Base 3.3.0 - eXosip_call_send_prack@Base 3.3.0 - eXosip_call_send_request@Base 3.3.0 - eXosip_call_set_reference@Base 3.3.0 - eXosip_call_terminate@Base 3.3.0 - eXosip_clear_authentication_info@Base 3.3.0 - eXosip_default_action@Base 3.3.0 - eXosip_delete_early_dialog@Base 3.3.0 - eXosip_dialog_free@Base 3.3.0 - eXosip_dialog_init_as_uac@Base 3.3.0 - eXosip_dialog_init_as_uas@Base 3.3.0 - eXosip_dialog_set_200ok@Base 3.3.0 - eXosip_dialog_set_state@Base 3.3.0 - eXosip_enable_ipv6@Base 3.3.0 - eXosip_event_add@Base 3.3.0 - eXosip_event_free@Base 3.3.0 - eXosip_event_get@Base 3.3.0 - eXosip_event_geteventsocket@Base 3.3.0 - eXosip_event_init@Base 3.3.0 - eXosip_event_init_for_call@Base 3.3.0 - eXosip_event_init_for_message@Base 3.3.0 - eXosip_event_init_for_notify@Base 3.3.0 - eXosip_event_init_for_reg@Base 3.3.0 - eXosip_event_init_for_subscribe@Base 3.3.0 - eXosip_event_wait@Base 3.3.0 - eXosip_execute@Base 3.3.0 - eXosip_find_free_port@Base 3.3.0 - eXosip_find_last_inc_invite@Base 3.3.0 - eXosip_find_last_inc_notify@Base 3.3.0 - eXosip_find_last_inc_subscribe@Base 3.3.0 - eXosip_find_last_inc_transaction@Base 3.3.0 - eXosip_find_last_invite@Base 3.3.0 - eXosip_find_last_out_invite@Base 3.3.0 - eXosip_find_last_out_notify@Base 3.3.0 - eXosip_find_last_out_subscribe@Base 3.3.0 - eXosip_find_last_out_transaction@Base 3.3.0 - eXosip_find_last_transaction@Base 3.3.0 - eXosip_find_previous_invite@Base 3.3.0 - eXosip_generate_random@Base 3.3.0 - eXosip_get_addrinfo@Base 3.3.0 - eXosip_get_audio_connection@Base 3.3.0 - eXosip_get_audio_media@Base 3.3.0 - eXosip_get_connection@Base 3.3.0 - eXosip_get_local_sdp@Base 3.3.0 - eXosip_get_local_sdp_from_tid@Base 3.3.0 - eXosip_get_media@Base 3.3.0 - eXosip_get_naptr@Base 3.3.0 - eXosip_get_previous_local_sdp@Base 3.3.0 - eXosip_get_remote_sdp@Base 3.3.0 - eXosip_get_remote_sdp_from_tid@Base 3.3.0 - eXosip_get_sdp_info@Base 3.3.0 - eXosip_get_srv_record@Base 3.3.0 - eXosip_get_version@Base 3.3.0 - eXosip_get_video_connection@Base 3.3.0 - eXosip_get_video_media@Base 3.3.0 - eXosip_guess_ip_for_via@Base 3.3.0 - eXosip_guess_localip@Base 3.3.0 - eXosip_init@Base 3.3.0 - eXosip_insubscription_automatic@Base 3.3.0 - eXosip_insubscription_build_answer@Base 3.3.0 - eXosip_insubscription_build_notify@Base 3.3.0 - eXosip_insubscription_build_request@Base 3.3.0 - eXosip_insubscription_remove@Base 3.3.0 - eXosip_insubscription_send_answer@Base 3.3.0 - eXosip_insubscription_send_request@Base 3.3.0 - eXosip_is_public_address@Base 3.3.0 - eXosip_kill_transaction@Base 3.3.0 - eXosip_listen_addr@Base 3.3.0 - eXosip_lock@Base 3.3.0 - eXosip_masquerade_contact@Base 3.3.0 - eXosip_message_build_answer@Base 3.3.0 - eXosip_message_build_request@Base 3.3.0 - eXosip_message_send_answer@Base 3.3.0 - eXosip_message_send_request@Base 3.3.0 - eXosip_notify_dialog_find@Base 3.3.0 - eXosip_notify_free@Base 3.3.0 - eXosip_notify_init@Base 3.3.0 - eXosip_options_build_answer@Base 3.3.0 - eXosip_options_build_request@Base 3.3.0 - eXosip_options_send_answer@Base 3.3.0 - eXosip_options_send_request@Base 3.3.0 - eXosip_publish@Base 3.3.0 - eXosip_quit@Base 3.3.0 - eXosip_read_message@Base 3.3.0 - eXosip_refer_build_request@Base 3.3.0 - eXosip_refer_send_request@Base 3.3.0 - eXosip_reg_find_id@Base 3.3.0 - eXosip_reg_free@Base 3.3.0 - eXosip_reg_init@Base 3.3.0 - eXosip_register_build_initial_register@Base 3.3.0 - eXosip_register_build_register@Base 3.3.0 - eXosip_register_remove@Base 3.3.0 - eXosip_register_send_register@Base 3.3.0 - eXosip_release_terminated_calls@Base 3.3.0 - eXosip_release_terminated_in_subscriptions@Base 3.3.0 - eXosip_release_terminated_publications@Base 3.3.0 - eXosip_release_terminated_registrations@Base 3.3.0 - eXosip_release_terminated_subscriptions@Base 3.3.0 - eXosip_remove_transaction_from_call@Base 3.3.0 - eXosip_retransmit_lost200ok@Base 3.3.0 - eXosip_set_callbacks@Base 3.3.0 - eXosip_set_cbsip_message@Base 3.3.0 - eXosip_set_option@Base 3.3.0 - eXosip_set_socket@Base 3.3.0 - eXosip_set_user_agent@Base 3.3.0 - eXosip_subscribe_build_initial_request@Base 3.3.0 - eXosip_subscribe_build_refresh_request@Base 3.3.0 - eXosip_subscribe_dialog_find@Base 3.3.0 - eXosip_subscribe_free@Base 3.3.0 - eXosip_subscribe_init@Base 3.3.0 - eXosip_subscribe_need_refresh@Base 3.3.0 - eXosip_subscribe_remove@Base 3.3.0 - eXosip_subscribe_send_initial_request@Base 3.3.0 - eXosip_subscribe_send_refresh_request@Base 3.3.0 - eXosip_transaction_find@Base 3.3.0 - eXosip_transport_set@Base 3.3.0 - eXosip_unlock@Base 3.3.0 - eXosip_update@Base 3.3.0 - eXosip_update_top_via@Base 3.3.0 - eXtl_protos@Base 3.3.0 - eXtl_tcp@Base 3.3.0 - eXtl_udp@Base 3.3.0 - f1@Base 3.3.0 - f1star@Base 3.3.0 - f2345@Base 3.3.0 - f5star@Base 3.3.0 - generating_bye@Base 3.3.0 - generating_cancel@Base 3.3.0 - generating_publish@Base 3.3.0 - generating_register@Base 3.3.0 - generating_request_out_of_dialog@Base 3.3.0 - hexa@Base 3.3.0 - ipv6_enable@Base 3.3.0 - jpipe@Base 3.3.0 - jpipe_close@Base 3.3.0 - jpipe_get_read_descr@Base 3.3.0 - jpipe_read@Base 3.3.0 - jpipe_write@Base 3.3.0 - osip_call_id_new_random@Base 3.3.0 - osip_from_tag_new_random@Base 3.3.0 - osip_to_tag_new_random@Base 3.3.0 - report_call_event@Base 3.3.0 - report_event@Base 3.3.0 - setsockopt_ipv6only@Base 3.3.0 - strdup_printf@Base 3.3.0 - udp_tl_learn_port_from_via@Base 3.3.0 - via_branch_new_random@Base 3.3.0 diff -Nru libexosip2-3.3.0/debian/libexosip2-7.install libexosip2-3.6.0/debian/libexosip2-7.install --- libexosip2-3.3.0/debian/libexosip2-7.install 1970-01-01 00:00:00.000000000 +0000 +++ libexosip2-3.6.0/debian/libexosip2-7.install 2012-06-24 10:37:48.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/lib*.so.* +usr/bin/* diff -Nru libexosip2-3.3.0/debian/libexosip2-7.manpages libexosip2-3.6.0/debian/libexosip2-7.manpages --- libexosip2-3.3.0/debian/libexosip2-7.manpages 1970-01-01 00:00:00.000000000 +0000 +++ libexosip2-3.6.0/debian/libexosip2-7.manpages 2011-10-08 03:33:40.000000000 +0000 @@ -0,0 +1 @@ +debian/manpages/* diff -Nru libexosip2-3.3.0/debian/libexosip2-dev.docs libexosip2-3.6.0/debian/libexosip2-dev.docs --- libexosip2-3.3.0/debian/libexosip2-dev.docs 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/libexosip2-dev.docs 2011-01-29 06:49:41.000000000 +0000 @@ -1,2 +1,4 @@ NEWS README +help/doxygen/doc/html/ + diff -Nru libexosip2-3.3.0/debian/libexosip2-dev.install libexosip2-3.6.0/debian/libexosip2-dev.install --- libexosip2-3.3.0/debian/libexosip2-dev.install 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/libexosip2-dev.install 2012-06-24 10:37:48.000000000 +0000 @@ -1,4 +1,4 @@ -debian/tmp/usr/include/* -debian/tmp/usr/lib/lib*.a -debian/tmp/usr/lib/lib*.so -debian/tmp/usr/lib/*.la +usr/include/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/*.la diff -Nru libexosip2-3.3.0/debian/libexosip2-dev.lintian-overrides libexosip2-3.6.0/debian/libexosip2-dev.lintian-overrides --- libexosip2-3.3.0/debian/libexosip2-dev.lintian-overrides 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/libexosip2-dev.lintian-overrides 2012-06-24 10:37:48.000000000 +0000 @@ -1,3 +1,3 @@ # override doxygen issues libexosip2-dev: manpage-has-bad-whatis-entry - +libexosip2-dev: hyphen-used-as-minus-sign diff -Nru libexosip2-3.3.0/debian/manpages/sip_reg-3.3.0.1 libexosip2-3.6.0/debian/manpages/sip_reg-3.3.0.1 --- libexosip2-3.3.0/debian/manpages/sip_reg-3.3.0.1 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/manpages/sip_reg-3.3.0.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -.TH "sip_reg-3.3.0" "1" "Sep 17 2007" "Debian Project" "" -.SH "NAME" -.LP -sip_reg\-3.3.0 \- SIP Registration Agent -.SH "SYNTAX" -.LP -sip_reg\-3.3.0 [\fIrequired_options\fP] [\fIoptional_options\fP] -.SH "DESCRIPTION" -.LP -This program will register to a SIP proxy using the contact supplied on the command line. This is useful if, for some reason your SIP client cannot register to the proxy itself. -For example, if your SIP client registers to Proxy A, but you want to be able to receive calls that arrive at Proxy B, you can use this program to register the client's contact information to Proxy B -.SH "OPTIONS" -.LP -.TP -\fBRequired Options\fR -.TP -\fB\-r\fR \fB\-\-proxy\fR <\fIsip:proxyhost[:port]\fP> -.TP -\fB\-u\fR \fB\-\-from\fR <\fIsip:user@host[:port]\fP> -.TP -.br -.br -\fBOptional Options\fR -.TP -\fB\-c\fR \fB\-\-contact\fR sip:user@host[:port] -.TP -\fB\-d\fR \fB\-\-debug\fR log to stderr and do not fork -.TP -\fB\-e\fR \fB\-\-expiry\fR number (default 3600) -.TP -\fB\-f\fR \fB\-\-firewallip\fR Firewall IP address -.TP -\fB\-l\fR \fB\-\-localip\fR Force local IP address -.TP -\fB\-p\fR \fB\-\-port\fR Port number (default 5060) -.TP -\fB\-U\fR \fB\-\-username\fR authentication username -.TP -\fB\-P\fR \fB\-\-password\fR authentication password -.TP -\fB\-h\fR \fB\-\-help\fR Display Usage help -.SH "AUTHORS" -.LP -This manual page was written by Rene Mayorga for the \fBDebian\fR system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version. -.SH "SEE ALSO" -.LP -eXosip.h(3) diff -Nru libexosip2-3.3.0/debian/manpages/sip_reg-3.6.0.1 libexosip2-3.6.0/debian/manpages/sip_reg-3.6.0.1 --- libexosip2-3.3.0/debian/manpages/sip_reg-3.6.0.1 1970-01-01 00:00:00.000000000 +0000 +++ libexosip2-3.6.0/debian/manpages/sip_reg-3.6.0.1 2011-10-08 04:15:57.000000000 +0000 @@ -0,0 +1,47 @@ +.TH "sip_reg-3.3.0" "1" "Sep 17 2007" "Debian Project" "" +.SH "NAME" +.LP +sip_reg\-3.3.0 \- SIP Registration Agent +.SH "SYNTAX" +.LP +sip_reg\-3.3.0 [\fIrequired_options\fP] [\fIoptional_options\fP] +.SH "DESCRIPTION" +.LP +This program will register to a SIP proxy using the contact supplied on the command line. This is useful if, for some reason your SIP client cannot register to the proxy itself. +For example, if your SIP client registers to Proxy A, but you want to be able to receive calls that arrive at Proxy B, you can use this program to register the client's contact information to Proxy B +.SH "OPTIONS" +.LP +.TP +\fBRequired Options\fR +.TP +\fB\-r\fR \fB\-\-proxy\fR <\fIsip:proxyhost[:port]\fP> +.TP +\fB\-u\fR \fB\-\-from\fR <\fIsip:user@host[:port]\fP> +.TP +.br +.br +\fBOptional Options\fR +.TP +\fB\-c\fR \fB\-\-contact\fR sip:user@host[:port] +.TP +\fB\-d\fR \fB\-\-debug\fR log to stderr and do not fork +.TP +\fB\-e\fR \fB\-\-expiry\fR number (default 3600) +.TP +\fB\-f\fR \fB\-\-firewallip\fR Firewall IP address +.TP +\fB\-l\fR \fB\-\-localip\fR Force local IP address +.TP +\fB\-p\fR \fB\-\-port\fR Port number (default 5060) +.TP +\fB\-U\fR \fB\-\-username\fR authentication username +.TP +\fB\-P\fR \fB\-\-password\fR authentication password +.TP +\fB\-h\fR \fB\-\-help\fR Display Usage help +.SH "AUTHORS" +.LP +This manual page was written by Rene Mayorga for the \fBDebian\fR system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version. +.SH "SEE ALSO" +.LP +eXosip.h(3) diff -Nru libexosip2-3.3.0/debian/patches/series libexosip2-3.6.0/debian/patches/series --- libexosip2-3.3.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libexosip2-3.6.0/debian/patches/series 2012-06-24 10:37:48.000000000 +0000 @@ -0,0 +1,3 @@ +spelling-error-in-manpage.patch +spelling-error-in-binary.patch +variable.diff diff -Nru libexosip2-3.3.0/debian/patches/spelling-error-in-binary.patch libexosip2-3.6.0/debian/patches/spelling-error-in-binary.patch --- libexosip2-3.3.0/debian/patches/spelling-error-in-binary.patch 1970-01-01 00:00:00.000000000 +0000 +++ libexosip2-3.6.0/debian/patches/spelling-error-in-binary.patch 2012-06-24 10:17:18.000000000 +0000 @@ -0,0 +1,16 @@ +Description: spelling-error-in-binary usr/bin/sip_reg-3.6.0 recieved received +Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-binary.html + +Index: libexosip2-3.6.0/tools/sip_reg.c +=================================================================== +--- libexosip2-3.6.0.orig/tools/sip_reg.c 2010-01-07 01:57:57.000000000 +1100 ++++ libexosip2-3.6.0/tools/sip_reg.c 2012-06-24 20:15:56.000000000 +1000 +@@ -373,7 +373,7 @@ + break; + default: + syslog_wrapper(LOG_DEBUG, +- "recieved unknown eXosip event (type, did, cid) = (%d, %d, %d)", ++ "received unknown eXosip event (type, did, cid) = (%d, %d, %d)", + event->type, event->did, event->cid); + + } diff -Nru libexosip2-3.3.0/debian/patches/spelling-error-in-manpage.patch libexosip2-3.6.0/debian/patches/spelling-error-in-manpage.patch --- libexosip2-3.3.0/debian/patches/spelling-error-in-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ libexosip2-3.6.0/debian/patches/spelling-error-in-manpage.patch 2012-06-24 10:37:48.000000000 +0000 @@ -0,0 +1,105 @@ +Description: spelling-error-in-manpage +Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-manpage.html + +Index: libexosip2-3.6.0/ChangeLog +=================================================================== +--- libexosip2-3.6.0.orig/ChangeLog 2011-10-06 01:35:05.000000000 +1100 ++++ libexosip2-3.6.0/ChangeLog 2012-06-24 20:23:56.000000000 +1000 +@@ -1,5 +1,5 @@ + eXosip2 (3.6.0) +- * use optionnal c-ares DNS library for non blocking DNS access ++ * use optional c-ares DNS library for non blocking DNS access + as well as improvments over DNS operation such as NAPTR and + SRV records. + * again, so many minor change/fix/improvments, sorry for not +@@ -15,7 +15,7 @@ + eXosip2 (3.4.0) + * modification to allow using "windows certificate store" for TLS. + * handle keep alive for TCP/TLS. +- * fix when receiving additionnal CRLF on reliable transport. ++ * fix when receiving additional CRLF on reliable transport. + * modification to allow non-blocking socket for reliable transport. (TLS/TCP) + * fix tag issue with application where tag is missing. + * fix compilation for mingw +Index: libexosip2-3.6.0/help/doxygen/doxygen.dox.in +=================================================================== +--- libexosip2-3.6.0.orig/help/doxygen/doxygen.dox.in 2010-01-07 01:57:57.000000000 +1100 ++++ libexosip2-3.6.0/help/doxygen/doxygen.dox.in 2012-06-24 20:25:42.000000000 +1000 +@@ -40,14 +40,14 @@ + * + * SIP is an IP telephony protocol made by the IETF. + * It is an effort to create a simple (telephony is never +- * simple) and powerfull protocol for next generation ++ * simple) and powerful protocol for next generation + * telephony systems. + * + * @section what_features SIP features + * + * SIP is not just about telephony. It's much more + * that what you expect from phones. SIP means mobility, +- * video, textual call informations, file exchange, ++ * video, textual call information, file exchange, + * instant messaging, presence support and much more! + * + * @section what_freesoftware eXosip2 is free software +Index: libexosip2-3.6.0/include/eXosip2/eX_setup.h +=================================================================== +--- libexosip2-3.6.0.orig/include/eXosip2/eX_setup.h 2011-09-28 09:56:28.000000000 +1000 ++++ libexosip2-3.6.0/include/eXosip2/eX_setup.h 2012-06-24 20:22:04.000000000 +1000 +@@ -60,7 +60,7 @@ + int eXosip_init (void); + + /** +- * Release ressource used by the eXtented oSIP library. ++ * Release resource used by the eXtented oSIP library. + * + */ + void eXosip_quit (void); +@@ -219,7 +219,7 @@ + /** + * Use IPv6 instead of IPv4. + * +- * @param ipv6_enable This paramter should be set to 1 to enable IPv6 mode. ++ * @param ipv6_enable This parameter should be set to 1 to enable IPv6 mode. + */ + void eXosip_enable_ipv6 (int ipv6_enable); + +Index: libexosip2-3.6.0/include/eXosip2/eXosip.h +=================================================================== +--- libexosip2-3.6.0.orig/include/eXosip2/eXosip.h 2011-04-28 23:45:33.000000000 +1000 ++++ libexosip2-3.6.0/include/eXosip2/eXosip.h 2012-06-24 20:23:21.000000000 +1000 +@@ -361,7 +361,7 @@ + }; + + /** +- * Free ressource in an eXosip event. ++ * Free resource in an eXosip event. + * + * @param je event to work on. + */ +Index: libexosip2-3.6.0/src/eXcall_api.c +=================================================================== +--- libexosip2-3.6.0.orig/src/eXcall_api.c 2011-09-28 09:56:28.000000000 +1000 ++++ libexosip2-3.6.0/src/eXcall_api.c 2012-06-24 20:21:08.000000000 +1000 +@@ -1377,7 +1377,7 @@ + osip_free(exp_h->element); + exp_h->element = osip_strdup(min_se_h->element); + +- /* rebuild session-expires with new value/same paramters */ ++ /* rebuild session-expires with new value/same parameters */ + osip_free(exp->hvalue); + exp->hvalue = NULL; + osip_content_disposition_to_str(exp_h, &exp->hvalue); +Index: libexosip2-3.6.0/src/eXosip2.h +=================================================================== +--- libexosip2-3.6.0.orig/src/eXosip2.h 2011-10-06 01:27:09.000000000 +1100 ++++ libexosip2-3.6.0/src/eXosip2.h 2012-06-24 20:24:48.000000000 +1000 +@@ -480,7 +480,7 @@ + /** + * Prepare addrinfo for socket binding and resolv hostname + * +- * @param addrinfo informations about the connections ++ * @param addrinfo information about the connections + * @param hostname hostname to resolv. + * @param service port number or "sip" SRV record if service=0 + */ diff -Nru libexosip2-3.3.0/debian/patches/variable.diff libexosip2-3.6.0/debian/patches/variable.diff --- libexosip2-3.3.0/debian/patches/variable.diff 1970-01-01 00:00:00.000000000 +0000 +++ libexosip2-3.6.0/debian/patches/variable.diff 2012-06-24 10:17:18.000000000 +0000 @@ -0,0 +1,14 @@ +Description: libexosip2: FTBFS on hurd-i386: typo in variable name +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661321 + +--- a/src/eXtl_udp.c ++++ b/src/eXtl_udp.c +@@ -178,7 +178,7 @@ + res = setsockopt(udp_socket, IPPROTO_IPV6, IPV6_TCLASS, + (SOCKET_OPTION_VALUE)&tos, sizeof(tos)); + #else +- retval = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS, ++ res = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS, + (SOCKET_OPTION_VALUE)&tos, sizeof(tos)); + #endif + } diff -Nru libexosip2-3.3.0/debian/rules libexosip2-3.6.0/debian/rules --- libexosip2-3.3.0/debian/rules 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/rules 2012-02-25 22:53:50.000000000 +0000 @@ -1,29 +1,22 @@ #!/usr/bin/make -f - -# Add here any variable or target overrides you need -FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz -URL = http://download.savannah.nongnu.org/releases/exosip/libeXosip2-$(DEB_UPSTREAM_VERSION).tar.gz +# Grab the version from the changelog, up to the first - +DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/debhelper.mk +%: + dh $@ --parallel --with autotools_dev -DEB_MAKE_BUILD_TARGET := doxygen -DEB_CONFIGURE_EXTRA_FLAGS := --disable-josua --program-suffix=-$(DEB_UPSTREAM_VERSION) +override_dh_auto_configure: + dh_auto_configure -- --disable-josua --program-suffix=-$(DEB_UPSTREAM_VERSION) -export DH_ALWAYS_EXCLUDE := eXosip2_license.3.gz - -clean:: - [ ! -d help/doxygen/doc ] || rm -rf help/doxygen/doc - -print-version: - @@echo "DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION)" - @@echo "Filename: $(FILENAME)" - @@echo "URL: $(URL)" +override_dh_auto_build: + dh_auto_build -- doxygen + +override_dh_install: + dh_install --list-missing + # Drop content of dependency_libs to avoid having to recompile exiv2 + # if the path of the libs that appear there changes + sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` get-orig-source: - @@dh_testdir - @@[ -d ../tarballs/. ]||mkdir -p ../tarballs - @@echo Downloading $(FILENAME) from $(URL) ... - @@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL) - + uscan --force-download diff -Nru libexosip2-3.3.0/debian/source/format libexosip2-3.6.0/debian/source/format --- libexosip2-3.3.0/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ libexosip2-3.6.0/debian/source/format 2012-07-13 13:38:16.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru libexosip2-3.3.0/debian/watch libexosip2-3.6.0/debian/watch --- libexosip2-3.3.0/debian/watch 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/debian/watch 2011-10-08 04:24:46.000000000 +0000 @@ -1,23 +1,3 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file version=3 -# Uncomment to examine a Webpage -# -#http://www.example.com/downloads.php libexosip2-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/libexosip2-(.*)\.tar\.gz http://download.savannah.nongnu.org/releases/exosip/libeXosip2-(.*)\.tar\.gz debian svn-upgrade - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/libexosip2-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for debscripts >= 2.9 -# http://sf.net/libexosip2/libexosip2-(.*)\.tar\.gz - - diff -Nru libexosip2-3.3.0/help/doxygen/ht1-callcontrol.dox libexosip2-3.6.0/help/doxygen/ht1-callcontrol.dox --- libexosip2-3.3.0/help/doxygen/ht1-callcontrol.dox 2008-09-18 11:50:19.000000000 +0000 +++ libexosip2-3.6.0/help/doxygen/ht1-callcontrol.dox 2011-01-13 15:28:48.000000000 +0000 @@ -16,7 +16,7 @@ i = eXosip_call_build_initial_invite (&invite, "", "", - NULL, // optionnal route header + NULL, // optional route header "This is a call for a conversation"); if (i != 0) { @@ -156,4 +156,4 @@ eXosip_unlock (); -*/ \ No newline at end of file +*/ diff -Nru libexosip2-3.3.0/help/doxygen/Makefile.in libexosip2-3.6.0/help/doxygen/Makefile.in --- libexosip2-3.3.0/help/doxygen/Makefile.in 2009-03-04 11:05:37.000000000 +0000 +++ libexosip2-3.6.0/help/doxygen/Makefile.in 2011-10-05 14:27:28.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +14,12 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -47,36 +45,27 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = doxygen.dox +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -85,35 +74,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -124,14 +121,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -143,6 +139,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -161,6 +158,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -170,8 +168,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ EXTRA_DIST = DoxyFile doxygen.dox.in \ ht0-initialize.dox \ ht1-callcontrol.dox \ @@ -184,14 +186,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/doxygen/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/doxygen/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/doxygen/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/doxygen/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -209,6 +211,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): doxygen.dox: $(top_builddir)/config.status $(srcdir)/doxygen.dox.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -217,10 +220,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -229,29 +228,32 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -279,6 +281,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -289,7 +292,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -297,18 +300,38 @@ html: html-am +html-am: + info: info-am info-am: install-data-am: +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -327,20 +350,24 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am all: doxygen.dox + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru libexosip2-3.3.0/help/Makefile.in libexosip2-3.6.0/help/Makefile.in --- libexosip2-3.3.0/help/Makefile.in 2009-03-04 11:05:37.000000000 +0000 +++ libexosip2-3.6.0/help/Makefile.in 2011-10-05 14:27:28.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +14,12 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -46,45 +44,67 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -93,35 +113,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -132,14 +160,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -151,6 +178,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -169,6 +197,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -178,8 +207,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = doxygen EXTRA_DIST = \ INSTALL.linux @@ -191,14 +224,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -216,6 +249,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -223,10 +257,6 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -234,7 +264,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]*);; \ @@ -251,16 +281,15 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -286,16 +315,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -303,14 +332,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -322,81 +351,101 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -426,6 +475,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -436,8 +486,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -445,18 +494,38 @@ html: html-recursive +html-am: + info: info-recursive info-am: install-data-am: +install-dvi: install-dvi-recursive + +install-dvi-am: + install-exec-am: +install-html: install-html-recursive + +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -475,22 +544,25 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libexosip2-3.3.0/include/eXosip2/eX_call.h libexosip2-3.6.0/include/eXosip2/eX_call.h --- libexosip2-3.3.0/include/eXosip2/eX_call.h 2008-11-11 10:42:25.000000000 +0000 +++ libexosip2-3.6.0/include/eXosip2/eX_call.h 2011-01-13 15:28:48.000000000 +0000 @@ -76,7 +76,7 @@ * @param cid id of the call. * @return Application context reference */ - void* eXosip_call_get_ref (int cid); + void* eXosip_call_get_reference (int cid); /** * Build a default INVITE message for a new call. @@ -84,7 +84,7 @@ * @param invite Pointer for the SIP element to hold. * @param to SIP url for callee. * @param from SIP url for caller. - * @param route Route header for INVITE. (optionnal) + * @param route Route header for INVITE. (optional) * @param subject Subject for the call. */ int eXosip_call_build_initial_invite (osip_message_t ** invite, const char *to, diff -Nru libexosip2-3.3.0/include/eXosip2/eX_message.h libexosip2-3.6.0/include/eXosip2/eX_message.h --- libexosip2-3.3.0/include/eXosip2/eX_message.h 2008-10-26 15:13:00.000000000 +0000 +++ libexosip2-3.6.0/include/eXosip2/eX_message.h 2011-01-13 15:28:48.000000000 +0000 @@ -66,7 +66,7 @@ * @param method request method. (like "MESSAGE" or "PING"...) * @param to SIP url for callee. * @param from SIP url for caller. - * @param route Route header for request. (optionnal) + * @param route Route header for request. (optional) */ int eXosip_message_build_request (osip_message_t ** message, const char *method, const char *to, const char *from, diff -Nru libexosip2-3.3.0/include/eXosip2/eX_options.h libexosip2-3.6.0/include/eXosip2/eX_options.h --- libexosip2-3.3.0/include/eXosip2/eX_options.h 2008-10-26 15:13:00.000000000 +0000 +++ libexosip2-3.6.0/include/eXosip2/eX_options.h 2011-01-13 15:28:48.000000000 +0000 @@ -62,7 +62,7 @@ * @param options Pointer for the SIP request to build. * @param to SIP url for callee. * @param from SIP url for caller. - * @param route Route header for INVITE. (optionnal) + * @param route Route header for INVITE. (optional) */ int eXosip_options_build_request (osip_message_t ** options, const char *to, const char *from, const char *route); diff -Nru libexosip2-3.3.0/include/eXosip2/eXosip.h libexosip2-3.6.0/include/eXosip2/eXosip.h --- libexosip2-3.3.0/include/eXosip2/eXosip.h 2008-10-26 15:13:00.000000000 +0000 +++ libexosip2-3.6.0/include/eXosip2/eXosip.h 2011-04-28 13:45:33.000000000 +0000 @@ -440,6 +440,38 @@ */ eXosip_tls_ctx_error eXosip_set_tls_ctx (eXosip_tls_ctx_t * ctx); +/** + * Select by CN name the server certificate from OS store. + * + * 12/11/2009 -> implemented only for "Windows Certificate Store" + * + * @param local_certificate_cn CN name of the certificate to send on incoming connection + * + * @return the eXosip_tls_ctx_error code + */ + eXosip_tls_ctx_error eXosip_tls_use_server_certificate (const char *local_certificate_cn); + +/** + * Select by CN name the client certificate from OS store. + * + * 31/1/2011 -> implemented only for "Windows Certificate Store" + * + * @param local_certificate_cn CN name of the certificate to send on outgoing connection + * + * @return the eXosip_tls_ctx_error code + */ + eXosip_tls_ctx_error eXosip_tls_use_client_certificate (const char *local_certificate_cn); + +/** + * Configure to accept/reject self signed and expired certificates. + * NOTE: default is to accept (0) + * + * @param _tls_verify_client_certificate ">0": refuse self signed and expired certificates + * + * @return the eXosip_tls_ctx_error code + */ + eXosip_tls_ctx_error eXosip_tls_verify_certificate (int _tls_verify_client_certificate); + /** @} */ #ifdef __cplusplus diff -Nru libexosip2-3.3.0/include/eXosip2/eX_refer.h libexosip2-3.6.0/include/eXosip2/eX_refer.h --- libexosip2-3.3.0/include/eXosip2/eX_refer.h 2008-10-26 15:13:00.000000000 +0000 +++ libexosip2-3.6.0/include/eXosip2/eX_refer.h 2011-01-13 15:28:48.000000000 +0000 @@ -62,7 +62,7 @@ * @param refer_to SIP url for transfer. * @param from SIP url for caller. * @param to SIP url for callee. - * @param route Route header for REFER. (optionnal) + * @param route Route header for REFER. (optional) */ int eXosip_refer_build_request (osip_message_t ** refer, const char *refer_to, const char *from, const char *to, diff -Nru libexosip2-3.3.0/include/eXosip2/eX_register.h libexosip2-3.6.0/include/eXosip2/eX_register.h --- libexosip2-3.3.0/include/eXosip2/eX_register.h 2008-10-26 15:13:00.000000000 +0000 +++ libexosip2-3.6.0/include/eXosip2/eX_register.h 2011-10-04 07:56:59.000000000 +0000 @@ -70,6 +70,21 @@ osip_message_t ** reg); /** + * Build initial REGISTER request with qvalue for contact. + * + * @param from SIP url for caller. + * @param proxy Proxy used for registration. + * @param contact Contact address. (optional) + * @param expires The expires value for registration. + * @param qvalue The qvalue value for contact header. + * @param reg The SIP request to build. + */ + int eXosip_register_build_initial_register_withqvalue(const char *from, const char *proxy, + const char *contact, int expires, + const char *qvalue, + osip_message_t ** reg); + +/** * Build a new REGISTER request for an existing registration. * * @param rid A unique identifier for the registration context diff -Nru libexosip2-3.3.0/include/eXosip2/eX_setup.h libexosip2-3.6.0/include/eXosip2/eX_setup.h --- libexosip2-3.3.0/include/eXosip2/eX_setup.h 2008-12-12 12:34:05.000000000 +0000 +++ libexosip2-3.6.0/include/eXosip2/eX_setup.h 2011-09-27 23:56:28.000000000 +0000 @@ -36,6 +36,7 @@ #endif struct osip_srv_record; + struct osip_naptr; /** * @file eX_setup.h @@ -71,22 +72,25 @@ */ int eXosip_execute (void); - typedef enum - { - EXOSIP_OPT_UDP_KEEP_ALIVE = 1, - EXOSIP_OPT_UDP_LEARN_PORT = 2, - EXOSIP_OPT_SET_HTTP_TUNNEL_PORT = 3, - EXOSIP_OPT_SET_HTTP_TUNNEL_PROXY = 4, - EXOSIP_OPT_SET_HTTP_OUTBOUND_PROXY = 5, /* used for http tunnel ONLY */ - EXOSIP_OPT_DONT_SEND_101 = 6, - EXOSIP_OPT_USE_RPORT = 7, - EXOSIP_OPT_SET_IPV4_FOR_GATEWAY = 8, - EXOSIP_OPT_ADD_DNS_CACHE = 9, - EXOSIP_OPT_EVENT_PACKAGE = 10, - EXOSIP_OPT_SET_IPV6_FOR_GATEWAY = 11, - EXOSIP_OPT_ADD_ACCOUNT_INFO = 12, - EXOSIP_OPT_SRV_WITH_NAPTR = 13 - } eXosip_option; +#define EXOSIP_OPT_BASE_OPTION 0 +#define EXOSIP_OPT_UDP_KEEP_ALIVE (EXOSIP_OPT_BASE_OPTION+1) +#define EXOSIP_OPT_UDP_LEARN_PORT (EXOSIP_OPT_BASE_OPTION+2) +#define EXOSIP_OPT_SET_HTTP_TUNNEL_PORT (EXOSIP_OPT_BASE_OPTION+3) /* obsolete */ +#define EXOSIP_OPT_SET_HTTP_TUNNEL_PROXY (EXOSIP_OPT_BASE_OPTION+4) /* obsolete */ +#define EXOSIP_OPT_SET_HTTP_OUTBOUND_PROXY (EXOSIP_OPT_BASE_OPTION+5) /* obsolete */ +#define EXOSIP_OPT_DONT_SEND_101 (EXOSIP_OPT_BASE_OPTION+6) +#define EXOSIP_OPT_USE_RPORT (EXOSIP_OPT_BASE_OPTION+7) +#define EXOSIP_OPT_SET_IPV4_FOR_GATEWAY (EXOSIP_OPT_BASE_OPTION+8) +#define EXOSIP_OPT_ADD_DNS_CACHE (EXOSIP_OPT_BASE_OPTION+9) +#define EXOSIP_OPT_DELETE_DNS_CACHE (EXOSIP_OPT_BASE_OPTION+10) +#define EXOSIP_OPT_EVENT_PACKAGE (EXOSIP_OPT_BASE_OPTION+11) +#define EXOSIP_OPT_SET_IPV6_FOR_GATEWAY (EXOSIP_OPT_BASE_OPTION+12) +#define EXOSIP_OPT_ADD_ACCOUNT_INFO (EXOSIP_OPT_BASE_OPTION+13) +#define EXOSIP_OPT_DNS_CAPABILITIES (EXOSIP_OPT_BASE_OPTION+14) +#define EXOSIP_OPT_SET_DSCP (EXOSIP_OPT_BASE_OPTION+15) + + /* non standard option: need a compilation flag to activate */ +#define EXOSIP_OPT_KEEP_ALIVE_OPTIONS_METHOD (EXOSIP_OPT_BASE_OPTION+1000) struct eXosip_dns_cache { @@ -118,7 +122,7 @@ * @param value value for options. * */ - int eXosip_set_option (eXosip_option opt, const void *value); + int eXosip_set_option (int opt, const void *value); #ifdef OSIP_MT @@ -143,25 +147,31 @@ #endif /** - * Ask for SRV record. + * Start and return osip_naptr context. + * Note that DNS results might not yet be available. * - * @param record result structure. - * @param domain domain name for SRV record - * @param protocol protocol to use + * @param domain domain name for NAPTR record + * @param protocol protocol to use ("SIP") + * @param transport transport to use ("UDP") + * @param keep_in_cache keep result in cache if >0 */ - int eXosip_get_srv_record (struct osip_srv_record *record, char *domain, - char *protocol); +struct osip_naptr *eXosip_dnsutils_naptr(const char *domain, const char *protocol, + const char *transport, int keep_in_cache); /** - * Ask for NAPTR request. + * Continue to process asynchronous DNS request (if implemented). * - * @param domain domain name for SRV record - * @param protocol protocol to use - * @param srv_record result structure. - * @param max_length sizeof srv_record. + * @param output_record result structure. + * @param force force waiting for final answer if >0 */ - int eXosip_get_naptr (char *domain, char *protocol, char *srv_record, - int max_length); +int eXosip_dnsutils_dns_process(struct osip_naptr *output_record, int force); + +/** + * Rotate first SRV entry to last SRV entry. + * + * @param output_record result structure. + */ + int eXosip_dnsutils_rotate_srv(struct osip_srv_record *output_record); /** * Listen on a specified socket. @@ -240,21 +250,6 @@ #ifndef DOXYGEN /** - * Force eXosip to use a specific ip address in all - * contact and Via headers in SIP message. - * **PLEASE DO NOT USE: use eXosip_masquerade_contact instead** - * - * @param localip the ip address. - * - * If set to NULL, then the local ip address will be guessed - * automatically (returns to default mode). - * - * ******LINPHONE specific methods****** - * - */ - int eXosip_force_masquerade_contact (const char *localip); - -/** * Wake Up the eXosip_event_wait method. * */ @@ -292,23 +287,6 @@ */ int eXosip_guess_localip (int family, char *address, int size); -#ifndef DOXYGEN - -/** - * Find the interface to be used to reach the specified host. - * - * @param ip a string containing the local IP address. - * @param localip the local ip address to be used to reach host. - * - * You usually don't need this function at all. - * - * ******LINPHONE specific methods****** - * - */ - int eXosip_get_localip_for (const char *host, char *localip, int size); - -#endif - /** @} */ diff -Nru libexosip2-3.3.0/include/eXosip2/eX_subscribe.h libexosip2-3.6.0/include/eXosip2/eX_subscribe.h --- libexosip2-3.3.0/include/eXosip2/eX_subscribe.h 2008-10-26 15:13:00.000000000 +0000 +++ libexosip2-3.6.0/include/eXosip2/eX_subscribe.h 2011-01-13 15:28:48.000000000 +0000 @@ -96,7 +96,7 @@ * @param subscribe Pointer for the SIP request to build. * @param to SIP url for callee. * @param from SIP url for caller. - * @param route Route header for SUBSCRIBE. (optionnal) + * @param route Route header for SUBSCRIBE. (optional) * @param event Event header for SUBSCRIBE. * @param expires Expires header for SUBSCRIBE. */ diff -Nru libexosip2-3.3.0/include/eXosip2/Makefile.in libexosip2-3.6.0/include/eXosip2/Makefile.in --- libexosip2-3.3.0/include/eXosip2/Makefile.in 2009-03-04 11:05:37.000000000 +0000 +++ libexosip2-3.6.0/include/eXosip2/Makefile.in 2011-10-05 14:27:28.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +15,12 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -48,6 +46,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -55,40 +54,44 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(eXosip_includedir)" -eXosip_includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(eXosip_include_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -97,35 +100,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -136,14 +147,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -155,6 +165,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -173,6 +184,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -182,8 +194,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ eXosip_includedir = $(includedir)/eXosip2 eXosip_include_HEADERS = eXosip.h eX_setup.h \ eX_register.h eX_call.h eX_options.h eX_refer.h \ @@ -196,14 +212,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/eXosip2/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/eXosip2/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/eXosip2/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu include/eXosip2/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -221,106 +237,113 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-eXosip_includeHEADERS: $(eXosip_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(eXosip_includedir)" || $(mkdir_p) "$(DESTDIR)$(eXosip_includedir)" - @list='$(eXosip_include_HEADERS)'; for p in $$list; do \ + test -z "$(eXosip_includedir)" || $(MKDIR_P) "$(DESTDIR)$(eXosip_includedir)" + @list='$(eXosip_include_HEADERS)'; test -n "$(eXosip_includedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(eXosip_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(eXosip_includedir)/$$f'"; \ - $(eXosip_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(eXosip_includedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(eXosip_includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(eXosip_includedir)" || exit $$?; \ done uninstall-eXosip_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(eXosip_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(eXosip_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(eXosip_includedir)/$$f"; \ - done + @list='$(eXosip_include_HEADERS)'; test -n "$(eXosip_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(eXosip_includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(eXosip_includedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -329,7 +352,7 @@ all-am: Makefile $(HEADERS) installdirs: for dir in "$(DESTDIR)$(eXosip_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -351,6 +374,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -361,8 +385,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-am @@ -370,18 +393,38 @@ html: html-am +html-am: + info: info-am info-am: install-data-am: install-eXosip_includeHEADERS +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -400,19 +443,24 @@ ps-am: -uninstall-am: uninstall-eXosip_includeHEADERS uninstall-info-am +uninstall-am: uninstall-eXosip_includeHEADERS + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-eXosip_includeHEADERS install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-eXosip_includeHEADERS \ - uninstall-info-am + install-data-am install-dvi install-dvi-am \ + install-eXosip_includeHEADERS install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags uninstall uninstall-am \ + uninstall-eXosip_includeHEADERS + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libexosip2-3.3.0/include/Makefile.in libexosip2-3.6.0/include/Makefile.in --- libexosip2-3.3.0/include/Makefile.in 2009-03-04 11:05:37.000000000 +0000 +++ libexosip2-3.6.0/include/Makefile.in 2011-10-05 14:27:28.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +14,12 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -46,45 +44,67 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -93,35 +113,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -132,14 +160,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -151,6 +178,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -169,6 +197,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -178,8 +207,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = eXosip2 all: all-recursive @@ -188,14 +221,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -213,6 +246,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -220,10 +254,6 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -231,7 +261,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]*);; \ @@ -248,16 +278,15 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -283,16 +312,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -300,14 +329,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -319,81 +348,101 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -423,6 +472,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -433,8 +483,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -442,18 +491,38 @@ html: html-recursive +html-am: + info: info-recursive info-am: install-data-am: +install-dvi: install-dvi-recursive + +install-dvi-am: + install-exec-am: +install-html: install-html-recursive + +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -472,22 +541,25 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libexosip2-3.3.0/Makefile.in libexosip2-3.6.0/Makefile.in --- libexosip2-3.3.0/Makefile.in 2009-03-04 11:05:37.000000000 +0000 +++ libexosip2-3.6.0/Makefile.in 2011-10-05 14:27:28.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +14,12 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -46,18 +44,25 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -65,40 +70,55 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -107,35 +127,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -146,14 +174,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -165,6 +192,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -183,6 +211,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -192,8 +221,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ EXTRA_DIST = README autogen.sh SUBDIRS = scripts platform src include tools help all: config.h @@ -206,15 +239,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -230,21 +263,22 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -258,8 +292,7 @@ -rm -rf .libs _libs distclean-libtool: - -rm -f libtool -uninstall-info-am: + -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -268,7 +301,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]*);; \ @@ -285,16 +318,15 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -320,16 +352,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -337,14 +369,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -356,93 +388,114 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/help/doxygen $(distdir)/scripts - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || 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 $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -451,6 +504,14 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -474,13 +535,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*) \ + 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 @@ -488,9 +553,11 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -512,13 +579,15 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -560,6 +629,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -580,18 +650,38 @@ html: html-recursive +html-am: + info: info-recursive info-am: install-data-am: +install-dvi: install-dvi-recursive + +install-dvi-am: + install-exec-am: +install-html: install-html-recursive + +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -612,24 +702,26 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am doxygen: @@ -646,6 +738,7 @@ indent */*.c rm -rf */*.h~ rm -rf */*.c~ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru libexosip2-3.3.0/NEWS libexosip2-3.6.0/NEWS --- libexosip2-3.3.0/NEWS 2008-09-18 11:50:19.000000000 +0000 +++ libexosip2-3.6.0/NEWS 2011-01-13 15:28:48.000000000 +0000 @@ -19,7 +19,7 @@ 1: the media/session information must now be handled by the application. -> no negotiation issue any more -> eXosip provide a basic API to quickly extract SDP information, - but this is kept optionnal. + but this is kept optional. -> no limitation about the attachment or the media to be supported. 2: the API has been refined to provide the flexibility you need. Thus, diff -Nru libexosip2-3.3.0/platform/Makefile.in libexosip2-3.6.0/platform/Makefile.in --- libexosip2-3.3.0/platform/Makefile.in 2009-03-04 11:05:37.000000000 +0000 +++ libexosip2-3.6.0/platform/Makefile.in 2011-10-05 14:27:28.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +14,12 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -46,45 +44,67 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -93,35 +113,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -132,14 +160,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -151,6 +178,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -169,6 +197,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -178,8 +207,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = vsnet wince all: all-recursive @@ -188,14 +221,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu platform/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu platform/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu platform/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu platform/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -213,6 +246,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -220,10 +254,6 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -231,7 +261,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]*);; \ @@ -248,16 +278,15 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -283,16 +312,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -300,14 +329,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -319,81 +348,101 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -423,6 +472,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -433,8 +483,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -442,18 +491,38 @@ html: html-recursive +html-am: + info: info-recursive info-am: install-data-am: +install-dvi: install-dvi-recursive + +install-dvi-am: + install-exec-am: +install-html: install-html-recursive + +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -472,22 +541,25 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libexosip2-3.3.0/platform/vsnet/eXosip2.def libexosip2-3.6.0/platform/vsnet/eXosip2.def --- libexosip2-3.3.0/platform/vsnet/eXosip2.def 2008-09-18 11:50:16.000000000 +0000 +++ libexosip2-3.6.0/platform/vsnet/eXosip2.def 2011-10-04 07:56:59.000000000 +0000 @@ -37,6 +37,7 @@ eXosip_insubscription_send_request eXosip_register_build_initial_register + eXosip_register_build_initial_register_withqvalue eXosip_register_build_register eXosip_register_send_register eXosip_register_remove diff -Nru libexosip2-3.3.0/platform/vsnet/Makefile.in libexosip2-3.6.0/platform/vsnet/Makefile.in --- libexosip2-3.3.0/platform/vsnet/Makefile.in 2009-03-04 11:05:37.000000000 +0000 +++ libexosip2-3.6.0/platform/vsnet/Makefile.in 2011-10-05 14:27:28.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +14,12 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -46,36 +44,27 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -84,35 +73,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -123,14 +120,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -142,6 +138,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -160,6 +157,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -169,8 +167,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ EXTRA_DIST = eXosip.vcproj \ eXosip.sln eXosip2.def @@ -181,14 +183,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu platform/vsnet/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu platform/vsnet/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu platform/vsnet/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu platform/vsnet/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -206,16 +208,13 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -224,29 +223,32 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -274,6 +276,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -284,7 +287,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -292,18 +295,38 @@ html: html-am +html-am: + info: info-am info-am: install-data-am: +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -322,17 +345,21 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libexosip2-3.3.0/platform/wince/eXosip2.def libexosip2-3.6.0/platform/wince/eXosip2.def --- libexosip2-3.3.0/platform/wince/eXosip2.def 2008-09-18 11:50:17.000000000 +0000 +++ libexosip2-3.6.0/platform/wince/eXosip2.def 2011-10-04 07:56:59.000000000 +0000 @@ -37,6 +37,7 @@ eXosip_insubscription_send_request eXosip_register_build_initial_register + eXosip_register_build_initial_register_withqvalue eXosip_register_build_register eXosip_register_send_register eXosip_register_remove diff -Nru libexosip2-3.3.0/platform/wince/eXosip2.vcproj libexosip2-3.6.0/platform/wince/eXosip2.vcproj --- libexosip2-3.3.0/platform/wince/eXosip2.vcproj 2008-11-01 15:13:04.000000000 +0000 +++ libexosip2-3.6.0/platform/wince/eXosip2.vcproj 2010-09-14 17:13:01.000000000 +0000 @@ -9,19 +9,341 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -170,7 +492,7 @@ /> @@ -178,9 +500,9 @@ /> @@ -369,7 +691,7 @@ UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)/eXosip2.pdb" WarningLevel="3" - DebugInformationFormat="3" + DebugInformationFormat="0" /> @@ -412,9 +734,9 @@ /> /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? @@ -324,6 +324,9 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -331,7 +334,20 @@ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -640,7 +656,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 @@ -796,7 +812,7 @@ x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -806,6 +822,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 @@ -866,40 +885,17 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #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:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif @@ -931,10 +927,13 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + 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 ;; + padre:Linux:*:*) + echo sparc-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 @@ -982,17 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - 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 @@ -1058,7 +1046,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:*:*) @@ -1102,8 +1090,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1141,6 +1132,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1153,7 +1154,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:*:*) @@ -1216,6 +1217,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1324,6 +1328,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru libexosip2-3.3.0/scripts/config.sub libexosip2-3.6.0/scripts/config.sub --- libexosip2-3.3.0/scripts/config.sub 2008-02-17 20:10:30.000000000 +0000 +++ libexosip2-3.6.0/scripts/config.sub 2010-01-12 12:12:07.000000000 +0000 @@ -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='2008-01-16' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,6 +122,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -152,6 +153,9 @@ os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -249,13 +253,16 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +275,7 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -277,7 +285,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | 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 | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -286,7 +294,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -329,14 +337,17 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +369,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | 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-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -439,6 +450,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -455,10 +470,18 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -526,6 +549,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1128,6 +1155,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1166,7 +1197,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1236,10 +1267,11 @@ # 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]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1248,7 +1280,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1388,6 +1420,9 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1585,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff -Nru libexosip2-3.3.0/scripts/depcomp libexosip2-3.6.0/scripts/depcomp --- libexosip2-3.3.0/scripts/depcomp 2008-09-18 12:02:07.000000000 +0000 +++ libexosip2-3.6.0/scripts/depcomp 2010-01-12 12:12:08.000000000 +0000 @@ -1,9 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,9 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -86,12 +85,34 @@ depmode=dashmstdout fi +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u="sed s,\\\\\\\\,/,g" + depmode=msvisualcpp +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" stat=$? if test $stat -eq 0; then : else @@ -178,14 +199,14 @@ ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> $depfile - echo >> $depfile +' ' ' >> "$depfile" + echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -201,34 +222,39 @@ # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -276,6 +302,51 @@ rm -f "$tmpdepfile" ;; +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. @@ -288,13 +359,13 @@ if test "$libtool" = yes; then # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to + # static library. This mechanism is used in libtool 1.4 series to # handle both shared and static libraries in a single compilation. # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. # # With libtool 1.5 this exception was removed, and libtool now # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and + # compilations output dependencies in $dir.libs/$base.o.d and # in $dir$base.o.d. We have to check for both files, because # one of the two compilations can be disabled. We should prefer # $dir$base.o.d over $dir.libs/$base.o.d because the latter is @@ -345,7 +416,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -396,32 +467,39 @@ "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -441,7 +519,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -479,13 +557,27 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -498,16 +590,23 @@ ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + none) exec "$@" ;; @@ -526,5 +625,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru libexosip2-3.3.0/scripts/ltmain.sh libexosip2-3.6.0/scripts/ltmain.sh --- libexosip2-3.3.0/scripts/ltmain.sh 2008-04-29 20:21:21.000000000 +0000 +++ libexosip2-3.6.0/scripts/ltmain.sh 2010-03-09 15:40:59.000000000 +0000 @@ -1,52 +1,83 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008 Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify +# Generated from ltmain.m4sh. + +# ltmain.sh (GNU libtool) 2.2.6b +# Written by Gordon Matzigkeit , 1996 + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, but +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -basename="s,^.*/,,g" - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - -# The name of this program: -progname=`echo "$progpath" | $SED $basename` -modename="$progname" +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 +# Usage: $progname [OPTION]... [MODE-ARG]... +# +# 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 +# +# 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 +# +# MODE-ARGS vary depending on the MODE. +# 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.6b Debian-2.2.6b-2 +# automake: $automake_version +# autoconf: $autoconf_version +# +# Report bugs to . PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.26 Debian 1.5.26-4" -TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" +VERSION="2.2.6b Debian-2.2.6b-2" +TIMESTAMP="" +package_revision=1.3017 -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -60,104 +91,261 @@ BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - 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 <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE -fi +dirname="s,/[^/]*$,," +basename="s,^.*/,," -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -duplicate_deps=no -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# 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 () +{ + # 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"` +} + +# Generated shell functions inserted here. + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + +# The name of this program: +# 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 + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=$func_dirname_result + progdir=`cd "$progdir" && pwd` + progpath="$progdir/$progname" + ;; + *) + save_IFS="$IFS" + IFS=: + for progdir in $PATH; do + IFS="$save_IFS" + test -x "$progdir/$progname" && break + done + IFS="$save_IFS" + test -n "$progdir" || progdir=`pwd` + progpath="$progdir/$progname" + ;; +esac + +# 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='s/\([`"$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/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. +# Since each input `\' is now two `\'s, look for any number of runs of +# four `\'s followed by two `\'s and then a '$'. `\' that '$'. +bs='\\' +bs2='\\\\' +bs4='\\\\\\\\' +dollar='\$' +sed_double_backslash="\ + s/$bs4/&\\ +/g + s/^$bs2$dollar/$bs&/ + s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g + s/\n//g" + +# Standard options: +opt_dry_run=false +opt_help=false +opt_quiet=false +opt_verbose=false +opt_warning=: + +# func_echo arg... +# Echo program name prefixed message, along with the current mode +# name if it has been set yet. +func_echo () +{ + $ECHO "$progname${mode+: }$mode: $*" +} + +# func_verbose arg... +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $opt_verbose && func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + +# func_error arg... +# Echo program name prefixed message to standard error. +func_error () +{ + $ECHO "$progname${mode+: }$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 + + # bash bug again: + : +} + +# func_fatal_error arg... +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + +# func_fatal_help arg... +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + func_error ${1+"$@"} + func_fatal_error "$help" +} +help="Try \`$progname --help' for more information." ## default + + +# func_grep expression filename +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_mkdir_p directory-path +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + my_directory_path="$1" + my_dir_list= + + if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + + # Protect directory names starting with `-' + case $my_directory_path in + -*) my_directory_path="./$my_directory_path" ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$my_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited + # list incase some portion of path contains whitespace. + my_dir_list="$my_directory_path:$my_dir_list" + + # If the last portion added has no slash in it, the list is done + 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"` + done + my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + + save_mkdir_p_IFS="$IFS"; IFS=':' + for my_dir in $my_dir_list; do + IFS="$save_mkdir_p_IFS" + # mkdir can fail with a `File exist' error if two processes + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$my_dir" 2>/dev/null || : + done + IFS="$save_mkdir_p_IFS" + + # Bail out if we (or some other process) failed to create a directory. + test -d "$my_directory_path" || \ + func_fatal_error "Failed to create \`$1'" + fi +} -##################################### -# Shell function definitions: -# This seems to be the best place for them # func_mktempdir [string] # Make a temporary directory that won't clash with other running @@ -167,7 +355,7 @@ { my_template="${TMPDIR-/tmp}/${1-$progname}" - if test "$run" = ":"; then + if test "$opt_dry_run" = ":"; then # Return a directory name, but don't create it in dry-run mode my_tmpdir="${my_template}-$$" else @@ -176,526 +364,787 @@ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" - save_mktempdir_umask=`umask` - umask 0077 - $mkdir "$my_tmpdir" - umask $save_mktempdir_umask + save_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$my_tmpdir" + umask $save_mktempdir_umask fi # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || { - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 - exit $EXIT_FAILURE - } + test -d "$my_tmpdir" || \ + func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $echo "X$my_tmpdir" | $Xsed + $ECHO "X$my_tmpdir" | $Xsed } -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -func_win32_libid () +# func_quote_for_eval arg +# Aesthetically quote ARG to be evaled later. +# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT +# is double-quoted, suitable for a subsequent eval, whereas +# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters +# which are still active within double quotes backslashified. +func_quote_for_eval () { - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; + case $1 in + *[\\\`\"\$]*) + func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + *) + func_quote_for_eval_unquoted_result="$1" ;; + esac + + case $func_quote_for_eval_unquoted_result in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and and variable + # expansion for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" + ;; + *) + func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" esac - ;; - esac - $echo $win32_libid_type } -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () +# func_quote_for_expand arg +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () { - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. + case $1 in + *[\\\`\"]*) + my_arg=`$ECHO "X$1" | $Xsed \ + -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case "$@ " in - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit $EXIT_FAILURE -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi + my_arg="$1" ;; + esac + + case $my_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + my_arg="\"$my_arg\"" + ;; + esac + + func_quote_for_expand_result="$my_arg" } -# func_extract_an_archive dir oldlib -func_extract_an_archive () +# func_show_eval cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () { - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" + my_cmd="$1" + my_fail_exp="${2-:}" - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$my_cmd" + my_status=$? + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi fi } -# func_extract_archives gentop oldlib ... -func_extract_archives () + +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () { - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi fi +} - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - extracted_serial=`expr $extracted_serial + 1` - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then - exit $exit_status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" + + + +# func_version +# Echo version message to standard output and exit. +func_version () +{ + $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + s/^# // + s/^# *$// + s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ + p + }' < "$progpath" + exit $? +} + +# func_usage +# Echo short help message to standard output and exit. +func_usage () +{ + $SED -n '/^# Usage:/,/# -h/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ + p + }' < "$progpath" + $ECHO + $ECHO "run \`$progname --help | more' for full usage" + exit $? +} + +# func_help +# Echo long help message to standard output and exit. +func_help () +{ + $SED -n '/^# Usage:/,/# Report bugs to/ { + s/^# // + s/^# *$// + s*\$progname*'$progname'* + s*\$host*'"$host"'* + s*\$SHELL*'"$SHELL"'* + s*\$LTCC*'"$LTCC"'* + s*\$LTCFLAGS*'"$LTCFLAGS"'* + s*\$LD*'"$LD"'* + s/\$with_gnu_ld/'"$with_gnu_ld"'/ + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p + }' < "$progpath" + exit $? +} + +# func_missing_arg argname +# Echo program name prefixed message to standard error and set global +# exit_cmd. +func_missing_arg () +{ + func_error "missing argument for $1" + exit_cmd=exit } -# End of Shell function definitions -##################################### -# Darwin sucks -eval std_shrext=\"$shrext_cmds\" +exit_cmd=: -disable_libs=no -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" + + + +# 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 - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat <&2 - exit $EXIT_FAILURE - ;; - esac +magic="%%%MAGIC variable%%%" +magic_exe="%%%MAGIC EXE variable%%%" - case $tagname in - CC) - # Don't test for the "default" C tag, as we know, it's there, but - # not specially marked. - ;; - *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi - ;; - esac - ;; - *) - eval "$prev=\$arg" - ;; - esac +# Global variables. +# $mode is unset +nonopt= +execute_dlfiles= +preserve_args= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 - prev= - prevopt= - continue - fi +opt_dry_run=false +opt_duplicate_deps=false +opt_silent=false +opt_debug=: - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; +# 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= - --version) - echo "\ -$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP - -Copyright (C) 2008 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $? - ;; +# func_fatal_configuration arg... +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. +func_fatal_configuration () +{ + func_error ${1+"$@"} + func_error "See the $PACKAGE documentation for more information." + func_fatal_error "Fatal configuration error." +} + + +# func_config +# Display the configuration for all the tags in this script. +func_config () +{ + re_begincf='^# ### BEGIN LIBTOOL' + re_endcf='^# ### END LIBTOOL' + + # Default configuration. + $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath # Now print the configurations for the tags. for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" + $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" done - exit $? - ;; - - --debug) - $echo "$progname: enabling shell trace mode" - set -x - preserve_args="$preserve_args $arg" - ;; - --dry-run | -n) - run=: - ;; + exit $? +} - --features) - $echo "host: $host" +# func_features +# Display the features supported by this script. +func_features () +{ + $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 $? - ;; +} - --finish) mode="finish" ;; +# func_enable_tag tagname +# Verify that TAGNAME is valid, and either flag an error and exit, or +# enable the TAGNAME tag. We also add TAGNAME to the global $taglist +# variable here. +func_enable_tag () +{ + # Global variable: + tagname="$1" + + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf="/$re_begincf/,/$re_endcf/p" + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; + *) + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - --preserve-dup-deps) duplicate_deps="yes" ;; + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac +} - --quiet | --silent) - show=: - preserve_args="$preserve_args $arg" - ;; +# Parse options once, thoroughly. This comes as soon as possible in +# the script to make things like `libtool --version' happen quickly. +{ - --tag) - prevopt="--tag" - prev=tag - preserve_args="$preserve_args --tag" + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag - preserve_args="$preserve_args --tag" + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift ;; - - *) - nonopt="$arg" - break + 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 -done -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE -fi + # Parse non-mode specific arguments: + while test "$#" -gt 0; do + opt="$1" + shift -case $disable_libs in -no) - ;; -shared) - build_libtool_libs=no - build_old_libs=yes - ;; -static) - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` - ;; -esac + case $opt in + --config) func_config ;; -# 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= + --debug) preserve_args="$preserve_args $opt" + func_echo "enabling shell trace mode" + opt_debug='set -x' + $opt_debug + ;; -if test -z "$show_help"; then + -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break + execute_dlfiles="$execute_dlfiles $1" + shift + ;; - # Infer the operation mode. - if test -z "$mode"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall + --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" + shift + ;; + + --preserve-dup-deps) + opt_duplicate_deps=: ;; + + --quiet|--silent) preserve_args="$preserve_args $opt" + opt_silent=: + ;; + + --verbose| -v) preserve_args="$preserve_args $opt" + opt_silent=false + ;; + + --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break + preserve_args="$preserve_args $opt $1" + func_enable_tag "$1" # tagname is set here + shift + ;; + + # Separate optargs to long options: + -dlopen=*|--mode=*|--tag=*) + func_opt_split "$opt" + set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + shift + ;; + + -\?|-h) func_usage ;; + --help) opt_help=: ;; + --version) func_version ;; + + -*) func_fatal_help "unrecognized option \`$opt'" ;; + + *) nonopt="$opt" + break + ;; + esac + done + + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: ;; *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute + opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + ;; + esac - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi + # Having warned about all mis-specified options, bail out if + # anything was wrong. + $exit_cmd $EXIT_FAILURE +} + +# 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 - ;; - esac + 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 + + exit $EXIT_MISMATCH + fi +} + + +## ----------- ## +## Main. ## +## ----------- ## + +$opt_help || { + # Sanity checks first: + func_check_version_match + + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi + test -z "$mode" && func_fatal_error "error: you must specify a MODE." + + + # 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 - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 + 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 \`$modename --help --mode=$mode' for more information." + help="Try \`$progname --help --mode=$mode' for more information." +} - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; +# func_lalib_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_lalib_p () +{ + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null \ + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} - target ) - libobj="$arg" - arg_mode=normal - continue - ;; +# func_lalib_unsafe_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function implements the same check as func_lalib_p without +# resorting to external programs. To this end, it redirects stdin and +# closes it afterwards, without saving the original file descriptor. +# As a safety measure, use it only where a negative result would be +# fatal anyway. Works if `file' does not exist. +func_lalib_unsafe_p () +{ + lalib_p=no + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line + case "$lalib_p_line" in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi + test "$lalib_p" = yes +} - normal ) - # Accept any command-line options. - case $arg in - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + func_lalib_p "$1" +} - -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" - continue - ;; +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; + esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} + +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# 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_ltwrapper_p file +# True iff FILE is a libtool wrapper script or wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_p () +{ + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +} + + +# func_execute_cmds commands fail_cmd +# Execute tilde-delimited COMMANDS. +# If FAIL_CMD is given, eval that upon failure. +# FAIL_CMD may read-access the current command in variable CMD! +func_execute_cmds () +{ + $opt_debug + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs + eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +} + + +# func_source file +# Source FILE, adding directory component if necessary. +# Note that it is not necessary on cygwin/mingw to append a dot to +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe +# behavior happens only for exec(3), not for open(2)! Also, sourcing +# `FILE.' does not work on cygwin managed mounts. +func_source () +{ + $opt_debug + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$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. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () +{ + $opt_debug + 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" + done + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" + done + case "$@ " in + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + func_echo "unable to infer tagged configuration" + func_fatal_error "specify a tag with \`--tag'" +# else +# func_verbose "using $tagname tagged configuration" + fi + ;; + esac + fi +} + + + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=${1} + if test "$build_libtool_libs" = yes; then + write_lobj=\'${2}\' + else + write_lobj=none + fi + + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T <\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" + func_quote_for_eval "$arg" + lastarg="$lastarg $func_quote_for_eval_result" done IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result # Add the arguments to base_compile. base_compile="$base_compile $lastarg" continue ;; - * ) + *) # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # @@ -744,66 +1187,42 @@ esac # case $arg_mode # Aesthetically quote the previous argument. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - - base_compile="$base_compile $lastarg" + func_quote_for_eval "$lastarg" + base_compile="$base_compile $func_quote_for_eval_result" done # for arg case $arg_mode in arg) - $echo "$modename: you must specify an argument for -Xcompile" - exit $EXIT_FAILURE + func_fatal_error "you must specify an argument for -Xcompile" ;; target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit $EXIT_FAILURE + func_fatal_error "you must specify a target with \`-o'" ;; *) # Get the name of the library object. - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + test -z "$libobj" && { + func_basename "$srcfile" + libobj="$func_basename_result" + } ;; esac # Recognize several different file suffixes. # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSifmso]' case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.ii) xform=ii ;; - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.[fF][09]?) xform=[fF][09]. ;; - *.for) xform=for ;; - *.java) xform=java ;; - *.obj) xform=obj ;; - *.sx) xform=sx ;; + *.[cCFSifmso] | \ + *.ada | *.adb | *.ads | *.asm | \ + *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ + *.[fF][09]? | *.for | *.java | *.obj | *.sx) + func_xform "$libobj" + libobj=$func_xform_result + ;; esac - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit $EXIT_FAILURE + func_fatal_error "cannot determine name of library object from \`$libobj'" ;; esac @@ -811,7 +1230,15 @@ for arg in $later; do case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + continue + ;; + -static) + build_libtool_libs=no build_old_libs=yes continue ;; @@ -828,28 +1255,17 @@ esac done - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qlibobj="\"$qlibobj\"" ;; - esac - test "X$libobj" != "X$qlibobj" \ - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir= - else - xdir=$xdir/ - fi + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name \`$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" + objname="$func_basename_result" + xdir="$func_dirname_result" lobj=${xdir}$objdir/$objname - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -z "$base_compile" && \ + func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. if test "$build_old_libs" = yes; then @@ -858,12 +1274,9 @@ removelist="$lobj $libobj ${libobj}T" fi - $run $rm $removelist - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in - cygwin* | mingw* | pw32* | os2*) + cygwin* | mingw* | pw32* | os2* | cegcc*) pic_mode=default ;; esac @@ -875,10 +1288,8 @@ # 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 "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 else output_obj= need_locks=no @@ -888,13 +1299,13 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file if test "$need_locks" = yes; then - until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" sleep 2 done elif test "$need_locks" = warn; then if test -f "$lockfile"; then - $echo "\ + $ECHO "\ *** ERROR, $lockfile exists and contains: `cat $lockfile 2>/dev/null` @@ -905,34 +1316,22 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." - $run $rm $removelist + $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - $echo "$srcfile" > "$lockfile" + removelist="$removelist $output_obj" + $ECHO "$srcfile" > "$lockfile" fi + $opt_dry_run || $RM $removelist + removelist="$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 - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qsrcfile="\"$qsrcfile\"" ;; - esac - - $run $rm "$libobj" "${libobj}T" - - # Create a libtool object file (analogous to a ".la" file), - # but don't create it if we're doing a dry run. - test -z "$run" && cat > ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ + $ECHO "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -985,45 +1371,27 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." - $run $rm $removelist + $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi # Just move the object if needed, then go on to compile the next one if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - $show "$mv $output_obj $lobj" - if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi + func_show_eval '$MV "$output_obj" "$lobj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' fi - # Append the name of the PIC object to the libtool object file. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ + $ECHO "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -1057,5485 +1420,6784 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." - $run $rm $removelist + $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi # Just move the object if needed if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi + func_show_eval '$MV "$output_obj" "$obj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' fi - - # Append the name of the non-PIC object the libtool object file. - # Only append if the libtool object file exists. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes + compile) + $ECHO \ +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" +Compile a source file into a libtool library object. - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac +This mode accepts the following additional options: - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit $EXIT_FAILURE - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat $save_arg` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. + -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 + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= +COMPILE-COMMAND is a command to be used in creating a \`standard' object file +from the given SOURCEFILE. - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix \`.c' with the +library object suffix, \`.lo'." + ;; - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi + execute) + $ECHO \ +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +Automatically set library path, then run a program. - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" +This mode accepts the following additional options: - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi + -dlopen FILE add the directory containing FILE to the library path - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi +This mode sets the library path environment variable according to \`-dlopen' +flags. - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" +Then, COMMAND is executed, with ARGS as arguments." + ;; - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. + finish) + $ECHO \ +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +Complete the installation of libtool libraries. - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - done - else - $echo "$modename: link input file \`$save_arg' does not exist" - exit $EXIT_FAILURE - fi - arg=$save_arg - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - darwin_framework|darwin_framework_skip) - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" +Each LIBDIR is a directory that contains libtool libraries. - prevarg="$arg" +The commands that this mode executes may require superuser privileges. Use +the \`--dry-run' option if you just want to see what would be executed." + ;; - case $arg in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; + install) + $ECHO \ +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; +Install executables or libraries. - -avoid-version) - avoid_version=yes - continue - ;; +INSTALL-COMMAND is the installation command. The first component should be +either the \`install' or \`cp' program. - -dlopen) - prev=dlfiles - continue - ;; +The following components of INSTALL-COMMAND are treated specially: - -dlpreopen) - prev=dlprefiles - continue - ;; + -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -export-dynamic) - export_dynamic=yes - continue - ;; +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; + link) + $ECHO \ +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -framework|-arch|-isysroot) - case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) - prev=darwin_framework_skip ;; - *) compiler_flags="$compiler_flags $arg" - prev=darwin_framework ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; +Link object files or libraries together to form another library, or to +create an executable program. - -inst-prefix-dir) - prev=inst_prefix - continue - ;; +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; +The following components of LINK-COMMAND are treated specially: - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - continue - ;; + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -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) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -no-install link a not-installable executable + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + -weak LIBNAME declare that the target provides the LIBNAME interface - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; +All other options (arguments beginning with \`-') are ignored. - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; +Every other argument is treated as a filename. Files ending in \`.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +only library objects (\`.lo' files) may be specified, and \`-rpath' is +required, except when creating a convenience library. - -multi_module) - single_module="${wl}-multi_module" - continue - ;; +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +using \`ar' and \`ranlib', or on Windows using \`lib'. - -module) - module=yes - continue - ;; +If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +is created, otherwise an executable program is created." + ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + uninstall) + $ECHO \ +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - compiler_flags="$compiler_flags $arg" - continue +Remove libraries from an installation directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." ;; - -shrext) - prev=shrext - continue - ;; + *) + func_fatal_help "invalid operation mode \`$mode'" + ;; + esac - -no-fast-install) - fast_install=no - continue - ;; + $ECHO + $ECHO "Try \`$progname --help' for more information about other modes." - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; + exit $? +} - -no-undefined) - allow_undefined=no - continue - ;; + # Now that we've collected a possible --mode arg, show help if necessary + $opt_help && func_mode_help - -objectlist) - prev=objectlist - continue - ;; - -o) prev=output ;; +# func_mode_execute arg... +func_mode_execute () +{ + $opt_debug + # The first argument is the command name. + cmd="$nonopt" + test -z "$cmd" && \ + func_fatal_help "you must specify a COMMAND" - -precious-files-regex) - prev=precious_regex - continue - ;; + # Handle -dlopen flags immediately. + for file in $execute_dlfiles; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" - -release) - prev=release - continue - ;; + dir= + case $file in + *.la) + # 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" - -rpath) - prev=rpath - continue - ;; + # Read the libtool library. + dlname= + library_names= + func_source "$file" - -R) - prev=xrpath - continue - ;; + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && \ + func_warning "\`$file' was not linked with \`-export-dynamic'" + continue + fi - -R*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; + func_dirname "$file" "" "." + dir="$func_dirname_result" - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue + if test -f "$dir/$objdir/$dlname"; then + dir="$dir/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + fi + fi ;; - -thread-safe) - thread_safe=yes - continue + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." + dir="$func_dirname_result" ;; - -version-info) - prev=vinfo - continue - ;; - -version-number) - prev=vinfo - vinfo_number=yes + *) + func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" continue ;; + esac - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir="$absdir" - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done - -Xcompiler) - prev=xcompiler - continue - ;; + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic="$magic" - -Xlinker) - prev=xlinker - continue + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -*) ;; + *) + # Do a test to see if this is really a libtool program. + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. + file="$progdir/$program" + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file="$progdir/$program" + fi ;; + esac + # Quote arguments (to preserve shell metacharacters). + func_quote_for_eval "$file" + args="$args $func_quote_for_eval_result" + done - -XCClinker) - prev=xcclinker - continue - ;; + if test "X$opt_dry_run" = Xfalse; then + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; + # Restore saved environment variables + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + done - *.$objext) - # A standard object. - objs="$objs $arg" - ;; + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" + else + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + $ECHO "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + fi +} - *.lo) - # A libtool-controlled object. +test "$mode" = execute && func_mode_execute ${1+"$@"} - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug + libdirs="$nonopt" + admincmds= - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for dir + do + libdirs="$libdirs $dir" + done - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +'"$cmd"'"' + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $cmds" + fi + done + fi - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi + $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\" - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi + $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 - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi + $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 +} - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" +test "$mode" = finish && func_mode_finish ${1+"$@"} - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +# func_mode_install arg... +func_mode_install () +{ + $opt_debug + # There may be an optional sh(1) argument at the beginning of + # 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 + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else + install_prog= + arg=$nonopt + fi - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - ;; + # 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" - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=no + stripme= + for arg + do + if test -n "$dest"; then + files="$files $dest" + dest=$arg continue - ;; - - *.la) - # A libtool-controlled library. + fi - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" + case $arg in + -d) isdir=yes ;; + -f) + case " $install_prog " in + *[\\\ /]cp\ *) ;; + *) prev=$arg ;; + esac + ;; + -g | -m | -o) + prev=$arg + ;; + -s) + stripme=" -s" + continue + ;; + -*) + ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then prev= else - deplibs="$deplibs $arg" + dest=$arg + continue fi - continue ;; + esac - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg + # Aesthetically quote the argument. + func_quote_for_eval "$arg" + install_prog="$install_prog $func_quote_for_eval_result" + done - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop + test -z "$install_prog" && \ + func_fatal_help "you must specify an install program" - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -n "$prev" && \ + func_fatal_help "the \`$prev' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" + if test -z "$files"; then + if test -z "$dest"; then + func_fatal_help "no file or destination specified" + else + func_fatal_help "you must specify a destination" + fi fi - oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" + # Strip any trailing slash from the destination. + func_stripname '' '/' "$dest" + dest=$func_stripname_result - 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\'\` + # Check to see that the destination is a directory. + test -d "$dest" && isdir=yes + if test "$isdir" = yes; then + destdir="$dest" + destname= else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + func_dirname_and_basename "$dest" "" "." + destdir="$func_dirname_result" + destname="$func_basename_result" - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then - exit $exit_status - fi + # Not a directory, so check to see that there is only one file specified. + set dummy $files; shift + test "$#" -gt 1 && \ + func_fatal_help "\`$dest' is not a directory" fi - - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; *) - duplicate_compiler_generated_deps=$duplicate_deps + for file in $files; do + case $file in + *.lo) ;; + *) + func_fatal_help "\`$destdir' must be an absolute directory name" + ;; + esac + done ;; esac - specialdeplibs= - libs= - # 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 test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + staticlibs="$staticlibs $file" + ;; + + *.la) + # 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" + + library_names= + old_library= + relink_command= + func_source "$file" + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) current_libdirs="$current_libdirs $libdir" ;; esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) future_libdirs="$future_libdirs $libdir" ;; + esac + fi - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit $EXIT_FAILURE + func_dirname "$file" "/" "" + dir="$func_dirname_result" + dir="$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\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + test "$inst_prefix_dir" = "$destdir" && \ + func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + + 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%"` + else + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + fi + + func_warning "relinking \`$file'" + func_show_eval "$relink_command" \ + 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + fi + + # See the names of the shared library. + set dummy $library_names; shift + if test -n "$1"; then + realname="$1" + shift + + srcname="$realname" + test -n "$relink_command" && srcname="$realname"T + + # Install the shared library and build the symlinks. + func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + 'exit $?' + tstripme="$stripme" + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme="" + ;; + esac ;; esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - for pass in $passes; do - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + if test -n "$tstripme" && test -n "$striplib"; then + func_show_eval "$striplib $destdir/$realname" 'exit $?' fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + # Try `ln -sf' first, because the `ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. + for linkname + do + test "$linkname" != "$realname" \ + && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if (${SED} -e '2q' $lib | - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" - $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 used here." - else - $echo - $echo "*** Warning: Linking the shared library $output against the" - $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - 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" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 - exit $EXIT_FAILURE - fi - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE + # Do each command in the postinstall commands. + lib="$destdir/$realname" + func_execute_cmds "$postinstall_cmds" 'exit $?' fi - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= + # Install the pseudo-library for information purposes. + func_basename "$file" + name="$func_basename_result" + instname="$dir/$name"i + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + ;; - # Read the .la file - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac + *.lo) + # Install (i.e. copy) a libtool object. - 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" + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" fi - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - 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 test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit $EXIT_FAILURE - fi - continue - fi # $pass = conv + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + func_lo2o "$destfile" + staticdest=$func_lo2o_result + ;; + *.$objext) + staticdest="$destfile" + destfile= + ;; + *) + func_fatal_help "cannot copy a libtool object to \`$destfile'" + ;; + esac + # Install the libtool object if requested. + test -n "$destfile" && \ + func_show_eval "$install_prog $file $destfile" 'exit $?' - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result + func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' fi + exit $EXIT_SUCCESS + ;; - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" + fi - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext="" + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result + stripped_ext=".exe" + fi + ;; + esac + + # Do a test to see if this is really a libtool program. + case $host in + *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi + ;; *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" + wrapper=$file + ;; + esac + if func_ltwrapper_script_p "$wrapper"; then + notinst_deplibs= + relink_command= + + func_source "$wrapper" + + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ + func_fatal_error "invalid libtool wrapper script \`$wrapper'" + + finalize=yes + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + func_source "$lib" + fi + libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e '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 + fi + done + + relink_command= + func_source "$wrapper" + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + $opt_dry_run || { + if test "$finalize" = yes; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" + file="$func_basename_result" + outputname="$tmpdir/$file" + # Replace the output file specification. + relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_silent || { + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else + func_error "error: relink \`$file' with the above command before installing it" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi + file="$outputname" + else + func_warning "cannot relink \`$file'" + fi + } + else + # Install the binary that we compiled earlier. + file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` fi + fi + + # remove .exe since cygwin /usr/bin/install will append another + # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + func_stripname '' '.exe' "$destfile" + destfile=$func_stripname_result + ;; + esac ;; esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` + func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' + $opt_dry_run || if test -n "$outputname"; then + ${RM}r "$tmpdir" + fi + ;; + esac + done - # 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 - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" + for file in $staticlibs; do + func_basename "$file" + name="$func_basename_result" + + # Set up the ranlib parameters. + oldlib="$destdir/$name" + + func_show_eval "$install_prog \$file \$oldlib" 'exit $?' + + if test -n "$stripme" && test -n "$old_striplib"; then + func_show_eval "$old_striplib $oldlib" 'exit $?' + fi + + # Do each command in the postinstall commands. + func_execute_cmds "$old_postinstall_cmds" 'exit $?' + done + + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + else + exit $EXIT_SUCCESS + fi +} + +test "$mode" = install && func_mode_install ${1+"$@"} + + +# func_generate_dlsyms outputname originator pic_p +# Extract symbols from dlprefiles and create ${outputname}S.o with +# a dlpreopen symbol table. +func_generate_dlsyms () +{ + $opt_debug + my_outputname="$1" + my_originator="$2" + my_pic_p="${3-no}" + my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + my_dlsyms= + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + my_dlsyms="${my_outputname}S.c" + else + func_error "not configured to extract global symbols from dlpreopened files" + fi + fi + + if test -n "$my_dlsyms"; then + case $my_dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist="$output_objdir/${my_outputname}.nm" + + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" + + # Parse the name list into a source file. + func_verbose "creating $output_objdir/$my_dlsyms" + + $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +/* External symbol declarations for the compiler. */\ +" + + if test "$dlself" = yes; then + func_verbose "generating symbol list for \`$output'" + + $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` + for progfile in $progfiles; do + func_verbose "extracting global C symbols from \`$progfile'" + $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + $opt_dry_run || { + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + fi - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE + for dlprefile in $dlprefiles; do + 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'" + } + done + + $opt_dry_run || { + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $MV "$nlist"T "$nlist" 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" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" + + # Try sorting and uniquifying the output. + if $GREP -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then + : else - newdlprefiles="$newdlprefiles $dir/$linklib" + $GREP -v "^: " < "$nlist" > "$nlist"S fi - fi # $pass = dlpreopen - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - deplibs="$lib $deplibs" # used for prog,scan pass + $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - continue - fi + $ECHO >> "$output_objdir/$my_dlsyms" "\ - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" +/* 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 - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi + $ECHO >> "$output_objdir/$my_dlsyms" "\ +extern $lt_dlsym_const lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[]; +$lt_dlsym_const lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{\ + { \"$my_originator\", (void *) 0 }," - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + *) + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + esac + $ECHO >> "$output_objdir/$my_dlsyms" "\ + {0, (void *) 0} +}; - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $absdir" ;; - esac - fi +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_${my_prefix}_LTX_preloaded_symbols; +} +#endif - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi # $linkmode,$pass = prog,link... +#ifdef __cplusplus +} +#endif\ +" + } # !$opt_dry_run - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi + pic_flag_for_symtable= + case "$compile_command " in + *" -static "*) ;; + *) + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) + if test "X$my_pic_p" != Xno; then + pic_flag_for_symtable=" $pic_flag" + fi + ;; + esac + ;; + esac + symtab_cflags= + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; + *) symtab_cflags="$symtab_cflags $arg" ;; + esac + done - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes ; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - # This is a shared library + # Now compile the dynamic symbol file. + func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - # Warn about portability, can't link against -module's on - # some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then - $echo - if test "$linkmode" = prog; then - $echo "*** Warning: Linking the executable $output against the loadable module" - else - $echo "*** Warning: Linking the shared library $output against the loadable module" - fi - $echo "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac + # Clean up the generated files. + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + + # Transform the symbol file into the correct name. + symfileobj="$output_objdir/${my_outputname}S.$objext" + 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%"` + else + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "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%"` + ;; + esac + ;; + *) + func_fatal_error "unknown suffix for \`$my_dlsyms'" + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # 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@%%"` + fi +} - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; shift - libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +func_win32_libid () +{ + $opt_debug + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + 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 | + $SED -n -e ' + 1,100{ + / I /{ + s,.*,import, + p + q + } + }'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $ECHO "$win32_libid_type" +} - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`$echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + $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 ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" + fi +} - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a module then we can not link against - # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | - $EGREP ": [^:]* bundle" >/dev/null ; 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" - else - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" - exit $EXIT_FAILURE - fi +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + $opt_debug + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" + my_xlib="$func_basename_result" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + func_arith $extracted_serial + 1 + extracted_serial=$func_arith_result + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi + func_mkdir_p "$my_xdir" - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" + case $host in + *-darwin*) + func_verbose "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + $opt_dry_run || { + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + darwin_base_archive=`basename "$darwin_archive"` + darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` + if test -n "$darwin_arches"; then + darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches ; do + func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + func_extract_an_archive "`pwd`" "${darwin_base_archive}" + cd "$darwin_curdir" + $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + done # $darwin_arches + ## Okay now we've a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ + cd "$darwin_orig_dir" else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. + cd $darwin_orig_dir + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + } # !$opt_dry_run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - $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." - 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." - 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." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? + func_extract_archives_result="$my_oldobjs" +} - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - newlib_search_path="$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 test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="$absdir" - fi - depdepl= - case $host in - *-*-darwin*) - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$deplibdir/$depdepl" ; then - depdepl="$deplibdir/$depdepl" - elif test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" - else - # Can't find it, oh well... - depdepl= - fi - # do not add paths which are already there - case " $newlib_search_path " in - *" $path "*) ;; - *) newlib_search_path="$newlib_search_path $path";; - esac - fi - path="" - ;; - *) - path="-L$path" - ;; - esac - ;; - -l*) - case $host in - *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" - ;; - *) continue ;; - esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= +# func_emit_wrapper_part1 [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 - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" + $ECHO "\ +#! $SHELL + +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# 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 +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command=\"$relink_command\" + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +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\ +" + $ECHO "\ - case $linkmode in - oldlib) - case " $deplibs" in - *\ -l* | *\ -L*) - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e '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'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; esac + fi - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + done +" +} +# end: func_emit_wrapper_part1 - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi +# 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 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi + if test "$fast_install" = yes; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi + if test ! -f \"\$progdir/\$program\" || + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi + file=\"\$\$-\$program\" - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; - esac + $ECHO "\ - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit $EXIT_FAILURE + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 + fi + fi + + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" - $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" fi - fi - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi + $ECHO "\ - set dummy $rpath - if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" + if test -f \"\$progdir/\$program\"; then" - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - 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 "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 + # 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/::*\$//'\` + + export $shlibpath_var +" fi - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 + # 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 - else - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" + $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 + 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 + exit 1 + fi +fi\ +" +} +# end: func_emit_wrapper_part2 - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + +# 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 - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible + # 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}" +} - case $vinfo_number in - yes) - number_major="$2" - number_minor="$3" - number_revision="$4" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - darwin|linux|osf|windows|none) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - esac - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# 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 - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# 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 - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat <&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - fi +/* $cwrappersource - temporary wrapper executable for $objdir/$outputname + Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; + The $output program cannot be directly executed until all the libtool + libraries that it depends on are installed. - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; + 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" +#include +#include +#ifdef _MSC_VER +# include +# include +# include +# define setmode _setmode +#else +# include +# include +# ifdef __CYGWIN__ +# include +# define HAVE_SETENV +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include - freebsd-elf) - major=".$current" - versuffix=".$current"; - ;; +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - major=`expr $current - $age` - else - major=`expr $current - $age + 1` - fi - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" - done +#ifdef _MSC_VER +# define S_IXUSR _S_IEXEC +# define stat _stat +# ifndef _INTPTR_T_DEFINED +# define intptr_t int +# endif +#endif - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +# define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif - osf) - major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; +#ifdef __CYGWIN__ +# define FOPEN_WB "wb" +#endif - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac +#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); +} +#else +# define LTWRAPPER_DEBUGPRINTF(args) +#endif - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi +const char *program_name = NULL; - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +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_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); - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi +static const char *script_text_part1 = +EOF - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$echo "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - removelist="$removelist $p" - ;; - *) ;; - esac - done - if test -n "$removelist"; then - $show "${rm}r $removelist" - $run ${rm}r $removelist - fi - fi + func_emit_wrapper_part1 yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ "/' -e 's/$/\\n"/' + echo ";" + cat <"))); + for (i = 0; i < newargc; i++) + { + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); + } - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $rm conftest.c - cat > conftest.c </dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $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" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for file magic test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a file magic. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - 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 \"$potent_lib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $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" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a regex pattern. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e '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" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ - | grep . >/dev/null; then - $echo - if test "X$deplibs_check_method" = "Xnone"; then - $echo "*** Warning: inter-library dependencies are not supported in this platform." - else - $echo "*** Warning: inter-library dependencies are not known to be supported." - fi - $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac + case $host_os in + mingw*) + cat <<"EOF" + /* execv doesn't actually work on mingw as expected on unix */ + 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)); + return 127; + } + return rval; +EOF + ;; + *) + cat <<"EOF" + execv (lt_argv_zero, newargz); + return rval; /* =127, but avoids unused variable warning */ +EOF + ;; + esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - $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." - 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." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - 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." + cat <<"EOF" +} - 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." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi +void * +xmalloc (size_t num) +{ + void *p = (void *) malloc (num); + if (!p) + lt_fatal ("Memory exhausted"); + return p; +} - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" +char * +xstrdup (const char *string) +{ + return string ? strcpy ((char *) xmalloc (strlen (string) + 1), + string) : NULL; +} +const char * +base_name (const char *name) +{ + const char *base; - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ + if (isalpha ((unsigned char) name[0]) && name[1] == ':') + name += 2; +#endif - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$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 - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - case $archive_cmds in - *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; - *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; - esac - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; + return base; +} - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi +int +check_executable (const char *path) +{ + struct stat st; - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift + LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); + if ((!path) || (!*path)) + return 0; - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi + if ((stat (path, &st) >= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} - lib="$output_objdir/$realname" - linknames= - for link - do - linknames="$linknames $link" - done +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); + if ((!path) || (!*path)) + return 0; - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - if len=`expr "X$cmd" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - $show "$cmd" - $run eval "$cmd" || exit $? - skipped_export=false - else - # The command line is too long to execute in one step. - $show "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + int tmp_len; + char *concat_name; - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" + LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", + wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } +#endif - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; +} - if test "X$skipped_export" != "X:" && - len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise. - $echo "creating reloadable object files..." +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", + tmp_pathspec)); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - output_la=`$echo "X$output" | $Xsed -e "$basename"` + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + char *errstr = strerror (errno); + lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + } + } + XFREE (tmp_pathspec); - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - delfiles= - last_robj= - k=1 - output=$output_objdir/$output_la-${k}.$objext - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - eval test_cmds=\"$reload_cmds $objlist $last_robj\" - if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else - # The command $test_cmds is almost too long, add a - # 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\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - len=1 - fi - done - # Handle the remaining objects by creating one last - # 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\" + if (!has_symlinks) + { + return xstrdup (pathspec); + } - if ${skipped_export-false}; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - libobjs=$output - # Append the command to create the export file. - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - - # Set up a command to remove the reloadable object files - # after they are used. - i=0 - while test "$i" -lt "$k" - do - i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" - done + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal ("Could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif +} - $echo "creating a temporary reloadable object file: $output" +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" + assert (str != NULL); + assert (pat != NULL); - libobjs=$output - # Restore the value of output. - output=$save_output + len = strlen (str); + patlen = strlen (pat); - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. + if (patlen <= len) + { + str += len - patlen; + if (strcmp (str, pat) == 0) + *str = '\0'; + } + return str; +} - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi +static void +lt_error_core (int exit_status, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s: %s: ", program_name, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); - # Append the command to remove the reloadable object files - # to the just-reset $cmds. - eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? + if (exit_status >= 0) + exit (exit_status); +} - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi +void +lt_fatal (const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + va_end (ap); +} - exit $lt_exit - } - done - IFS="$save_ifs" +void +lt_setenv (const char *name, const char *value) +{ + LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", + (name ? name : ""), + (value ? value : ""))); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); +#else + int len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } +#endif + } +} - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + int orig_value_len = strlen (orig_value); + int add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - fi - fi +int +lt_split_name_value (const char *arg, char** name, char** value) +{ + const char *p; + int len; + if (!arg || !*arg) + return 1; - exit $EXIT_SUCCESS - fi + p = strchr (arg, (int)'='); - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; + if (!p) + return 1; - obj) - case " $deplibs" in - *\ -l* | *\ -L*) - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; - esac + *value = xstrdup (++p); - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi + len = strlen (arg) - strlen (*value); + *name = XMALLOC (char, len); + strncpy (*name, arg, len-1); + (*name)[len - 1] = '\0'; - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi + return 0; +} - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 - fi +void +lt_opt_process_env_set (const char *arg) +{ + char *name = NULL; + char *value = NULL; - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); + } - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi + lt_setenv (name, value); + XFREE (name); + XFREE (value); +} - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac +void +lt_opt_process_env_prepend (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; - # Delete the old objects. - $run $rm $obj $libobj + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); + } - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= + new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} - 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'` - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" +void +lt_opt_process_env_append (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); + } - # 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 + new_value = lt_extend_str (getenv (name), value, 1); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} - output="$obj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" +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 : ""), + (value ? value : ""))); - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + int len = strlen (new_value); + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[len-1] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} - exit $EXIT_SUCCESS - fi +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 : ""), + (value ? value : ""))); - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi +EOF +} +# end: func_emit_cwrapperexe_src - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi +# func_mode_link arg... +func_mode_link () +{ + $opt_debug + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra + # flag for every libtool invocation. + # allow_undefined=no - exit $EXIT_SUCCESS + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll which has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes ;; + *) + allow_undefined=yes + ;; + esac + libtool_args=$nonopt + base_compile="$nonopt $@" + compile_command=$nonopt + finalize_command=$nonopt - prog) - case $host in - *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 - fi + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= + new_inherited_linker_flags= - if test "$preload" = yes; then - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && - test "$dlopen_self_static" = unknown; then - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi - fi + avoid_version=no + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + non_pic_objects= + precious_files_regex= + prefer_static_libs=no + preload=no + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= + single_module="${wl}-single_module" + func_infer_tag $base_compile - 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 / -framework System /'` - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + break + ;; + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac + build_libtool_libs=no + build_old_libs=yes + break ;; esac + done - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - if test "$tagname" = CXX ; then - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - fi - ;; - esac + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" ;; - *) new_libs="$new_libs $deplib" ;; esac - done - compile_deplibs="$new_libs" - - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + case $prev in + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" + preload=yes + fi + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test "$prev" = dlprefiles; then + dlself=yes + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + dlself=yes else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac + dlself=needless + export_dynamic=yes fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + prev= + continue + ;; + *) + if test "$prev" = dlfiles; then + dlfiles="$dlfiles $arg" + else + dlprefiles="$dlprefiles $arg" + fi + prev= + continue + ;; esac ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; + expsyms) + export_symbols="$arg" + test -f "$arg" \ + || func_fatal_error "symbol file \`$arg' does not exist" + prev= + continue + ;; + expsyms_regex) + export_symbols_regex="$arg" + prev= + continue + ;; + framework) + case $host in + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; + *) deplibs="$deplibs $qarg.ltframework" # this is fixed later + ;; esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + ;; esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - 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` - fi + prev= + continue + ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat "$save_arg"` + do +# moreargs="$moreargs $fil" + arg=$fil + # A libtool-controlled object. - dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${outputname}S.c" - else - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - fi - fi + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= - if test -n "$dlsyms"; then - case $dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${outputname}.nm" + # Read the .lo file + func_source "$arg" - $show "$rm $nlist ${nlist}S ${nlist}T" - $run $rm "$nlist" "${nlist}S" "${nlist}T" + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi - # Parse the name list into a source file. - $show "creating $output_objdir/$dlsyms" + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" -#ifdef __cplusplus -extern \"C\" { -#endif + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi -/* External symbol declarations for the compiler. */\ -" + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi done - - if test -n "$exclude_expsyms"; then - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - else - $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - fi + else + func_fatal_error "link input file \`$arg' does not exist" fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -z "$run"; then - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else - $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ - -#undef lt_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -" - - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ -const struct { -" - ;; - esac - - - $echo >> "$output_objdir/$dlsyms" "\ - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{\ -" - - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - fi - - pic_flag_for_symtable= - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; - esac + arg=$save_arg + prev= + continue + ;; + precious_regex) + precious_files_regex="$arg" + prev= + continue + ;; + release) + release="-$arg" + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; esac - - # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - else - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - ;; - esac + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; + *) rpath="$rpath $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) xrpath="$xrpath $arg" ;; + esac + fi + prev= + continue + ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; + weak) + weak_libs="$weak_libs $arg" + prev= + continue + ;; + xcclinker) + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) + compiler_flags="$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" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" + continue ;; *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE + eval "$prev=\"\$arg\"" + prev= + continue ;; esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - fi - - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` - link_command="$compile_command$compile_rpath" + fi # test -n "$prev" - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - exit_status=$? + prevarg="$arg" - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" + case $arg in + -all-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" fi + continue + ;; - exit $exit_status - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi + -allow-undefined) + # FIXME: remove this flag sometime in the future. + func_fatal_error "\`-allow-undefined' must not be used because it is the default" + ;; - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi + -avoid-version) + avoid_version=yes + continue + ;; - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi + -dlopen) + prev=dlfiles + continue + ;; - if test "$no_install" = yes; then - # 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'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - exit $EXIT_SUCCESS - fi + -dlpreopen) + prev=dlprefiles + continue + ;; - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + -export-dynamic) + export_dynamic=yes + continue + ;; - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - 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" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - else - # fast_install is set to needless - relink_command= - fi + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + func_fatal_error "more than one -exported-symbols argument is not allowed" + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + prev=expsyms_regex fi - fi - - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + continue + ;; - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname + -framework) + prev=framework + continue + ;; - $show "$link_command" - $run eval "$link_command" || exit $? + -inst-prefix-dir) + prev=inst_prefix + continue + ;; - # Now create the wrapper script. - $show "creating $output" + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) + func_append compile_command " $arg" + func_append finalize_command " $arg" + ;; + esac + continue + ;; - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" + -L*) + func_stripname '-L' '' "$arg" + dir=$func_stripname_result + if test -z "$dir"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" + func_fatal_error "need path for \`-L' option" fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - 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";; + fi + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" + ;; esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; + case "$deplibs " in + *" -L$dir "*) ;; + *) + deplibs="$deplibs -L$dir" + lib_search_path="$lib_search_path $dir" + ;; esac - # test for cygwin because mv fails w/o .exe extensions case $host in - *cygwin*) - exeext=.exe - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; + *) dllsearchpath="$dllsearchpath:$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac + ;; esac - case $host in - *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + continue + ;; - cat > $cwrappersource <> $cwrappersource<<"EOF" -#include -#include -#include -#include -#include -#include -#include -#include -#include + -multi_module) + single_module="${wl}-multi_module" + continue + ;; -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif + -no-fast-install) + fast_install=no + continue + ;; -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif + -no-install) + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. + func_warning "\`-no-install' is ignored for $host" + func_warning "assuming \`-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif + -no-undefined) + allow_undefined=no + continue + ;; -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ + -objectlist) + prev=objectlist + continue + ;; -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ + -o) prev=output ;; -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) + -precious-files-regex) + prev=precious_regex + continue + ;; -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif + -release) + prev=release + continue + ;; -const char *program_name = NULL; + -rpath) + prev=rpath + continue + ;; -void * xmalloc (size_t num); -char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); + -R) + prev=xrpath + continue + ;; -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; + -R*) + func_stripname '-R' '' "$arg" + dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) xrpath="$xrpath $dir" ;; + esac + continue + ;; - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); -EOF + -shared) + # The effects of -shared are defined in a previous loop. + continue + ;; - cat >> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; + -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. + continue + ;; - for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - return 127; -} + -weak) + prev=weak + continue + ;; -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + 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" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; - return p; -} + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + 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" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; -char * -xstrdup (const char *string) -{ - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; -} + -Xcompiler) + prev=xcompiler + continue + ;; -const char * -base_name (const char *name) -{ - const char *base; + -Xlinker) + prev=xlinker + continue + ;; -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') - name += 2; -#endif + -XCClinker) + prev=xcclinker + continue + ;; - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return base; -} + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; -int -check_executable(const char * path) -{ - struct stat st; + # -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 + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + 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" + continue + ;; - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} + *.$objext) + # A standard object. + objs="$objs $arg" + ;; -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ -char * -find_executable (const char* wrapper) -{ - int has_slash = 0; - const char* p; - const char* p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; + *.lo) + # A libtool-controlled object. - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; + # Read the .lo file + func_source "$arg" - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; -} + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" -char * -strendzap(char *str, const char *pat) -{ - size_t len, patlen; + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi - assert(str != NULL); - assert(pat != NULL); + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi - len = strlen(str); - patlen = strlen(pat); + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi - if (patlen <= len) - { - str += len - patlen; - if (strcmp(str, pat) == 0) - *str = '\0'; - } - return str; -} + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - if (exit_status >= 0) - exit (exit_status); -} + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + ;; -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + *.$libext) + # An archive. + deplibs="$deplibs $arg" + old_deplibs="$old_deplibs $arg" + continue + ;; - $echo > $output "\ -#! $SHELL + *.la) + # A libtool-controlled library. -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. + dlfiles="$dlfiles $arg" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. + dlprefiles="$dlprefiles $arg" + prev= + else + deplibs="$deplibs $arg" + fi + continue + ;; -# 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' + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + esac # arg -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + done # argument parsing loop -# 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 + test -n "$prev" && \ + func_fatal_help "the \`$prevarg' option requires an argument" -relink_command=\"$relink_command\" + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variable: - notinst_deplibs='$notinst_deplibs' -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! - : + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" + outputname="$func_basename_result" + libobjs_save="$libobjs" + + 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\'\` else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + shlib_search_path= fi - fi\ -" - $echo >> $output "\ + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" + # Create the object directory. + func_mkdir_p "$output_objdir" - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + # Determine the type of output + case $output in + "") + func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + + libs= + # 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 + case "$libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + libs="$libs $deplib" + done + + if test "$linkmode" = lib; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + 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" ;; + esac + pre_post_deps="$pre_post_deps $pre_post_dep" + done + fi + pre_post_deps= + fi + + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + + case $linkmode in + lib) + passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=no + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + + for pass in $passes; do + # The preopen pass in lib mode reverses $deplibs; put it back here + # so that -L comes before libs that need it for instance... + if test "$linkmode,$pass" = "lib,link"; then + ## FIXME: Find the place where the list is rebuilt in the wrong + ## order, and fix it there properly + tmp_deplibs= + for deplib in $deplibs; do + tmp_deplibs="$deplib $tmp_deplibs" + done + deplibs="$tmp_deplibs" + fi + + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" + deplibs= + fi + if test "$linkmode" = prog; then + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= + case $lib in + *.la) func_source "$lib" ;; + 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"` + case " $weak_libs " in + *" $deplib_base "*) ;; + *) deplibs="$deplibs $deplib" ;; + esac + done + done + libs="$dlprefiles" + fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= + fi + + for deplib in $libs; do + lib= + found=no + case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + compiler_flags="$compiler_flags $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + esac + fi + fi + continue + ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + func_warning "\`-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + fi + break 2 + fi + done + done + if test "$found" != yes; then + # deplib doesn't seem to be a libtool library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + else # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi + fi + ;; # -l + *.ltframework) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + esac + fi + fi + continue + ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" + newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" + newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" + dir=$func_stripname_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) xrpath="$xrpath $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) lib="$deplib" ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + # Linking convenience modules into shared libraries is allowed, + # but linking other static libraries is non-portable. + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) + valid_a_lib=no + case $deplibs_check_method in + 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 \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=yes + fi + ;; + pass_all) + valid_a_lib=yes + ;; + esac + if test "$valid_a_lib" != yes; then + $ECHO + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + $ECHO "*** I have the capability to make that library automatically link in when" + $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 "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + fi + ;; + esac + continue + ;; + prog) + if test "$pass" != link; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + elif test "$linkmode" = prog; then + 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" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + newdlfiles="$newdlfiles $deplib" + fi + fi + continue + ;; + %DEPLIBS%) + alldeplibs=yes + continue + ;; + esac # case $deplib + + if test "$found" = yes || test -f "$lib"; then : + else + func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" + fi + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$lib" \ + || func_fatal_error "\`$lib' is not a valid libtool archive" + + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no + avoidtemprpath= + + + # Read the .la file + func_source "$lib" + + # 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'` + 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";; + esac + done + fi + dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e '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" + fi + + if test "$pass" = conv; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then + 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 + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + 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 -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + func_fatal_error "cannot -dlopen a convenience library: \`$lib'" + fi + if test -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + dlprefiles="$dlprefiles $lib $dependency_libs" + else + newdlfiles="$newdlfiles $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then + func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "passing it literally to the linker, although it might fail" + abs_ladir="$ladir" + fi + ;; + esac + func_basename "$lib" + laname="$func_basename_result" + + # 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 + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else + dir="$libdir" + absdir="$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" + name=$func_stripname_result + + # This library was specified with -dlpreopen. + if test "$pass" = dlpreopen; then + 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 + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test "$linkmode" = lib; then + deplibs="$dir/$old_library $deplibs" + elif test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" # used for prog,scan pass + fi + continue + fi + + + if test "$linkmode" = prog && test "$pass" != link; then + newlib_search_path="$newlib_search_path $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no + if test "$link_all_deplibs" != no || test -z "$library_names" || + test "$build_libtool_libs" = no; then + linkalldeplibs=yes + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + esac + # Need to link against all dependency_libs? + if test "$linkalldeplibs" = yes; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; + *) temp_rpath="$temp_rpath$absdir:" ;; + esac + fi + + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + fi + + link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes; then + use_static_libs=no + fi + if test -n "$library_names" && + { test "$use_static_libs" = no || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded + notinst_deplibs="$notinst_deplibs $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" + need_relink=yes + fi + ;; + esac + # This is a shared library + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! + dlopenmodule="" + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then + dlopenmodule="$dlpremoduletest" + break + fi + done + if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + $ECHO + if test "$linkmode" = prog; then + $ECHO "*** Warning: Linking the executable $output against the loadable module" + else + $ECHO "*** Warning: Linking the shared library $output against the loadable module" + fi + $ECHO "*** $linklib is not portable!" + fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + shift + realname="$1" + shift + libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc*) + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + esac + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot="$soname" + func_basename "$soroot" + soname="$func_basename_result" + func_stripname 'lib' '.dll' "$soname" + newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else + func_verbose "extracting exported symbol list from \`$soname'" + func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else + func_verbose "generating import library for \`$soname'" + func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test "$linkmode" = prog || test "$mode" != relink; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a (non-dlopened) module then we can not + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | + $GREP ": [^:]* bundle" >/dev/null ; then + 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" + else + add="$dir/$old_library" + fi + elif test -n "$old_library"; then + add="$dir/$old_library" + fi + fi + esac + elif test "$hardcode_minus_L" = no; then + case $host in + *-*-sunos*) add_shlibpath="$dir" ;; + esac + add_dir="-L$dir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = no; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + relink) + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test "$lib_linked" != yes; then + func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + if test "$hardcode_direct" != yes && + test "$hardcode_minus_L" != yes && + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + esac + fi + fi + fi + + if test "$linkmode" = prog || test "$mode" = relink; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + fi + + if test "$linkmode" = prog; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test "$linkmode" = prog; then + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test "$hardcode_direct" != unsupported; then + test -n "$old_library" && linklib="$old_library" + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi + elif test "$build_libtool_libs" = yes; then + # Not a shared library + if test "$deplibs_check_method" != pass_all; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + $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." + 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." + 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." + fi + if test "$build_old_libs" = no; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) func_stripname '-R' '' "$libdir" + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) xrpath="$xrpath $temp_xrpath";; + esac;; + *) temp_deplibs="$temp_deplibs $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + + newlib_search_path="$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 "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done + + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + path= + case $deplib in + -L*) path="$deplib" ;; + *.la) + func_dirname "$deplib" "" "." + dir="$func_dirname_result" + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + func_warning "cannot determine absolute directory name of \`$dir'" + absdir="$dir" + fi + ;; + esac + if $GREP "^installed=no" $deplib > /dev/null; then + case $host in + *-*-darwin*) + depdepl= + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl" ; then + depdepl="$absdir/$objdir/$depdepl" + darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + 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}" + path= + fi + fi + ;; + *) + path="-L$absdir/$objdir" + ;; + esac + else + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ + func_warning "\`$deplib' seems to be moved" + + path="-L$absdir" + fi + ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test "$pass" = link; then + if test "$linkmode" = "prog"; then + 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'` + fi + fi + dependency_libs="$newdependency_libs" + if test "$pass" = dlpreopen; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi + if test "$pass" != dlopen; then + if test "$pass" != conv; then + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) lib_search_path="$lib_search_path $dir" ;; + esac + done + newlib_search_path= + fi + + if test "$linkmode,$pass" != "prog,link"; then + vars="deplibs" + else + vars="compile_deplibs finalize_deplibs" + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; + *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) tmp_libs="$tmp_libs $deplib" ;; + esac + ;; + *) tmp_libs="$tmp_libs $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i="" + ;; + esac + if test -n "$i" ; then + tmp_libs="$tmp_libs $i" + fi + done + dependency_libs=$tmp_libs + done # for pass + if test "$linkmode" = prog; then + dlfiles="$newdlfiles" + fi + if test "$linkmode" = prog || test "$linkmode" = lib; then + dlprefiles="$newdlprefiles" + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for archives" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for archives" + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ + func_warning "\`-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ + func_warning "\`-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" + objs="$objs$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form `libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ + func_fatal_help "libtool library \`$output' must begin with \`lib'" + + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result + fi + ;; + esac + + if test -n "$objs"; then + 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 "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" + libobjs="$libobjs $objs" + fi + fi + + test "$dlself" != no && \ + func_warning "\`-dlopen self' is ignored for libtool libraries" + + set dummy $rpath + shift + test "$#" -gt 1 && \ + func_warning "ignoring multiple \`-rpath's for a libtool library" + + install_libdir="$1" + + oldlibs= + if test -z "$rpath"; then + if test "$build_libtool_libs" = yes; then + # Building a libtool convenience library. + # Some compilers have problems with a `.al' extension so + # convenience libraries should have the same extension an + # archive normally would. + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ + func_warning "\`-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 + shift + IFS="$save_ifs" + + test -n "$7" && \ + func_fatal_help "too many parameters to \`-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major="$1" + number_minor="$2" + number_revision="$3" + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # which has an extra 1 added just for fun + # + case $version_type in + darwin|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|sunos) + current="$number_major" + revision="$number_minor" + age="0" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_minor" + lt_irix_increment=no + ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; + esac + ;; + no) + current="$1" + revision="$2" + age="$3" + ;; + esac + + # Check that each of the things are valid numbers. + case $current in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "CURRENT \`$current' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $revision in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "REVISION \`$revision' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $age in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "AGE \`$age' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then + func_error "AGE \`$age' is greater than the current interface number \`$current'" + func_fatal_error "\`$vinfo' is not valid version information" + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + func_arith $current + 1 + minor_current=$func_arith_result + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + + freebsd-aout) + major=".$current" + versuffix=".$current.$revision"; + ;; + + freebsd-elf) + major=".$current" + versuffix=".$current" + ;; + + irix | nonstopux) + if test "X$lt_irix_increment" = "Xno"; then + func_arith $current - $age + else + func_arith $current - $age + 1 + fi + major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring="$verstring_prefix$major.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test "$loop" -ne 0; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring_prefix$major.$iface:$verstring" + done + + # Before this point, $major must not contain `.'. + major=.$major + versuffix="$major.$revision" + ;; + + linux) + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test "$loop" -ne 0; do + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + verstring="$verstring:${current}.0" + ;; + + qnx) + major=".$current" + versuffix=".$current" + ;; + + sunos) + major=".$current" + versuffix=".$current.$revision" + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 filesystems. + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + + *) + func_fatal_configuration "unknown library version type \`$version_type'" + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring= + ;; + *) + verstring="0.0" + ;; + esac + if test "$need_version" = no; then + versuffix= + else + versuffix=".0.0" + fi + fi + + # Remove version info from name if versioning should be avoided + if test "$avoid_version" = yes && test "$need_version" = no; then + major= + versuffix= + verstring="" + fi + + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + func_warning "undefined symbols not allowed in $host shared libraries" + build_libtool_libs=no + build_old_libs=yes + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + + fi + + func_generate_dlsyms "$libname" "$libname" "yes" + libobjs="$libobjs $symfileobj" + test "X$libobjs" = "X " && libobjs= + + if test "$mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + removelist="$removelist $p" + ;; + *) ;; + esac + done + test -n "$removelist" && \ + func_show_eval "${RM}r \$removelist" + fi + + # 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" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$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"` + #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" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles="$dlfiles" + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) dlfiles="$dlfiles $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles="$dlprefiles" + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) dlprefiles="$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*) + # 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" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then + deplibs="$deplibs -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release="" + versuffix="" + major="" + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behavior. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | + $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib="$potent_lib" + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; + *) potlib=`$ECHO "X$potlib" | $Xsed -e '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" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + $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" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do + case $a_deplib in + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + 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 | \ + $EGREP "$match_pattern_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + $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" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + newdeplibs="$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'` + 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,,"` + done + fi + if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | + $GREP . >/dev/null; then + $ECHO + if test "X$deplibs_check_method" = "Xnone"; then + $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + else + $ECHO "*** Warning: inter-library dependencies are not known to be supported." + fi + $ECHO "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + fi + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; + 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 /'` + ;; + esac + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then + $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." + 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." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + 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." + + 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." + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + # 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'` + ;; esac - fi - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= + + # Test again, we may have decided not to build it any more + if test "$build_libtool_libs" = yes; then + if test "$hardcode_into_libs" = yes; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" + test "$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 + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + dep_rpath="$dep_rpath $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi - if test "$fast_install" = yes; then - $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" + shlibpath="$finalize_shlibpath" + test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi - if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then + # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift - file=\"\$\$-\$program\" + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + if test -z "$dlname"; then + dlname=$soname + fi - if test ! -d \"\$progdir\"; then - $mkdir \"\$progdir\" - else - $rm \"\$progdir/\$file\" - fi" + lib="$output_objdir/$realname" + linknames= + for link + do + linknames="$linknames $link" + done - $echo >> $output "\ + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test "X$libobjs" = "X " && libobjs= - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" - exit $EXIT_FAILURE - fi - fi + 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" + fi + + orig_export_symbols= + case $host_os in + cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile + if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + # and it's NOT already a .def file. Must figure out + # which of the given symbols are data symbols and tag + # them as such. So, trigger use of export_symbols_cmds. + # export_symbols gets reassigned inside the "prepare + # the list of exported symbols" if statement, so the + # include_expsyms logic still works. + orig_export_symbols="$export_symbols" + export_symbols= + always_export_symbols=yes + fi + fi + ;; + esac - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd 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 + func_show_eval "$cmd" 'exit $?' + skipped_export=false + else + # The command line is too long to execute in one step. + func_verbose "using reloadable object file for export list..." + skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break + fi + done + IFS="$save_ifs" + if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi fi - $echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" + 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"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # 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" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + 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 >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + tmp_deplibs="$tmp_deplibs $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" - # 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/::*\$//'\` + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && + test "$compiler_needs_object" = yes && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. + whole_archive_flag_spec= + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - export $shlibpath_var -" + func_extract_archives $gentop $convenience + libobjs="$libobjs $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linker_flags="$linker_flags $flag" fi - $echo >> $output "\ - 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*) - $echo >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $echo >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \$*\" - exit $EXIT_FAILURE - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit $EXIT_FAILURE - fi -fi\ -" - chmod +x $output - fi - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do + # Make a backup of the uninstalled library when relinking + if test "$mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi else - oldobjs="$old_deplibs $non_pic_objects" + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi fi - addlibs="$old_convenience" - fi - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + if test "X$skipped_export" != "X:" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise + # or, if using GNU ld and skipped_export is not :, use a linker + # script. - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" - fi + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + output_la=`$ECHO "X$output" | $Xsed -e "$basename"` - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + last_robj= + k=1 + + 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 + for obj in $save_libobjs do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." + $ECHO "$obj" >> $output + done + $ECHO ')' >> $output + delfiles="$delfiles $output" + 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" + : > $output + set x $save_libobjs + shift + firstobj= + if test "$compiler_needs_object" = yes; then + firstobj="$1 " + shift + fi + for obj + do + $ECHO "$obj" >> $output + done + delfiles="$delfiles $output" + output=$firstobj\"$file_list_spec$output\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + if test "X$objlist" = X || + test "$len" -lt "$max_cmd_len"; then + func_append objlist " $obj" + else + # The command $test_cmds is almost too long, add a + # 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\" + 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\" + 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 + func_len " $last_robj" + func_arith $len0 + $func_len_result + len=$func_arith_result + fi + done + # Handle the remaining objects by creating one last + # 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\" + if test -n "$last_robj"; then + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi + delfiles="$delfiles $output" - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + else + output= + fi + + if ${skipped_export-false}; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + + test -n "$save_libobjs" && + func_verbose "creating a temporary reloadable object file: $output" + + # Loop through the commands generated above and execute them. + save_ifs="$IFS"; IFS='~' + for cmd in $concat_cmds; do + IFS="$save_ifs" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS="$save_ifs" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then - exit $exit_status + if test -n "$export_symbols_regex" && ${skipped_export-false}; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi fi - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi + if ${skipped_export-false}; then + 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"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # 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" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + fi - eval cmds=\"$old_archive_cmds\" + libobjs=$output + # Restore the value of output. + output=$save_output - if len=`expr "X$cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - $echo "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - for obj in $save_oldobjs - do - oldobjs="$objlist $obj" - objlist="$objlist $obj" - eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; then - : + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= + cmds=$module_cmds fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi fi fi - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. + eval cmds=\"\$cmds~\$RM $delfiles\" + fi - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "creating $output" + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" + func_extract_archives $gentop $dlprefiles + libobjs="$libobjs $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= fi - 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" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break + # Restore the uninstalled library and exit + if test "$mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. -# The name that we can dlopen(3). -dlname='$tdlname' + exit $lt_exit + } + done + IFS="$save_ifs" -# Names of this library. -library_names='$library_names' + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? -# The name of the static archive. -old_library='$old_library' + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + func_show_eval '${RM}r "$gentop"' + fi + fi -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' + exit $EXIT_SUCCESS + fi -# Version information for $libname. -current=$current -age=$age -revision=$revision + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + fi + done -# Is this an already installed library? -installed=$installed + # If -module or -export-dynamic was specified, set the dlname. + if test "$module" = yes || test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi + ;; -# Should we warn about portability when linking against -modules? -shouldnotlink=$module + obj) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for objects" + fi -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for objects" ;; + esac -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" - fi - done - fi + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for objects" - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac - exit $EXIT_SUCCESS - ;; + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for objects" - # libtool install mode - install) - modename="$modename: install" + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for objects" - # There may be an optional sh(1) argument at the beginning of - # 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 - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" + test -n "$release" && \ + func_warning "\`-release' is ignored for objects" + + case $output in + *.lo) + test -n "$objs$old_deplibs" && \ + func_fatal_error "cannot build library object \`$output' from non-libtool objects" + + libobj=$output + func_lo2o "$libobj" + obj=$func_lo2o_result + ;; + *) + libobj= + obj="$output" ;; esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg=$nonopt - fi - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" + # Delete the old objects. + $opt_dry_run || $RM $obj $libobj - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest=$arg - continue - fi + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. + wl= - case $arg in - -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) prev=$arg ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= + 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'` else - dest=$arg - continue + gentop="$output_objdir/${obj}x" + generated="$generated $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" fi - ;; - esac + fi - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done + # 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 - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + output="$obj" + func_execute_cmds "$reload_cmds" 'exit $?' - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 + exit $EXIT_SUCCESS fi - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" + func_execute_cmds "$reload_cmds" 'exit $?' fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done + + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS ;; - esac - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" + prog) + case $host in + *cygwin*) func_stripname '' '.exe' "$output" + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for programs" - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do + test -n "$release" && \ + func_warning "\`-release' is ignored for programs" - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" + test "$preload" = yes \ + && test "$dlopen_support" = unknown \ + && test "$dlopen_self" = unknown \ + && test "$dlopen_self_static" = unknown && \ + func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + + 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 /'` ;; + esac - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + case $host in + *-*-darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + # But is supposedly fixed on 10.4 or later (yay!). + 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" + ;; + 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'` + ;; + esac - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; esac - fi + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit $EXIT_FAILURE - fi + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done + fi - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi else - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` + eval flag=\"$hardcode_libdir_flag_spec\" + rpath="$rpath $flag" fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; + *) dllsearchpath="$dllsearchpath:$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit $EXIT_FAILURE + eval flag=\"$hardcode_libdir_flag_spec\" + rpath="$rpath $flag" fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + esac fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift + 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` + fi - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run eval "$striplib $destdir/$realname" || exit $? - fi + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - if test "$linkname" != "$realname"; then - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi + wrappers_required=yes + case $host in + *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 + fi + ;; + esac + if test "$wrappers_required" = no; then + # Replace the output file specification. + compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command="$compile_command$compile_rpath" - # Do each command in the postinstall commands. - lib="$destdir/$realname" - cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' - exit $lt_exit - } - done - IFS="$save_ifs" + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' fi - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; + exit $exit_status + fi - *.lo) - # Install (i.e. copy) a libtool object. + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + rpath="$rpath$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi + fi - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi + if test "$no_install" = yes; then + # 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'` + # Delete the old output file. + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' exit $EXIT_SUCCESS - ;; + fi - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" + if test "$hardcode_action" = relink; then + # Fast installation is not supported + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "\`$output' will be relinked during installation" + else + 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'` + else + # fast_install is set to needless + relink_command= + fi else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" fi + fi - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - file=`$echo $file|${SED} 's,.exe$,,'` - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` - ;; - *) - wrapper=$file - ;; - esac - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit $EXIT_FAILURE - fi + # Replace the output file specification. + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac + func_show_eval "$link_command" 'exit $?' - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then - tmpdir=`func_mktempdir` - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` + # Now create the wrapper script. + func_verbose "creating $output" - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" else - # Install the binary that we compiled earlier. - file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi - fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; + # 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"` + fi + + # Only actually do things if not in dry run mode. + $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) func_stripname '' '.exe' "$output" + output=$func_stripname_result ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe + func_stripname '' '.exe' "$outputname" + outputname=$func_stripname_result ;; + *) exeext= ;; esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done + case $host in + *cygwin* | *mingw* ) + func_dirname_and_basename "$output" "" "." + output_name=$func_basename_result + output_path=$func_dirname_result + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + func_emit_cwrapperexe_src > $cwrappersource + + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper + } - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host" ; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi + } + ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - # Set up the ranlib parameters. - oldlib="$destdir/$name" + func_emit_wrapper no > $output + chmod +x $output + ;; + esac + } + exit $EXIT_SUCCESS + ;; + esac - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do - if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? + if test "$build_libtool_libs" = convenience; then + oldobjs="$libobjs_save $symfileobj" + addlibs="$convenience" + build_libtool_libs=no + else + if test "$build_libtool_libs" = module; then + oldobjs="$libobjs_save" + build_libtool_libs=no + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then + oldobjs="$oldobjs $symfileobj" + fi + fi + addlibs="$old_convenience" fi - # Do each command in the postinstall commands. - cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi + func_extract_archives $gentop $addlibs + oldobjs="$oldobjs $func_extract_archives_result" + fi - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - ;; + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + cmds=$old_archive_from_new_cmds + else - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + func_extract_archives $gentop $dlprefiles + oldobjs="$oldobjs $func_extract_archives_result" + fi - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + func_basename "$obj" + $ECHO "$func_basename_result" + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $ECHO "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + func_basename "$obj" + objbase="$func_basename_result" + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + func_arith $counter + 1 + counter=$func_arith_result + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + oldobjs="$oldobjs $gentop/$newobj" + ;; + *) oldobjs="$oldobjs $obj" ;; + esac done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS + eval cmds=\"$old_archive_cmds\" - $echo "X----------------------------------------------------------------------" | $Xsed - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + 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..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + for obj in $save_oldobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + func_append objlist " $obj" + if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + func_execute_cmds "$cmds" 'exit $?' 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 "See any operating system documentation about shared libraries for" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit $EXIT_FAILURE - fi + test -n "$generated" && \ + func_show_eval "${RM}r$generated" - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + # Now create the libtool archive. + case $output in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.$libext" + func_verbose "creating $output" - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi + 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"` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi - # Read the libtool library. - dlname= - library_names= + # Only create the output if not a dry run. + $opt_dry_run || { + for installed in no yes; do + if test "$installed" = yes; then + if test -z "$install_libdir"; then + break + fi + output="$output_objdir/$outputname"i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + func_basename "$deplib" + name="$func_basename_result" + 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" + ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" + newdlfiles= + + for lib in $dlfiles; do + case $lib in + *.la) + func_basename "$lib" + name="$func_basename_result" + 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" + ;; + *) newdlfiles="$newdlfiles $lib" ;; + esac + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + *.la) + # Only pass preopened files to the pseudo-archive (for + # eventual linking with the app. that links it) if we + # didn't already link the preopened objects directly into + # the library: + func_basename "$lib" + name="$func_basename_result" + 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" + ;; + esac + done + dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlfiles="$newdlfiles $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlprefiles="$newdlprefiles $abs" + done + dlprefiles="$newdlprefiles" + fi + $RM $output + # place dlname in correct position for cygwin + 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 ;; + esac + $ECHO > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# Please DO NOT delete this file! +# It is necessary for linking the library. - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac +# The name that we can dlopen(3). +dlname='$tdlname' - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi +# Names of this library. +library_names='$library_names' - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. +# The name of the static archive. +old_library='$old_library' - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - if test ! -f "$dir/$dlname"; then - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi - fi - ;; +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='$new_inherited_linker_flags' - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac +# Names of additional weak libraries provided by this library +weak_library_names='$weak_libs' - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" +# Version information for $libname. +current=$current +age=$age +revision=$revision - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done +# Is this an already installed library? +installed=$installed - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" +# Should we warn about portability when linking against -modules? +shouldnotlink=$module - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test "$installed" = no && test "$need_relink" = yes; then + $ECHO >> $output "\ +relink_command=\"$relink_command\"" + fi + done + } - if test -z "$run"; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac + exit $EXIT_SUCCESS +} - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - fi" - done +{ test "$mode" = link || test "$mode" = relink; } && + func_mode_link ${1+"$@"} - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" - exit $EXIT_SUCCESS - fi - ;; - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - rm="$nonopt" +# func_mode_uninstall arg... +func_mode_uninstall () +{ + $opt_debug + RM="$nonopt" files= rmforce= exit_status=0 @@ -6547,30 +8209,28 @@ for arg do case $arg in - -f) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; + -f) RM="$RM $arg"; rmforce=yes ;; + -*) RM="$RM $arg" ;; *) files="$files $arg" ;; esac done - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -z "$RM" && \ + func_fatal_help "you must specify an RM program" rmdirs= origobjdir="$objdir" for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then objdir="$origobjdir" else objdir="$dir/$origobjdir" fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + func_basename "$file" + name="$func_basename_result" test "$mode" = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates @@ -6582,9 +8242,9 @@ fi # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then + if { test -L "$file"; } >/dev/null 2>&1 || + { test -h "$file"; } >/dev/null 2>&1 || + test -f "$file"; then : elif test -d "$file"; then exit_status=1 @@ -6598,8 +8258,8 @@ case $name in *.la) # Possibly a libtool archive, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name + if func_lalib_p "$file"; then + func_source $dir/$name # Delete the libtool libraries and symlinks. for n in $library_names; do @@ -6614,39 +8274,17 @@ *" $dlname "*) ;; *) rmfiles="$rmfiles $objdir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ;; uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" + func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" + func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -6656,20 +8294,20 @@ *.lo) # Possibly a libtool object, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + if func_lalib_p "$file"; then # Read the .lo file - . $dir/$name + func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" \ - && test "$pic_object" != none; then + if test -n "$pic_object" && + test "$pic_object" != none; then rmfiles="$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 + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then rmfiles="$rmfiles $dir/$non_pic_object" fi fi @@ -6680,17 +8318,26 @@ noexename=$name case $file in *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` + func_stripname '' '.exe' "$file" + file=$func_stripname_result + func_stripname '' '.exe' "$name" + noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe rmfiles="$rmfiles $file" ;; esac # Do a test to see if this is a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$noexename + if func_ltwrapper_p "$file"; then + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles @@ -6705,239 +8352,38 @@ fi ;; esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 + 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 if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 + func_show_eval "rmdir $dir >/dev/null 2>&1" fi done exit $exit_status - ;; +} - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - ;; - esac +{ test "$mode" = uninstall || test "$mode" = clean; } && + func_mode_uninstall ${1+"$@"} - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - fi -fi # test -z "$show_help" +test -z "$mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ + func_fatal_help "invalid operation mode \`$mode'" if test -n "$exec_cmd"; then - eval exec $exec_cmd + eval exec "$exec_cmd" exit $EXIT_FAILURE fi -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -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 - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - --version print version information - -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 - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE. - -Report bugs to ." - exit $EXIT_SUCCESS - ;; - -clean) - $echo \ -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. +exit $exit_status -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -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) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - -uninstall) - $echo \ -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit $? # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting @@ -6951,14 +8397,17 @@ # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared +build_libtool_libs=no +build_old_libs=yes # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: # mode:shell-script # sh-indentation:2 # End: +# vi:sw=2 + diff -Nru libexosip2-3.3.0/scripts/Makefile.in libexosip2-3.6.0/scripts/Makefile.in --- libexosip2-3.3.0/scripts/Makefile.in 2009-03-04 11:05:38.000000000 +0000 +++ libexosip2-3.6.0/scripts/Makefile.in 2011-10-05 14:27:29.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +14,12 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -47,36 +45,27 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -85,35 +74,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -124,14 +121,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -143,6 +139,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -161,6 +158,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -170,8 +168,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ EXTRA_DIST = config.guess config.sub install-sh missing mkinstalldirs \ ltmain.sh acx_pthread.m4 aclocal-include.m4 @@ -182,14 +184,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu scripts/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu scripts/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -207,16 +209,13 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -225,29 +224,32 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -275,6 +277,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -285,7 +288,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -293,18 +296,38 @@ html: html-am +html-am: + info: info-am info-am: install-data-am: +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -323,17 +346,21 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libexosip2-3.3.0/src/eXcall_api.c libexosip2-3.6.0/src/eXcall_api.c --- libexosip2-3.3.0/src/eXcall_api.c 2008-12-12 13:43:22.000000000 +0000 +++ libexosip2-3.6.0/src/eXcall_api.c 2011-09-27 23:56:28.000000000 +0000 @@ -27,1547 +27,1558 @@ extern eXosip_t eXosip; -static int eXosip_create_transaction (eXosip_call_t * jc, - eXosip_dialog_t * jd, - osip_message_t * request); -static int eXosip_create_cancel_transaction (eXosip_call_t * jc, - eXosip_dialog_t * jd, - osip_message_t * request); +static int eXosip_create_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_message_t * request); +static int eXosip_create_cancel_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_message_t * request); -static int _eXosip_call_reuse_contact (osip_message_t * invite, - osip_message_t * msg); +static int _eXosip_call_reuse_contact(osip_message_t * invite, + osip_message_t * msg); static int -eXosip_create_transaction (eXosip_call_t * jc, - eXosip_dialog_t * jd, osip_message_t * request) +eXosip_create_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, osip_message_t * request) { - osip_event_t *sipevent; - osip_transaction_t *tr; - int i; - - i = _eXosip_transaction_init (&tr, NICT, eXosip.j_osip, request); - if (i != 0) - { - /* TODO: release the j_call.. */ - - osip_message_free (request); - return i; - } + osip_event_t *sipevent; + osip_transaction_t *tr; + int i; + + i = _eXosip_transaction_init(&tr, NICT, eXosip.j_osip, request); + if (i != 0) { + /* TODO: release the j_call.. */ + + osip_message_free(request); + return i; + } - if (jd != NULL) - osip_list_add (jd->d_out_trs, tr, 0); + if (jd != NULL) + osip_list_add(jd->d_out_trs, tr, 0); - sipevent = osip_new_outgoing_sipmessage (request); - sipevent->transactionid = tr->transactionid; + sipevent = osip_new_outgoing_sipmessage(request); + sipevent->transactionid = tr->transactionid; #ifndef MINISIZE - osip_transaction_set_your_instance (tr, __eXosip_new_jinfo (jc, jd, NULL, NULL)); + osip_transaction_set_your_instance(tr, __eXosip_new_jinfo(jc, jd, NULL, NULL)); #else - osip_transaction_set_your_instance (tr, __eXosip_new_jinfo (jc, jd)); + osip_transaction_set_your_instance(tr, __eXosip_new_jinfo(jc, jd)); #endif - osip_transaction_add_event (tr, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_add_event(tr, sipevent); + __eXosip_wakeup(); + return OSIP_SUCCESS; } static int -eXosip_create_cancel_transaction (eXosip_call_t * jc, - eXosip_dialog_t * jd, osip_message_t * request) +eXosip_create_cancel_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, osip_message_t * request) { - osip_event_t *sipevent; - osip_transaction_t *tr; - int i; - - i = _eXosip_transaction_init (&tr, NICT, eXosip.j_osip, request); - if (i != 0) - { - /* TODO: release the j_call.. */ - - osip_message_free (request); - return i; - } - - osip_list_add (&eXosip.j_transactions, tr, 0); - - sipevent = osip_new_outgoing_sipmessage (request); - sipevent->transactionid = tr->transactionid; - - osip_transaction_add_event (tr, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; -} + osip_event_t *sipevent; + osip_transaction_t *tr; + int i; -static int -_eXosip_call_reuse_contact (osip_message_t * invite, osip_message_t * msg) -{ - osip_contact_t *co_invite = NULL; - osip_contact_t *co_msg = NULL; - int i; - i = osip_message_get_contact (invite, 0, &co_invite); - if (i < 0 || co_invite == NULL || co_invite->url == NULL) - { - return i; - } - - i = osip_message_get_contact (msg, 0, &co_msg); - if (i >= 0 && co_msg != NULL) - { - osip_list_remove (&msg->contacts, 0); - osip_contact_free (co_msg); - } - - co_msg = NULL; - i = osip_contact_clone (co_invite, &co_msg); - if (i >= 0 && co_msg != NULL) - { - osip_list_add (&msg->contacts, co_msg, 0); - return OSIP_SUCCESS; - } - return i; -} + i = _eXosip_transaction_init(&tr, NICT, eXosip.j_osip, request); + if (i != 0) { + /* TODO: release the j_call.. */ -int -_eXosip_call_transaction_find (int tid, eXosip_call_t ** jc, - eXosip_dialog_t ** jd, osip_transaction_t ** tr) -{ - for (*jc = eXosip.j_calls; *jc != NULL; *jc = (*jc)->next) - { - if ((*jc)->c_inc_tr != NULL && (*jc)->c_inc_tr->transactionid == tid) - { - *tr = (*jc)->c_inc_tr; - *jd = (*jc)->c_dialogs; - return OSIP_SUCCESS; - } - if ((*jc)->c_out_tr != NULL && (*jc)->c_out_tr->transactionid == tid) - { - *tr = (*jc)->c_out_tr; - *jd = (*jc)->c_dialogs; - return OSIP_SUCCESS; - } - for (*jd = (*jc)->c_dialogs; *jd != NULL; *jd = (*jd)->next) - { - osip_transaction_t *transaction; - int pos = 0; - - while (!osip_list_eol ((*jd)->d_inc_trs, pos)) - { - transaction = - (osip_transaction_t *) osip_list_get ((*jd)->d_inc_trs, pos); - if (transaction != NULL && transaction->transactionid == tid) - { - *tr = transaction; - return OSIP_SUCCESS; - } - pos++; - } - - pos = 0; - while (!osip_list_eol ((*jd)->d_out_trs, pos)) - { - transaction = - (osip_transaction_t *) osip_list_get ((*jd)->d_out_trs, pos); - if (transaction != NULL && transaction->transactionid == tid) - { - *tr = transaction; - return OSIP_SUCCESS; - } - pos++; - } - } - } - *jd = NULL; - *jc = NULL; - return OSIP_NOTFOUND; -} + osip_message_free(request); + return i; + } -int -eXosip_call_set_reference (int id, void *reference) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; + osip_list_add(&eXosip.j_transactions, tr, 0); - if (id > 0) - { - eXosip_call_dialog_find (id, &jc, &jd); - if (jc == NULL) - { - eXosip_call_find (id, &jc); - } - } - if (jc == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return OSIP_NOTFOUND; - } - jc->external_reference = reference; - return OSIP_SUCCESS; -} - -void* -eXosip_call_get_reference (int cid) -{ - eXosip_call_t* jc = NULL; - - eXosip_call_find (cid, &jc); - if (jc == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return NULL; - } + sipevent = osip_new_outgoing_sipmessage(request); + sipevent->transactionid = tr->transactionid; - return jc->external_reference; + osip_transaction_add_event(tr, sipevent); + __eXosip_wakeup(); + return OSIP_SUCCESS; } -/* this method can't be called unless the previous - INVITE transaction is over. */ -int -eXosip_call_build_initial_invite (osip_message_t ** invite, - const char *to, - const char *from, - const char *route, const char *subject) -{ - int i; - osip_to_t *_to = NULL; - osip_header_t *subject_header; - - *invite = NULL; - - if (to != NULL && *to == '\0') - return OSIP_BADPARAMETER; - if (route != NULL && *route == '\0') - route = NULL; - if (subject != NULL && *subject == '\0') - subject = NULL; - - i = osip_to_init (&_to); - if (i != 0) - return i; - - i = osip_to_parse (_to, to); - if (i != 0) - { - osip_to_free (_to); - return i; - } - - i = generating_request_out_of_dialog (invite, "INVITE", to, - eXosip.transport, from, route); - osip_to_free (_to); - if (i != 0) - return i; - _eXosip_dialog_add_contact (*invite, NULL); - - subject_header=NULL; - osip_message_get_subject (*invite, 0, &subject_header); - if (subject_header==NULL && subject != NULL) - osip_message_set_subject (*invite, subject); +static int +_eXosip_call_reuse_contact(osip_message_t * invite, osip_message_t * msg) +{ + osip_contact_t *co_invite = NULL; + osip_contact_t *co_msg = NULL; + int i; + i = osip_message_get_contact(invite, 0, &co_invite); + if (i < 0 || co_invite == NULL || co_invite->url == NULL) { + return i; + } + + i = osip_message_get_contact(msg, 0, &co_msg); + if (i >= 0 && co_msg != NULL) { + osip_list_remove(&msg->contacts, 0); + osip_contact_free(co_msg); + } + + co_msg = NULL; + i = osip_contact_clone(co_invite, &co_msg); + if (i >= 0 && co_msg != NULL) { + osip_list_add(&msg->contacts, co_msg, 0); + return OSIP_SUCCESS; + } + return i; +} + +int +_eXosip_call_transaction_find(int tid, eXosip_call_t ** jc, + eXosip_dialog_t ** jd, osip_transaction_t ** tr) +{ + for (*jc = eXosip.j_calls; *jc != NULL; *jc = (*jc)->next) { + if ((*jc)->c_inc_tr != NULL && (*jc)->c_inc_tr->transactionid == tid) { + *tr = (*jc)->c_inc_tr; + *jd = (*jc)->c_dialogs; + return OSIP_SUCCESS; + } + if ((*jc)->c_out_tr != NULL && (*jc)->c_out_tr->transactionid == tid) { + *tr = (*jc)->c_out_tr; + *jd = (*jc)->c_dialogs; + return OSIP_SUCCESS; + } + for (*jd = (*jc)->c_dialogs; *jd != NULL; *jd = (*jd)->next) { + osip_transaction_t *transaction; + int pos = 0; + + while (!osip_list_eol((*jd)->d_inc_trs, pos)) { + transaction = + (osip_transaction_t *) osip_list_get((*jd)->d_inc_trs, pos); + if (transaction != NULL && transaction->transactionid == tid) { + *tr = transaction; + return OSIP_SUCCESS; + } + pos++; + } + + pos = 0; + while (!osip_list_eol((*jd)->d_out_trs, pos)) { + transaction = + (osip_transaction_t *) osip_list_get((*jd)->d_out_trs, pos); + if (transaction != NULL && transaction->transactionid == tid) { + *tr = transaction; + return OSIP_SUCCESS; + } + pos++; + } + } + } + *jd = NULL; + *jc = NULL; + return OSIP_NOTFOUND; +} + +int eXosip_call_set_reference(int id, void *reference) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + + if (id > 0) { + eXosip_call_dialog_find(id, &jc, &jd); + if (jc == NULL) { + eXosip_call_find(id, &jc); + } + } + if (jc == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return OSIP_NOTFOUND; + } + jc->external_reference = reference; + return OSIP_SUCCESS; +} + +void *eXosip_call_get_reference(int cid) +{ + eXosip_call_t *jc = NULL; + + eXosip_call_find(cid, &jc); + if (jc == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return NULL; + } - return OSIP_SUCCESS; + return jc->external_reference; } +/* this method can't be called unless the previous + INVITE transaction is over. */ int -eXosip_call_send_initial_invite (osip_message_t * invite) -{ - eXosip_call_t *jc; - osip_transaction_t *transaction; - osip_event_t *sipevent; - int i; - - if (invite == NULL) - { - osip_message_free (invite); - return OSIP_BADPARAMETER; - } - - i = eXosip_call_init (&jc); - if (i != 0) - { - osip_message_free (invite); - return i; - } - - i = _eXosip_transaction_init (&transaction, ICT, eXosip.j_osip, invite); - if (i != 0) - { - eXosip_call_free (jc); - osip_message_free (invite); - return i; - } +eXosip_call_build_initial_invite(osip_message_t ** invite, + const char *to, + const char *from, + const char *route, const char *subject) +{ + int i; + osip_to_t *_to = NULL; + osip_header_t *subject_header; + + *invite = NULL; + + if (to != NULL && *to == '\0') + return OSIP_BADPARAMETER; + if (route != NULL && *route == '\0') + route = NULL; + if (subject != NULL && *subject == '\0') + subject = NULL; + + i = osip_to_init(&_to); + if (i != 0) + return i; + + i = osip_to_parse(_to, to); + if (i != 0) { + osip_to_free(_to); + return i; + } + + i = generating_request_out_of_dialog(invite, "INVITE", to, + eXosip.transport, from, route); + osip_to_free(_to); + if (i != 0) + return i; + _eXosip_dialog_add_contact(*invite, NULL); + + subject_header = NULL; + osip_message_get_subject(*invite, 0, &subject_header); + if (subject_header == NULL && subject != NULL) + osip_message_set_subject(*invite, subject); + + return OSIP_SUCCESS; +} + +int eXosip_call_send_initial_invite(osip_message_t * invite) +{ + eXosip_call_t *jc; + osip_transaction_t *transaction; + osip_event_t *sipevent; + int i; + + if (invite == NULL) { + osip_message_free(invite); + return OSIP_BADPARAMETER; + } + + i = eXosip_call_init(&jc); + if (i != 0) { + osip_message_free(invite); + return i; + } + + i = _eXosip_transaction_init(&transaction, ICT, eXosip.j_osip, invite); + if (i != 0) { + eXosip_call_free(jc); + osip_message_free(invite); + return i; + } - jc->c_out_tr = transaction; + jc->c_out_tr = transaction; - sipevent = osip_new_outgoing_sipmessage (invite); - sipevent->transactionid = transaction->transactionid; + sipevent = osip_new_outgoing_sipmessage(invite); + sipevent->transactionid = transaction->transactionid; #ifndef MINISIZE - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (jc, NULL, NULL, NULL)); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, NULL, NULL, NULL)); #else - osip_transaction_set_your_instance (transaction, __eXosip_new_jinfo (jc, NULL)); + osip_transaction_set_your_instance(transaction, __eXosip_new_jinfo(jc, NULL)); #endif - osip_transaction_add_event (transaction, sipevent); + osip_transaction_add_event(transaction, sipevent); - jc->external_reference = NULL; - ADD_ELEMENT (eXosip.j_calls, jc); + jc->external_reference = NULL; + ADD_ELEMENT(eXosip.j_calls, jc); - eXosip_update (); /* fixed? */ - __eXosip_wakeup (); - return jc->c_id; -} - -int -eXosip_call_build_ack (int did, osip_message_t ** _ack) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *tr = NULL; - - osip_message_t *ack; - char *transport; - int i; - - *_ack = NULL; - - if (did <= 0) - return OSIP_BADPARAMETER; - if (did > 0) - { - eXosip_call_dialog_find (did, &jc, &jd); - } - if (jc == NULL || jd == NULL || jd->d_dialog == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return OSIP_NOTFOUND; - } - - tr = eXosip_find_last_invite (jc, jd); - - if (tr == NULL || tr->orig_request == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No transaction for call?\n")); - return OSIP_NOTFOUND; - } - - if (0 != osip_strcasecmp (tr->orig_request->sip_method, "INVITE")) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: ACK are only sent for invite transactions\n")); - return OSIP_BADPARAMETER; - } - - transport = NULL; - transport = _eXosip_transport_protocol (tr->orig_request); - if (transport == NULL) - i = _eXosip_build_request_within_dialog (&ack, "ACK", jd->d_dialog, "UDP"); - else - i = _eXosip_build_request_within_dialog (&ack, "ACK", jd->d_dialog, transport); - - if (i != 0) - { - return i; - } - - _eXosip_call_reuse_contact (tr->orig_request, ack); - - /* Fix CSeq Number when request has been exchanged during INVITE transactions */ - if (tr->orig_request->cseq != NULL && tr->orig_request->cseq->number != NULL) - { - if (ack != NULL && ack->cseq != NULL && ack->cseq->number != NULL) - { - osip_free (ack->cseq->number); - ack->cseq->number = osip_strdup (tr->orig_request->cseq->number); - } - } - - /* copy all credentials from INVITE! */ - { - int pos = 0; - osip_proxy_authorization_t *pa = NULL; - - i = osip_message_get_proxy_authorization (tr->orig_request, pos, &pa); - while (i >= 0 && pa != NULL) - { - osip_proxy_authorization_t *pa2; - - i = osip_proxy_authorization_clone (pa, &pa2); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Error in credential from INVITE\n")); - break; - } - osip_list_add (&ack->proxy_authorizations, pa2, -1); - pa = NULL; - pos++; - i = osip_message_get_proxy_authorization (tr->orig_request, pos, &pa); - } - } - - *_ack = ack; - return OSIP_SUCCESS; -} - -int -eXosip_call_send_ack (int did, osip_message_t * ack) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - int i; - - osip_route_t *route; - char *host; - int port; - - if (did <= 0) - return OSIP_BADPARAMETER; - if (did > 0) - { - eXosip_call_dialog_find (did, &jc, &jd); - } - - if (jc == NULL || jd == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - if (ack != NULL) - osip_message_free (ack); - return OSIP_NOTFOUND; - } - - if (ack == NULL) - { - i = eXosip_call_build_ack (did, &ack); - if (i != 0) - { - return i; - } - } - - osip_message_get_route (ack, 0, &route); - if (route != NULL) - { - osip_uri_param_t *lr_param = NULL; - - osip_uri_uparam_get_byname (route->url, "lr", &lr_param); - if (lr_param == NULL) - route = NULL; - } - - if (route != NULL) - { - port = 5060; - if (route->url->port != NULL) - port = osip_atoi (route->url->port); - host = route->url->host; - } else - { - /* search for maddr parameter */ - osip_uri_param_t *maddr_param = NULL; - osip_uri_uparam_get_byname (ack->req_uri, "maddr", &maddr_param); - host = NULL; - if (maddr_param != NULL && maddr_param->gvalue != NULL) - host = maddr_param->gvalue; - - port = 5060; - if (ack->req_uri->port != NULL) - port = osip_atoi (ack->req_uri->port); - - if (host == NULL) - host = ack->req_uri->host; - } - - i = cb_snd_message (NULL, ack, host, port, -1); - - if (jd->d_ack != NULL) - osip_message_free (jd->d_ack); - jd->d_ack = ack; - if (i < 0) - return i; - - /* TODO: could be 1 for icmp... */ - return OSIP_SUCCESS; -} - -int -eXosip_call_build_request (int jid, const char *method, osip_message_t ** request) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; + eXosip_update(); /* fixed? */ + __eXosip_wakeup(); + return jc->c_id; +} + +int eXosip_call_build_ack(int did, osip_message_t ** _ack) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *tr = NULL; + + osip_message_t *ack; + char *transport; + int i; + + *_ack = NULL; + + if (did <= 0) + return OSIP_BADPARAMETER; + if (did > 0) { + eXosip_call_dialog_find(did, &jc, &jd); + } + if (jc == NULL || jd == NULL || jd->d_dialog == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return OSIP_NOTFOUND; + } + + tr = eXosip_find_last_invite(jc, jd); + + if (tr == NULL || tr->orig_request == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No transaction for call?\n")); + return OSIP_NOTFOUND; + } + + if (0 != osip_strcasecmp(tr->orig_request->sip_method, "INVITE")) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: ACK are only sent for invite transactions\n")); + return OSIP_BADPARAMETER; + } + + transport = NULL; + transport = _eXosip_transport_protocol(tr->orig_request); + if (transport == NULL) + i = _eXosip_build_request_within_dialog(&ack, "ACK", jd->d_dialog, "UDP"); + else + i = _eXosip_build_request_within_dialog(&ack, "ACK", jd->d_dialog, + transport); + + if (i != 0) { + return i; + } + + _eXosip_call_reuse_contact(tr->orig_request, ack); + + /* Fix CSeq Number when request has been exchanged during INVITE transactions */ + if (tr->orig_request->cseq != NULL && tr->orig_request->cseq->number != NULL) { + if (ack != NULL && ack->cseq != NULL && ack->cseq->number != NULL) { + osip_free(ack->cseq->number); + ack->cseq->number = osip_strdup(tr->orig_request->cseq->number); + } + } + + /* copy all credentials from INVITE! */ + { + int pos = 0; + osip_proxy_authorization_t *pa = NULL; + + i = osip_message_get_proxy_authorization(tr->orig_request, pos, &pa); + while (i >= 0 && pa != NULL) { + osip_proxy_authorization_t *pa2; + + i = osip_proxy_authorization_clone(pa, &pa2); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Error in credential from INVITE\n")); + break; + } + osip_list_add(&ack->proxy_authorizations, pa2, -1); + pa = NULL; + pos++; + i = osip_message_get_proxy_authorization(tr->orig_request, pos, &pa); + } + } + + *_ack = ack; + return OSIP_SUCCESS; +} + +int eXosip_call_send_ack(int did, osip_message_t * ack) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + int i; + + osip_route_t *route; + char *host=NULL; + int port; + + if (did <= 0) + return OSIP_BADPARAMETER; + if (did > 0) { + eXosip_call_dialog_find(did, &jc, &jd); + } + + if (jc == NULL || jd == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + if (ack != NULL) + osip_message_free(ack); + return OSIP_NOTFOUND; + } + + if (ack == NULL) { + i = eXosip_call_build_ack(did, &ack); + if (i != 0) { + return i; + } + } + + if (host==NULL) + { + osip_message_get_route(ack, 0, &route); + if (route != NULL) { + osip_uri_param_t *lr_param = NULL; + + osip_uri_uparam_get_byname(route->url, "lr", &lr_param); + if (lr_param == NULL) + route = NULL; + } + + if (route != NULL) { + port = 5060; + if (route->url->port != NULL) + port = osip_atoi(route->url->port); + host = route->url->host; + } else { + /* search for maddr parameter */ + osip_uri_param_t *maddr_param = NULL; + osip_uri_uparam_get_byname(ack->req_uri, "maddr", &maddr_param); + host = NULL; + if (maddr_param != NULL && maddr_param->gvalue != NULL) + host = maddr_param->gvalue; + + port = 5060; + if (ack->req_uri->port != NULL) + port = osip_atoi(ack->req_uri->port); + + if (host == NULL) + host = ack->req_uri->host; + } + } + + i = cb_snd_message(NULL, ack, host, port, -1); + + if (jd->d_ack != NULL) + osip_message_free(jd->d_ack); + jd->d_ack = ack; + if (i < 0) + return i; + + /* TODO: could be 1 for icmp... */ + return OSIP_SUCCESS; +} + +int +eXosip_call_build_request(int jid, const char *method, osip_message_t ** request) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + + osip_transaction_t *transaction; + int i; + + *request = NULL; + if (jid <= 0) + return OSIP_BADPARAMETER; + if (method == NULL || method[0] == '\0') + return OSIP_BADPARAMETER; + + if (jid > 0) { + eXosip_call_dialog_find(jid, &jc, &jd); + } + if (jd == NULL || jd->d_dialog == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return OSIP_NOTFOUND; + } + + transaction = NULL; + if (0 == osip_strcasecmp(method, "INVITE")) { + transaction = eXosip_find_last_invite(jc, jd); + } else { /* OPTIONS, UPDATE, INFO, REFER, ?... */ + + transaction = eXosip_find_last_transaction(jc, jd, method); + } + + if (transaction != NULL) { + if (0 != osip_strcasecmp(method, "INVITE")) { + if (transaction->state != NICT_TERMINATED && + transaction->state != NIST_TERMINATED && + transaction->state != NICT_COMPLETED && + transaction->state != NIST_COMPLETED) + return OSIP_WRONG_STATE; + } else { + if (transaction->state != ICT_TERMINATED && + transaction->state != IST_TERMINATED && + transaction->state != IST_CONFIRMED && + transaction->state != ICT_COMPLETED) + return OSIP_WRONG_STATE; + } + } + + i = _eXosip_build_request_within_dialog(request, method, jd->d_dialog, + eXosip.transport); + if (i != 0) + return i; + + eXosip_add_authentication_information(*request, NULL); + + return OSIP_SUCCESS; +} + +int eXosip_call_send_request(int jid, osip_message_t * request) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + + osip_transaction_t *transaction; + osip_event_t *sipevent; + + int i; + + if (request == NULL) + return OSIP_BADPARAMETER; + if (jid <= 0) { + osip_message_free(request); + return OSIP_BADPARAMETER; + } + + if (request->sip_method == NULL) { + osip_message_free(request); + return OSIP_BADPARAMETER; + } + + if (jid > 0) { + eXosip_call_dialog_find(jid, &jc, &jd); + } + if (jd == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + osip_message_free(request); + return OSIP_NOTFOUND; + } + + transaction = NULL; + if (0 == osip_strcasecmp(request->sip_method, "INVITE")) { + transaction = eXosip_find_last_invite(jc, jd); + } else { /* OPTIONS, UPDATE, INFO, REFER, ?... */ + + transaction = eXosip_find_last_transaction(jc, jd, request->sip_method); + } + + if (transaction != NULL) { + if (0 != osip_strcasecmp(request->sip_method, "INVITE")) { + if (transaction->state != NICT_TERMINATED && + transaction->state != NIST_TERMINATED && + transaction->state != NICT_COMPLETED && + transaction->state != NIST_COMPLETED) { + osip_message_free(request); + return OSIP_WRONG_STATE; + } + } else { + if (transaction->state != ICT_TERMINATED && + transaction->state != IST_TERMINATED && + transaction->state != IST_CONFIRMED && + transaction->state != ICT_COMPLETED) { + osip_message_free(request); + return OSIP_WRONG_STATE; + } + } + } + + transaction = NULL; + if (0 != osip_strcasecmp(request->sip_method, "INVITE")) { + i = _eXosip_transaction_init(&transaction, NICT, eXosip.j_osip, request); + } else { + i = _eXosip_transaction_init(&transaction, ICT, eXosip.j_osip, request); + } + + if (i != 0) { + osip_message_free(request); + return i; + } - osip_transaction_t *transaction; - int i; + osip_list_add(jd->d_out_trs, transaction, 0); - *request = NULL; - if (jid <= 0) - return OSIP_BADPARAMETER; - if (method == NULL || method[0] == '\0') - return OSIP_BADPARAMETER; - - if (jid > 0) - { - eXosip_call_dialog_find (jid, &jc, &jd); - } - if (jd == NULL || jd->d_dialog == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return OSIP_NOTFOUND; - } - - transaction = NULL; - if (0 == osip_strcasecmp (method, "INVITE")) - { - transaction = eXosip_find_last_invite (jc, jd); - } else /* OPTIONS, UPDATE, INFO, REFER, ?... */ - { - transaction = eXosip_find_last_transaction (jc, jd, method); - } - - if (transaction != NULL) - { - if (0 != osip_strcasecmp (method, "INVITE")) - { - if (transaction->state != NICT_TERMINATED && - transaction->state != NIST_TERMINATED && - transaction->state != NICT_COMPLETED && - transaction->state != NIST_COMPLETED) - return OSIP_WRONG_STATE; - } else - { - if (transaction->state != ICT_TERMINATED && - transaction->state != IST_TERMINATED && - transaction->state != IST_CONFIRMED && - transaction->state != ICT_COMPLETED) - return OSIP_WRONG_STATE; - } - } - - i = _eXosip_build_request_within_dialog (request, method, jd->d_dialog, - eXosip.transport); - if (i != 0) - return i; - - eXosip_add_authentication_information (*request, NULL); - - return OSIP_SUCCESS; -} - -int -eXosip_call_send_request (int jid, osip_message_t * request) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - - osip_transaction_t *transaction; - osip_event_t *sipevent; - - int i; - - if (request == NULL) - return OSIP_BADPARAMETER; - if (jid <= 0) - { - osip_message_free (request); - return OSIP_BADPARAMETER; - } - - if (request->sip_method == NULL) - { - osip_message_free (request); - return OSIP_BADPARAMETER; - } - - if (jid > 0) - { - eXosip_call_dialog_find (jid, &jc, &jd); - } - if (jd == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - osip_message_free (request); - return OSIP_NOTFOUND; - } - - transaction = NULL; - if (0 == osip_strcasecmp (request->sip_method, "INVITE")) - { - transaction = eXosip_find_last_invite (jc, jd); - } else /* OPTIONS, UPDATE, INFO, REFER, ?... */ - { - transaction = eXosip_find_last_transaction (jc, jd, request->sip_method); - } - - if (transaction != NULL) - { - if (0 != osip_strcasecmp (request->sip_method, "INVITE")) - { - if (transaction->state != NICT_TERMINATED && - transaction->state != NIST_TERMINATED && - transaction->state != NICT_COMPLETED && - transaction->state != NIST_COMPLETED) - { - osip_message_free (request); - return OSIP_WRONG_STATE; - } - } else - { - if (transaction->state != ICT_TERMINATED && - transaction->state != IST_TERMINATED && - transaction->state != IST_CONFIRMED && - transaction->state != ICT_COMPLETED) - { - osip_message_free (request); - return OSIP_WRONG_STATE; - } - } - } - - transaction = NULL; - if (0 != osip_strcasecmp (request->sip_method, "INVITE")) - { - i = _eXosip_transaction_init (&transaction, NICT, eXosip.j_osip, request); - } else - { - i = _eXosip_transaction_init (&transaction, ICT, eXosip.j_osip, request); - } - - if (i != 0) - { - osip_message_free (request); - return i; - } - - osip_list_add (jd->d_out_trs, transaction, 0); - - sipevent = osip_new_outgoing_sipmessage (request); - sipevent->transactionid = transaction->transactionid; + sipevent = osip_new_outgoing_sipmessage(request); + sipevent->transactionid = transaction->transactionid; #ifndef MINISIZE - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (jc, jd, NULL, NULL)); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, jd, NULL, NULL)); #else - osip_transaction_set_your_instance (transaction, __eXosip_new_jinfo (jc, jd)); + osip_transaction_set_your_instance(transaction, __eXosip_new_jinfo(jc, jd)); #endif - osip_transaction_add_event (transaction, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_add_event(transaction, sipevent); + __eXosip_wakeup(); + return OSIP_SUCCESS; } #ifndef MINISIZE int -eXosip_call_build_refer (int did, const char *refer_to, osip_message_t ** request) +eXosip_call_build_refer(int did, const char *refer_to, osip_message_t ** request) { - int i; + int i; - *request = NULL; - i = eXosip_call_build_request (did, "REFER", request); - if (i != 0) - return i; + *request = NULL; + i = eXosip_call_build_request(did, "REFER", request); + if (i != 0) + return i; - if (refer_to == NULL || refer_to[0] == '\0') - return OSIP_SUCCESS; + if (refer_to == NULL || refer_to[0] == '\0') + return OSIP_SUCCESS; - osip_message_set_header (*request, "Refer-to", refer_to); - return OSIP_SUCCESS; + osip_message_set_header(*request, "Refer-to", refer_to); + return OSIP_SUCCESS; } -int -eXosip_call_build_options (int did, osip_message_t ** request) +int eXosip_call_build_options(int did, osip_message_t ** request) { - int i; + int i; - *request = NULL; - i = eXosip_call_build_request (did, "OPTIONS", request); - if (i != 0) - return i; + *request = NULL; + i = eXosip_call_build_request(did, "OPTIONS", request); + if (i != 0) + return i; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_call_build_info (int did, osip_message_t ** request) +int eXosip_call_build_info(int did, osip_message_t ** request) { - int i; + int i; - *request = NULL; - i = eXosip_call_build_request (did, "INFO", request); - if (i != 0) - return i; + *request = NULL; + i = eXosip_call_build_request(did, "INFO", request); + if (i != 0) + return i; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_call_build_update (int did, osip_message_t ** request) +int eXosip_call_build_update(int did, osip_message_t ** request) { - int i; + int i; - *request = NULL; - i = eXosip_call_build_request (did, "UPDATE", request); - if (i != 0) - return i; + *request = NULL; + i = eXosip_call_build_request(did, "UPDATE", request); + if (i != 0) + return i; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } int -eXosip_call_build_notify (int did, int subscription_status, - osip_message_t ** request) +eXosip_call_build_notify(int did, int subscription_status, + osip_message_t ** request) { - char subscription_state[50]; - char *tmp; - int i; - - *request = NULL; - i = eXosip_call_build_request (did, "NOTIFY", request); - if (i != 0) - return i; - - if (subscription_status == EXOSIP_SUBCRSTATE_PENDING) - osip_strncpy (subscription_state, "pending;expires=", 16); - else if (subscription_status == EXOSIP_SUBCRSTATE_ACTIVE) - osip_strncpy (subscription_state, "active;expires=", 15); - else if (subscription_status == EXOSIP_SUBCRSTATE_TERMINATED) - { - int reason = NORESOURCE; - - if (reason == DEACTIVATED) - osip_strncpy (subscription_state, "terminated;reason=deactivated", 29); - else if (reason == PROBATION) - osip_strncpy (subscription_state, "terminated;reason=probation", 27); - else if (reason == REJECTED) - osip_strncpy (subscription_state, "terminated;reason=rejected", 26); - else if (reason == TIMEOUT) - osip_strncpy (subscription_state, "terminated;reason=timeout", 25); - else if (reason == GIVEUP) - osip_strncpy (subscription_state, "terminated;reason=giveup", 24); - else if (reason == NORESOURCE) - osip_strncpy (subscription_state, "terminated;reason=noresource", 29); - } - tmp = subscription_state + strlen (subscription_state); - if (subscription_status != EXOSIP_SUBCRSTATE_TERMINATED) - sprintf (tmp, "%i", 180); - osip_message_set_header (*request, "Subscription-State", subscription_state); + char subscription_state[50]; + char *tmp; + int i; - return OSIP_SUCCESS; -} + *request = NULL; + i = eXosip_call_build_request(did, "NOTIFY", request); + if (i != 0) + return i; + if (subscription_status == EXOSIP_SUBCRSTATE_PENDING) + osip_strncpy(subscription_state, "pending;expires=", 16); + else if (subscription_status == EXOSIP_SUBCRSTATE_ACTIVE) + osip_strncpy(subscription_state, "active;expires=", 15); + else if (subscription_status == EXOSIP_SUBCRSTATE_TERMINATED) { +#if 0 + int reason = NORESOURCE; + if (reason == DEACTIVATED) + osip_strncpy(subscription_state, "terminated;reason=deactivated", 29); + else if (reason == PROBATION) + osip_strncpy(subscription_state, "terminated;reason=probation", 27); + else if (reason == REJECTED) + osip_strncpy(subscription_state, "terminated;reason=rejected", 26); + else if (reason == TIMEOUT) + osip_strncpy(subscription_state, "terminated;reason=timeout", 25); + else if (reason == GIVEUP) + osip_strncpy(subscription_state, "terminated;reason=giveup", 24); + else if (reason == NORESOURCE) #endif + osip_strncpy(subscription_state, "terminated;reason=noresource", 29); + } + tmp = subscription_state + strlen(subscription_state); + if (subscription_status != EXOSIP_SUBCRSTATE_TERMINATED) + snprintf(tmp, 50 - (tmp - subscription_state), "%i", 180); + osip_message_set_header(*request, "Subscription-State", subscription_state); -int -eXosip_call_build_answer (int tid, int status, osip_message_t ** answer) -{ - int i = -1; - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *tr = NULL; - - *answer = NULL; - - if (tid < 0) - return OSIP_BADPARAMETER; - if (status <= 100) - return OSIP_BADPARAMETER; - if (status > 699) - return OSIP_BADPARAMETER; - - if (tid > 0) - { - _eXosip_call_transaction_find (tid, &jc, &jd, &tr); - } - if (tr == NULL || jd == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return OSIP_NOTFOUND; - } - - if (0 == osip_strcasecmp (tr->orig_request->sip_method, "INVITE")) - { - i = _eXosip_answer_invite_123456xx (jc, jd, status, answer, 0); - } else - { - if (jd != NULL) - i = _eXosip_build_response_default (answer, jd->d_dialog, status, - tr->orig_request); - else - i = _eXosip_build_response_default (answer, NULL, status, - tr->orig_request); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: Could not create response for %s\n", - tr->orig_request->sip_method)); - return i; - } - if (status > 100 && status < 300) - i = complete_answer_that_establish_a_dialog (*answer, tr->orig_request); - } - - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: Could not create response for %s\n", - tr->orig_request->sip_method)); - return i; - } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_call_send_answer (int tid, int status, osip_message_t * answer) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *tr = NULL; - osip_event_t *evt_answer; - - if (tid < 0) - { - osip_message_free (answer); - return OSIP_BADPARAMETER; - } - if (status <= 100) - { - osip_message_free (answer); - return OSIP_BADPARAMETER; - } - if (status > 699) - { - osip_message_free (answer); - return OSIP_BADPARAMETER; - } - - if (tid > 0) - { - _eXosip_call_transaction_find (tid, &jc, &jd, &tr); - } - if (jd == NULL || tr == NULL || tr->orig_request == NULL - || tr->orig_request->sip_method == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here or no transaction for call\n")); - osip_message_free (answer); - return OSIP_NOTFOUND; - } - - if (answer == NULL) - { - if (0 == osip_strcasecmp (tr->orig_request->sip_method, "INVITE")) - { - if (status >= 200 && status <= 299) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Wrong parameter?\n")); - osip_message_free (answer); - return OSIP_BADPARAMETER; - } - } - } - - /* is the transaction already answered? */ - if (tr->state == IST_COMPLETED - || tr->state == IST_CONFIRMED - || tr->state == IST_TERMINATED - || tr->state == NIST_COMPLETED || tr->state == NIST_TERMINATED) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: transaction already answered\n")); - osip_message_free (answer); - return OSIP_WRONG_STATE; - } - - if (answer == NULL) - { - if (0 == osip_strcasecmp (tr->orig_request->sip_method, "INVITE")) - { - osip_message_t *response; - return _eXosip_answer_invite_123456xx (jc, jd, status, &response, 1); - } - osip_message_free (answer); - return OSIP_BADPARAMETER; - } - - if (0 == osip_strcasecmp (tr->orig_request->sip_method, "INVITE")) - { - if (MSG_IS_STATUS_2XX (answer) && jd != NULL) - { - if (status >= 200 && status < 300 && jd != NULL) - { - eXosip_dialog_set_200ok (jd, answer); - /* wait for a ACK */ - osip_dialog_set_state (jd->d_dialog, DIALOG_CONFIRMED); - } - } - } - - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = tr->transactionid; - - osip_transaction_add_event (tr, evt_answer); - eXosip_update (); - __eXosip_wakeup (); - return OSIP_SUCCESS; -} +#endif -int -eXosip_call_terminate (int cid, int did) +int eXosip_call_build_answer(int tid, int status, osip_message_t ** answer) { - int i; - osip_transaction_t *tr; - osip_message_t *request = NULL; - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - - if (did <= 0 && cid <= 0) - return OSIP_BADPARAMETER; - if (did > 0) - { - eXosip_call_dialog_find (did, &jc, &jd); - if (jd == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return OSIP_NOTFOUND; - } - } else - { - eXosip_call_find (cid, &jc); - } - - if (jc == NULL) - { - return OSIP_NOTFOUND; - } - - tr = eXosip_find_last_out_invite (jc, jd); - if (jd != NULL && jd->d_dialog != NULL - && jd->d_dialog->state == DIALOG_CONFIRMED) - { - /* don't send CANCEL on re-INVITE: send BYE instead */ - } else if (tr != NULL && tr->last_response != NULL - && MSG_IS_STATUS_1XX (tr->last_response)) - { - i = generating_cancel (&request, tr->orig_request); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot terminate this call!\n")); - return i; - } - i = eXosip_create_cancel_transaction (jc, jd, request); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot initiate SIP transaction!\n")); - return i; - } - if (jd != NULL) - { - osip_dialog_free (jd->d_dialog); - jd->d_dialog = NULL; - eXosip_update (); /* AMD 30/09/05 */ - } - return OSIP_SUCCESS; - } - - if (jd == NULL || jd->d_dialog == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No established dialog!\n")); - return OSIP_WRONG_STATE; - } - - if (tr == NULL) - { - /*this may not be enough if it's a re-INVITE! */ - tr = eXosip_find_last_inc_invite (jc, jd); - if (tr != NULL && tr->last_response != NULL && - MSG_IS_STATUS_1XX (tr->last_response)) - { /* answer with 603 */ - osip_generic_param_t *to_tag; - osip_from_param_get_byname (tr->orig_request->to, "tag", &to_tag); - - i = eXosip_call_send_answer (tr->transactionid, 603, NULL); - - if (to_tag == NULL) - return i; - } - } - - if (jd->d_dialog == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot terminate this call!\n")); - return OSIP_WRONG_STATE; - } - - i = generating_bye (&request, jd->d_dialog, eXosip.transport); - - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot terminate this call!\n")); - return i; - } - - eXosip_add_authentication_information (request, NULL); - - i = eXosip_create_transaction (jc, jd, request); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot initiate SIP transaction!\n")); - return i; - } - - osip_dialog_free (jd->d_dialog); - jd->d_dialog = NULL; - eXosip_update (); /* AMD 30/09/05 */ - return OSIP_SUCCESS; + int i = -1; + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *tr = NULL; + + *answer = NULL; + + if (tid < 0) + return OSIP_BADPARAMETER; + if (status <= 100) + return OSIP_BADPARAMETER; + if (status > 699) + return OSIP_BADPARAMETER; + + if (tid > 0) { + _eXosip_call_transaction_find(tid, &jc, &jd, &tr); + } + if (tr == NULL || jd == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return OSIP_NOTFOUND; + } + + if (0 == osip_strcasecmp(tr->orig_request->sip_method, "INVITE")) { + i = _eXosip_answer_invite_123456xx(jc, jd, status, answer, 0); + } else { + i = _eXosip_build_response_default(answer, jd->d_dialog, status, + tr->orig_request); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: Could not create response for %s\n", + tr->orig_request->sip_method)); + return i; + } + if (status > 100 && status < 300) + i = complete_answer_that_establish_a_dialog(*answer, tr->orig_request); + } + + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: Could not create response for %s\n", + tr->orig_request->sip_method)); + return i; + } + return OSIP_SUCCESS; +} + +int eXosip_call_send_answer(int tid, int status, osip_message_t * answer) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *tr = NULL; + osip_event_t *evt_answer; + + if (tid < 0) { + osip_message_free(answer); + return OSIP_BADPARAMETER; + } + if (status <= 100) { + osip_message_free(answer); + return OSIP_BADPARAMETER; + } + if (status > 699) { + osip_message_free(answer); + return OSIP_BADPARAMETER; + } + + if (tid > 0) { + _eXosip_call_transaction_find(tid, &jc, &jd, &tr); + } + if (jd == NULL || tr == NULL || tr->orig_request == NULL + || tr->orig_request->sip_method == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here or no transaction for call\n")); + osip_message_free(answer); + return OSIP_NOTFOUND; + } + + if (answer == NULL) { + if (0 == osip_strcasecmp(tr->orig_request->sip_method, "INVITE")) { + if (status >= 200 && status <= 299) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Wrong parameter?\n")); + osip_message_free(answer); + return OSIP_BADPARAMETER; + } + } + } + + /* is the transaction already answered? */ + if (tr->state == IST_COMPLETED + || tr->state == IST_CONFIRMED + || tr->state == IST_TERMINATED + || tr->state == NIST_COMPLETED || tr->state == NIST_TERMINATED) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: transaction already answered\n")); + osip_message_free(answer); + return OSIP_WRONG_STATE; + } + + if (answer == NULL) { + if (0 == osip_strcasecmp(tr->orig_request->sip_method, "INVITE")) { + osip_message_t *response; + return _eXosip_answer_invite_123456xx(jc, jd, status, &response, 1); + } + osip_message_free(answer); + return OSIP_BADPARAMETER; + } + + if (0 == osip_strcasecmp(tr->orig_request->sip_method, "INVITE")) { + if (MSG_IS_STATUS_2XX(answer) && jd != NULL) { + if (status >= 200 && status < 300 && jd != NULL) { + eXosip_dialog_set_200ok(jd, answer); + /* wait for a ACK */ + osip_dialog_set_state(jd->d_dialog, DIALOG_CONFIRMED); + } + } + } + + if (0 == osip_strcasecmp(tr->orig_request->sip_method, "INVITE") + || 0 == osip_strcasecmp(tr->orig_request->sip_method, "UPDATE")) { + if (MSG_IS_STATUS_2XX(answer) && jd != NULL) { + osip_header_t *supported = NULL; + int i = 0; + + /* look for timer in supported header: must be added by user-application */ + + i = osip_message_header_get_byname(answer, "supported", 0, &supported); + while (i >= 0) { + if (supported == NULL) + break; + if (supported->hvalue != NULL + && osip_strcasecmp(supported->hvalue, "timer") == 0) { + /*found */ + break; + } + supported = NULL; + i = osip_message_header_get_byname(answer, "supported", i + 1, + &supported); + } + if (supported != NULL) { /* timer is supported */ + /* copy session-expires */ + /* add refresher=uas, if it's not already there */ + osip_header_t *se_exp = NULL; + osip_message_header_get_byname(tr->orig_request, "session-expires", + 0, &se_exp); + if (se_exp == NULL) + osip_message_header_get_byname(tr->orig_request, "x", 0, + &se_exp); + if (se_exp != NULL) { + osip_header_t *cp = NULL; + + i = osip_header_clone(se_exp, &cp); + if (cp != NULL) { + osip_content_disposition_t *exp_h = NULL; + /* syntax of Session-Expires is equivalent to "Content-Disposition" */ + osip_content_disposition_init(&exp_h); + if (exp_h == NULL) { + osip_header_free(cp); + } else { + osip_content_disposition_parse(exp_h, se_exp->hvalue); + if (exp_h->element == NULL) { + osip_content_disposition_free(exp_h); + osip_header_free(cp); + exp_h = NULL; + } else { + osip_generic_param_t *param = NULL; + osip_generic_param_get_byname(&exp_h->gen_params, + "refresher", ¶m); + if (param == NULL) { + osip_generic_param_add(&exp_h->gen_params, + osip_strdup + ("refresher"), + osip_strdup("uas")); + osip_free(cp->hvalue); + cp->hvalue = NULL; + osip_content_disposition_to_str(exp_h, + &cp->hvalue); + jd->d_refresher = 0; + } else { + if (osip_strcasecmp(param->gvalue, "uas") == 0) + jd->d_refresher = 0; + else + jd->d_refresher = 1; + } + jd->d_session_timer_start = time(NULL); + jd->d_session_timer_length = atoi(exp_h->element); + if (jd->d_session_timer_length <= 90) + jd->d_session_timer_length = 90; + osip_list_add(&answer->headers, cp, 0); + } + } + if (exp_h) + osip_content_disposition_free(exp_h); + exp_h = NULL; + + + /* add Require only if remote UA support "timer" */ + i = osip_message_header_get_byname(tr->orig_request, + "supported", 0, + &supported); + while (i >= 0) { + if (supported == NULL) + break; + if (supported->hvalue != NULL + && osip_strcasecmp(supported->hvalue, + "timer") == 0) { + /*found */ + break; + } + supported = NULL; + i = osip_message_header_get_byname(tr->orig_request, + "supported", i + 1, + &supported); + } + if (supported != NULL) { /* timer is supported */ + osip_message_set_header(answer, "Require", "timer"); + } + } + } + } + } + } + + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = tr->transactionid; + + osip_transaction_add_event(tr, evt_answer); + eXosip_update(); + __eXosip_wakeup(); + return OSIP_SUCCESS; +} + +int eXosip_call_terminate(int cid, int did) +{ + int i; + osip_transaction_t *tr; + osip_message_t *request = NULL; + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + + if (did <= 0 && cid <= 0) + return OSIP_BADPARAMETER; + if (did > 0) { + eXosip_call_dialog_find(did, &jc, &jd); + if (jd == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return OSIP_NOTFOUND; + } + } else { + eXosip_call_find(cid, &jc); + } + + if (jc == NULL) { + return OSIP_NOTFOUND; + } + + tr = eXosip_find_last_out_invite(jc, jd); + if (jd != NULL && jd->d_dialog != NULL + && jd->d_dialog->state == DIALOG_CONFIRMED) { + /* don't send CANCEL on re-INVITE: send BYE instead */ + } else if (tr != NULL && tr->last_response != NULL + && MSG_IS_STATUS_1XX(tr->last_response)) { + i = generating_cancel(&request, tr->orig_request); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot terminate this call!\n")); + return i; + } + i = eXosip_create_cancel_transaction(jc, jd, request); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot initiate SIP transaction!\n")); + return i; + } + if (jd != NULL) { + /*Fix: keep dialog opened after the CANCEL. + osip_dialog_free(jd->d_dialog); + jd->d_dialog = NULL; + eXosip_update(); */ + } + return OSIP_SUCCESS+1; + } + + if (jd == NULL || jd->d_dialog == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No established dialog!\n")); + return OSIP_WRONG_STATE; + } + + if (tr == NULL) { + /*this may not be enough if it's a re-INVITE! */ + tr = eXosip_find_last_inc_invite(jc, jd); + if (tr != NULL && tr->last_response != NULL && MSG_IS_STATUS_1XX(tr->last_response)) { /* answer with 603 */ + osip_generic_param_t *to_tag; + osip_from_param_get_byname(tr->orig_request->to, "tag", &to_tag); + + i = eXosip_call_send_answer(tr->transactionid, 603, NULL); + + if (to_tag == NULL) + return i; + } + } + + if (jd->d_dialog == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot terminate this call!\n")); + return OSIP_WRONG_STATE; + } + + i = generating_bye(&request, jd->d_dialog, eXosip.transport); + + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot terminate this call!\n")); + return i; + } + + eXosip_add_authentication_information(request, NULL); + + i = eXosip_create_transaction(jc, jd, request); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot initiate SIP transaction!\n")); + return i; + } + + osip_dialog_free(jd->d_dialog); + jd->d_dialog = NULL; + eXosip_update(); /* AMD 30/09/05 */ + return OSIP_SUCCESS; } #ifndef MINISIZE -int -eXosip_call_build_prack (int tid, osip_message_t ** prack) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *tr = NULL; - - osip_header_t *rseq; - char *transport; - int i; - - *prack = NULL; - - if (tid < 0) - return OSIP_BADPARAMETER; - - if (tid > 0) - { - _eXosip_call_transaction_find (tid, &jc, &jd, &tr); - } - if (jc == NULL || jd == NULL || jd->d_dialog == NULL - || tr == NULL || tr->orig_request == NULL - || tr->orig_request->sip_method == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here or no transaction for call\n")); - return OSIP_NOTFOUND; - } - - if (0 != osip_strcasecmp (tr->orig_request->sip_method, "INVITE")) - return OSIP_BADPARAMETER; - - /* PRACK are only send in the PROCEEDING state */ - if (tr->state != ICT_PROCEEDING) - return OSIP_WRONG_STATE; - - if (tr->orig_request->cseq == NULL - || tr->orig_request->cseq->number == NULL - || tr->orig_request->cseq->method == NULL) - return OSIP_SYNTAXERROR; - - transport = NULL; - if (tr != NULL && tr->orig_request != NULL) - transport = _eXosip_transport_protocol (tr->orig_request); - - if (transport == NULL) - i = _eXosip_build_request_within_dialog (prack, "PRACK", jd->d_dialog, "UDP"); - else - i = - _eXosip_build_request_within_dialog (prack, "PRACK", jd->d_dialog, - transport); - - if (i != 0) - return i; - - osip_message_header_get_byname (tr->last_response, "RSeq", 0, &rseq); - if (rseq != NULL && rseq->hvalue != NULL) - { - char tmp[128]; - - memset (tmp, '\0', sizeof (tmp)); - snprintf (tmp, 127, "%s %s %s", rseq->hvalue, - tr->orig_request->cseq->number, tr->orig_request->cseq->method); - osip_message_set_header (*prack, "RAck", tmp); - } - - return OSIP_SUCCESS; -} - -int -eXosip_call_send_prack (int tid, osip_message_t * prack) +int eXosip_call_build_prack(int tid, osip_message_t ** prack) { - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *tr = NULL; - - osip_event_t *sipevent; - int i; - - if (tid < 0) - return OSIP_BADPARAMETER; - if (prack == NULL) - return OSIP_BADPARAMETER; - - if (tid > 0) - { - _eXosip_call_transaction_find (tid, &jc, &jd, &tr); - } - if (jc == NULL || jd == NULL || jd->d_dialog == NULL - || tr == NULL || tr->orig_request == NULL - || tr->orig_request->sip_method == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here or no transaction for call\n")); - osip_message_free (prack); - return OSIP_NOTFOUND; - } - - if (0 != osip_strcasecmp (tr->orig_request->sip_method, "INVITE")) - { - osip_message_free (prack); - return OSIP_BADPARAMETER; - } - - /* PRACK are only send in the PROCEEDING state */ - if (tr->state != ICT_PROCEEDING) - { - osip_message_free (prack); - return OSIP_WRONG_STATE; - } - - tr = NULL; - i = _eXosip_transaction_init (&tr, NICT, eXosip.j_osip, prack); - - if (i != 0) - { - osip_message_free (prack); - return i; - } + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *tr = NULL; + + osip_header_t *rseq; + char *transport; + int i; + + *prack = NULL; + + if (tid < 0) + return OSIP_BADPARAMETER; + + if (tid > 0) { + _eXosip_call_transaction_find(tid, &jc, &jd, &tr); + } + if (jc == NULL || jd == NULL || jd->d_dialog == NULL + || tr == NULL || tr->orig_request == NULL + || tr->orig_request->sip_method == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here or no transaction for call\n")); + return OSIP_NOTFOUND; + } + + if (0 != osip_strcasecmp(tr->orig_request->sip_method, "INVITE")) + return OSIP_BADPARAMETER; + + /* PRACK are only send in the PROCEEDING state */ + if (tr->state != ICT_PROCEEDING) + return OSIP_WRONG_STATE; + + if (tr->orig_request->cseq == NULL + || tr->orig_request->cseq->number == NULL + || tr->orig_request->cseq->method == NULL) + return OSIP_SYNTAXERROR; + + transport = NULL; + if (tr != NULL && tr->orig_request != NULL) + transport = _eXosip_transport_protocol(tr->orig_request); + + if (transport == NULL) + i = _eXosip_build_request_within_dialog(prack, "PRACK", jd->d_dialog, + "UDP"); + else + i = _eXosip_build_request_within_dialog(prack, "PRACK", jd->d_dialog, + transport); + + if (i != 0) + return i; + + osip_message_header_get_byname(tr->last_response, "RSeq", 0, &rseq); + if (rseq != NULL && rseq->hvalue != NULL) { + char tmp[128]; + + memset(tmp, '\0', sizeof(tmp)); + snprintf(tmp, 127, "%s %s %s", rseq->hvalue, + tr->orig_request->cseq->number, tr->orig_request->cseq->method); + osip_message_set_header(*prack, "RAck", tmp); + } + + return OSIP_SUCCESS; +} + +int eXosip_call_send_prack(int tid, osip_message_t * prack) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *tr = NULL; + + osip_event_t *sipevent; + int i; + + if (tid < 0) + return OSIP_BADPARAMETER; + if (prack == NULL) + return OSIP_BADPARAMETER; + + if (tid > 0) { + _eXosip_call_transaction_find(tid, &jc, &jd, &tr); + } + if (jc == NULL || jd == NULL || jd->d_dialog == NULL + || tr == NULL || tr->orig_request == NULL + || tr->orig_request->sip_method == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here or no transaction for call\n")); + osip_message_free(prack); + return OSIP_NOTFOUND; + } + + if (0 != osip_strcasecmp(tr->orig_request->sip_method, "INVITE")) { + osip_message_free(prack); + return OSIP_BADPARAMETER; + } + + /* PRACK are only send in the PROCEEDING state */ + if (tr->state != ICT_PROCEEDING) { + osip_message_free(prack); + return OSIP_WRONG_STATE; + } + + tr = NULL; + i = _eXosip_transaction_init(&tr, NICT, eXosip.j_osip, prack); + + if (i != 0) { + osip_message_free(prack); + return i; + } - jd->d_mincseq++; + jd->d_mincseq++; - osip_list_add (jd->d_out_trs, tr, 0); + osip_list_add(jd->d_out_trs, tr, 0); - sipevent = osip_new_outgoing_sipmessage (prack); - sipevent->transactionid = tr->transactionid; + sipevent = osip_new_outgoing_sipmessage(prack); + sipevent->transactionid = tr->transactionid; #ifndef MINISIZE - osip_transaction_set_your_instance (tr, __eXosip_new_jinfo (jc, jd, NULL, NULL)); + osip_transaction_set_your_instance(tr, __eXosip_new_jinfo(jc, jd, NULL, NULL)); #else - osip_transaction_set_your_instance (tr, __eXosip_new_jinfo (jc, jd)); + osip_transaction_set_your_instance(tr, __eXosip_new_jinfo(jc, jd)); #endif - osip_transaction_add_event (tr, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_add_event(tr, sipevent); + __eXosip_wakeup(); + return OSIP_SUCCESS; } #endif int -_eXosip_call_retry_request (eXosip_call_t * jc, - eXosip_dialog_t * jd, osip_transaction_t * out_tr) +_eXosip_call_retry_request(eXosip_call_t * jc, + eXosip_dialog_t * jd, osip_transaction_t * out_tr) { - osip_transaction_t *tr = NULL; - osip_message_t *msg = NULL; - osip_event_t *sipevent; - - int cseq; - osip_via_t *via; - osip_contact_t *co; - int pos; - int i; - int protocol = IPPROTO_UDP; - - if (jc == NULL) - return OSIP_BADPARAMETER; - if (jd != NULL) - { - if (jd->d_out_trs == NULL) - return OSIP_BADPARAMETER; - } - if (out_tr == NULL - || out_tr->orig_request == NULL || out_tr->last_response == NULL) - return OSIP_BADPARAMETER; - - i = osip_message_clone (out_tr->orig_request, &msg); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for authentication\n")); - return i; - } - - via = (osip_via_t *) osip_list_get (&msg->vias, 0); - if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) - { - osip_message_free (msg); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: missing via or cseq header\n")); - return OSIP_SYNTAXERROR; - } - - if (MSG_IS_STATUS_3XX (out_tr->last_response)) - { - co = NULL; - pos = 0; - while (!osip_list_eol (&out_tr->last_response->contacts, pos)) - { - co = - (osip_contact_t *) osip_list_get (&out_tr->last_response->contacts, - pos); - if (co != NULL && co->url != NULL) - { - /* check tranport? Only allow UDP, right now */ - osip_uri_param_t *u_param; - int pos2; - - u_param = NULL; - pos2 = 0; - while (!osip_list_eol (&co->url->url_params, pos2)) - { - u_param = - (osip_uri_param_t *) osip_list_get (&co->url->url_params, - pos2); - if (u_param == NULL || u_param->gname == NULL - || u_param->gvalue == NULL) - { - u_param = NULL; - /* skip */ - } else if (0 == osip_strcasecmp (u_param->gname, "transport")) - { - if (0 == osip_strcasecmp (u_param->gvalue, "udp")) - { - u_param = NULL; - protocol = IPPROTO_UDP; - break; /* ok */ - } else if (0 == osip_strcasecmp (u_param->gvalue, "tcp")) - { - protocol = IPPROTO_TCP; - u_param = NULL; - } - break; - } - pos2++; - } - - if (u_param == NULL || u_param->gname == NULL - || u_param->gvalue == NULL) - { - break; /* default is udp! */ - } - } - pos++; - co = NULL; - } - - if (co == NULL || co->url == NULL) - { - osip_message_free (msg); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: contact header\n")); - return OSIP_SYNTAXERROR; - } - - /* TODO: - remove extra parameter from new request-uri - check usual parameter like "transport" - */ - - if (msg->req_uri != NULL && msg->req_uri->host != NULL - && co->url->host != NULL - && 0 == osip_strcasecmp (co->url->host, msg->req_uri->host)) - { - osip_uri_param_t *maddr_param = NULL; - osip_uri_uparam_get_byname (co->url, "maddr", &maddr_param); - if (maddr_param != NULL && maddr_param->gvalue != NULL) - { - /* This is a redirect server, the route should probably be removed? */ - osip_route_t *route = NULL; - osip_generic_param_t *tag = NULL; - osip_message_get_route (msg, 0, &route); - if (route != NULL) - { - osip_to_get_tag (msg->to, &tag); - if (tag == NULL && route != NULL && route->url != NULL) - { - osip_list_remove (&msg->routes, 0); - osip_route_free (route); - } - } - } - } - - /* replace request-uri with NEW contact address */ - osip_uri_free (msg->req_uri); - msg->req_uri = NULL; - osip_uri_clone (co->url, &msg->req_uri); - - /* support for diversions headers/draft! */ - { - int count = 0; - pos = 0; - while (!osip_list_eol (&out_tr->last_response->headers, pos)) - { - osip_header_t *copy = NULL; - osip_header_t *head = - osip_list_get (&out_tr->last_response->headers, pos); - if (head != NULL && 0 == osip_strcasecmp (head->hname, "diversion")) - { - i = osip_header_clone (head, ©); - if (i == 0) - { - osip_list_add (&msg->headers, copy, count); - count++; - } - } - pos++; - } - } - - } - /* remove all previous authentication headers */ - osip_list_special_free (&msg->authorizations, - (void *(*)(void *)) &osip_authorization_free); - osip_list_special_free (&msg->proxy_authorizations, - (void *(*)(void *)) &osip_proxy_authorization_free); - - /* increment cseq */ - cseq = atoi (msg->cseq->number); - osip_free (msg->cseq->number); - msg->cseq->number = strdup_printf ("%i", cseq + 1); - if (jd != NULL && jd->d_dialog != NULL) - { - jd->d_dialog->local_cseq++; - } - - i = eXosip_update_top_via (msg); - if (i != 0) - { - osip_message_free (msg); - return i; - } - - if (out_tr->last_response->status_code == 401 - || out_tr->last_response->status_code == 407) - eXosip_add_authentication_information (msg, out_tr->last_response); - else - eXosip_add_authentication_information (msg, NULL); - osip_message_force_update (msg); - - if (0 != osip_strcasecmp (msg->sip_method, "INVITE")) - { - i = _eXosip_transaction_init (&tr, NICT, eXosip.j_osip, msg); - } else - { - i = _eXosip_transaction_init (&tr, ICT, eXosip.j_osip, msg); - } - - if (i != 0) - { - osip_message_free (msg); - return i; - } - - if (out_tr == jc->c_out_tr) - { - /* replace with the new tr */ - osip_list_add (&eXosip.j_transactions, jc->c_out_tr, 0); - jc->c_out_tr = tr; - - /* fix dialog issue */ - if (jd != NULL) - { - REMOVE_ELEMENT (jc->c_dialogs, jd); - eXosip_dialog_free (jd); - jd = NULL; - } - } else - { - /* add the new tr for the current dialog */ - osip_list_add (jd->d_out_trs, tr, 0); - } + osip_transaction_t *tr = NULL; + osip_message_t *msg = NULL; + osip_event_t *sipevent; + + int cseq; + osip_via_t *via; + osip_contact_t *co; + int pos; + int i; + + if (jc == NULL) + return OSIP_BADPARAMETER; + if (jd != NULL) { + if (jd->d_out_trs == NULL) + return OSIP_BADPARAMETER; + } + if (out_tr == NULL + || out_tr->orig_request == NULL || out_tr->last_response == NULL) + return OSIP_BADPARAMETER; + + i = osip_message_clone(out_tr->orig_request, &msg); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for authentication\n")); + return i; + } + + via = (osip_via_t *) osip_list_get(&msg->vias, 0); + if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing via or cseq header\n")); + return OSIP_SYNTAXERROR; + } + + if (MSG_IS_STATUS_3XX(out_tr->last_response)) { + co = NULL; + pos = 0; + while (!osip_list_eol(&out_tr->last_response->contacts, pos)) { + co = (osip_contact_t *) osip_list_get(&out_tr->last_response->contacts, + pos); + if (co != NULL && co->url != NULL) { + /* check tranport? */ + osip_uri_param_t *u_param; + + u_param = NULL; + osip_uri_uparam_get_byname(co->url, "transport", &u_param); + if (u_param == NULL || u_param->gname == NULL + || u_param->gvalue == NULL) { + if (0 == osip_strcasecmp(eXosip.transport, "udp")) + break; /* no transport param in uri & we want udp */ + } else if (0 == osip_strcasecmp(u_param->gvalue, eXosip.transport)) { + break; /* transport param in uri & match our protocol */ + } + } + pos++; + co = NULL; + } + + if (co == NULL || co->url == NULL) { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: contact header\n")); + return OSIP_SYNTAXERROR; + } + + /* TODO: + remove extra parameter from new request-uri + check usual parameter like "transport" + */ + + if (msg->req_uri != NULL && msg->req_uri->host != NULL + && co->url->host != NULL + && 0 == osip_strcasecmp(co->url->host, msg->req_uri->host)) { + osip_uri_param_t *maddr_param = NULL; + osip_uri_uparam_get_byname(co->url, "maddr", &maddr_param); + if (maddr_param != NULL && maddr_param->gvalue != NULL) { + /* This is a redirect server, the route should probably be removed? */ + osip_route_t *route = NULL; + osip_generic_param_t *tag = NULL; + osip_message_get_route(msg, 0, &route); + if (route != NULL) { + osip_to_get_tag(msg->to, &tag); + if (tag == NULL && route != NULL && route->url != NULL) { + osip_list_remove(&msg->routes, 0); + osip_route_free(route); + } + } + } + } + + /* replace request-uri with NEW contact address */ + osip_uri_free(msg->req_uri); + msg->req_uri = NULL; + i = osip_uri_clone(co->url, &msg->req_uri); + if (i != 0) { + osip_message_free(msg); + return i; + } + + /* support for diversions headers/draft! */ + { + int count = 0; + pos = 0; + while (!osip_list_eol(&out_tr->last_response->headers, pos)) { + osip_header_t *copy = NULL; + osip_header_t *head = + osip_list_get(&out_tr->last_response->headers, pos); + if (head != NULL && 0 == osip_strcasecmp(head->hname, "diversion")) { + i = osip_header_clone(head, ©); + if (i == 0) { + osip_list_add(&msg->headers, copy, count); + count++; + } + } + pos++; + } + } + + } + /* remove all previous authentication headers */ + osip_list_special_free(&msg->authorizations, + (void (*)(void *)) &osip_authorization_free); + osip_list_special_free(&msg->proxy_authorizations, + (void (*)(void *)) &osip_proxy_authorization_free); + + /* increment cseq */ + cseq = atoi(msg->cseq->number); + osip_free(msg->cseq->number); + msg->cseq->number = strdup_printf("%i", cseq + 1); + if (jd != NULL && jd->d_dialog != NULL) { + jd->d_dialog->local_cseq++; + } + + i = eXosip_update_top_via(msg); + if (i != 0) { + osip_message_free(msg); + return i; + } + + if (out_tr->last_response->status_code == 422) { + /* increase expires value to "min-se" value */ + osip_header_t *exp; + osip_header_t *min_se; + /* syntax of Min-SE & Session-Expires are equivalent to "Content-Disposition" */ + osip_content_disposition_t *exp_h = NULL; + osip_content_disposition_t *min_se_h = NULL; + + osip_message_header_get_byname(msg, "session-expires", 0, &exp); + if (exp == NULL) + osip_message_header_get_byname(msg, "x", 0, &exp); + osip_message_header_get_byname(out_tr->last_response, "min-se", 0, + &min_se); + if (exp != NULL && exp->hvalue != NULL && min_se != NULL + && min_se->hvalue != NULL) { + osip_content_disposition_init(&exp_h); + osip_content_disposition_init(&min_se_h); + if (exp_h == NULL || min_se_h == NULL) { + osip_content_disposition_free(exp_h); + osip_content_disposition_free(min_se_h); + exp_h = NULL; + min_se_h = NULL; + } else { + osip_content_disposition_parse(exp_h, exp->hvalue); + osip_content_disposition_parse(min_se_h, min_se->hvalue); + if (exp_h->element == NULL || min_se_h->element == NULL) { + osip_content_disposition_free(exp_h); + osip_content_disposition_free(min_se_h); + exp_h = NULL; + min_se_h = NULL; + } + } + } + + if (exp_h != NULL && exp_h->element != NULL && min_se_h != NULL + && min_se_h->element != NULL) { + osip_header_t *min_se_new = NULL; + char minse_new[32]; + memset(minse_new, 0, sizeof(minse_new)); + + osip_free(exp_h->element); + exp_h->element = osip_strdup(min_se_h->element); + + /* rebuild session-expires with new value/same paramters */ + osip_free(exp->hvalue); + exp->hvalue = NULL; + osip_content_disposition_to_str(exp_h, &exp->hvalue); + + /* add or update Min-SE in INVITE: */ + osip_message_header_get_byname(msg, "min-se", 0, &min_se_new); + if (min_se_new != NULL && min_se_new->hvalue != NULL) { + osip_free(min_se_new->hvalue); + min_se_new->hvalue = osip_strdup(min_se_h->element); + } else { + osip_message_set_header(msg, "Min-SE", min_se_h->element); + } + } else { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing Min-SE or Session-Expires in dialog\n")); + return OSIP_SYNTAXERROR; + } + + osip_content_disposition_free(exp_h); + osip_content_disposition_free(min_se_h); + + } else { + osip_header_t *exp; + + osip_message_header_get_byname(msg, "session-expires", 0, &exp); + if (exp == NULL) { + osip_message_header_get_byname(msg, "x", 0, &exp); + } + if (exp == NULL) { + /* add missing one? */ + } + } + + if (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407) + eXosip_add_authentication_information(msg, out_tr->last_response); + else + eXosip_add_authentication_information(msg, NULL); + osip_message_force_update(msg); + + if (0 != osip_strcasecmp(msg->sip_method, "INVITE")) { + i = _eXosip_transaction_init(&tr, NICT, eXosip.j_osip, msg); + } else { + i = _eXosip_transaction_init(&tr, ICT, eXosip.j_osip, msg); + } + + if (i != 0) { + osip_message_free(msg); + return i; + } + + if (out_tr == jc->c_out_tr) { + /* replace with the new tr */ + osip_list_add(&eXosip.j_transactions, jc->c_out_tr, 0); + jc->c_out_tr = tr; + + /* fix dialog issue */ + if (jd != NULL) { + REMOVE_ELEMENT(jc->c_dialogs, jd); + eXosip_dialog_free(jd); + jd = NULL; + } + } else { + /* add the new tr for the current dialog */ + osip_list_add(jd->d_out_trs, tr, 0); + } - sipevent = osip_new_outgoing_sipmessage (msg); + sipevent = osip_new_outgoing_sipmessage(msg); #ifndef MINISIZE - osip_transaction_set_your_instance (tr, __eXosip_new_jinfo (jc, jd, NULL, NULL)); + osip_transaction_set_your_instance(tr, __eXosip_new_jinfo(jc, jd, NULL, NULL)); #else - osip_transaction_set_your_instance (tr, __eXosip_new_jinfo (jc, jd)); + osip_transaction_set_your_instance(tr, __eXosip_new_jinfo(jc, jd)); #endif - osip_transaction_add_event (tr, sipevent); + osip_transaction_add_event(tr, sipevent); - eXosip_update (); /* fixed? */ - __eXosip_wakeup (); - return OSIP_SUCCESS; + eXosip_update(); /* fixed? */ + __eXosip_wakeup(); + return OSIP_SUCCESS; } #ifndef MINISIZE -int -eXosip_call_get_referto (int did, char *refer_to, size_t refer_to_len) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *tr = NULL; - osip_uri_t *referto_uri; - char atmp[256]; - char *referto_tmp = NULL; - int i; - - if (did <= 0) - return OSIP_BADPARAMETER; - - eXosip_call_dialog_find (did, &jc, &jd); - if (jc == NULL || jd == NULL || jd->d_dialog == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return OSIP_NOTFOUND; - } - - tr = eXosip_find_last_invite (jc, jd); - - if (tr == NULL || tr->orig_request == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No transaction for call?\n")); - return OSIP_NOTFOUND; - } - - i = osip_uri_clone (jd->d_dialog->remote_uri->url, &referto_uri); - if (i != 0) - return i; - - snprintf (atmp, sizeof (atmp), "%s;to-tag=%s;from-tag=%s", - jd->d_dialog->call_id, - jd->d_dialog->remote_tag, jd->d_dialog->local_tag); - - osip_uri_uheader_add (referto_uri, osip_strdup ("Replaces"), osip_strdup (atmp)); - i = osip_uri_to_str (referto_uri, &referto_tmp); - if (i != 0) - { - osip_uri_free (referto_uri); - return i; - } - - snprintf (refer_to, refer_to_len, "%s", referto_tmp); - osip_uri_free (referto_uri); - - return OSIP_SUCCESS; -} - -int -eXosip_call_find_by_replaces (char *replaces_str) +int eXosip_call_get_referto(int did, char *refer_to, size_t refer_to_len) { - eXosip_call_t *jc = NULL; - eXosip_dialog_t *jd = NULL; - char *call_id; - char *to_tag; - char *from_tag; - char *early_flag; - char *semicolon; - char *totag_str = (char *) "to-tag="; - char *fromtag_str = (char *) "from-tag="; - char *earlyonly_str = (char *) "early-only"; - - /* copy replaces string */ - if (replaces_str == NULL) - return OSIP_SYNTAXERROR; - call_id = osip_strdup (replaces_str); - if (call_id == NULL) - return OSIP_NOMEM; - - /* parse replaces string */ - strcpy (call_id, replaces_str); - to_tag = strstr (call_id, totag_str); - from_tag = strstr (call_id, fromtag_str); - early_flag = strstr (call_id, earlyonly_str); - - if ((to_tag == NULL) || (from_tag == NULL)) - { - osip_free (call_id); - return OSIP_SYNTAXERROR; - } - to_tag += strlen (totag_str); - from_tag += strlen (fromtag_str); - - while ((semicolon = strrchr (call_id, ';')) != NULL) - { - *semicolon = '\0'; - } - - for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) - { - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog == NULL) - { - /* skip */ - } else if (((0 == strcmp (jd->d_dialog->call_id, call_id)) && - (0 == strcmp (jd->d_dialog->remote_tag, to_tag)) && - (0 == strcmp (jd->d_dialog->local_tag, from_tag))) - || - ((0 == strcmp (jd->d_dialog->call_id, call_id)) && - (0 == strcmp (jd->d_dialog->local_tag, to_tag)) && - (0 == strcmp (jd->d_dialog->remote_tag, from_tag)))) - { - /* This dialog match! */ - if (jd->d_dialog->state == DIALOG_CONFIRMED && early_flag != NULL) - { - osip_free (call_id); - return OSIP_WRONG_STATE; /* confirmed dialog but already answered with 486 */ - } - if (jd->d_dialog->state == DIALOG_EARLY - && jd->d_dialog->type == CALLEE) - { - osip_free (call_id); - return OSIP_BADPARAMETER; /* confirmed dialog but already answered with 481 */ - } - - osip_free (call_id); - return jc->c_id; /* match anyway */ - } - } - } - osip_free (call_id); - return OSIP_NOTFOUND; /* answer with 481 */ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *tr = NULL; + osip_uri_t *referto_uri; + char atmp[256]; + char *referto_tmp = NULL; + int i; + + if (did <= 0) + return OSIP_BADPARAMETER; + + eXosip_call_dialog_find(did, &jc, &jd); + if (jc == NULL || jd == NULL || jd->d_dialog == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return OSIP_NOTFOUND; + } + + tr = eXosip_find_last_invite(jc, jd); + + if (tr == NULL || tr->orig_request == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No transaction for call?\n")); + return OSIP_NOTFOUND; + } + + i = osip_uri_clone(jd->d_dialog->remote_uri->url, &referto_uri); + if (i != 0) + return i; + + snprintf(atmp, sizeof(atmp), "%s;to-tag=%s;from-tag=%s", + jd->d_dialog->call_id, + jd->d_dialog->remote_tag, jd->d_dialog->local_tag); + + osip_uri_uheader_add(referto_uri, osip_strdup("Replaces"), osip_strdup(atmp)); + i = osip_uri_to_str(referto_uri, &referto_tmp); + if (i != 0) { + osip_uri_free(referto_uri); + return i; + } + + snprintf(refer_to, refer_to_len, "%s", referto_tmp); + osip_uri_free(referto_uri); + + return OSIP_SUCCESS; +} + +int eXosip_call_find_by_replaces(char *replaces_str) +{ + eXosip_call_t *jc = NULL; + eXosip_dialog_t *jd = NULL; + char *call_id; + char *to_tag; + char *from_tag; + char *early_flag; + char *semicolon; + char *totag_str = (char *) "to-tag="; + char *fromtag_str = (char *) "from-tag="; + char *earlyonly_str = (char *) "early-only"; + + /* copy replaces string */ + if (replaces_str == NULL) + return OSIP_SYNTAXERROR; + call_id = osip_strdup(replaces_str); + if (call_id == NULL) + return OSIP_NOMEM; + + /* parse replaces string */ + to_tag = strstr(call_id, totag_str); + from_tag = strstr(call_id, fromtag_str); + early_flag = strstr(call_id, earlyonly_str); + + if ((to_tag == NULL) || (from_tag == NULL)) { + osip_free(call_id); + return OSIP_SYNTAXERROR; + } + to_tag += strlen(totag_str); + from_tag += strlen(fromtag_str); + + while ((semicolon = strrchr(call_id, ';')) != NULL) { + *semicolon = '\0'; + } + + for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) { + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog == NULL) { + /* skip */ + } else if (((0 == strcmp(jd->d_dialog->call_id, call_id)) && + (0 == strcmp(jd->d_dialog->remote_tag, to_tag)) && + (0 == strcmp(jd->d_dialog->local_tag, from_tag))) + || + ((0 == strcmp(jd->d_dialog->call_id, call_id)) && + (0 == strcmp(jd->d_dialog->local_tag, to_tag)) && + (0 == strcmp(jd->d_dialog->remote_tag, from_tag)))) { + /* This dialog match! */ + if (jd->d_dialog->state == DIALOG_CONFIRMED && early_flag != NULL) { + osip_free(call_id); + return OSIP_WRONG_STATE; /* confirmed dialog but already answered with 486 */ + } + if (jd->d_dialog->state == DIALOG_EARLY + && jd->d_dialog->type == CALLEE) { + osip_free(call_id); + return OSIP_BADPARAMETER; /* confirmed dialog but already answered with 481 */ + } + + osip_free(call_id); + return jc->c_id; /* match anyway */ + } + } + } + osip_free(call_id); + return OSIP_NOTFOUND; /* answer with 481 */ } #endif diff -Nru libexosip2-3.3.0/src/eXconf.c libexosip2-3.6.0/src/eXconf.c --- libexosip2-3.3.0/src/eXconf.c 2008-12-12 12:34:05.000000000 +0000 +++ libexosip2-3.6.0/src/eXconf.c 2011-09-27 23:56:28.000000000 +0000 @@ -27,1084 +27,1113 @@ #include #include +#if defined (_WIN32_WCE) +#include "inet_ntop.h" +#elif WIN32 +#include "inet_ntop.h" +#endif + extern eXosip_t eXosip; int ipv6_enable = 0; #ifdef OSIP_MT -static void *_eXosip_thread (void *arg); +static void *_eXosip_thread(void *arg); #endif -static void _eXosip_keep_alive (void); +static void _eXosip_keep_alive(void); #ifndef MINISIZE -void -eXosip_enable_ipv6 (int _ipv6_enable) +void eXosip_enable_ipv6(int _ipv6_enable) { - ipv6_enable = _ipv6_enable; + ipv6_enable = _ipv6_enable; } #endif -const char * -eXosip_get_version (void) +const char *eXosip_get_version(void) { - return EXOSIP_VERSION; + return EXOSIP_VERSION; } -int -eXosip_set_cbsip_message (CbSipCallback cbsipCallback) +int eXosip_set_cbsip_message(CbSipCallback cbsipCallback) { - eXosip.cbsipCallback = cbsipCallback; - return 0; + eXosip.cbsipCallback = cbsipCallback; + return 0; } -void -eXosip_masquerade_contact (const char *public_address, int port) +void eXosip_masquerade_contact(const char *public_address, int port) { - eXtl_udp.tl_masquerade_contact (public_address, port); - eXtl_tcp.tl_masquerade_contact (public_address, port); + eXtl_udp.tl_masquerade_contact(public_address, port); + eXtl_tcp.tl_masquerade_contact(public_address, port); #ifdef HAVE_OPENSSL_SSL_H - eXtl_tls.tl_masquerade_contact (public_address, port); + eXtl_tls.tl_masquerade_contact(public_address, port); #if !(OPENSSL_VERSION_NUMBER < 0x00908000L) - eXtl_dtls.tl_masquerade_contact (public_address, port); + eXtl_dtls.tl_masquerade_contact(public_address, port); #endif #endif - return; + return; } -int -eXosip_guess_localip (int family, char *address, int size) +int eXosip_guess_localip(int family, char *address, int size) { - return eXosip_guess_ip_for_via (family, address, size); + return eXosip_guess_ip_for_via(family, address, size); } -int -eXosip_is_public_address (const char *c_address) +int eXosip_is_public_address(const char *c_address) { - return (0 != strncmp (c_address, "192.168", 7) - && 0 != strncmp (c_address, "10.", 3) - && 0 != strncmp (c_address, "172.16.", 7) - && 0 != strncmp (c_address, "172.17.", 7) - && 0 != strncmp (c_address, "172.18.", 7) - && 0 != strncmp (c_address, "172.19.", 7) - && 0 != strncmp (c_address, "172.20.", 7) - && 0 != strncmp (c_address, "172.21.", 7) - && 0 != strncmp (c_address, "172.22.", 7) - && 0 != strncmp (c_address, "172.23.", 7) - && 0 != strncmp (c_address, "172.24.", 7) - && 0 != strncmp (c_address, "172.25.", 7) - && 0 != strncmp (c_address, "172.26.", 7) - && 0 != strncmp (c_address, "172.27.", 7) - && 0 != strncmp (c_address, "172.28.", 7) - && 0 != strncmp (c_address, "172.29.", 7) - && 0 != strncmp (c_address, "172.30.", 7) - && 0 != strncmp (c_address, "172.31.", 7) - && 0 != strncmp (c_address, "169.254", 7)); + return (0 != strncmp(c_address, "192.168", 7) + && 0 != strncmp(c_address, "10.", 3) + && 0 != strncmp(c_address, "172.16.", 7) + && 0 != strncmp(c_address, "172.17.", 7) + && 0 != strncmp(c_address, "172.18.", 7) + && 0 != strncmp(c_address, "172.19.", 7) + && 0 != strncmp(c_address, "172.20.", 7) + && 0 != strncmp(c_address, "172.21.", 7) + && 0 != strncmp(c_address, "172.22.", 7) + && 0 != strncmp(c_address, "172.23.", 7) + && 0 != strncmp(c_address, "172.24.", 7) + && 0 != strncmp(c_address, "172.25.", 7) + && 0 != strncmp(c_address, "172.26.", 7) + && 0 != strncmp(c_address, "172.27.", 7) + && 0 != strncmp(c_address, "172.28.", 7) + && 0 != strncmp(c_address, "172.29.", 7) + && 0 != strncmp(c_address, "172.30.", 7) + && 0 != strncmp(c_address, "172.31.", 7) + && 0 != strncmp(c_address, "169.254", 7)); } -void -eXosip_set_user_agent (const char *user_agent) +void eXosip_set_user_agent(const char *user_agent) { - osip_free (eXosip.user_agent); - eXosip.user_agent = osip_strdup (user_agent); + osip_free(eXosip.user_agent); + eXosip.user_agent = osip_strdup(user_agent); } -void -eXosip_kill_transaction (osip_list_t * transactions) +void eXosip_kill_transaction(osip_list_t * transactions) { - osip_transaction_t *transaction; + osip_transaction_t *transaction; - if (!osip_list_eol (transactions, 0)) - { - /* some transaction are still used by osip, - transaction should be released by modules! */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "module sfp: _osip_kill_transaction transaction should be released by modules!\n")); - } - - while (!osip_list_eol (transactions, 0)) - { - transaction = osip_list_get (transactions, 0); - - __eXosip_delete_jinfo (transaction); - osip_transaction_free (transaction); - } + if (!osip_list_eol(transactions, 0)) { + /* some transaction are still used by osip, + transaction should be released by modules! */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "module sfp: _osip_kill_transaction transaction should be released by modules!\n")); + } + + while (!osip_list_eol(transactions, 0)) { + transaction = osip_list_get(transactions, 0); + + __eXosip_delete_jinfo(transaction); + _eXosip_dnsutils_release(transaction->naptr_record); + transaction->naptr_record=NULL; + osip_transaction_free(transaction); + } } -void -eXosip_quit (void) +void eXosip_quit(void) { - jauthinfo_t *jauthinfo; - eXosip_call_t *jc; - eXosip_reg_t *jreg; + jauthinfo_t *jauthinfo; + eXosip_call_t *jc; + eXosip_reg_t *jreg; #ifndef MINISIZE - eXosip_notify_t *jn; - eXosip_subscribe_t *js; - eXosip_pub_t *jpub; + eXosip_notify_t *jn; + eXosip_subscribe_t *js; + eXosip_pub_t *jpub; #endif #ifdef OSIP_MT - int i; + int i; #endif - if (eXosip.j_stop_ua == -1) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, NULL, - "eXosip: already stopped!\n")); - return; - } - - eXosip.j_stop_ua = 1; /* ask to quit the application */ - __eXosip_wakeup (); - __eXosip_wakeup_event (); + if (eXosip.j_stop_ua == -1) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, NULL, + "eXosip: already stopped!\n")); + return; + } + + eXosip.j_stop_ua = 1; /* ask to quit the application */ + __eXosip_wakeup(); + __eXosip_wakeup_event(); #ifdef OSIP_MT - if (eXosip.j_thread != NULL) - { - i = osip_thread_join ((struct osip_thread *) eXosip.j_thread); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: can't terminate thread!\n")); - } - osip_free ((struct osip_thread *) eXosip.j_thread); - } - - jpipe_close (eXosip.j_socketctl); - jpipe_close (eXosip.j_socketctl_event); -#endif - - osip_free (eXosip.user_agent); - - for (jc = eXosip.j_calls; jc != NULL; jc = eXosip.j_calls) - { - REMOVE_ELEMENT (eXosip.j_calls, jc); - eXosip_call_free (jc); - } + if (eXosip.j_thread != NULL) { + i = osip_thread_join((struct osip_thread *) eXosip.j_thread); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: can't terminate thread!\n")); + } + osip_free((struct osip_thread *) eXosip.j_thread); + } + + jpipe_close(eXosip.j_socketctl); + jpipe_close(eXosip.j_socketctl_event); +#endif + + osip_free(eXosip.user_agent); + + for (jc = eXosip.j_calls; jc != NULL; jc = eXosip.j_calls) { + REMOVE_ELEMENT(eXosip.j_calls, jc); + eXosip_call_free(jc); + } #ifndef MINISIZE - for (js = eXosip.j_subscribes; js != NULL; js = eXosip.j_subscribes) - { - REMOVE_ELEMENT (eXosip.j_subscribes, js); - eXosip_subscribe_free (js); - } - - for (jn = eXosip.j_notifies; jn != NULL; jn = eXosip.j_notifies) - { - REMOVE_ELEMENT (eXosip.j_notifies, jn); - eXosip_notify_free (jn); - } + for (js = eXosip.j_subscribes; js != NULL; js = eXosip.j_subscribes) { + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + } + + for (jn = eXosip.j_notifies; jn != NULL; jn = eXosip.j_notifies) { + REMOVE_ELEMENT(eXosip.j_notifies, jn); + eXosip_notify_free(jn); + } #endif #ifdef OSIP_MT - osip_mutex_destroy ((struct osip_mutex *) eXosip.j_mutexlock); + osip_mutex_destroy((struct osip_mutex *) eXosip.j_mutexlock); #if !defined (_WIN32_WCE) - osip_cond_destroy ((struct osip_cond *) eXosip.j_cond); + osip_cond_destroy((struct osip_cond *) eXosip.j_cond); #endif #endif - for (jreg = eXosip.j_reg; jreg != NULL; jreg = eXosip.j_reg) - { - REMOVE_ELEMENT (eXosip.j_reg, jreg); - eXosip_reg_free (jreg); - } + for (jreg = eXosip.j_reg; jreg != NULL; jreg = eXosip.j_reg) { + REMOVE_ELEMENT(eXosip.j_reg, jreg); + eXosip_reg_free(jreg); + } #ifndef MINISIZE - for (jpub = eXosip.j_pub; jpub != NULL; jpub = eXosip.j_pub) - { - REMOVE_ELEMENT (eXosip.j_pub, jpub); - _eXosip_pub_free (jpub); - } -#endif - - while (!osip_list_eol (&eXosip.j_transactions, 0)) - { - osip_transaction_t *tr = - (osip_transaction_t *) osip_list_get (&eXosip.j_transactions, 0); - if (tr->state == IST_TERMINATED || tr->state == ICT_TERMINATED - || tr->state == NICT_TERMINATED || tr->state == NIST_TERMINATED) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Release a terminated transaction\n")); - osip_list_remove (&eXosip.j_transactions, 0); - __eXosip_delete_jinfo (tr); - osip_transaction_free (tr); - } else - { - osip_list_remove (&eXosip.j_transactions, 0); - __eXosip_delete_jinfo (tr); - osip_transaction_free (tr); - } - } - - eXosip_kill_transaction (&eXosip.j_osip->osip_ict_transactions); - eXosip_kill_transaction (&eXosip.j_osip->osip_nict_transactions); - eXosip_kill_transaction (&eXosip.j_osip->osip_ist_transactions); - eXosip_kill_transaction (&eXosip.j_osip->osip_nist_transactions); - osip_release (eXosip.j_osip); - - { - eXosip_event_t *ev; - - for (ev = osip_fifo_tryget (eXosip.j_events); ev != NULL; - ev = osip_fifo_tryget (eXosip.j_events)) - eXosip_event_free (ev); - } - - osip_fifo_free (eXosip.j_events); - - for (jauthinfo = eXosip.authinfos; jauthinfo != NULL; - jauthinfo = eXosip.authinfos) - { - REMOVE_ELEMENT (eXosip.authinfos, jauthinfo); - osip_free (jauthinfo); - } - - { - struct eXosip_http_auth *http_auth; - int pos; - - /* update entries with same call_id */ - for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) - { - http_auth = &eXosip.http_auths[pos]; - if (http_auth->pszCallId[0] == '\0') - continue; - osip_proxy_authenticate_free (http_auth->wa); - memset (http_auth, 0, sizeof (struct eXosip_http_auth)); - } - } + for (jpub = eXosip.j_pub; jpub != NULL; jpub = eXosip.j_pub) { + REMOVE_ELEMENT(eXosip.j_pub, jpub); + _eXosip_pub_free(jpub); + } +#endif + + while (!osip_list_eol(&eXosip.j_transactions, 0)) { + osip_transaction_t *tr = + (osip_transaction_t *) osip_list_get(&eXosip.j_transactions, 0); + if (tr->state == IST_TERMINATED || tr->state == ICT_TERMINATED + || tr->state == NICT_TERMINATED || tr->state == NIST_TERMINATED) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Release a terminated transaction\n")); + osip_list_remove(&eXosip.j_transactions, 0); + __eXosip_delete_jinfo(tr); + _eXosip_dnsutils_release(tr->naptr_record); + tr->naptr_record=NULL; + osip_transaction_free(tr); + } else { + osip_list_remove(&eXosip.j_transactions, 0); + __eXosip_delete_jinfo(tr); + _eXosip_dnsutils_release(tr->naptr_record); + tr->naptr_record=NULL; + osip_transaction_free(tr); + } + } + + eXosip_kill_transaction(&eXosip.j_osip->osip_ict_transactions); + eXosip_kill_transaction(&eXosip.j_osip->osip_nict_transactions); + eXosip_kill_transaction(&eXosip.j_osip->osip_ist_transactions); + eXosip_kill_transaction(&eXosip.j_osip->osip_nist_transactions); + osip_release(eXosip.j_osip); + + { + eXosip_event_t *ev; + + for (ev = osip_fifo_tryget(eXosip.j_events); ev != NULL; + ev = osip_fifo_tryget(eXosip.j_events)) + eXosip_event_free(ev); + } + + osip_fifo_free(eXosip.j_events); + + for (jauthinfo = eXosip.authinfos; jauthinfo != NULL; + jauthinfo = eXosip.authinfos) { + REMOVE_ELEMENT(eXosip.authinfos, jauthinfo); + osip_free(jauthinfo); + } + + { + struct eXosip_http_auth *http_auth; + int pos; + + /* update entries with same call_id */ + for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) { + http_auth = &eXosip.http_auths[pos]; + if (http_auth->pszCallId[0] == '\0') + continue; + osip_proxy_authenticate_free(http_auth->wa); + memset(http_auth, 0, sizeof(struct eXosip_http_auth)); + } + } - eXtl_udp.tl_free (); - eXtl_tcp.tl_free (); + eXtl_udp.tl_free(); + eXtl_tcp.tl_free(); #ifdef HAVE_OPENSSL_SSL_H #if !(OPENSSL_VERSION_NUMBER < 0x00908000L) - eXtl_dtls.tl_free (); + eXtl_dtls.tl_free(); #endif - eXtl_tls.tl_free (); + eXtl_tls.tl_free(); #endif - memset (&eXosip, 0, sizeof (eXosip)); - eXosip.j_stop_ua = -1; - return; + memset(&eXosip, 0, sizeof(eXosip)); + eXosip.j_stop_ua = -1; + return; } -int -eXosip_set_socket (int transport, int socket, int port) +int eXosip_set_socket(int transport, int socket, int port) { - eXosip.eXtl = NULL; - if (transport == IPPROTO_UDP) - { - eXtl_udp.proto_port = port; - eXtl_udp.tl_set_socket (socket); - eXosip.eXtl = &eXtl_udp; - snprintf (eXosip.transport, sizeof (eXosip.transport), "%s", "UDP"); - } else if (transport == IPPROTO_TCP) - { - eXtl_tcp.proto_port = port; - eXtl_tcp.tl_set_socket (socket); - eXosip.eXtl = &eXtl_tcp; - snprintf (eXosip.transport, sizeof (eXosip.transport), "%s", "TCP"); - } else - return OSIP_BADPARAMETER; + eXosip.eXtl = NULL; + if (transport == IPPROTO_UDP) { + eXtl_udp.proto_port = port; + eXtl_udp.tl_set_socket(socket); + eXosip.eXtl = &eXtl_udp; + snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "UDP"); + } else if (transport == IPPROTO_TCP) { + eXtl_tcp.proto_port = port; + eXtl_tcp.tl_set_socket(socket); + eXosip.eXtl = &eXtl_tcp; + snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "TCP"); + } else + return OSIP_BADPARAMETER; #ifdef OSIP_MT - eXosip.j_thread = (void *) osip_thread_create (20000, _eXosip_thread, NULL); - if (eXosip.j_thread == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot start thread!\n")); - return OSIP_UNDEFINED_ERROR; - } + eXosip.j_thread = (void *) osip_thread_create(20000, _eXosip_thread, NULL); + if (eXosip.j_thread == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot start thread!\n")); + return OSIP_UNDEFINED_ERROR; + } #endif - return OSIP_SUCCESS; + return OSIP_SUCCESS; } #ifdef IPV6_V6ONLY -int -setsockopt_ipv6only (int sock) +int setsockopt_ipv6only(int sock) { - int on = 1; + int on = 1; - return setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &on, sizeof (on)); + return setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &on, sizeof(on)); } -#endif /* IPV6_V6ONLY */ +#endif /* IPV6_V6ONLY */ #ifndef MINISIZE -int -eXosip_find_free_port (int free_port, int transport) +int eXosip_find_free_port(int free_port, int transport) { - int res1; - int res2; - struct addrinfo *addrinfo_rtp = NULL; - struct addrinfo *curinfo_rtp; - struct addrinfo *addrinfo_rtcp = NULL; - struct addrinfo *curinfo_rtcp; - int sock; - int count; - - for (count = 0; count < 8; count++) - { - res1 = - eXosip_get_addrinfo (&addrinfo_rtp, "0.0.0.0", free_port + count * 2, - transport); - if (res1 != 0) - return res1; - res2 = - eXosip_get_addrinfo (&addrinfo_rtcp, "0.0.0.0", free_port + count * 2 + 1, - transport); - if (res2 != 0) - { - eXosip_freeaddrinfo (addrinfo_rtp); - return res2; - } - - sock = -1; - for (curinfo_rtp = addrinfo_rtp; curinfo_rtp; - curinfo_rtp = curinfo_rtp->ai_next) - { - if (curinfo_rtp->ai_protocol && curinfo_rtp->ai_protocol != transport) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "eXosip: Skipping protocol %d\n", - curinfo_rtp->ai_protocol)); - continue; - } - - sock = (int) socket (curinfo_rtp->ai_family, curinfo_rtp->ai_socktype, - curinfo_rtp->ai_protocol); - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot create socket!\n")); - continue; - } + int res1; + int res2; + struct addrinfo *addrinfo_rtp = NULL; + struct addrinfo *curinfo_rtp; + struct addrinfo *addrinfo_rtcp = NULL; + struct addrinfo *curinfo_rtcp; + int sock; + int count; + + for (count = 0; count < 8; count++) { + if (ipv6_enable == 0) + res1 = eXosip_get_addrinfo(&addrinfo_rtp, "0.0.0.0", free_port + count * 2, transport); + else + res1 = eXosip_get_addrinfo(&addrinfo_rtp, "::", free_port + count * 2, transport); + if (res1 != 0) + return res1; + if (ipv6_enable == 0) + res2 = eXosip_get_addrinfo(&addrinfo_rtcp, "0.0.0.0", free_port + count * 2 + 1, transport); + else + res2 = eXosip_get_addrinfo(&addrinfo_rtcp, "::", free_port + count * 2 + 1, transport); + if (res2 != 0) { + eXosip_freeaddrinfo(addrinfo_rtp); + return res2; + } + + sock = -1; + for (curinfo_rtp = addrinfo_rtp; curinfo_rtp; + curinfo_rtp = curinfo_rtp->ai_next) { + if (curinfo_rtp->ai_protocol && curinfo_rtp->ai_protocol != transport) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "eXosip: Skipping protocol %d\n", + curinfo_rtp->ai_protocol)); + continue; + } + + sock = (int) socket(curinfo_rtp->ai_family, curinfo_rtp->ai_socktype, + curinfo_rtp->ai_protocol); + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot create socket!\n")); + continue; + } - if (curinfo_rtp->ai_family == AF_INET6) - { + if (curinfo_rtp->ai_family == AF_INET6) { #ifdef IPV6_V6ONLY - if (setsockopt_ipv6only (sock)) - { - close (sock); - sock = -1; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot set socket option!\n")); - continue; - } -#endif /* IPV6_V6ONLY */ - } - - res1 = bind (sock, curinfo_rtp->ai_addr, curinfo_rtp->ai_addrlen); - if (res1 < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, NULL, - "eXosip: Cannot bind socket node: 0.0.0.0 family:%d\n", - curinfo_rtp->ai_family)); - close (sock); - sock = -1; - continue; - } - break; - } - - eXosip_freeaddrinfo (addrinfo_rtp); - - if (sock == -1) - { - eXosip_freeaddrinfo (addrinfo_rtcp); - continue; - } - - close (sock); - sock = -1; - for (curinfo_rtcp = addrinfo_rtcp; curinfo_rtcp; - curinfo_rtcp = curinfo_rtcp->ai_next) - { - if (curinfo_rtcp->ai_protocol && curinfo_rtcp->ai_protocol != transport) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "eXosip: Skipping protocol %d\n", - curinfo_rtcp->ai_protocol)); - continue; - } - - sock = (int) socket (curinfo_rtcp->ai_family, curinfo_rtcp->ai_socktype, - curinfo_rtcp->ai_protocol); - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot create socket!\n")); - continue; - } + if (setsockopt_ipv6only(sock)) { + close(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot set socket option!\n")); + continue; + } +#endif /* IPV6_V6ONLY */ + } + + res1 = bind(sock, curinfo_rtp->ai_addr, curinfo_rtp->ai_addrlen); + if (res1 < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, NULL, + "eXosip: Cannot bind socket node: 0.0.0.0 family:%d\n", + curinfo_rtp->ai_family)); + close(sock); + sock = -1; + continue; + } + break; + } + + eXosip_freeaddrinfo(addrinfo_rtp); + + if (sock == -1) { + eXosip_freeaddrinfo(addrinfo_rtcp); + continue; + } + + close(sock); + sock = -1; + for (curinfo_rtcp = addrinfo_rtcp; curinfo_rtcp; + curinfo_rtcp = curinfo_rtcp->ai_next) { + if (curinfo_rtcp->ai_protocol + && curinfo_rtcp->ai_protocol != transport) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "eXosip: Skipping protocol %d\n", + curinfo_rtcp->ai_protocol)); + continue; + } + + sock = (int) socket(curinfo_rtcp->ai_family, curinfo_rtcp->ai_socktype, + curinfo_rtcp->ai_protocol); + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot create socket!\n")); + continue; + } - if (curinfo_rtcp->ai_family == AF_INET6) - { + if (curinfo_rtcp->ai_family == AF_INET6) { #ifdef IPV6_V6ONLY - if (setsockopt_ipv6only (sock)) - { - close (sock); - sock = -1; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot set socket option!\n")); - continue; - } -#endif /* IPV6_V6ONLY */ - } - - res1 = bind (sock, curinfo_rtcp->ai_addr, curinfo_rtcp->ai_addrlen); - if (res1 < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, NULL, - "eXosip: Cannot bind socket node: 0.0.0.0 family:%d\n", - curinfo_rtp->ai_family)); - close (sock); - sock = -1; - continue; - } - break; - } - - eXosip_freeaddrinfo (addrinfo_rtcp); - - /* the pair must be free */ - if (sock == -1) - continue; - - close (sock); - sock = -1; - return free_port + count * 2; - } - - /* just get a free port */ - res1 = eXosip_get_addrinfo (&addrinfo_rtp, "0.0.0.0", 0, transport); - if (res1) - return res1; - - sock = -1; - for (curinfo_rtp = addrinfo_rtp; curinfo_rtp; curinfo_rtp = curinfo_rtp->ai_next) - { - socklen_t len; - struct sockaddr_storage ai_addr; - - if (curinfo_rtp->ai_protocol && curinfo_rtp->ai_protocol != transport) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "eXosip: Skipping protocol %d\n", - curinfo_rtp->ai_protocol)); - continue; - } - - sock = (int) socket (curinfo_rtp->ai_family, curinfo_rtp->ai_socktype, - curinfo_rtp->ai_protocol); - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot create socket!\n")); - continue; - } + if (setsockopt_ipv6only(sock)) { + close(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot set socket option!\n")); + continue; + } +#endif /* IPV6_V6ONLY */ + } + + res1 = bind(sock, curinfo_rtcp->ai_addr, curinfo_rtcp->ai_addrlen); + if (res1 < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, NULL, + "eXosip: Cannot bind socket node: 0.0.0.0 family:%d\n", + curinfo_rtp->ai_family)); + close(sock); + sock = -1; + continue; + } + break; + } + + eXosip_freeaddrinfo(addrinfo_rtcp); + + /* the pair must be free */ + if (sock == -1) + continue; + + close(sock); + sock = -1; + return free_port + count * 2; + } + + /* just get a free port */ + if (ipv6_enable == 0) + res1 = eXosip_get_addrinfo(&addrinfo_rtp, "0.0.0.0", 0, transport); + else + res1 = eXosip_get_addrinfo(&addrinfo_rtp, "::", 0, transport); + + if (res1) + return res1; + + sock = -1; + for (curinfo_rtp = addrinfo_rtp; curinfo_rtp; + curinfo_rtp = curinfo_rtp->ai_next) { + socklen_t len; + struct sockaddr_storage ai_addr; + + if (curinfo_rtp->ai_protocol && curinfo_rtp->ai_protocol != transport) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "eXosip: Skipping protocol %d\n", + curinfo_rtp->ai_protocol)); + continue; + } + + sock = (int) socket(curinfo_rtp->ai_family, curinfo_rtp->ai_socktype, + curinfo_rtp->ai_protocol); + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot create socket!\n")); + continue; + } - if (curinfo_rtp->ai_family == AF_INET6) - { + if (curinfo_rtp->ai_family == AF_INET6) { #ifdef IPV6_V6ONLY - if (setsockopt_ipv6only (sock)) - { - close (sock); - sock = -1; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot set socket option!\n")); - continue; - } -#endif /* IPV6_V6ONLY */ - } - - res1 = bind (sock, curinfo_rtp->ai_addr, curinfo_rtp->ai_addrlen); - if (res1 < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, NULL, - "eXosip: Cannot bind socket node: 0.0.0.0 family:%d\n", - curinfo_rtp->ai_family)); - close (sock); - sock = -1; - continue; - } - - len = sizeof (ai_addr); - res1 = getsockname (sock, (struct sockaddr *) &ai_addr, &len); - if (res1 != 0) - { - close (sock); - sock = -1; - continue; - } - - close (sock); - sock = -1; - eXosip_freeaddrinfo (addrinfo_rtp); - - if (ipv6_enable == 0) - return ntohs (((struct sockaddr_in *) &ai_addr)->sin_port); - else - return ntohs (((struct sockaddr_in6 *) &ai_addr)->sin6_port); - } - - eXosip_freeaddrinfo (addrinfo_rtp); - - if (sock != -1) - { - close (sock); - sock = -1; - } + if (setsockopt_ipv6only(sock)) { + close(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot set socket option!\n")); + continue; + } +#endif /* IPV6_V6ONLY */ + } + + res1 = bind(sock, curinfo_rtp->ai_addr, curinfo_rtp->ai_addrlen); + if (res1 < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, NULL, + "eXosip: Cannot bind socket node: 0.0.0.0 family:%d\n", + curinfo_rtp->ai_family)); + close(sock); + sock = -1; + continue; + } + + len = sizeof(ai_addr); + res1 = getsockname(sock, (struct sockaddr *) &ai_addr, &len); + if (res1 != 0) { + close(sock); + sock = -1; + continue; + } + + close(sock); + sock = -1; + eXosip_freeaddrinfo(addrinfo_rtp); + + if (curinfo_rtp->ai_family == AF_INET) + return ntohs(((struct sockaddr_in *) &ai_addr)->sin_port); + else + return ntohs(((struct sockaddr_in6 *) &ai_addr)->sin6_port); + } + + eXosip_freeaddrinfo(addrinfo_rtp); + + if (sock != -1) { + close(sock); + sock = -1; + } - return OSIP_UNDEFINED_ERROR; + return OSIP_UNDEFINED_ERROR; } #endif int -eXosip_listen_addr (int transport, const char *addr, int port, int family, - int secure) +eXosip_listen_addr(int transport, const char *addr, int port, int family, + int secure) { - int i = -1; - struct eXtl_protocol *eXtl = NULL; + int i = -1; + struct eXtl_protocol *eXtl = NULL; - if (eXosip.eXtl != NULL) - { - /* already set */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: already listening somewhere\n")); - return OSIP_WRONG_STATE; - } - - if (transport == IPPROTO_UDP && secure == 0) - eXtl = &eXtl_udp; - else if (transport == IPPROTO_TCP && secure == 0) - eXtl = &eXtl_tcp; + if (eXosip.eXtl != NULL) { + /* already set */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: already listening somewhere\n")); + return OSIP_WRONG_STATE; + } + + if (transport == IPPROTO_UDP && secure == 0) + eXtl = &eXtl_udp; + else if (transport == IPPROTO_TCP && secure == 0) + eXtl = &eXtl_tcp; #ifdef HAVE_OPENSSL_SSL_H #if !(OPENSSL_VERSION_NUMBER < 0x00908000L) - else if (transport == IPPROTO_UDP) - eXtl = &eXtl_dtls; + else if (transport == IPPROTO_UDP) + eXtl = &eXtl_dtls; #endif - else if (transport == IPPROTO_TCP) - eXtl = &eXtl_tls; + else if (transport == IPPROTO_TCP) + eXtl = &eXtl_tls; #endif - if (eXtl == NULL) - return OSIP_BADPARAMETER; + if (eXtl == NULL) + return OSIP_BADPARAMETER; - eXtl->proto_family = family; - eXtl->proto_port = port; - if (addr != NULL) - snprintf (eXtl->proto_ifs, sizeof (eXtl->proto_ifs), "%s", addr); + eXtl->proto_family = family; + eXtl->proto_port = port; + if (addr != NULL) + snprintf(eXtl->proto_ifs, sizeof(eXtl->proto_ifs), "%s", addr); #ifdef AF_INET6 - if (family == AF_INET6 && !addr) - snprintf (eXtl->proto_ifs, sizeof (eXtl->proto_ifs), "::0"); + if (family == AF_INET6 && !addr) + snprintf(eXtl->proto_ifs, sizeof(eXtl->proto_ifs), "::0"); #endif - i = eXtl->tl_open (); + i = eXtl->tl_open(); - if (i != 0) - return i; + if (i != 0) + return i; - eXosip.eXtl = eXtl; + eXosip.eXtl = eXtl; - if (transport == IPPROTO_UDP && secure == 0) - snprintf (eXosip.transport, sizeof (eXosip.transport), "%s", "UDP"); - else if (transport == IPPROTO_TCP && secure == 0) - snprintf (eXosip.transport, sizeof (eXosip.transport), "%s", "TCP"); - else if (transport == IPPROTO_UDP) - snprintf (eXosip.transport, sizeof (eXosip.transport), "%s", "DTLS-UDP"); - else if (transport == IPPROTO_TCP) - snprintf (eXosip.transport, sizeof (eXosip.transport), "%s", "TLS"); + if (transport == IPPROTO_UDP && secure == 0) + snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "UDP"); + else if (transport == IPPROTO_TCP && secure == 0) + snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "TCP"); + else if (transport == IPPROTO_UDP) + snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "DTLS-UDP"); + else if (transport == IPPROTO_TCP) + snprintf(eXosip.transport, sizeof(eXosip.transport), "%s", "TLS"); #ifdef OSIP_MT - if (eXosip.j_thread == NULL) - { - eXosip.j_thread = (void *) osip_thread_create (20000, _eXosip_thread, NULL); - if (eXosip.j_thread == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot start thread!\n")); - return OSIP_UNDEFINED_ERROR; - } - } + if (eXosip.j_thread == NULL) { + eXosip.j_thread = (void *) osip_thread_create(20000, _eXosip_thread, NULL); + if (eXosip.j_thread == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot start thread!\n")); + return OSIP_UNDEFINED_ERROR; + } + } #endif - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_init (void) +int eXosip_init(void) { - osip_t *osip; - int i; + osip_t *osip; + int i; - memset (&eXosip, 0, sizeof (eXosip)); + memset(&eXosip, 0, sizeof(eXosip)); - snprintf (eXosip.ipv4_for_gateway, 256, "%s", "217.12.3.11"); - snprintf (eXosip.ipv6_for_gateway, 256, "%s", - "2001:638:500:101:2e0:81ff:fe24:37c6"); + eXosip.dscp = 0x1A; + + snprintf(eXosip.ipv4_for_gateway, 256, "%s", "217.12.3.11"); + snprintf(eXosip.ipv6_for_gateway, 256, "%s", + "2001:638:500:101:2e0:81ff:fe24:37c6"); #ifndef MINISIZE - snprintf (eXosip.event_package, 256, "%s", "dialog"); + snprintf(eXosip.event_package, 256, "%s", "dialog"); #endif #ifdef WIN32 - /* Initializing windows socket library */ - { - WORD wVersionRequested; - WSADATA wsaData; - - wVersionRequested = MAKEWORD (1, 1); - i = WSAStartup (wVersionRequested, &wsaData); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, NULL, - "eXosip: Unable to initialize WINSOCK, reason: %d\n", i)); - /* return -1; It might be already initilized?? */ - } - } -#endif - - eXosip.user_agent = osip_strdup ("eXosip/" EXOSIP_VERSION); - if (eXosip.user_agent == NULL) - return OSIP_NOMEM; + /* Initializing windows socket library */ + { + WORD wVersionRequested; + WSADATA wsaData; + + wVersionRequested = MAKEWORD(1, 1); + i = WSAStartup(wVersionRequested, &wsaData); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, NULL, + "eXosip: Unable to initialize WINSOCK, reason: %d\n", i)); + /* return -1; It might be already initilized?? */ + } + } +#endif + + eXosip.user_agent = osip_strdup("eXosip/" EXOSIP_VERSION); + if (eXosip.user_agent == NULL) + return OSIP_NOMEM; - eXosip.j_calls = NULL; - eXosip.j_stop_ua = 0; + eXosip.j_calls = NULL; + eXosip.j_stop_ua = 0; #ifdef OSIP_MT - eXosip.j_thread = NULL; + eXosip.j_thread = NULL; #endif - i = osip_list_init (&eXosip.j_transactions); - eXosip.j_reg = NULL; + i = osip_list_init(&eXosip.j_transactions); + eXosip.j_reg = NULL; #ifdef OSIP_MT #if !defined (_WIN32_WCE) - eXosip.j_cond = (struct osip_cond *) osip_cond_init (); - if (eXosip.j_cond == NULL) - { - osip_free (eXosip.user_agent); - eXosip.user_agent = NULL; - return OSIP_NOMEM; - } + eXosip.j_cond = (struct osip_cond *) osip_cond_init(); + if (eXosip.j_cond == NULL) { + osip_free(eXosip.user_agent); + eXosip.user_agent = NULL; + return OSIP_NOMEM; + } #endif - eXosip.j_mutexlock = (struct osip_mutex *) osip_mutex_init (); - if (eXosip.j_mutexlock == NULL) - { - osip_free (eXosip.user_agent); - eXosip.user_agent = NULL; + eXosip.j_mutexlock = (struct osip_mutex *) osip_mutex_init(); + if (eXosip.j_mutexlock == NULL) { + osip_free(eXosip.user_agent); + eXosip.user_agent = NULL; #if !defined (_WIN32_WCE) - osip_cond_destroy ((struct osip_cond *) eXosip.j_cond); - eXosip.j_cond = NULL; + osip_cond_destroy((struct osip_cond *) eXosip.j_cond); + eXosip.j_cond = NULL; #endif - return OSIP_NOMEM; - } + return OSIP_NOMEM; + } #endif - i = osip_init (&osip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot initialize osip!\n")); - return i; - } + i = osip_init(&osip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot initialize osip!\n")); + return i; + } - osip_set_application_context (osip, &eXosip); + osip_set_application_context(osip, &eXosip); - eXosip_set_callbacks (osip); + eXosip_set_callbacks(osip); - eXosip.j_osip = osip; + eXosip.j_osip = osip; #ifdef OSIP_MT - /* open a TCP socket to wake up the application when needed. */ - eXosip.j_socketctl = jpipe (); - if (eXosip.j_socketctl == NULL) - return OSIP_UNDEFINED_ERROR; - - eXosip.j_socketctl_event = jpipe (); - if (eXosip.j_socketctl_event == NULL) - return OSIP_UNDEFINED_ERROR; -#endif - - /* To be changed in osip! */ - eXosip.j_events = (osip_fifo_t *) osip_malloc (sizeof (osip_fifo_t)); - if (eXosip.j_events == NULL) - return OSIP_NOMEM; - osip_fifo_init (eXosip.j_events); - - eXosip.use_rport = 1; - eXosip.use_naptr = 1; - eXosip.keep_alive = 17000; + /* open a TCP socket to wake up the application when needed. */ + eXosip.j_socketctl = jpipe(); + if (eXosip.j_socketctl == NULL) + return OSIP_UNDEFINED_ERROR; + + eXosip.j_socketctl_event = jpipe(); + if (eXosip.j_socketctl_event == NULL) + return OSIP_UNDEFINED_ERROR; +#endif + + /* To be changed in osip! */ + eXosip.j_events = (osip_fifo_t *) osip_malloc(sizeof(osip_fifo_t)); + if (eXosip.j_events == NULL) + return OSIP_NOMEM; + osip_fifo_init(eXosip.j_events); + + eXosip.use_rport = 1; + eXosip.dns_capabilities = 2; + eXosip.keep_alive = 17000; + eXosip.keep_alive_options = 0; - eXtl_udp.tl_init (); - eXtl_tcp.tl_init (); + eXtl_udp.tl_init(); + eXtl_tcp.tl_init(); #ifdef HAVE_OPENSSL_SSL_H #if !(OPENSSL_VERSION_NUMBER < 0x00908000L) - eXtl_dtls.tl_init (); + eXtl_dtls.tl_init(); #endif - eXtl_tls.tl_init (); + eXtl_tls.tl_init(); #endif - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_execute (void) +int eXosip_execute(void) { - struct timeval lower_tv; - int i; + struct timeval lower_tv; + int i; #ifdef OSIP_MT - osip_timers_gettimeout (eXosip.j_osip, &lower_tv); - if (lower_tv.tv_sec > 10) - { - lower_tv.tv_sec = 10; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Reseting timer to 10s before waking up!\n")); - } else - { - /* add a small amount of time on windows to avoid - waking up too early. (probably a bad time precision) */ - if (lower_tv.tv_usec < 900000) - lower_tv.tv_usec = 100000; /* add 10ms */ - else - { - lower_tv.tv_usec = 10000; /* add 10ms */ - lower_tv.tv_sec++; - } - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: timer sec:%i usec:%i!\n", - lower_tv.tv_sec, lower_tv.tv_usec)); - } + osip_timers_gettimeout(eXosip.j_osip, &lower_tv); + if (lower_tv.tv_sec > 10) { + eXosip_reg_t *jr; + time_t now; + now = time(NULL); + + lower_tv.tv_sec = 10; + + eXosip_lock(); + for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) { + if (jr->r_id >= 1 && jr->r_last_tr != NULL) { + if (jr->r_reg_period == 0) { + /* skip refresh! */ + } else if (now - jr->r_last_tr->birth_time > jr->r_reg_period - (jr->r_reg_period/10)) { + /* automatic refresh at "timeout - 10%" */ + lower_tv.tv_sec = 1; + } + } + } + eXosip_unlock(); + + if (lower_tv.tv_sec==1) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: Reseting timer to 1s before waking up!\n")); + } + else + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: Reseting timer to 10s before waking up!\n")); + } + } else { + /* add a small amount of time on windows to avoid + waking up too early. (probably a bad time precision) */ + if (lower_tv.tv_usec < 990000) + lower_tv.tv_usec += 10000; /* add 10ms */ + else { + lower_tv.tv_usec = 10000; /* add 10ms */ + lower_tv.tv_sec++; + } + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: timer sec:%i usec:%i!\n", + lower_tv.tv_sec, lower_tv.tv_usec)); + } #else - lower_tv.tv_sec = 0; - lower_tv.tv_usec = 0; + lower_tv.tv_sec = 0; + lower_tv.tv_usec = 0; #endif - i = eXosip_read_message (1, lower_tv.tv_sec, lower_tv.tv_usec); + i = eXosip_read_message(1, lower_tv.tv_sec, lower_tv.tv_usec); - if (i == -2000) - { - return -2000; - } - - eXosip_lock (); - osip_timers_ict_execute (eXosip.j_osip); - osip_timers_nict_execute (eXosip.j_osip); - osip_timers_ist_execute (eXosip.j_osip); - osip_timers_nist_execute (eXosip.j_osip); - - osip_nist_execute (eXosip.j_osip); - osip_nict_execute (eXosip.j_osip); - osip_ist_execute (eXosip.j_osip); - osip_ict_execute (eXosip.j_osip); - - /* free all Calls that are in the TERMINATED STATE? */ - eXosip_release_terminated_calls (); - eXosip_release_terminated_registrations (); - eXosip_release_terminated_publications (); + if (i == -2000) { + return -2000; + } + + eXosip_lock(); + osip_timers_ict_execute(eXosip.j_osip); + osip_timers_nict_execute(eXosip.j_osip); + osip_timers_ist_execute(eXosip.j_osip); + osip_timers_nist_execute(eXosip.j_osip); + + osip_nist_execute(eXosip.j_osip); + osip_nict_execute(eXosip.j_osip); + osip_ist_execute(eXosip.j_osip); + osip_ict_execute(eXosip.j_osip); + + /* free all Calls that are in the TERMINATED STATE? */ + eXosip_release_terminated_calls(); + eXosip_release_terminated_registrations(); + eXosip_release_terminated_publications(); #ifndef MINISIZE - eXosip_release_terminated_subscriptions (); - eXosip_release_terminated_in_subscriptions (); + eXosip_release_terminated_subscriptions(); + eXosip_release_terminated_in_subscriptions(); #endif - eXosip_unlock (); + eXosip_unlock(); + _eXosip_keep_alive(); - if (eXosip.keep_alive > 0) - { - _eXosip_keep_alive (); - } - - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_set_option (eXosip_option opt, const void *value) +int eXosip_set_option(int opt, const void *value) { - int val; - char *tmp; + int val; + char *tmp; - switch (opt) - { - case EXOSIP_OPT_ADD_ACCOUNT_INFO: - { - struct eXosip_account_info *ainfo; - int i; - ainfo = (struct eXosip_account_info *) value; - if (ainfo == NULL || ainfo->proxy[0] == '\0') - { - return OSIP_BADPARAMETER; - } - for (i = 0; i < MAX_EXOSIP_ACCOUNT_INFO; i++) - { - if (eXosip.account_entries[i].proxy[0] != '\0' - && 0 == osip_strcasecmp (eXosip.account_entries[i].proxy, - ainfo->proxy)) - { - /* update ainfo */ - if (ainfo->nat_ip[0] != '\0') - { - snprintf (eXosip.account_entries[i].nat_ip, - sizeof (eXosip.account_entries[i].nat_ip), "%s", - ainfo->nat_ip); - eXosip.account_entries[i].nat_port = ainfo->nat_port; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: account info updated:%s -> %s:%i\n", - ainfo->proxy, ainfo->nat_ip, ainfo->nat_port)); - } else - { - eXosip.account_entries[i].proxy[0] = '\0'; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip option set: account info deleted :%s\n", - ainfo->proxy)); - } - return OSIP_SUCCESS; - } - } - if (ainfo->nat_ip[0] == '\0') - { - return OSIP_BADPARAMETER; - } - /* not found case: */ - for (i = 0; i < MAX_EXOSIP_ACCOUNT_INFO; i++) - { - if (eXosip.account_entries[i].proxy[0] == '\0') - { - /* add ainfo */ - snprintf (eXosip.account_entries[i].proxy, sizeof (ainfo->proxy), - "%s", ainfo->proxy); - snprintf (eXosip.account_entries[i].nat_ip, - sizeof (ainfo->nat_ip), "%s", ainfo->nat_ip); - eXosip.account_entries[i].nat_port = ainfo->nat_port; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: account info added:%s -> %s:%i\n", - ainfo->proxy, ainfo->nat_ip, ainfo->nat_port)); - return OSIP_SUCCESS; - } - } - return OSIP_UNDEFINED_ERROR; - } - break; - case EXOSIP_OPT_ADD_DNS_CACHE: - { - struct eXosip_dns_cache *entry; - int i; - entry = (struct eXosip_dns_cache *) value; - if (entry == NULL || entry->host[0] == '\0') - { - return OSIP_BADPARAMETER; - } - for (i = 0; i < MAX_EXOSIP_DNS_ENTRY; i++) - { - if (eXosip.dns_entries[i].host[0] != '\0' - && 0 == osip_strcasecmp (eXosip.dns_entries[i].host, - entry->host)) - { - /* update entry */ - if (entry->ip[0] != '\0') - { - snprintf (eXosip.dns_entries[i].ip, - sizeof (eXosip.dns_entries[i].ip), "%s", - entry->ip); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: dns cache updated:%s -> %s\n", - entry->host, entry->ip)); - } else - { - eXosip.dns_entries[i].host[0] = '\0'; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip option set: dns cache deleted :%s\n", - entry->host)); - } - return OSIP_SUCCESS; - } - } - if (entry->ip[0] == '\0') - { - return OSIP_BADPARAMETER; - } - /* not found case: */ - for (i = 0; i < MAX_EXOSIP_DNS_ENTRY; i++) - { - if (eXosip.dns_entries[i].host[0] == '\0') - { - /* add entry */ - snprintf (eXosip.dns_entries[i].host, sizeof (entry->host), "%s", - entry->host); - snprintf (eXosip.dns_entries[i].ip, sizeof (entry->ip), "%s", - entry->ip); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip option set: dns cache added:%s -> %s\n", - entry->host, entry->ip)); - return OSIP_SUCCESS; - } - } - return OSIP_UNDEFINED_ERROR; - } - break; - case EXOSIP_OPT_UDP_KEEP_ALIVE: - val = *((int *) value); - eXosip.keep_alive = val; /* value in ms */ - break; - case EXOSIP_OPT_UDP_LEARN_PORT: - val = *((int *) value); - eXosip.learn_port = val; /* 1 to learn port */ - break; + switch (opt) { + case EXOSIP_OPT_ADD_ACCOUNT_INFO: + { + struct eXosip_account_info *ainfo; + int i; + ainfo = (struct eXosip_account_info *) value; + if (ainfo == NULL || ainfo->proxy[0] == '\0') { + return OSIP_BADPARAMETER; + } + for (i = 0; i < MAX_EXOSIP_ACCOUNT_INFO; i++) { + if (eXosip.account_entries[i].proxy[0] != '\0' + && 0 == osip_strcasecmp(eXosip.account_entries[i].proxy, + ainfo->proxy)) { + /* update ainfo */ + if (ainfo->nat_ip[0] != '\0') { + snprintf(eXosip.account_entries[i].nat_ip, + sizeof(eXosip.account_entries[i].nat_ip), "%s", + ainfo->nat_ip); + eXosip.account_entries[i].nat_port = ainfo->nat_port; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: account info updated:%s -> %s:%i\n", + ainfo->proxy, ainfo->nat_ip, ainfo->nat_port)); + } else { + eXosip.account_entries[i].proxy[0] = '\0'; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip option set: account info deleted :%s\n", + ainfo->proxy)); + } + return OSIP_SUCCESS; + } + } + if (ainfo->nat_ip[0] == '\0') { + return OSIP_BADPARAMETER; + } + /* not found case: */ + for (i = 0; i < MAX_EXOSIP_ACCOUNT_INFO; i++) { + if (eXosip.account_entries[i].proxy[0] == '\0') { + /* add ainfo */ + snprintf(eXosip.account_entries[i].proxy, sizeof(ainfo->proxy), + "%s", ainfo->proxy); + snprintf(eXosip.account_entries[i].nat_ip, + sizeof(ainfo->nat_ip), "%s", ainfo->nat_ip); + eXosip.account_entries[i].nat_port = ainfo->nat_port; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: account info added:%s -> %s:%i\n", + ainfo->proxy, ainfo->nat_ip, ainfo->nat_port)); + return OSIP_SUCCESS; + } + } + return OSIP_UNDEFINED_ERROR; + } + break; + case EXOSIP_OPT_ADD_DNS_CACHE: + { + struct eXosip_dns_cache *entry; + int i; + entry = (struct eXosip_dns_cache *) value; + if (entry == NULL || entry->host[0] == '\0') { + return OSIP_BADPARAMETER; + } + for (i = 0; i < MAX_EXOSIP_DNS_ENTRY; i++) { + if (eXosip.dns_entries[i].host[0] != '\0' + && 0 == osip_strcasecmp(eXosip.dns_entries[i].host, + entry->host)) { + /* update entry */ + if (entry->ip[0] != '\0') { + snprintf(eXosip.dns_entries[i].ip, + sizeof(eXosip.dns_entries[i].ip), "%s", + entry->ip); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: dns cache updated:%s -> %s\n", + entry->host, entry->ip)); + } else { + /* return previously added cache */ + snprintf(entry->ip, sizeof(entry->ip), "%s", eXosip.dns_entries[i].ip); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip option set: dns cache returned:%s ->%s\n", + entry->host, entry->ip)); + } + return OSIP_SUCCESS; + } + } + if (entry->ip[0] == '\0') { + char ipbuf[INET6_ADDRSTRLEN]; + struct __eXosip_sockaddr addr; + struct addrinfo *addrinfo; + + /* create the A record */ + i = eXosip_get_addrinfo(&addrinfo, entry->host, 0, IPPROTO_UDP); + if (i!=0) + return OSIP_BADPARAMETER; + + memcpy(&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); + + eXosip_freeaddrinfo(addrinfo); + switch (((struct sockaddr *) &addr)->sa_family) { + case AF_INET: + inet_ntop(((struct sockaddr *) &addr)->sa_family, + &(((struct sockaddr_in *) &addr)->sin_addr), ipbuf, + sizeof(ipbuf)); + break; + case AF_INET6: + inet_ntop(((struct sockaddr *) &addr)->sa_family, + &(((struct sockaddr_in6 *) &addr)->sin6_addr), ipbuf, + sizeof(ipbuf)); + break; + default: + return OSIP_BADPARAMETER; + } + + if (osip_strcasecmp(ipbuf, entry->host)==0) + return OSIP_SUCCESS; + snprintf(entry->ip, sizeof(entry->ip), "%s", ipbuf); + } + /* not found case: */ + for (i = 0; i < MAX_EXOSIP_DNS_ENTRY; i++) { + if (eXosip.dns_entries[i].host[0] == '\0') { + /* add entry */ + snprintf(eXosip.dns_entries[i].host, sizeof(entry->host), "%s", + entry->host); + snprintf(eXosip.dns_entries[i].ip, sizeof(entry->ip), "%s", + entry->ip); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip option set: dns cache added:%s -> %s\n", + entry->host, entry->ip)); + return OSIP_SUCCESS; + } + } + return OSIP_UNDEFINED_ERROR; + } + break; + case EXOSIP_OPT_DELETE_DNS_CACHE: + { + struct eXosip_dns_cache *entry; + int i; + entry = (struct eXosip_dns_cache *) value; + if (entry == NULL || entry->host[0] == '\0') { + return OSIP_BADPARAMETER; + } + for (i = 0; i < MAX_EXOSIP_DNS_ENTRY; i++) { + if (eXosip.dns_entries[i].host[0] != '\0' + && 0 == osip_strcasecmp(eXosip.dns_entries[i].host, + entry->host)) { + eXosip.dns_entries[i].host[0] = '\0'; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip option set: dns cache deleted :%s\n", + entry->host)); + return OSIP_SUCCESS; + } + } + return OSIP_UNDEFINED_ERROR; + } + break; + case EXOSIP_OPT_UDP_KEEP_ALIVE: + val = *((int *) value); + eXosip.keep_alive = val; /* value in ms */ + break; +#ifdef ENABLE_KEEP_ALIVE_OPTIONS_METHOD + case EXOSIP_OPT_KEEP_ALIVE_OPTIONS_METHOD: + val = *((int *) value); + eXosip.keep_alive_options = val; /* value 0 or 1 */ + break; +#endif + case EXOSIP_OPT_UDP_LEARN_PORT: + val = *((int *) value); + eXosip.learn_port = val; /* 1 to learn port */ + break; #ifndef MINISIZE - case EXOSIP_OPT_SET_HTTP_TUNNEL_PORT: - val = *((int *) value); - eXosip.http_port = val; /* value in ms */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: http_port:%i!\n", eXosip.http_port)); - break; - case EXOSIP_OPT_SET_HTTP_TUNNEL_PROXY: - tmp = (char *) value; - memset (eXosip.http_proxy, '\0', sizeof (eXosip.http_proxy)); - if (tmp != NULL && tmp[0] != '\0') - strncpy (eXosip.http_proxy, tmp, sizeof (eXosip.http_proxy)); /* value in proxy:port */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: http_proxy:%s!\n", eXosip.http_proxy)); - break; - case EXOSIP_OPT_SET_HTTP_OUTBOUND_PROXY: - tmp = (char *) value; - memset (eXosip.http_outbound_proxy, '\0', - sizeof (eXosip.http_outbound_proxy)); - if (tmp != NULL && tmp[0] != '\0') - strncpy (eXosip.http_outbound_proxy, tmp, sizeof (eXosip.http_outbound_proxy)); /* value in proxy:port */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: http_outbound_proxy:%s!\n", - eXosip.http_outbound_proxy)); - break; - - case EXOSIP_OPT_DONT_SEND_101: - val = *((int *) value); - eXosip.dontsend_101 = val; /* 0 to disable */ - break; -#endif - - case EXOSIP_OPT_USE_RPORT: - val = *((int *) value); - eXosip.use_rport = val; /* 0 to disable (for broken NAT only?) */ - break; - - case EXOSIP_OPT_SET_IPV4_FOR_GATEWAY: - tmp = (char *) value; - memset (eXosip.ipv4_for_gateway, '\0', sizeof (eXosip.ipv4_for_gateway)); - if (tmp != NULL && tmp[0] != '\0') - strncpy (eXosip.ipv4_for_gateway, tmp, sizeof (eXosip.ipv4_for_gateway)); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: ipv4_for_gateway:%s!\n", - eXosip.ipv4_for_gateway)); - break; + case EXOSIP_OPT_SET_HTTP_TUNNEL_PORT: + val = *((int *) value); + eXosip.http_port = val; /* value in ms */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: http_port:%i!\n", eXosip.http_port)); + break; + case EXOSIP_OPT_SET_HTTP_TUNNEL_PROXY: + tmp = (char *) value; + memset(eXosip.http_proxy, '\0', sizeof(eXosip.http_proxy)); + if (tmp != NULL && tmp[0] != '\0') + osip_strncpy(eXosip.http_proxy, tmp, sizeof(eXosip.http_proxy)-1); /* value in proxy:port */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: http_proxy:%s!\n", eXosip.http_proxy)); + break; + case EXOSIP_OPT_SET_HTTP_OUTBOUND_PROXY: + tmp = (char *) value; + memset(eXosip.http_outbound_proxy, '\0', + sizeof(eXosip.http_outbound_proxy)); + if (tmp != NULL && tmp[0] != '\0') + osip_strncpy(eXosip.http_outbound_proxy, tmp, sizeof(eXosip.http_outbound_proxy)-1); /* value in proxy:port */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: http_outbound_proxy:%s!\n", + eXosip.http_outbound_proxy)); + break; + + case EXOSIP_OPT_DONT_SEND_101: + val = *((int *) value); + eXosip.dontsend_101 = val; /* 0 to disable */ + break; +#endif + + case EXOSIP_OPT_USE_RPORT: + val = *((int *) value); + eXosip.use_rport = val; /* 0 to disable (for broken NAT only?) */ + break; + + case EXOSIP_OPT_SET_IPV4_FOR_GATEWAY: + tmp = (char *) value; + memset(eXosip.ipv4_for_gateway, '\0', sizeof(eXosip.ipv4_for_gateway)); + if (tmp != NULL && tmp[0] != '\0') + osip_strncpy(eXosip.ipv4_for_gateway, tmp, sizeof(eXosip.ipv4_for_gateway)-1); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: ipv4_for_gateway:%s!\n", + eXosip.ipv4_for_gateway)); + break; #ifndef MINISIZE - case EXOSIP_OPT_SET_IPV6_FOR_GATEWAY: - tmp = (char *) value; - memset (eXosip.ipv6_for_gateway, '\0', sizeof (eXosip.ipv6_for_gateway)); - if (tmp != NULL && tmp[0] != '\0') - strncpy (eXosip.ipv6_for_gateway, tmp, sizeof (eXosip.ipv6_for_gateway)); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: ipv6_for_gateway:%s!\n", - eXosip.ipv6_for_gateway)); - break; - case EXOSIP_OPT_EVENT_PACKAGE: - tmp = (char *) value; - memset (eXosip.event_package, '\0', sizeof (eXosip.event_package)); - if (tmp != NULL && tmp[0] != '\0') - strncpy (eXosip.event_package, tmp, sizeof (eXosip.event_package)); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: event_package:%s!\n", - eXosip.event_package)); - break; -#endif - case EXOSIP_OPT_SRV_WITH_NAPTR: - val = *((int *) value); - eXosip.use_naptr=val; - break; - default: - return OSIP_BADPARAMETER; - } - return OSIP_SUCCESS; + case EXOSIP_OPT_SET_IPV6_FOR_GATEWAY: + tmp = (char *) value; + memset(eXosip.ipv6_for_gateway, '\0', sizeof(eXosip.ipv6_for_gateway)); + if (tmp != NULL && tmp[0] != '\0') + osip_strncpy(eXosip.ipv6_for_gateway, tmp, sizeof(eXosip.ipv6_for_gateway)-1); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: ipv6_for_gateway:%s!\n", + eXosip.ipv6_for_gateway)); + break; + case EXOSIP_OPT_EVENT_PACKAGE: + tmp = (char *) value; + memset(eXosip.event_package, '\0', sizeof(eXosip.event_package)); + if (tmp != NULL && tmp[0] != '\0') + osip_strncpy(eXosip.event_package, tmp, sizeof(eXosip.event_package)-1); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: event_package:%s!\n", + eXosip.event_package)); + break; +#endif + case EXOSIP_OPT_DNS_CAPABILITIES: /*EXOSIP_OPT_SRV_WITH_NAPTR: */ + val = *((int *) value); + /* 0: A request, 1: SRV support, 2: NAPTR+SRV support */ + eXosip.dns_capabilities = val; + break; + case EXOSIP_OPT_SET_DSCP: + val = *((int *) value); + /* 0x1A by default */ + eXosip.dscp = val; + break; + default: + return OSIP_BADPARAMETER; + } + return OSIP_SUCCESS; } -static void -_eXosip_keep_alive (void) +static void _eXosip_keep_alive(void) { - static struct timeval mtimer = { 0, 0 }; + static struct timeval mtimer = { 0, 0 }; - struct timeval now; + struct timeval now; - osip_gettimeofday (&now, NULL); + osip_gettimeofday(&now, NULL); - if (mtimer.tv_sec == 0 && mtimer.tv_usec == 0) - { - /* first init */ - osip_gettimeofday (&mtimer, NULL); - add_gettimeofday (&mtimer, eXosip.keep_alive); - } + if (mtimer.tv_sec == 0 && mtimer.tv_usec == 0) { + /* first init */ + osip_gettimeofday(&mtimer, NULL); + add_gettimeofday(&mtimer, eXosip.keep_alive); + } - if (osip_timercmp (&now, &mtimer, <)) - { - return; /* not yet time */ - } + if (osip_timercmp(&now, &mtimer, <)) { + return; /* not yet time */ + } - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, NULL, - "keep alive: %i\n", now.tv_sec - mtimer.tv_sec)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "keep alive: %i\n", now.tv_sec - mtimer.tv_sec)); - /* reset timer */ - osip_gettimeofday (&mtimer, NULL); - add_gettimeofday (&mtimer, eXosip.keep_alive); + /* reset timer */ + osip_gettimeofday(&mtimer, NULL); + add_gettimeofday(&mtimer, eXosip.keep_alive); - eXtl_udp.tl_keepalive (); + eXtl_udp.tl_keepalive(); + eXtl_tcp.tl_keepalive(); +#ifdef HAVE_OPENSSL_SSL_H + eXtl_tls.tl_keepalive(); +#if !(OPENSSL_VERSION_NUMBER < 0x00908000L) + eXtl_dtls.tl_keepalive(); +#endif +#endif } #ifdef OSIP_MT -void * -_eXosip_thread (void *arg) +void *_eXosip_thread(void *arg) { - int i; + int i; - while (eXosip.j_stop_ua == 0) - { - i = eXosip_execute (); - if (i == -2000) - osip_thread_exit (); - } - osip_thread_exit (); - return NULL; + while (eXosip.j_stop_ua == 0) { + i = eXosip_execute(); + if (i == -2000) + osip_thread_exit(); + } + osip_thread_exit(); + return NULL; } #endif diff -Nru libexosip2-3.3.0/src/eXinsubscription_api.c libexosip2-3.6.0/src/eXinsubscription_api.c --- libexosip2-3.3.0/src/eXinsubscription_api.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXinsubscription_api.c 2011-09-27 23:56:28.000000000 +0000 @@ -29,733 +29,646 @@ extern eXosip_t eXosip; int -_eXosip_insubscription_transaction_find (int tid, eXosip_notify_t ** jn, - eXosip_dialog_t ** jd, - osip_transaction_t ** tr) +_eXosip_insubscription_transaction_find(int tid, eXosip_notify_t ** jn, + eXosip_dialog_t ** jd, + osip_transaction_t ** tr) { - for (*jn = eXosip.j_notifies; *jn != NULL; *jn = (*jn)->next) - { - if ((*jn)->n_inc_tr != NULL && (*jn)->n_inc_tr->transactionid == tid) - { - *tr = (*jn)->n_inc_tr; - *jd = (*jn)->n_dialogs; - return OSIP_SUCCESS; - } - if ((*jn)->n_out_tr != NULL && (*jn)->n_out_tr->transactionid == tid) - { - *tr = (*jn)->n_out_tr; - *jd = (*jn)->n_dialogs; - return OSIP_SUCCESS; - } - for (*jd = (*jn)->n_dialogs; *jd != NULL; *jd = (*jd)->next) - { - osip_transaction_t *transaction; - int pos = 0; - - while (!osip_list_eol ((*jd)->d_inc_trs, pos)) - { - transaction = - (osip_transaction_t *) osip_list_get ((*jd)->d_inc_trs, pos); - if (transaction != NULL && transaction->transactionid == tid) - { - *tr = transaction; - return OSIP_SUCCESS; - } - pos++; - } - - pos = 0; - while (!osip_list_eol ((*jd)->d_out_trs, pos)) - { - transaction = - (osip_transaction_t *) osip_list_get ((*jd)->d_out_trs, pos); - if (transaction != NULL && transaction->transactionid == tid) - { - *tr = transaction; - return OSIP_SUCCESS; - } - pos++; - } - } - } - *jd = NULL; - *jn = NULL; - return OSIP_NOTFOUND; + for (*jn = eXosip.j_notifies; *jn != NULL; *jn = (*jn)->next) { + if ((*jn)->n_inc_tr != NULL && (*jn)->n_inc_tr->transactionid == tid) { + *tr = (*jn)->n_inc_tr; + *jd = (*jn)->n_dialogs; + return OSIP_SUCCESS; + } + if ((*jn)->n_out_tr != NULL && (*jn)->n_out_tr->transactionid == tid) { + *tr = (*jn)->n_out_tr; + *jd = (*jn)->n_dialogs; + return OSIP_SUCCESS; + } + for (*jd = (*jn)->n_dialogs; *jd != NULL; *jd = (*jd)->next) { + osip_transaction_t *transaction; + int pos = 0; + + while (!osip_list_eol((*jd)->d_inc_trs, pos)) { + transaction = + (osip_transaction_t *) osip_list_get((*jd)->d_inc_trs, pos); + if (transaction != NULL && transaction->transactionid == tid) { + *tr = transaction; + return OSIP_SUCCESS; + } + pos++; + } + + pos = 0; + while (!osip_list_eol((*jd)->d_out_trs, pos)) { + transaction = + (osip_transaction_t *) osip_list_get((*jd)->d_out_trs, pos); + if (transaction != NULL && transaction->transactionid == tid) { + *tr = transaction; + return OSIP_SUCCESS; + } + pos++; + } + } + } + *jd = NULL; + *jn = NULL; + return OSIP_NOTFOUND; } -int -eXosip_insubscription_remove (int did) +int eXosip_insubscription_remove(int did) { - eXosip_dialog_t *jd = NULL; - eXosip_notify_t *jn = NULL; + eXosip_dialog_t *jd = NULL; + eXosip_notify_t *jn = NULL; - if (did <= 0) - return OSIP_BADPARAMETER; + if (did <= 0) + return OSIP_BADPARAMETER; - if (did > 0) - { - eXosip_notify_dialog_find (did, &jn, &jd); - } - if (jd == NULL || jn == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No incoming subscription here?\n")); - return OSIP_NOTFOUND; - } - REMOVE_ELEMENT (eXosip.j_notifies, jn); - eXosip_notify_free (jn); - return OSIP_SUCCESS; + if (did > 0) { + eXosip_notify_dialog_find(did, &jn, &jd); + } + if (jd == NULL || jn == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No incoming subscription here?\n")); + return OSIP_NOTFOUND; + } + REMOVE_ELEMENT(eXosip.j_notifies, jn); + eXosip_notify_free(jn); + return OSIP_SUCCESS; } int -eXosip_insubscription_build_answer (int tid, int status, osip_message_t ** answer) +eXosip_insubscription_build_answer(int tid, int status, osip_message_t ** answer) { - int i = -1; - eXosip_dialog_t *jd = NULL; - eXosip_notify_t *jn = NULL; - osip_transaction_t *tr = NULL; - - *answer = NULL; - - if (tid <= 0) - return OSIP_BADPARAMETER; - - if (tid > 0) - { - _eXosip_insubscription_transaction_find (tid, &jn, &jd, &tr); - } - if (tr == NULL || jd == NULL || jn == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No incoming subscription here?\n")); - return OSIP_NOTFOUND; - } - - if (status < 101 || status > 699) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: wrong status code (101d_dialog, status, - tr->orig_request); - else - i = _eXosip_build_response_default (answer, NULL, status, tr->orig_request); - - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: Could not create response for %s\n", - tr->orig_request->sip_method)); - return i; - } + int i = -1; + eXosip_dialog_t *jd = NULL; + eXosip_notify_t *jn = NULL; + osip_transaction_t *tr = NULL; + + *answer = NULL; + + if (tid <= 0) + return OSIP_BADPARAMETER; + + if (tid > 0) { + _eXosip_insubscription_transaction_find(tid, &jn, &jd, &tr); + } + if (tr == NULL || jd == NULL || jn == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No incoming subscription here?\n")); + return OSIP_NOTFOUND; + } + + if (status < 101 || status > 699) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: wrong status code (101d_dialog, status, + tr->orig_request); + + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: Could not create response for %s\n", + tr->orig_request->sip_method)); + return i; + } - if (status >= 200 && status <= 299) - _eXosip_notify_add_expires_in_2XX_for_subscribe (jn, *answer); + if (status >= 200 && status <= 299) + _eXosip_notify_add_expires_in_2XX_for_subscribe(jn, *answer); - if (status < 300) - i = complete_answer_that_establish_a_dialog (*answer, tr->orig_request); + if (status < 300) + i = complete_answer_that_establish_a_dialog(*answer, tr->orig_request); - return i; + return i; } -int -eXosip_insubscription_send_answer (int tid, int status, osip_message_t * answer) +int eXosip_insubscription_send_answer(int tid, int status, osip_message_t * answer) { - int i = -1; - eXosip_dialog_t *jd = NULL; - eXosip_notify_t *jn = NULL; - osip_transaction_t *tr = NULL; - osip_event_t *evt_answer; - - if (tid <= 0) - return OSIP_BADPARAMETER; - - if (tid > 0) - { - _eXosip_insubscription_transaction_find (tid, &jn, &jd, &tr); - } - if (jd == NULL || tr == NULL || tr->orig_request == NULL - || tr->orig_request->sip_method == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No incoming subscription here?\n")); - osip_message_free (answer); - return OSIP_NOTFOUND; - } - - if (answer == NULL) - { - if (0 == osip_strcasecmp (tr->orig_request->sip_method, "SUBSCRIBE")) - { - if (status >= 200 && status <= 299) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Wrong parameter?\n")); - return OSIP_BADPARAMETER; - } - } - } - - /* is the transaction already answered? */ - if (tr->state == NIST_COMPLETED || tr->state == NIST_TERMINATED) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: transaction already answered\n")); - osip_message_free (answer); - return OSIP_WRONG_STATE; - } - - if (answer == NULL) - { - if (0 == osip_strcasecmp (tr->orig_request->sip_method, "SUBSCRIBE")) - { - if (status < 200) - i = _eXosip_insubscription_answer_1xx (jn, jd, status); - else - i = _eXosip_insubscription_answer_3456xx (jn, jd, status); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot send response!\n")); - return i; - } - } else - { - /* TODO */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: a response must be given!\n")); - return OSIP_BADPARAMETER; - } - return OSIP_SUCCESS; - } else - { - i = 0; - } - - if (0 == osip_strcasecmp (tr->orig_request->sip_method, "SUBSCRIBE")) - { - if (MSG_IS_STATUS_1XX (answer)) - { - } else if (MSG_IS_STATUS_2XX (answer)) - { - eXosip_dialog_set_200ok (jd, answer); - osip_dialog_set_state (jd->d_dialog, DIALOG_CONFIRMED); - } else if (answer->status_code >= 300 && answer->status_code <= 699) - { - i = 0; - } else - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: wrong status code (101transactionid = tr->transactionid; - - osip_transaction_add_event (tr, evt_answer); - eXosip_update (); - __eXosip_wakeup (); - return OSIP_SUCCESS; + int i = -1; + eXosip_dialog_t *jd = NULL; + eXosip_notify_t *jn = NULL; + osip_transaction_t *tr = NULL; + osip_event_t *evt_answer; + + if (tid <= 0) + return OSIP_BADPARAMETER; + + if (tid > 0) { + _eXosip_insubscription_transaction_find(tid, &jn, &jd, &tr); + } + if (jd == NULL || tr == NULL || tr->orig_request == NULL + || tr->orig_request->sip_method == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No incoming subscription here?\n")); + osip_message_free(answer); + return OSIP_NOTFOUND; + } + + if (answer == NULL) { + if (0 == osip_strcasecmp(tr->orig_request->sip_method, "SUBSCRIBE")) { + if (status >= 200 && status <= 299) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Wrong parameter?\n")); + return OSIP_BADPARAMETER; + } + } + } + + /* is the transaction already answered? */ + if (tr->state == NIST_COMPLETED || tr->state == NIST_TERMINATED) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: transaction already answered\n")); + osip_message_free(answer); + return OSIP_WRONG_STATE; + } + + if (answer == NULL) { + if (0 == osip_strcasecmp(tr->orig_request->sip_method, "SUBSCRIBE")) { + if (status < 200) + i = _eXosip_insubscription_answer_1xx(jn, jd, status); + else + i = _eXosip_insubscription_answer_3456xx(jn, jd, status); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot send response!\n")); + return i; + } + } else { + /* TODO */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: a response must be given!\n")); + return OSIP_BADPARAMETER; + } + return OSIP_SUCCESS; + } else { + i = 0; + } + + if (0 == osip_strcasecmp(tr->orig_request->sip_method, "SUBSCRIBE")) { + if (MSG_IS_STATUS_1XX(answer)) { + } else if (MSG_IS_STATUS_2XX(answer)) { + eXosip_dialog_set_200ok(jd, answer); + osip_dialog_set_state(jd->d_dialog, DIALOG_CONFIRMED); + } else if (answer->status_code >= 300 && answer->status_code <= 699) { + i = 0; + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: wrong status code (101transactionid = tr->transactionid; + + osip_transaction_add_event(tr, evt_answer); + eXosip_update(); + __eXosip_wakeup(); + return OSIP_SUCCESS; } int -eXosip_insubscription_build_notify (int did, int subscription_status, - int subscription_reason, - osip_message_t ** request) +eXosip_insubscription_build_notify(int did, int subscription_status, + int subscription_reason, + osip_message_t ** request) { - eXosip_dialog_t *jd = NULL; - eXosip_notify_t *jn = NULL; + eXosip_dialog_t *jd = NULL; + eXosip_notify_t *jn = NULL; - char subscription_state[50]; - char *tmp; - time_t now = time (NULL); - - int i; - - *request = NULL; - - if (did <= 0) - return OSIP_BADPARAMETER; - - if (did > 0) - { - eXosip_notify_dialog_find (did, &jn, &jd); - } - if (jd == NULL || jn == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No incoming subscription here?\n")); - return OSIP_NOTFOUND; - } - - i = eXosip_insubscription_build_request (did, "NOTIFY", request); - if (i != 0) - { - return i; - } + char subscription_state[50]; + char *tmp; + time_t now = time(NULL); + + int i; + + *request = NULL; + + if (did <= 0) + return OSIP_BADPARAMETER; + + if (did > 0) { + eXosip_notify_dialog_find(did, &jn, &jd); + } + if (jd == NULL || jn == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No incoming subscription here?\n")); + return OSIP_NOTFOUND; + } + + i = eXosip_insubscription_build_request(did, "NOTIFY", request); + if (i != 0) { + return i; + } #ifndef SUPPORT_MSN - if (subscription_status == EXOSIP_SUBCRSTATE_PENDING) - osip_strncpy (subscription_state, "pending;expires=", 16); - else if (subscription_status == EXOSIP_SUBCRSTATE_ACTIVE) - osip_strncpy (subscription_state, "active;expires=", 15); - else if (subscription_status == EXOSIP_SUBCRSTATE_TERMINATED) - { - if (subscription_reason == DEACTIVATED) - osip_strncpy (subscription_state, "terminated;reason=deactivated", 29); - else if (subscription_reason == PROBATION) - osip_strncpy (subscription_state, "terminated;reason=probation", 27); - else if (subscription_reason == REJECTED) - osip_strncpy (subscription_state, "terminated;reason=rejected", 26); - else if (subscription_reason == TIMEOUT) - osip_strncpy (subscription_state, "terminated;reason=timeout", 25); - else if (subscription_reason == GIVEUP) - osip_strncpy (subscription_state, "terminated;reason=giveup", 24); - else if (subscription_reason == NORESOURCE) - osip_strncpy (subscription_state, "terminated;reason=noresource", 28); - else - osip_strncpy (subscription_state, "terminated;reason=noresource", 28); - } else - osip_strncpy (subscription_state, "pending;expires=", 16); - - tmp = subscription_state + strlen (subscription_state); - if (subscription_status != EXOSIP_SUBCRSTATE_TERMINATED) - sprintf (tmp, "%li", jn->n_ss_expires - now); - osip_message_set_header (*request, "Subscription-State", subscription_state); + if (subscription_status == EXOSIP_SUBCRSTATE_PENDING) + osip_strncpy(subscription_state, "pending;expires=", 16); + else if (subscription_status == EXOSIP_SUBCRSTATE_ACTIVE) + osip_strncpy(subscription_state, "active;expires=", 15); + else if (subscription_status == EXOSIP_SUBCRSTATE_TERMINATED) { + if (subscription_reason == DEACTIVATED) + osip_strncpy(subscription_state, "terminated;reason=deactivated", 29); + else if (subscription_reason == PROBATION) + osip_strncpy(subscription_state, "terminated;reason=probation", 27); + else if (subscription_reason == REJECTED) + osip_strncpy(subscription_state, "terminated;reason=rejected", 26); + else if (subscription_reason == TIMEOUT) + osip_strncpy(subscription_state, "terminated;reason=timeout", 25); + else if (subscription_reason == GIVEUP) + osip_strncpy(subscription_state, "terminated;reason=giveup", 24); + else if (subscription_reason == NORESOURCE) + osip_strncpy(subscription_state, "terminated;reason=noresource", 28); + else + osip_strncpy(subscription_state, "terminated;reason=noresource", 28); + } else + osip_strncpy(subscription_state, "pending;expires=", 16); + + tmp = subscription_state + strlen(subscription_state); + if (subscription_status != EXOSIP_SUBCRSTATE_TERMINATED) + snprintf(tmp, 50 - (tmp - subscription_state), "%li", jn->n_ss_expires - now); + osip_message_set_header(*request, "Subscription-State", subscription_state); #endif - return OSIP_SUCCESS; + return OSIP_SUCCESS; } int -eXosip_insubscription_build_request (int did, const char *method, - osip_message_t ** request) +eXosip_insubscription_build_request(int did, const char *method, + osip_message_t ** request) { - eXosip_dialog_t *jd = NULL; - eXosip_notify_t *jn = NULL; + eXosip_dialog_t *jd = NULL; + eXosip_notify_t *jn = NULL; - osip_transaction_t *transaction; - char *transport; - int i; - - *request = NULL; - if (method == NULL || method[0] == '\0') - return OSIP_BADPARAMETER; - - if (did <= 0) - return OSIP_BADPARAMETER; - - if (did > 0) - { - eXosip_notify_dialog_find (did, &jn, &jd); - } - if (jd == NULL || jn == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No incoming subscription here?\n")); - return OSIP_NOTFOUND; - } - - transaction = NULL; - transaction = eXosip_find_last_out_notify (jn, jd); - if (transaction != NULL) - { - if (transaction->state != NICT_TERMINATED && - transaction->state != NIST_TERMINATED && - transaction->state != NICT_COMPLETED && - transaction->state != NIST_COMPLETED) - return OSIP_WRONG_STATE; - } - - transport = NULL; - if (transaction == NULL) - transaction = jn->n_inc_tr; - - if (transaction != NULL && transaction->orig_request != NULL) - transport = _eXosip_transport_protocol (transaction->orig_request); - - transaction = NULL; - - if (transport == NULL) - i = _eXosip_build_request_within_dialog (request, method, jd->d_dialog, "UDP"); - else - i = - _eXosip_build_request_within_dialog (request, method, jd->d_dialog, - transport); - if (i != 0) - return i; + osip_transaction_t *transaction; + char *transport; + int i; + + *request = NULL; + if (method == NULL || method[0] == '\0') + return OSIP_BADPARAMETER; + + if (did <= 0) + return OSIP_BADPARAMETER; + + if (did > 0) { + eXosip_notify_dialog_find(did, &jn, &jd); + } + if (jd == NULL || jn == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No incoming subscription here?\n")); + return OSIP_NOTFOUND; + } + + transaction = NULL; + transaction = eXosip_find_last_out_notify(jn, jd); + if (transaction != NULL) { + if (transaction->state != NICT_TERMINATED && + transaction->state != NIST_TERMINATED && + transaction->state != NICT_COMPLETED && + transaction->state != NIST_COMPLETED) + return OSIP_WRONG_STATE; + } + + transport = NULL; + if (transaction == NULL) + transaction = jn->n_inc_tr; + + if (transaction != NULL && transaction->orig_request != NULL) + transport = _eXosip_transport_protocol(transaction->orig_request); + + transaction = NULL; + + if (transport == NULL) + i = _eXosip_build_request_within_dialog(request, method, jd->d_dialog, + "UDP"); + else + i = _eXosip_build_request_within_dialog(request, method, jd->d_dialog, + transport); + if (i != 0) + return i; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_insubscription_send_request (int did, osip_message_t * request) +int eXosip_insubscription_send_request(int did, osip_message_t * request) { - eXosip_dialog_t *jd = NULL; - eXosip_notify_t *jn = NULL; + eXosip_dialog_t *jd = NULL; + eXosip_notify_t *jn = NULL; - osip_transaction_t *transaction; - osip_event_t *sipevent; - int i; - - if (request == NULL) - return OSIP_BADPARAMETER; - - if (did <= 0) - { - osip_message_free (request); - return OSIP_BADPARAMETER; - } - - if (did > 0) - { - eXosip_notify_dialog_find (did, &jn, &jd); - } - if (jd == NULL || jn == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No incoming subscription here?\n")); - osip_message_free (request); - return OSIP_NOTFOUND; - } - - transaction = NULL; - transaction = eXosip_find_last_out_notify (jn, jd); - if (transaction != NULL) - { - if (transaction->state != NICT_TERMINATED && - transaction->state != NIST_TERMINATED && - transaction->state != NICT_COMPLETED && - transaction->state != NIST_COMPLETED) - { - osip_message_free (request); - return OSIP_WRONG_STATE; - } - transaction = NULL; - } - - i = _eXosip_transaction_init (&transaction, NICT, eXosip.j_osip, request); - if (i != 0) - { - osip_message_free (request); - return i; - } - - osip_list_add (jd->d_out_trs, transaction, 0); - - sipevent = osip_new_outgoing_sipmessage (request); - sipevent->transactionid = transaction->transactionid; - - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, jd, NULL, jn)); - osip_transaction_add_event (transaction, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_t *transaction; + osip_event_t *sipevent; + int i; + + if (request == NULL) + return OSIP_BADPARAMETER; + + if (did <= 0) { + osip_message_free(request); + return OSIP_BADPARAMETER; + } + + if (did > 0) { + eXosip_notify_dialog_find(did, &jn, &jd); + } + if (jd == NULL || jn == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No incoming subscription here?\n")); + osip_message_free(request); + return OSIP_NOTFOUND; + } + + transaction = NULL; + transaction = eXosip_find_last_out_notify(jn, jd); + if (transaction != NULL) { + if (transaction->state != NICT_TERMINATED && + transaction->state != NIST_TERMINATED && + transaction->state != NICT_COMPLETED && + transaction->state != NIST_COMPLETED) { + osip_message_free(request); + return OSIP_WRONG_STATE; + } + transaction = NULL; + } + + i = _eXosip_transaction_init(&transaction, NICT, eXosip.j_osip, request); + if (i != 0) { + osip_message_free(request); + return i; + } + + osip_list_add(jd->d_out_trs, transaction, 0); + + sipevent = osip_new_outgoing_sipmessage(request); + sipevent->transactionid = transaction->transactionid; + + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, jd, NULL, jn)); + osip_transaction_add_event(transaction, sipevent); + __eXosip_wakeup(); + return OSIP_SUCCESS; } int -_eXosip_insubscription_send_request_with_credential (eXosip_notify_t * jn, - eXosip_dialog_t * jd, - osip_transaction_t * out_tr) +_eXosip_insubscription_send_request_with_credential(eXosip_notify_t * jn, + eXosip_dialog_t * jd, + osip_transaction_t * out_tr) { - osip_transaction_t *tr = NULL; - osip_message_t *msg = NULL; - osip_event_t *sipevent; - - int cseq; - osip_via_t *via; - int i; - - if (jn == NULL) - return OSIP_BADPARAMETER; - if (jd != NULL) - { - if (jd->d_out_trs == NULL) - return OSIP_BADPARAMETER; - } - - if (out_tr == NULL) - { - out_tr = eXosip_find_last_out_notify (jn, jd); - } - - if (out_tr == NULL - || out_tr->orig_request == NULL || out_tr->last_response == NULL) - return OSIP_NOTFOUND; - - i = osip_message_clone (out_tr->orig_request, &msg); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for authentication\n")); - return i; - } - - via = (osip_via_t *) osip_list_get (&msg->vias, 0); - if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) - { - osip_message_free (msg); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: missing via or cseq header\n")); - return OSIP_SYNTAXERROR; - } - - /* increment cseq */ - cseq = atoi (msg->cseq->number); - osip_free (msg->cseq->number); - msg->cseq->number = strdup_printf ("%i", cseq + 1); - if (msg->cseq->number == NULL) - { - osip_message_free (msg); - return OSIP_NOMEM; - } - - if (jd != NULL && jd->d_dialog != NULL) - { - jd->d_dialog->local_cseq++; - } - - i = eXosip_update_top_via (msg); - if (i != 0) - { - osip_message_free (msg); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: unsupported protocol\n")); - return i; - } - - if (out_tr->last_response->status_code == 401 - || out_tr->last_response->status_code == 407) - eXosip_add_authentication_information (msg, out_tr->last_response); - else - eXosip_add_authentication_information (msg, NULL); - - osip_message_force_update (msg); - - i = _eXosip_transaction_init (&tr, NICT, eXosip.j_osip, msg); - - if (i != 0) - { - osip_message_free (msg); - return i; - } - - /* add the new tr for the current dialog */ - osip_list_add (jd->d_out_trs, tr, 0); - - sipevent = osip_new_outgoing_sipmessage (msg); - - osip_transaction_set_your_instance (tr, __eXosip_new_jinfo (NULL, jd, NULL, jn)); - osip_transaction_add_event (tr, sipevent); - - eXosip_update (); /* fixed? */ - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_t *tr = NULL; + osip_message_t *msg = NULL; + osip_event_t *sipevent; + + int cseq; + osip_via_t *via; + int i; + + if (jn == NULL) + return OSIP_BADPARAMETER; + if (jd != NULL) { + if (jd->d_out_trs == NULL) + return OSIP_BADPARAMETER; + } + + if (out_tr == NULL) { + out_tr = eXosip_find_last_out_notify(jn, jd); + } + + if (out_tr == NULL + || out_tr->orig_request == NULL || out_tr->last_response == NULL) + return OSIP_NOTFOUND; + + i = osip_message_clone(out_tr->orig_request, &msg); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for authentication\n")); + return i; + } + + via = (osip_via_t *) osip_list_get(&msg->vias, 0); + if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing via or cseq header\n")); + return OSIP_SYNTAXERROR; + } + + /* increment cseq */ + cseq = atoi(msg->cseq->number); + osip_free(msg->cseq->number); + msg->cseq->number = strdup_printf("%i", cseq + 1); + if (msg->cseq->number == NULL) { + osip_message_free(msg); + return OSIP_NOMEM; + } + + if (jd != NULL && jd->d_dialog != NULL) { + jd->d_dialog->local_cseq++; + } + + i = eXosip_update_top_via(msg); + if (i != 0) { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: unsupported protocol\n")); + return i; + } + + if (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407) + eXosip_add_authentication_information(msg, out_tr->last_response); + else + eXosip_add_authentication_information(msg, NULL); + + osip_message_force_update(msg); + + i = _eXosip_transaction_init(&tr, NICT, eXosip.j_osip, msg); + + if (i != 0) { + osip_message_free(msg); + return i; + } + + /* add the new tr for the current dialog */ + osip_list_add(jd->d_out_trs, tr, 0); + + sipevent = osip_new_outgoing_sipmessage(msg); + + osip_transaction_set_your_instance(tr, __eXosip_new_jinfo(NULL, jd, NULL, jn)); + osip_transaction_add_event(tr, sipevent); + + eXosip_update(); /* fixed? */ + __eXosip_wakeup(); + return OSIP_SUCCESS; } int -_eXosip_insubscription_auto_send_notify (int did, - int subscription_status, - int subscription_reason) +_eXosip_insubscription_auto_send_notify(int did, + int subscription_status, + int subscription_reason) { - osip_message_t *notify; - int i; - char xml[4096]; - char *entity; - eXosip_call_t *jc; - eXosip_dialog_t *jd; - - if (did <= 0) - return OSIP_BADPARAMETER; - - i = eXosip_insubscription_build_notify (did, subscription_status, - subscription_reason, ¬ify); - if (i != 0) - { - return i; - } - - /* build dialog xml state */ - memset (xml, 0, sizeof (xml)); - - i = osip_uri_to_str (notify->from->url, &entity); - if (i != 0 || entity == NULL) - { - osip_message_free (notify); - return i; - } - snprintf (xml, sizeof (xml), - "" "\r\n" - "" "\r\n", entity); - osip_free (entity); - - /* loop over all jc/jd */ - for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) - { - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog == NULL) /* finished call */ - { - } else - { - char tmp_dialog[2048]; - char direction[20]; - char dlg_state[20]; - char *remote_uri = NULL; - - if (jd->d_dialog->type == CALLER) - strcpy (direction, "initiator"); - else - strcpy (direction, "recipient"); - if (jd->d_dialog->state == DIALOG_CONFIRMED) - strcpy (dlg_state, "confirmed"); - else - strcpy (dlg_state, "early"); - - if (jd->d_dialog->remote_uri != NULL - && jd->d_dialog->remote_uri->url != NULL) - { - osip_uri_to_str (jd->d_dialog->remote_uri->url, &remote_uri); - } - if (remote_uri != NULL) - { - /* add dialog info */ - snprintf (tmp_dialog, sizeof (tmp_dialog), - " " - "\r\n" - " %s" - "\r\n" - " " - "\r\n" - " %s" - "\r\n" - " " - "\r\n" - " " - "\r\n", - jd-> - d_dialog-> - call_id, - jd-> - d_dialog-> - call_id, - jd-> - d_dialog-> - local_tag, - jd-> - d_dialog-> - remote_tag, direction, dlg_state, remote_uri); - strcat (xml, tmp_dialog); - } - } - } - } - strcat (xml, "" "\r\n"); - osip_message_set_content_type (notify, "application/dialog-info+xml"); - osip_message_set_body (notify, xml, strlen (xml)); + osip_message_t *notify; + int i; + char xml[4096]; + char *entity; + eXosip_call_t *jc; + eXosip_dialog_t *jd; + + if (did <= 0) + return OSIP_BADPARAMETER; + + i = eXosip_insubscription_build_notify(did, subscription_status, + subscription_reason, ¬ify); + if (i != 0) { + return i; + } + + /* build dialog xml state */ + memset(xml, 0, sizeof(xml)); + + i = osip_uri_to_str(notify->from->url, &entity); + if (i != 0 || entity == NULL) { + osip_message_free(notify); + return i; + } + snprintf(xml, sizeof(xml), + "" "\r\n" + "" "\r\n", entity); + osip_free(entity); + + /* loop over all jc/jd */ + for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) { + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog == NULL) { /* finished call */ + } else { + char tmp_dialog[2048]; + char direction[20]; + char dlg_state[20]; + char *remote_uri = NULL; + + if (jd->d_dialog->type == CALLER) + strcpy(direction, "initiator"); + else + strcpy(direction, "recipient"); + if (jd->d_dialog->state == DIALOG_CONFIRMED) + strcpy(dlg_state, "confirmed"); + else + strcpy(dlg_state, "early"); + + if (jd->d_dialog->remote_uri != NULL + && jd->d_dialog->remote_uri->url != NULL) { + osip_uri_to_str(jd->d_dialog->remote_uri->url, &remote_uri); + } + if (remote_uri != NULL) { + /* add dialog info */ + snprintf(tmp_dialog, sizeof(tmp_dialog), + " " + "\r\n" + " %s" + "\r\n" + " " + "\r\n" + " %s" + "\r\n" + " " + "\r\n" + " " + "\r\n", + jd->d_dialog->call_id, + jd->d_dialog->call_id, + jd->d_dialog->local_tag, + jd->d_dialog->remote_tag, + direction, dlg_state, remote_uri); + if (strlen(xml) + strlen(tmp_dialog) < sizeof(xml)) + strcat(xml, tmp_dialog); + } + } + } + } + if (strlen(xml) + 16 < sizeof(xml)) + strcat(xml, "" "\r\n"); + osip_message_set_content_type(notify, "application/dialog-info+xml"); + osip_message_set_body(notify, xml, strlen(xml)); - return eXosip_insubscription_send_request (did, notify); + return eXosip_insubscription_send_request(did, notify); } -int -eXosip_insubscription_automatic (eXosip_event_t * evt) +int eXosip_insubscription_automatic(eXosip_event_t * evt) { - eXosip_dialog_t *jd = NULL; - eXosip_notify_t *jn = NULL; + eXosip_dialog_t *jd = NULL; + eXosip_notify_t *jn = NULL; - osip_header_t *event_header; - if (evt->did <= 0 || evt->nid <= 0) - return OSIP_BADPARAMETER; - if (evt->request == NULL) - return OSIP_BADPARAMETER; - - eXosip_notify_dialog_find (evt->did, &jn, &jd); - if (jd == NULL || jn == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No incoming subscription here?\n")); - return OSIP_NOTFOUND; - } - - osip_message_header_get_byname (evt->request, "event", 0, &event_header); - if (event_header == NULL || event_header->hvalue == NULL) - { - eXosip_insubscription_send_answer (evt->tid, 400, NULL); - return OSIP_SUCCESS; - } - - /* this event should be handled internally */ - if (osip_strcasecmp (event_header->hvalue, "dialog") == 0) - { - /* send 200 ok to SUBSCRIBEs */ - - if (evt->type == EXOSIP_IN_SUBSCRIPTION_NEW) - { - osip_message_t *answer; - int i; - - i = eXosip_insubscription_build_answer (evt->tid, 202, &answer); - if (i == 0) - { - i = eXosip_insubscription_send_answer (evt->tid, 202, answer); - } - if (i != 0) - { - i = eXosip_insubscription_send_answer (evt->tid, 400, NULL); - return OSIP_SUCCESS; - } - - /* send initial notify */ - i = - _eXosip_insubscription_auto_send_notify (evt->did, - EXOSIP_SUBCRSTATE_ACTIVE, - PROBATION); - if (i != 0) - { - /* delete subscription... */ - return OSIP_SUCCESS; - } - } - } else - { - if (evt->type == EXOSIP_IN_SUBSCRIPTION_NEW) - { - eXosip_insubscription_send_answer (evt->tid, 489, NULL); - } - } + osip_header_t *event_header; + if (evt->did <= 0 || evt->nid <= 0) + return OSIP_BADPARAMETER; + if (evt->request == NULL) + return OSIP_BADPARAMETER; + + eXosip_notify_dialog_find(evt->did, &jn, &jd); + if (jd == NULL || jn == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No incoming subscription here?\n")); + return OSIP_NOTFOUND; + } + + osip_message_header_get_byname(evt->request, "event", 0, &event_header); + if (event_header == NULL || event_header->hvalue == NULL) { + eXosip_insubscription_send_answer(evt->tid, 400, NULL); + return OSIP_SUCCESS; + } + + /* this event should be handled internally */ + if (osip_strcasecmp(event_header->hvalue, "dialog") == 0) { + /* send 200 ok to SUBSCRIBEs */ + + if (evt->type == EXOSIP_IN_SUBSCRIPTION_NEW) { + osip_message_t *answer; + int i; + + i = eXosip_insubscription_build_answer(evt->tid, 202, &answer); + if (i == 0) { + i = eXosip_insubscription_send_answer(evt->tid, 202, answer); + } + if (i != 0) { + i = eXosip_insubscription_send_answer(evt->tid, 400, NULL); + return OSIP_SUCCESS; + } + + /* send initial notify */ + i = _eXosip_insubscription_auto_send_notify(evt->did, + EXOSIP_SUBCRSTATE_ACTIVE, + PROBATION); + if (i != 0) { + /* delete subscription... */ + return OSIP_SUCCESS; + } + } + } else { + if (evt->type == EXOSIP_IN_SUBSCRIPTION_NEW) { + eXosip_insubscription_send_answer(evt->tid, 489, NULL); + } + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } #endif diff -Nru libexosip2-3.3.0/src/eXmessage_api.c libexosip2-3.6.0/src/eXmessage_api.c --- libexosip2-3.3.0/src/eXmessage_api.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXmessage_api.c 2010-01-06 14:57:57.000000000 +0000 @@ -28,150 +28,140 @@ extern eXosip_t eXosip; int -eXosip_message_build_request (osip_message_t ** message, const char *method, - const char *to, const char *from, const char *route) +eXosip_message_build_request(osip_message_t ** message, const char *method, + const char *to, const char *from, const char *route) { - int i; + int i; - *message = NULL; - if (method != NULL && *method == '\0') - return OSIP_BADPARAMETER; - if (to != NULL && *to == '\0') - return OSIP_BADPARAMETER; - if (from != NULL && *from == '\0') - return OSIP_BADPARAMETER; - if (route != NULL && *route == '\0') - route = NULL; - - i = generating_request_out_of_dialog (message, method, to, "UDP", from, route); - if (i != 0) - return i; + *message = NULL; + if (method != NULL && *method == '\0') + return OSIP_BADPARAMETER; + if (to != NULL && *to == '\0') + return OSIP_BADPARAMETER; + if (from != NULL && *from == '\0') + return OSIP_BADPARAMETER; + if (route != NULL && *route == '\0') + route = NULL; + + i = generating_request_out_of_dialog(message, method, to, "UDP", from, route); + if (i != 0) + return i; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_message_send_request (osip_message_t * message) +int eXosip_message_send_request(osip_message_t * message) { - osip_transaction_t *transaction; - osip_event_t *sipevent; - int i; - - i = _eXosip_transaction_init (&transaction, NICT, eXosip.j_osip, message); - if (i != 0) - { - osip_message_free (message); - return i; - } + osip_transaction_t *transaction; + osip_event_t *sipevent; + int i; + + i = _eXosip_transaction_init(&transaction, NICT, eXosip.j_osip, message); + if (i != 0) { + osip_message_free(message); + return i; + } - osip_list_add (&eXosip.j_transactions, transaction, 0); + osip_list_add(&eXosip.j_transactions, transaction, 0); - sipevent = osip_new_outgoing_sipmessage (message); - sipevent->transactionid = transaction->transactionid; + sipevent = osip_new_outgoing_sipmessage(message); + sipevent->transactionid = transaction->transactionid; #ifndef MINISIZE - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, NULL, NULL, NULL)); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, NULL, NULL, NULL)); #else - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, NULL)); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, NULL)); #endif - osip_transaction_add_event (transaction, sipevent); + osip_transaction_add_event(transaction, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + __eXosip_wakeup(); + return OSIP_SUCCESS; } -int -eXosip_message_build_answer (int tid, int status, osip_message_t ** answer) +int eXosip_message_build_answer(int tid, int status, osip_message_t ** answer) { - osip_transaction_t *tr = NULL; - int i; + osip_transaction_t *tr = NULL; + int i; - *answer = NULL; + *answer = NULL; - if (tid <= 0) - return OSIP_BADPARAMETER; - if (status < 200 || status > 699) - return OSIP_BADPARAMETER; - - if (tid > 0) - { - eXosip_transaction_find (tid, &tr); - } - if (tr == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return OSIP_NOTFOUND; - } - - i = -1; - if (status < 300) /* 2xx answer */ - i = _eXosip_build_response_default (answer, NULL, status, tr->orig_request); - else if (status > 300) /* 3456xx answer */ - i = _eXosip_build_response_default (answer, NULL, status, tr->orig_request); - - if (i != 0) - return i; - return OSIP_SUCCESS; + if (tid <= 0) + return OSIP_BADPARAMETER; + if (status < 200 || status > 699) + return OSIP_BADPARAMETER; + + if (tid > 0) { + eXosip_transaction_find(tid, &tr); + } + if (tr == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return OSIP_NOTFOUND; + } + + i = -1; + if (status < 300) /* 2xx answer */ + i = _eXosip_build_response_default(answer, NULL, status, tr->orig_request); + else if (status > 300) /* 3456xx answer */ + i = _eXosip_build_response_default(answer, NULL, status, tr->orig_request); + + if (i != 0) + return i; + return OSIP_SUCCESS; } -int -eXosip_message_send_answer (int tid, int status, osip_message_t * answer) +int eXosip_message_send_answer(int tid, int status, osip_message_t * answer) { - osip_transaction_t *tr = NULL; - osip_event_t *evt_answer; - int i = -1; - - if (tid <= 0) - return OSIP_BADPARAMETER; - if (status <= 100 || status > 699) - return OSIP_BADPARAMETER; - if (answer == NULL && status > 100 && status < 200) - return OSIP_BADPARAMETER; - - if (tid > 0) - { - eXosip_transaction_find (tid, &tr); - } - if (tr == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No MESSAGE transaction found\n")); - osip_message_free (answer); - return OSIP_NOTFOUND; - } - - /* is the transaction already answered? */ - if (tr->state == NIST_COMPLETED || tr->state == NIST_TERMINATED) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: transaction already answered\n")); - osip_message_free (answer); - return OSIP_WRONG_STATE; - } - - if (answer == NULL) - { - i = -1; - if (status > 199 && status < 300) - i = _eXosip_build_response_default (&answer, NULL, status, - tr->orig_request); - else if (status > 300 && status <= 699) - i = _eXosip_build_response_default (&answer, NULL, status, - tr->orig_request); - if (i != 0) - return i; - } - - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = tr->transactionid; - - osip_transaction_add_event (tr, evt_answer); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_t *tr = NULL; + osip_event_t *evt_answer; + int i = -1; + + if (tid <= 0) + return OSIP_BADPARAMETER; + if (status <= 100 || status > 699) + return OSIP_BADPARAMETER; + if (answer == NULL && status > 100 && status < 200) + return OSIP_BADPARAMETER; + + if (tid > 0) { + eXosip_transaction_find(tid, &tr); + } + if (tr == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No MESSAGE transaction found\n")); + osip_message_free(answer); + return OSIP_NOTFOUND; + } + + /* is the transaction already answered? */ + if (tr->state == NIST_COMPLETED || tr->state == NIST_TERMINATED) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: transaction already answered\n")); + osip_message_free(answer); + return OSIP_WRONG_STATE; + } + + if (answer == NULL) { + i = -1; + if (status > 199 && status < 300) + i = _eXosip_build_response_default(&answer, NULL, status, + tr->orig_request); + else if (status > 300 && status <= 699) + i = _eXosip_build_response_default(&answer, NULL, status, + tr->orig_request); + if (i != 0) + return i; + } + + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = tr->transactionid; + + osip_transaction_add_event(tr, evt_answer); + __eXosip_wakeup(); + return OSIP_SUCCESS; } diff -Nru libexosip2-3.3.0/src/eXoptions_api.c libexosip2-3.6.0/src/eXoptions_api.c --- libexosip2-3.3.0/src/eXoptions_api.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXoptions_api.c 2010-03-10 10:54:27.000000000 +0000 @@ -29,150 +29,137 @@ extern eXosip_t eXosip; int -eXosip_options_build_request (osip_message_t ** options, const char *to, - const char *from, const char *route) +eXosip_options_build_request(osip_message_t ** options, const char *to, + const char *from, const char *route) { - int i; + int i; - *options = NULL; - if (to != NULL && *to == '\0') - return OSIP_BADPARAMETER; - if (from != NULL && *from == '\0') - return OSIP_BADPARAMETER; - if (route != NULL && *route == '\0') - route = NULL; - - i = generating_request_out_of_dialog (options, "OPTIONS", to, "UDP", from, - route); - if (i != 0) - return i; + *options = NULL; + if (to != NULL && *to == '\0') + return OSIP_BADPARAMETER; + if (from != NULL && *from == '\0') + return OSIP_BADPARAMETER; + if (route != NULL && *route == '\0') + route = NULL; + + i = generating_request_out_of_dialog(options, "OPTIONS", to, "UDP", from, + route); + if (i != 0) + return i; - /* after this delay, we should send a CANCEL */ - osip_message_set_expires (*options, "120"); - - /* osip_message_set_organization(*invite, "Jack's Org"); */ - return OSIP_SUCCESS; + /* osip_message_set_organization(*invite, "Jack's Org"); */ + return OSIP_SUCCESS; } -int -eXosip_options_send_request (osip_message_t * options) +int eXosip_options_send_request(osip_message_t * options) { - osip_transaction_t *transaction; - osip_event_t *sipevent; - int i; - - i = _eXosip_transaction_init (&transaction, NICT, eXosip.j_osip, options); - if (i != 0) - { - osip_message_free (options); - return i; - } - - osip_list_add (&eXosip.j_transactions, transaction, 0); - - sipevent = osip_new_outgoing_sipmessage (options); - sipevent->transactionid = transaction->transactionid; - - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, NULL, NULL, NULL)); - osip_transaction_add_event (transaction, sipevent); + osip_transaction_t *transaction; + osip_event_t *sipevent; + int i; + + i = _eXosip_transaction_init(&transaction, NICT, eXosip.j_osip, options); + if (i != 0) { + osip_message_free(options); + return i; + } + + osip_list_add(&eXosip.j_transactions, transaction, 0); + + sipevent = osip_new_outgoing_sipmessage(options); + sipevent->transactionid = transaction->transactionid; + + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, NULL, NULL, NULL)); + osip_transaction_add_event(transaction, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + __eXosip_wakeup(); + return OSIP_SUCCESS; } -int -eXosip_options_build_answer (int tid, int status, osip_message_t ** answer) +int eXosip_options_build_answer(int tid, int status, osip_message_t ** answer) { - osip_transaction_t *tr = NULL; - int i; + osip_transaction_t *tr = NULL; + int i; - *answer = NULL; + *answer = NULL; - if (tid <= 0) - return OSIP_BADPARAMETER; - if (status < 200 || status > 699) - return OSIP_BADPARAMETER; - - if (tid > 0) - { - eXosip_transaction_find (tid, &tr); - } - if (tr == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return OSIP_NOTFOUND; - } - - i = -1; - if (status > 199 && status < 300) - i = _eXosip_build_response_default (answer, NULL, status, tr->orig_request); - else if (status > 300 && status <= 699) - i = _eXosip_build_response_default (answer, NULL, status, tr->orig_request); - if (i != 0) - return i; + if (tid <= 0) + return OSIP_BADPARAMETER; + if (status < 200 || status > 699) + return OSIP_BADPARAMETER; + + if (tid > 0) { + eXosip_transaction_find(tid, &tr); + } + if (tr == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return OSIP_NOTFOUND; + } + + i = -1; + if (status > 199 && status < 300) + i = _eXosip_build_response_default(answer, NULL, status, tr->orig_request); + else if (status > 300 && status <= 699) + i = _eXosip_build_response_default(answer, NULL, status, tr->orig_request); + if (i != 0) + return i; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_options_send_answer (int tid, int status, osip_message_t * answer) +int eXosip_options_send_answer(int tid, int status, osip_message_t * answer) { - osip_transaction_t *tr = NULL; - osip_event_t *evt_answer; - int i = -1; - - if (tid <= 0) - return OSIP_BADPARAMETER; - if (status <= 100 || status > 699) - return OSIP_BADPARAMETER; - if (answer == NULL && status > 100 && status < 200) - return OSIP_BADPARAMETER; - - if (tid > 0) - { - eXosip_transaction_find (tid, &tr); - } - if (tr == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No OPTIONS transaction found\n")); - osip_message_free (answer); - return OSIP_NOTFOUND; - } - - /* is the transaction already answered? */ - if (tr->state == NIST_COMPLETED || tr->state == NIST_TERMINATED) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: transaction already answered\n")); - osip_message_free (answer); - return OSIP_WRONG_STATE; - } - - if (answer == NULL) - { - i = -1; - if (status > 199 && status < 300) - i = _eXosip_build_response_default (&answer, NULL, status, - tr->orig_request); - else if (status > 300 && status <= 699) - i = _eXosip_build_response_default (&answer, NULL, status, - tr->orig_request); - if (i != 0) - return i; - } - - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = tr->transactionid; - - osip_transaction_add_event (tr, evt_answer); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_t *tr = NULL; + osip_event_t *evt_answer; + int i = -1; + + if (tid <= 0) + return OSIP_BADPARAMETER; + if (status <= 100 || status > 699) + return OSIP_BADPARAMETER; + if (answer == NULL && status > 100 && status < 200) + return OSIP_BADPARAMETER; + + if (tid > 0) { + eXosip_transaction_find(tid, &tr); + } + if (tr == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No OPTIONS transaction found\n")); + osip_message_free(answer); + return OSIP_NOTFOUND; + } + + /* is the transaction already answered? */ + if (tr->state == NIST_COMPLETED || tr->state == NIST_TERMINATED) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: transaction already answered\n")); + osip_message_free(answer); + return OSIP_WRONG_STATE; + } + + if (answer == NULL) { + i = -1; + if (status > 199 && status < 300) + i = _eXosip_build_response_default(&answer, NULL, status, + tr->orig_request); + else if (status > 300 && status <= 699) + i = _eXosip_build_response_default(&answer, NULL, status, + tr->orig_request); + if (i != 0) + return i; + } + + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = tr->transactionid; + + osip_transaction_add_event(tr, evt_answer); + __eXosip_wakeup(); + return OSIP_SUCCESS; } #endif diff -Nru libexosip2-3.3.0/src/eXosip2.h libexosip2-3.6.0/src/eXosip2.h --- libexosip2-3.3.0/src/eXosip2.h 2009-03-04 11:01:13.000000000 +0000 +++ libexosip2-3.6.0/src/eXosip2.h 2011-10-05 14:27:09.000000000 +0000 @@ -80,11 +80,10 @@ #endif -#define EXOSIP_VERSION "3.3.0" +#define EXOSIP_VERSION "3.6.0" #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #if defined(__arc__) @@ -99,26 +98,24 @@ #define PF_INET6 AF_INET6 - struct sockaddr_storage - { - unsigned char sa_len; - unsigned char sa_family; /* Address family AF_XXX */ - char sa_data[14]; /* Protocol specific address */ - }; - - struct addrinfo - { - int ai_flags; /* Input flags. */ - int ai_family; /* Protocol family for socket. */ - int ai_socktype; /* Socket type. */ - int ai_protocol; /* Protocol for socket. */ - socklen_t ai_addrlen; /* Length of socket address. */ - struct sockaddr *ai_addr; /* Socket address for socket. */ - char *ai_canonname; /* Canonical name for service location. */ - struct addrinfo *ai_next; /* Pointer to next in list. */ - }; + struct sockaddr_storage { + unsigned char sa_len; + unsigned char sa_family; /* Address family AF_XXX */ + char sa_data[14]; /* Protocol specific address */ + }; + + struct addrinfo { + int ai_flags; /* Input flags. */ + int ai_family; /* Protocol family for socket. */ + int ai_socktype; /* Socket type. */ + int ai_protocol; /* Protocol for socket. */ + socklen_t ai_addrlen; /* Length of socket address. */ + struct sockaddr *ai_addr; /* Socket address for socket. */ + char *ai_canonname; /* Canonical name for service location. */ + struct addrinfo *ai_next; /* Pointer to next in list. */ + }; - void eXosip_freeaddrinfo (struct addrinfo *ai); + void eXosip_freeaddrinfo(struct addrinfo *ai); #else @@ -126,221 +123,224 @@ #endif - void eXosip_update (void); + void eXosip_update(void); #ifdef OSIP_MT - void __eXosip_wakeup (void); + void __eXosip_wakeup(void); #else #define __eXosip_wakeup() ; #endif - struct __eXosip_sockaddr - { - u_char ss_len; - u_char ss_family; - u_char padding[128 - 2]; - }; +#ifndef DEFINE_SOCKADDR_STORAGE +#define __eXosip_sockaddr sockaddr_storage +#else + struct __eXosip_sockaddr { + u_char ss_len; + u_char ss_family; + u_char padding[128 - 2]; + }; +#endif + + typedef struct eXosip_dialog_t eXosip_dialog_t; - typedef struct eXosip_dialog_t eXosip_dialog_t; + struct eXosip_dialog_t { - struct eXosip_dialog_t - { + int d_id; + int d_STATE; + osip_dialog_t *d_dialog; /* active dialog */ - int d_id; - int d_STATE; - osip_dialog_t *d_dialog; /* active dialog */ + time_t d_session_timer_start; /* session-timer helper */ + int d_session_timer_length; + int d_refresher; - time_t d_timer; - int d_count; - osip_message_t *d_200Ok; - osip_message_t *d_ack; + time_t d_timer; + int d_count; + osip_message_t *d_200Ok; + osip_message_t *d_ack; - osip_list_t *d_inc_trs; - osip_list_t *d_out_trs; - int d_retry; /* avoid too many unsuccessfull retry */ - int d_mincseq; /* remember cseq after PRACK and UPDATE during setup */ + osip_list_t *d_inc_trs; + osip_list_t *d_out_trs; + int d_retry; /* avoid too many unsuccessfull retry */ + int d_mincseq; /* remember cseq after PRACK and UPDATE during setup */ - eXosip_dialog_t *next; - eXosip_dialog_t *parent; - }; + eXosip_dialog_t *next; + eXosip_dialog_t *parent; + }; #ifndef MINISIZE - typedef struct eXosip_subscribe_t eXosip_subscribe_t; + typedef struct eXosip_subscribe_t eXosip_subscribe_t; - struct eXosip_subscribe_t - { + struct eXosip_subscribe_t { - int s_id; - int s_ss_status; - int s_ss_reason; - int s_reg_period; - eXosip_dialog_t *s_dialogs; + int s_id; + int s_ss_status; + int s_ss_reason; + int s_reg_period; + eXosip_dialog_t *s_dialogs; - int s_retry; /* avoid too many unsuccessfull retry */ - osip_transaction_t *s_inc_tr; - osip_transaction_t *s_out_tr; + int s_retry; /* avoid too many unsuccessfull retry */ + osip_transaction_t *s_inc_tr; + osip_transaction_t *s_out_tr; - eXosip_subscribe_t *next; - eXosip_subscribe_t *parent; - }; + eXosip_subscribe_t *next; + eXosip_subscribe_t *parent; + }; - typedef struct eXosip_notify_t eXosip_notify_t; + typedef struct eXosip_notify_t eXosip_notify_t; - struct eXosip_notify_t - { + struct eXosip_notify_t { - int n_id; - int n_online_status; + int n_id; + int n_online_status; - int n_ss_status; - int n_ss_reason; - time_t n_ss_expires; - eXosip_dialog_t *n_dialogs; + int n_ss_status; + int n_ss_reason; + time_t n_ss_expires; + eXosip_dialog_t *n_dialogs; - osip_transaction_t *n_inc_tr; - osip_transaction_t *n_out_tr; + osip_transaction_t *n_inc_tr; + osip_transaction_t *n_out_tr; - eXosip_notify_t *next; - eXosip_notify_t *parent; - }; + eXosip_notify_t *next; + eXosip_notify_t *parent; + }; #endif - typedef struct eXosip_call_t eXosip_call_t; + typedef struct eXosip_call_t eXosip_call_t; - struct eXosip_call_t - { + struct eXosip_call_t { - int c_id; - eXosip_dialog_t *c_dialogs; - osip_transaction_t *c_inc_tr; - osip_transaction_t *c_out_tr; - int c_retry; /* avoid too many unsuccessfull retry */ - void *external_reference; + int c_id; + eXosip_dialog_t *c_dialogs; + osip_transaction_t *c_inc_tr; + osip_transaction_t *c_out_tr; + int c_retry; /* avoid too many unsuccessfull retry */ + void *external_reference; - eXosip_call_t *next; - eXosip_call_t *parent; - }; + time_t expire_time; + eXosip_call_t *next; + eXosip_call_t *parent; + }; - typedef struct eXosip_reg_t eXosip_reg_t; - struct eXosip_reg_t - { + typedef struct eXosip_reg_t eXosip_reg_t; - int r_id; + struct eXosip_reg_t { - int r_reg_period; /* delay between registration */ - char *r_aor; /* sip identity */ - char *r_registrar; /* registrar */ - char *r_contact; /* list of contacts string */ + int r_id; - char r_line[16]; /* line identifier */ + int r_reg_period; /* delay between registration */ + char *r_aor; /* sip identity */ + char *r_registrar; /* registrar */ + char *r_contact; /* list of contacts string */ - osip_transaction_t *r_last_tr; - int r_retry; /* avoid too many unsuccessfull retry */ + char r_line[16]; /* line identifier */ + char r_qvalue[16]; /* the q value used for routing */ + + osip_transaction_t *r_last_tr; + int r_retry; /* avoid too many unsuccessfull retry */ - struct __eXosip_sockaddr addr; - int len; + struct __eXosip_sockaddr addr; + int len; - eXosip_reg_t *next; - eXosip_reg_t *parent; - }; + eXosip_reg_t *next; + eXosip_reg_t *parent; + }; #ifndef MINISIZE - typedef struct eXosip_pub_t eXosip_pub_t; + typedef struct eXosip_pub_t eXosip_pub_t; - struct eXosip_pub_t - { - int p_id; + struct eXosip_pub_t { + int p_id; - int p_period; /* delay between registration */ - char p_aor[256]; /* sip identity */ - char p_sip_etag[64]; /* sip_etag from 200ok */ + int p_period; /* delay between registration */ + char p_aor[256]; /* sip identity */ + char p_sip_etag[64]; /* sip_etag from 200ok */ - osip_transaction_t *p_last_tr; - int p_retry; - eXosip_pub_t *next; - eXosip_pub_t *parent; - }; + osip_transaction_t *p_last_tr; + int p_retry; + eXosip_pub_t *next; + eXosip_pub_t *parent; + }; - int _eXosip_pub_update (eXosip_pub_t ** pub, osip_transaction_t * tr, - osip_message_t * answer); - int _eXosip_pub_find_by_aor (eXosip_pub_t ** pub, const char *aor); - int _eXosip_pub_find_by_tid (eXosip_pub_t ** pjp, int tid); - int _eXosip_pub_init (eXosip_pub_t ** pub, const char *aor, const char *exp); - void _eXosip_pub_free (eXosip_pub_t * pub); + int _eXosip_pub_update(eXosip_pub_t ** pub, osip_transaction_t * tr, + osip_message_t * answer); + int _eXosip_pub_find_by_aor(eXosip_pub_t ** pub, const char *aor); + int _eXosip_pub_find_by_tid(eXosip_pub_t ** pjp, int tid); + int _eXosip_pub_init(eXosip_pub_t ** pub, const char *aor, const char *exp); + void _eXosip_pub_free(eXosip_pub_t * pub); #endif - typedef struct jauthinfo_t jauthinfo_t; + typedef struct jauthinfo_t jauthinfo_t; - struct jauthinfo_t - { - char username[50]; - char userid[50]; - char passwd[50]; - char ha1[50]; - char realm[50]; - jauthinfo_t *parent; - jauthinfo_t *next; - }; + struct jauthinfo_t { + char username[50]; + char userid[50]; + char passwd[50]; + char ha1[50]; + char realm[50]; + jauthinfo_t *parent; + jauthinfo_t *next; + }; - int - __eXosip_create_authorization_header (osip_www_authenticate_t * wa, - const char *rquri, - const char *username, - const char *passwd, - const char *ha1, - osip_authorization_t ** auth, - const char *method, - const char *pszCNonce, int iNonceCount); - int __eXosip_create_proxy_authorization_header (osip_proxy_authenticate_t * wa, - const char *rquri, - const char *username, - const char *passwd, - const char *ha1, - osip_proxy_authorization_t - ** auth, const char *method, - const char *pszCNonce, - int iNonceCount); - int _eXosip_store_nonce (const char *call_id, osip_proxy_authenticate_t * wa, - int answer_code); - int _eXosip_delete_nonce (const char *call_id); + int + __eXosip_create_authorization_header(osip_www_authenticate_t * wa, + const char *rquri, + const char *username, + const char *passwd, + const char *ha1, + osip_authorization_t ** auth, + const char *method, + const char *pszCNonce, int iNonceCount); + int __eXosip_create_proxy_authorization_header(osip_proxy_authenticate_t * wa, + const char *rquri, + const char *username, + const char *passwd, + const char *ha1, + osip_proxy_authorization_t + ** auth, const char *method, + const char *pszCNonce, + int iNonceCount); + int _eXosip_store_nonce(const char *call_id, osip_proxy_authenticate_t * wa, + int answer_code); + int _eXosip_delete_nonce(const char *call_id); - eXosip_event_t *eXosip_event_init_for_call (int type, eXosip_call_t * jc, - eXosip_dialog_t * jd, - osip_transaction_t * tr); + eXosip_event_t *eXosip_event_init_for_call(int type, eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_transaction_t * tr); #ifndef MINISIZE - eXosip_event_t *eXosip_event_init_for_subscribe (int type, - eXosip_subscribe_t * js, - eXosip_dialog_t * jd, - osip_transaction_t * tr); - eXosip_event_t *eXosip_event_init_for_notify (int type, - eXosip_notify_t * jn, - eXosip_dialog_t * jd, - osip_transaction_t * tr); + eXosip_event_t *eXosip_event_init_for_subscribe(int type, + eXosip_subscribe_t * js, + eXosip_dialog_t * jd, + osip_transaction_t * tr); + eXosip_event_t *eXosip_event_init_for_notify(int type, + eXosip_notify_t * jn, + eXosip_dialog_t * jd, + osip_transaction_t * tr); #endif - eXosip_event_t *eXosip_event_init_for_reg (int type, eXosip_reg_t * jr, - osip_transaction_t * tr); - eXosip_event_t *eXosip_event_init_for_message (int type, - osip_transaction_t * tr); + eXosip_event_t *eXosip_event_init_for_reg(int type, eXosip_reg_t * jr, + osip_transaction_t * tr); + eXosip_event_t *eXosip_event_init_for_message(int type, + osip_transaction_t * tr); - int eXosip_event_init (eXosip_event_t ** je, int type); - void report_call_event (int evt, eXosip_call_t * jc, eXosip_dialog_t * jd, - osip_transaction_t * tr); - void report_event (eXosip_event_t * je, osip_message_t * sip); - int eXosip_event_add (eXosip_event_t * je); - eXosip_event_t *eXosip_event_wait (int tv_s, int tv_ms); - eXosip_event_t *eXosip_event_get (void); + int eXosip_event_init(eXosip_event_t ** je, int type); + void report_call_event(int evt, eXosip_call_t * jc, eXosip_dialog_t * jd, + osip_transaction_t * tr); + void report_event(eXosip_event_t * je, osip_message_t * sip); + int eXosip_event_add(eXosip_event_t * je); + eXosip_event_t *eXosip_event_wait(int tv_s, int tv_ms); + eXosip_event_t *eXosip_event_get(void); - typedef void (*eXosip_callback_t) (int type, eXosip_event_t *); + typedef void (*eXosip_callback_t) (int type, eXosip_event_t *); - char *strdup_printf (const char *fmt, ...); + char *strdup_printf(const char *fmt, ...); #define eXosip_trace(loglevel,args) do \ { \ @@ -355,38 +355,36 @@ #endif #if 0 - /* structure used for keepalive management with connected protocols (TCP or TLS) */ - struct eXosip_socket - { - int socket; - char remote_ip[65]; - int remote_port; - }; - - struct eXosip_net - { - char net_firewall_ip[65]; /* ip address to use for masquerading contacts */ - int net_ip_family; /* AF_INET6 or AF_INET */ - struct sockaddr_storage ai_addr; - char net_port[20]; /* port for receiving message/connection */ - int net_socket; /* initial socket for receiving message/connection */ - int net_protocol; /* initial socket for receiving message/connection */ - struct eXosip_socket net_socket_tab[EXOSIP_MAX_SOCKETS]; - }; -#endif - - char *_eXosip_transport_protocol (osip_message_t * msg); - int _eXosip_find_protocol (osip_message_t * msg); - int _eXosip_tcp_find_socket (char *host, int port); - int _eXosip_tcp_connect_socket (char *host, int port); - int setsockopt_ipv6only (int sock); + /* structure used for keepalive management with connected protocols (TCP or TLS) */ + struct eXosip_socket { + int socket; + char remote_ip[65]; + int remote_port; + }; + + struct eXosip_net { + char net_firewall_ip[65]; /* ip address to use for masquerading contacts */ + int net_ip_family; /* AF_INET6 or AF_INET */ + struct sockaddr_storage ai_addr; + char net_port[20]; /* port for receiving message/connection */ + int net_socket; /* initial socket for receiving message/connection */ + int net_protocol; /* initial socket for receiving message/connection */ + struct eXosip_socket net_socket_tab[EXOSIP_MAX_SOCKETS]; + }; +#endif + + char *_eXosip_transport_protocol(osip_message_t * msg); + int _eXosip_find_protocol(osip_message_t * msg); + int _eXosip_tcp_find_socket(char *host, int port); + int _eXosip_tcp_connect_socket(char *host, int port); + int setsockopt_ipv6only(int sock); #ifndef MINISIZE - int _eXosip_recvfrom (int s, char *buf, int len, unsigned int flags, - struct sockaddr *from, socklen_t * fromlen); - int _eXosip_sendto (int s, const void *buf, size_t len, int flags, - const struct sockaddr *to, socklen_t tolen); + int _eXosip_recvfrom(int s, char *buf, int len, unsigned int flags, + struct sockaddr *from, socklen_t * fromlen); + int _eXosip_sendto(int s, const void *buf, size_t len, int flags, + const struct sockaddr *to, socklen_t tolen); #else @@ -406,78 +404,78 @@ #define MAX_EXOSIP_HTTP_AUTH 100 #endif - typedef struct eXosip_t eXosip_t; + typedef struct eXosip_t eXosip_t; - struct eXosip_t - { - struct eXtl_protocol *eXtl; - char transport[10]; - char *user_agent; + struct eXosip_t { + struct eXtl_protocol *eXtl; + char transport[10]; + char *user_agent; - eXosip_call_t *j_calls; /* my calls */ + eXosip_call_t *j_calls; /* my calls */ #ifndef MINISIZE - eXosip_subscribe_t *j_subscribes; /* my friends */ - eXosip_notify_t *j_notifies; /* my susbscribers */ + eXosip_subscribe_t *j_subscribes; /* my friends */ + eXosip_notify_t *j_notifies; /* my susbscribers */ #endif - osip_list_t j_transactions; + osip_list_t j_transactions; - eXosip_reg_t *j_reg; /* my registrations */ + eXosip_reg_t *j_reg; /* my registrations */ #ifndef MINISIZE - eXosip_pub_t *j_pub; /* my publications */ + eXosip_pub_t *j_pub; /* my publications */ #endif #ifdef OSIP_MT - void *j_cond; - void *j_mutexlock; + void *j_cond; + void *j_mutexlock; #endif - osip_t *j_osip; - int j_stop_ua; + osip_t *j_osip; + int j_stop_ua; #ifdef OSIP_MT - void *j_thread; - jpipe_t *j_socketctl; - jpipe_t *j_socketctl_event; + void *j_thread; + jpipe_t *j_socketctl; + jpipe_t *j_socketctl_event; #endif - osip_fifo_t *j_events; + osip_fifo_t *j_events; - jauthinfo_t *authinfos; + jauthinfo_t *authinfos; - int keep_alive; - int learn_port; + int keep_alive; + int keep_alive_options; + int learn_port; #ifndef MINISIZE - int http_port; - char http_proxy[256]; - char http_outbound_proxy[256]; - int dontsend_101; + int http_port; + char http_proxy[256]; + char http_outbound_proxy[256]; + int dontsend_101; #endif - int use_rport; - int use_naptr; - char ipv4_for_gateway[256]; - char ipv6_for_gateway[256]; + int use_rport; + int dns_capabilities; + int dscp; + char ipv4_for_gateway[256]; + char ipv6_for_gateway[256]; #ifndef MINISIZE - char event_package[256]; + char event_package[256]; #endif - struct eXosip_dns_cache dns_entries[MAX_EXOSIP_DNS_ENTRY]; - struct eXosip_account_info account_entries[MAX_EXOSIP_ACCOUNT_INFO]; - struct eXosip_http_auth http_auths[MAX_EXOSIP_HTTP_AUTH]; + struct eXosip_dns_cache dns_entries[MAX_EXOSIP_DNS_ENTRY]; + struct eXosip_account_info account_entries[MAX_EXOSIP_ACCOUNT_INFO]; + struct eXosip_http_auth http_auths[MAX_EXOSIP_HTTP_AUTH]; - CbSipCallback cbsipCallback; - }; + CbSipCallback cbsipCallback; + }; - typedef struct jinfo_t jinfo_t; + typedef struct jinfo_t jinfo_t; - struct jinfo_t - { - eXosip_dialog_t *jd; - eXosip_call_t *jc; + struct jinfo_t { + eXosip_dialog_t *jd; + eXosip_call_t *jc; #ifndef MINISIZE - eXosip_subscribe_t *js; - eXosip_notify_t *jn; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; #endif - }; + }; - int eXosip_guess_ip_for_via (int family, char *address, int size); + int eXosip_guess_ip_for_via(int family, char *address, int size); /** * Prepare addrinfo for socket binding and resolv hostname @@ -486,205 +484,208 @@ * @param hostname hostname to resolv. * @param service port number or "sip" SRV record if service=0 */ - int eXosip_get_addrinfo (struct addrinfo **addrinfo, const char *hostname, - int service, int protocol); + int eXosip_get_addrinfo(struct addrinfo **addrinfo, const char *hostname, + int service, int protocol); - int eXosip_set_callbacks (osip_t * osip); - int cb_snd_message (osip_transaction_t * tr, osip_message_t * sip, - char *host, int port, int out_socket); - int cb_udp_snd_message (osip_transaction_t * tr, osip_message_t * sip, - char *host, int port, int out_socket); - int cb_tcp_snd_message (osip_transaction_t * tr, osip_message_t * sip, - char *host, int port, int out_socket); - char *osip_call_id_new_random (void); - char *osip_to_tag_new_random (void); - char *osip_from_tag_new_random (void); - unsigned int via_branch_new_random (void); - void __eXosip_delete_jinfo (osip_transaction_t * transaction); + int eXosip_set_callbacks(osip_t * osip); + int cb_snd_message(osip_transaction_t * tr, osip_message_t * sip, + char *host, int port, int out_socket); + int cb_udp_snd_message(osip_transaction_t * tr, osip_message_t * sip, + char *host, int port, int out_socket); + int cb_tcp_snd_message(osip_transaction_t * tr, osip_message_t * sip, + char *host, int port, int out_socket); + char *osip_call_id_new_random(void); + char *osip_to_tag_new_random(void); + char *osip_from_tag_new_random(void); + unsigned int via_branch_new_random(void); + void __eXosip_delete_jinfo(osip_transaction_t * transaction); #ifndef MINISIZE - jinfo_t *__eXosip_new_jinfo (eXosip_call_t * jc, eXosip_dialog_t * jd, - eXosip_subscribe_t * js, eXosip_notify_t * jn); + jinfo_t *__eXosip_new_jinfo(eXosip_call_t * jc, eXosip_dialog_t * jd, + eXosip_subscribe_t * js, eXosip_notify_t * jn); #else - jinfo_t *__eXosip_new_jinfo (eXosip_call_t * jc, eXosip_dialog_t * jd); + jinfo_t *__eXosip_new_jinfo(eXosip_call_t * jc, eXosip_dialog_t * jd); #endif - int eXosip_dialog_init_as_uac (eXosip_dialog_t ** jd, osip_message_t * _200Ok); - int eXosip_dialog_init_as_uas (eXosip_dialog_t ** jd, - osip_message_t * _invite, - osip_message_t * _200Ok); - void eXosip_dialog_free (eXosip_dialog_t * jd); - void eXosip_dialog_set_state (eXosip_dialog_t * jd, int state); - void eXosip_delete_early_dialog (eXosip_dialog_t * jd); - - - int isrfc1918 (char *ipaddr); - void eXosip_get_localip_from_via (osip_message_t *, char *localip, int size); - int generating_request_out_of_dialog (osip_message_t ** dest, - const char *method, const char *to, - const char *transport, - const char *from, const char *proxy); - int generating_publish (osip_message_t ** message, const char *to, - const char *from, const char *route); - int generating_cancel (osip_message_t ** dest, - osip_message_t * request_cancelled); - int generating_bye (osip_message_t ** bye, osip_dialog_t * dialog, - char *transport); - int generating_ack_for_2xx (osip_message_t ** ack, osip_dialog_t * dialog); - - int eXosip_update_top_via (osip_message_t * sip); - int _eXosip_request_add_via (osip_message_t * request, const char *transport, - const char *locip); - - int eXosip_add_authentication_information (osip_message_t * req, - osip_message_t * last_response); - int _eXosip_reg_find (eXosip_reg_t ** reg, osip_transaction_t * tr); - int eXosip_reg_find_id (eXosip_reg_t ** reg, int rid); - int eXosip_reg_init (eXosip_reg_t ** jr, const char *from, - const char *proxy, const char *contact); - void eXosip_reg_free (eXosip_reg_t * jreg); - int generating_register (eXosip_reg_t * jreg, osip_message_t ** reg, - char *transport, char *from, char *proxy, char *contact, - int expires); - - int _eXosip_call_transaction_find (int tid, eXosip_call_t ** jc, - eXosip_dialog_t ** jd, - osip_transaction_t ** tr); - int _eXosip_call_retry_request (eXosip_call_t * jc, - eXosip_dialog_t * jd, - osip_transaction_t * out_tr); - int eXosip_transaction_find (int tid, osip_transaction_t ** transaction); - int eXosip_call_dialog_find (int jid, eXosip_call_t ** jc, - eXosip_dialog_t ** jd); -#ifndef MINISIZE - int _eXosip_insubscription_transaction_find (int tid, - eXosip_notify_t ** jn, - eXosip_dialog_t ** jd, - osip_transaction_t ** tr); - int eXosip_notify_dialog_find (int nid, eXosip_notify_t ** jn, - eXosip_dialog_t ** jd); - int _eXosip_subscribe_transaction_find (int tid, eXosip_subscribe_t ** js, - eXosip_dialog_t ** jd, - osip_transaction_t ** tr); - int eXosip_subscribe_dialog_find (int nid, eXosip_subscribe_t ** js, - eXosip_dialog_t ** jd); -#endif - int eXosip_call_find (int cid, eXosip_call_t ** jc); - int eXosip_dialog_set_200ok (eXosip_dialog_t * _jd, osip_message_t * _200Ok); - - int _eXosip_answer_invite_123456xx (eXosip_call_t * jc, eXosip_dialog_t * jd, - int code, osip_message_t ** answer, - int send); -#ifndef MINISIZE - int _eXosip_insubscription_answer_1xx (eXosip_notify_t * jc, - eXosip_dialog_t * jd, int code); - int _eXosip_insubscription_answer_2xx (eXosip_notify_t * jn, - eXosip_dialog_t * jd, int code); - int _eXosip_insubscription_answer_3456xx (eXosip_notify_t * jn, - eXosip_dialog_t * jd, int code); -#endif - - int eXosip_build_response_default (int jid, int status); - int _eXosip_build_response_default (osip_message_t ** dest, - osip_dialog_t * dialog, int status, - osip_message_t * request); - int complete_answer_that_establish_a_dialog (osip_message_t * response, - osip_message_t * request); - int _eXosip_build_request_within_dialog (osip_message_t ** dest, - const char *method, - osip_dialog_t * dialog, - const char *transport); - void eXosip_kill_transaction (osip_list_t * transactions); - int eXosip_remove_transaction_from_call (osip_transaction_t * tr, - eXosip_call_t * jc); -#ifndef MINISIZE - osip_transaction_t *eXosip_find_last_inc_notify (eXosip_subscribe_t * jn, - eXosip_dialog_t * jd); - osip_transaction_t *eXosip_find_last_out_notify (eXosip_notify_t * jn, - eXosip_dialog_t * jd); - osip_transaction_t *eXosip_find_last_inc_subscribe (eXosip_notify_t * jn, - eXosip_dialog_t * jd); - osip_transaction_t *eXosip_find_last_out_subscribe (eXosip_subscribe_t * js, - eXosip_dialog_t * jd); -#endif - - osip_transaction_t *eXosip_find_last_transaction (eXosip_call_t * jc, - eXosip_dialog_t * jd, - const char *method); - osip_transaction_t *eXosip_find_last_inc_transaction (eXosip_call_t * jc, - eXosip_dialog_t * jd, - const char *method); - osip_transaction_t *eXosip_find_last_out_transaction (eXosip_call_t * jc, - eXosip_dialog_t * jd, - const char *method); - osip_transaction_t *eXosip_find_last_invite (eXosip_call_t * jc, - eXosip_dialog_t * jd); - osip_transaction_t *eXosip_find_last_inc_invite (eXosip_call_t * jc, - eXosip_dialog_t * jd); - osip_transaction_t *eXosip_find_last_out_invite (eXosip_call_t * jc, - eXosip_dialog_t * jd); - osip_transaction_t *eXosip_find_previous_invite (eXosip_call_t * jc, - eXosip_dialog_t * jd, - osip_transaction_t * - last_invite); - - - int eXosip_call_init (eXosip_call_t ** jc); - void eXosip_call_free (eXosip_call_t * jc); - void __eXosip_call_remove_dialog_reference_in_call (eXosip_call_t * jc, - eXosip_dialog_t * jd); - int eXosip_read_message (int max_message_nb, int sec_max, int usec_max); - void eXosip_release_terminated_calls (void); - void eXosip_release_terminated_registrations (void); - void eXosip_release_terminated_publications (void); - -#ifndef MINISIZE - void eXosip_release_terminated_subscriptions (void); - void eXosip_release_terminated_in_subscriptions (void); - int eXosip_subscribe_init (eXosip_subscribe_t ** js); - void eXosip_subscribe_free (eXosip_subscribe_t * js); - int _eXosip_subscribe_set_refresh_interval (eXosip_subscribe_t * js, - osip_message_t * inc_subscribe); - int eXosip_subscribe_need_refresh (eXosip_subscribe_t * js, - eXosip_dialog_t * jd, int now); - int _eXosip_subscribe_send_request_with_credential (eXosip_subscribe_t * js, - eXosip_dialog_t * jd, - osip_transaction_t * out_tr); - int _eXosip_subscribe_automatic_refresh (eXosip_subscribe_t * js, - eXosip_dialog_t * jd, - osip_transaction_t * out_tr); - int eXosip_notify_init (eXosip_notify_t ** jn, osip_message_t * inc_subscribe); - void eXosip_notify_free (eXosip_notify_t * jn); - int _eXosip_notify_set_contact_info (eXosip_notify_t * jn, char *uri); - int _eXosip_notify_set_refresh_interval (eXosip_notify_t * jn, - osip_message_t * inc_subscribe); - void _eXosip_notify_add_expires_in_2XX_for_subscribe (eXosip_notify_t * jn, - osip_message_t * answer); - int _eXosip_insubscription_send_request_with_credential (eXosip_notify_t * - jn, - eXosip_dialog_t * - jd, - osip_transaction_t - * out_tr); -#endif - - int eXosip_is_public_address (const char *addr); - - void eXosip_retransmit_lost200ok (void); - int _eXosip_dialog_add_contact (osip_message_t * request, - osip_message_t * answer); - - int _eXosip_transaction_init (osip_transaction_t ** transaction, - osip_fsm_type_t ctx_type, osip_t * osip, - osip_message_t * message); + int eXosip_dialog_init_as_uac(eXosip_dialog_t ** jd, osip_message_t * _200Ok); + int eXosip_dialog_init_as_uas(eXosip_dialog_t ** jd, + osip_message_t * _invite, + osip_message_t * _200Ok); + void eXosip_dialog_free(eXosip_dialog_t * jd); + void eXosip_dialog_set_state(eXosip_dialog_t * jd, int state); + void eXosip_delete_early_dialog(eXosip_dialog_t * jd); + + + int isrfc1918(char *ipaddr); + void eXosip_get_localip_from_via(osip_message_t *, char *localip, int size); + int generating_request_out_of_dialog(osip_message_t ** dest, + const char *method, const char *to, + const char *transport, + const char *from, const char *proxy); + int generating_publish(osip_message_t ** message, const char *to, + const char *from, const char *route); + int generating_cancel(osip_message_t ** dest, + osip_message_t * request_cancelled); + int generating_bye(osip_message_t ** bye, osip_dialog_t * dialog, + char *transport); + + int eXosip_update_top_via(osip_message_t * sip); + int _eXosip_request_add_via(osip_message_t * request, const char *transport, + const char *locip); + + void eXosip_mark_all_registrations_expired (); + + int eXosip_add_authentication_information(osip_message_t * req, + osip_message_t * last_response); + int _eXosip_reg_find(eXosip_reg_t ** reg, osip_transaction_t * tr); + int eXosip_reg_find_id(eXosip_reg_t ** reg, int rid); + int eXosip_reg_init(eXosip_reg_t ** jr, const char *from, + const char *proxy, const char *contact); + void eXosip_reg_free(eXosip_reg_t * jreg); + int generating_register(eXosip_reg_t * jreg, osip_message_t ** reg, + char *transport, char *from, char *proxy, + char *contact, int expires); + + int _eXosip_call_transaction_find(int tid, eXosip_call_t ** jc, + eXosip_dialog_t ** jd, + osip_transaction_t ** tr); + int _eXosip_call_retry_request(eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_transaction_t * out_tr); + int eXosip_transaction_find(int tid, osip_transaction_t ** transaction); + int eXosip_call_dialog_find(int jid, eXosip_call_t ** jc, + eXosip_dialog_t ** jd); +#ifndef MINISIZE + int _eXosip_insubscription_transaction_find(int tid, + eXosip_notify_t ** jn, + eXosip_dialog_t ** jd, + osip_transaction_t ** tr); + int eXosip_notify_dialog_find(int nid, eXosip_notify_t ** jn, + eXosip_dialog_t ** jd); + int _eXosip_subscribe_transaction_find(int tid, eXosip_subscribe_t ** js, + eXosip_dialog_t ** jd, + osip_transaction_t ** tr); + int eXosip_subscribe_dialog_find(int nid, eXosip_subscribe_t ** js, + eXosip_dialog_t ** jd); +#endif + int eXosip_call_find(int cid, eXosip_call_t ** jc); + int eXosip_dialog_set_200ok(eXosip_dialog_t * _jd, osip_message_t * _200Ok); + + int _eXosip_answer_invite_123456xx(eXosip_call_t * jc, eXosip_dialog_t * jd, + int code, osip_message_t ** answer, + int send); +#ifndef MINISIZE + int _eXosip_insubscription_answer_1xx(eXosip_notify_t * jc, + eXosip_dialog_t * jd, int code); + int _eXosip_insubscription_answer_2xx(eXosip_notify_t * jn, + eXosip_dialog_t * jd, int code); + int _eXosip_insubscription_answer_3456xx(eXosip_notify_t * jn, + eXosip_dialog_t * jd, int code); +#endif + + int eXosip_build_response_default(int jid, int status); + int _eXosip_build_response_default(osip_message_t ** dest, + osip_dialog_t * dialog, int status, + osip_message_t * request); + int complete_answer_that_establish_a_dialog(osip_message_t * response, + osip_message_t * request); + int _eXosip_build_request_within_dialog(osip_message_t ** dest, + const char *method, + osip_dialog_t * dialog, + const char *transport); + void eXosip_kill_transaction(osip_list_t * transactions); + int eXosip_remove_transaction_from_call(osip_transaction_t * tr, + eXosip_call_t * jc); +#ifndef MINISIZE + osip_transaction_t *eXosip_find_last_inc_notify(eXosip_subscribe_t * jn, + eXosip_dialog_t * jd); + osip_transaction_t *eXosip_find_last_out_notify(eXosip_notify_t * jn, + eXosip_dialog_t * jd); + osip_transaction_t *eXosip_find_last_inc_subscribe(eXosip_notify_t * jn, + eXosip_dialog_t * jd); + osip_transaction_t *eXosip_find_last_out_subscribe(eXosip_subscribe_t * js, + eXosip_dialog_t * jd); +#endif + + osip_transaction_t *eXosip_find_last_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, + const char *method); + osip_transaction_t *eXosip_find_last_inc_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, + const char *method); + osip_transaction_t *eXosip_find_last_out_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, + const char *method); + osip_transaction_t *eXosip_find_last_invite(eXosip_call_t * jc, + eXosip_dialog_t * jd); + osip_transaction_t *eXosip_find_last_inc_invite(eXosip_call_t * jc, + eXosip_dialog_t * jd); + osip_transaction_t *eXosip_find_last_out_invite(eXosip_call_t * jc, + eXosip_dialog_t * jd); + osip_transaction_t *eXosip_find_previous_invite(eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_transaction_t * + last_invite); + + + int eXosip_call_init(eXosip_call_t ** jc); + void eXosip_call_renew_expire_time(eXosip_call_t * jc); + void eXosip_call_free(eXosip_call_t * jc); + void __eXosip_call_remove_dialog_reference_in_call(eXosip_call_t * jc, + eXosip_dialog_t * jd); + int eXosip_read_message(int max_message_nb, int sec_max, int usec_max); + void eXosip_release_terminated_calls(void); + void eXosip_release_terminated_registrations(void); + void eXosip_release_terminated_publications(void); + +#ifndef MINISIZE + void eXosip_release_terminated_subscriptions(void); + void eXosip_release_terminated_in_subscriptions(void); + int eXosip_subscribe_init(eXosip_subscribe_t ** js); + void eXosip_subscribe_free(eXosip_subscribe_t * js); + int _eXosip_subscribe_set_refresh_interval(eXosip_subscribe_t * js, + osip_message_t * inc_subscribe); + int eXosip_subscribe_need_refresh(eXosip_subscribe_t * js, + eXosip_dialog_t * jd, int now); + int _eXosip_subscribe_send_request_with_credential(eXosip_subscribe_t * js, + eXosip_dialog_t * jd, + osip_transaction_t * + out_tr); + int _eXosip_subscribe_automatic_refresh(eXosip_subscribe_t * js, + eXosip_dialog_t * jd, + osip_transaction_t * out_tr); + int eXosip_notify_init(eXosip_notify_t ** jn, osip_message_t * inc_subscribe); + void eXosip_notify_free(eXosip_notify_t * jn); + int _eXosip_notify_set_contact_info(eXosip_notify_t * jn, char *uri); + int _eXosip_notify_set_refresh_interval(eXosip_notify_t * jn, + osip_message_t * inc_subscribe); + void _eXosip_notify_add_expires_in_2XX_for_subscribe(eXosip_notify_t * jn, + osip_message_t * answer); + int _eXosip_insubscription_send_request_with_credential(eXosip_notify_t * + jn, + eXosip_dialog_t * + jd, + osip_transaction_t + * out_tr); +#endif + + int eXosip_is_public_address(const char *addr); + + void eXosip_retransmit_lost200ok(void); + int _eXosip_dialog_add_contact(osip_message_t * request, + osip_message_t * answer); + + int _eXosip_transaction_init(osip_transaction_t ** transaction, + osip_fsm_type_t ctx_type, osip_t * osip, + osip_message_t * message); - int _eXosip_srv_lookup (osip_transaction_t * tr, osip_message_t * sip, - struct osip_srv_record *record); + int _eXosip_srv_lookup(osip_message_t * sip, osip_naptr_t **naptr_record); - int _eXosip_handle_incoming_message (char *buf, size_t len, int socket, - char *host, int port); + void _eXosip_dnsutils_release(osip_naptr_t *naptr_record); + + int _eXosip_handle_incoming_message(char *buf, size_t len, int socket, + char *host, int port); #ifdef __cplusplus } #endif - #endif diff -Nru libexosip2-3.3.0/src/eXosip.c libexosip2-3.6.0/src/eXosip.c --- libexosip2-3.3.0/src/eXosip.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXosip.c 2011-10-04 07:56:59.000000000 +0000 @@ -22,6 +22,10 @@ #include #endif +#ifdef __APPLE__ +#include "TargetConditionals.h" +#endif + #include "eXosip2.h" #include @@ -38,1541 +42,1480 @@ #endif /* Private functions */ -static jauthinfo_t *eXosip_find_authentication_info (const char *username, - const char *realm); +static jauthinfo_t *eXosip_find_authentication_info(const char *username, + const char *realm); eXosip_t eXosip; #ifdef OSIP_MT -void -__eXosip_wakeup (void) +void __eXosip_wakeup(void) { - jpipe_write (eXosip.j_socketctl, "w", 1); + jpipe_write(eXosip.j_socketctl, "w", 1); } -void -__eXosip_wakeup_event (void) +void __eXosip_wakeup_event(void) { - jpipe_write (eXosip.j_socketctl_event, "w", 1); + jpipe_write(eXosip.j_socketctl_event, "w", 1); } -int -eXosip_lock (void) +int eXosip_lock(void) { - return osip_mutex_lock ((struct osip_mutex *) eXosip.j_mutexlock); + return osip_mutex_lock((struct osip_mutex *) eXosip.j_mutexlock); } -int -eXosip_unlock (void) +int eXosip_unlock(void) { - return osip_mutex_unlock ((struct osip_mutex *) eXosip.j_mutexlock); + return osip_mutex_unlock((struct osip_mutex *) eXosip.j_mutexlock); } #endif int -_eXosip_transaction_init (osip_transaction_t ** transaction, - osip_fsm_type_t ctx_type, osip_t * osip, - osip_message_t * message) -{ -#ifdef SRV_RECORD - osip_srv_record_t record; -#endif - int i; - i = osip_transaction_init (transaction, ctx_type, osip, message); - if (i != 0) - { - return i; - } -#ifdef SRV_RECORD - memset (&record, 0, sizeof (osip_srv_record_t)); - i = _eXosip_srv_lookup (*transaction, message, &record); - if (i < 0) - { - /* might be a simple DNS request or an IP */ - return OSIP_SUCCESS; - } - osip_transaction_set_srv_record (*transaction, &record); -#endif - return OSIP_SUCCESS; -} - -int -eXosip_transaction_find (int tid, osip_transaction_t ** transaction) -{ - int pos = 0; - - *transaction = NULL; - while (!osip_list_eol (&eXosip.j_transactions, pos)) - { - osip_transaction_t *tr; - - tr = (osip_transaction_t *) osip_list_get (&eXosip.j_transactions, pos); - if (tr->transactionid == tid) - { - *transaction = tr; - return OSIP_SUCCESS; - } - pos++; - } - return OSIP_NOTFOUND; +_eXosip_transaction_init(osip_transaction_t ** transaction, + osip_fsm_type_t ctx_type, osip_t * osip, + osip_message_t * message) +{ + int i; + i = osip_transaction_init(transaction, ctx_type, osip, message); + if (i != 0) { + return i; + } + { + osip_naptr_t *naptr_record=NULL; + i = _eXosip_srv_lookup(message, &naptr_record); + if (i < 0) { + /* might be a simple DNS request or an IP */ + return OSIP_SUCCESS; + } + osip_transaction_set_naptr_record(*transaction, naptr_record); + } + return OSIP_SUCCESS; +} + +int eXosip_transaction_find(int tid, osip_transaction_t ** transaction) +{ + int pos = 0; + + *transaction = NULL; + while (!osip_list_eol(&eXosip.j_transactions, pos)) { + osip_transaction_t *tr; + + tr = (osip_transaction_t *) osip_list_get(&eXosip.j_transactions, pos); + if (tr->transactionid == tid) { + *transaction = tr; + return OSIP_SUCCESS; + } + pos++; + } + return OSIP_NOTFOUND; } #ifndef MINISIZE static int -_eXosip_retry_with_auth (eXosip_dialog_t * jd, osip_transaction_t ** ptr, - int *retry) -{ - osip_transaction_t *out_tr = NULL; - osip_transaction_t *tr = NULL; - osip_message_t *msg = NULL; - osip_event_t *sipevent; - jinfo_t *ji = NULL; - - int cseq; - osip_via_t *via; - int i; - - if (!ptr) - return OSIP_BADPARAMETER; - - if (jd != NULL) - { - if (jd->d_out_trs == NULL) - return OSIP_UNDEFINED_ERROR; - } - - out_tr = *ptr; - - if (out_tr == NULL - || out_tr->orig_request == NULL || out_tr->last_response == NULL) - return OSIP_BADPARAMETER; - - if (retry && (*retry >= 3)) - return OSIP_UNDEFINED_ERROR; - - i = osip_message_clone (out_tr->orig_request, &msg); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for authentication\n")); - return i; - } - - via = (osip_via_t *) osip_list_get (&msg->vias, 0); - if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) - { - osip_message_free (msg); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: missing via or cseq header\n")); - return OSIP_SYNTAXERROR; - } - - /* increment cseq */ - cseq = atoi (msg->cseq->number); - osip_free (msg->cseq->number); - msg->cseq->number = strdup_printf ("%i", cseq + 1); - if (jd != NULL && jd->d_dialog != NULL) - { - jd->d_dialog->local_cseq++; - } - - i = eXosip_update_top_via (msg); - if (i != 0) - { - osip_message_free (msg); - return i; - } - - osip_list_special_free (&msg->authorizations, - (void *(*)(void *)) &osip_authorization_free); - osip_list_special_free (&msg->proxy_authorizations, - (void *(*)(void *)) &osip_proxy_authorization_free); - - if (out_tr != NULL && out_tr->last_response != NULL - && (out_tr->last_response->status_code == 401 - || out_tr->last_response->status_code == 407)) - { - i = eXosip_add_authentication_information (msg, out_tr->last_response); - if (i < 0) - { - osip_message_free (msg); - return i; - } - } else - { - i = eXosip_add_authentication_information (msg, NULL); - if (i < 0) - { - osip_message_free (msg); - return i; - } - } - - - osip_message_force_update (msg); - - if (MSG_IS_INVITE (msg)) - i = _eXosip_transaction_init (&tr, ICT, eXosip.j_osip, msg); - else - i = _eXosip_transaction_init (&tr, NICT, eXosip.j_osip, msg); - - if (i != 0) - { - osip_message_free (msg); - return i; - } - - /* replace with the new tr */ - if (MSG_IS_PUBLISH (msg)) - { - /* old transaction is put in the garbage list */ - osip_list_add (&eXosip.j_transactions, out_tr, 0); - /* new transaction is put in the publish context */ - *ptr = tr; - } else - osip_list_add (&eXosip.j_transactions, tr, 0); - - sipevent = osip_new_outgoing_sipmessage (msg); - - ji = osip_transaction_get_your_instance (out_tr); - - osip_transaction_set_your_instance (out_tr, NULL); - osip_transaction_set_your_instance (tr, ji); - osip_transaction_add_event (tr, sipevent); - - if (retry) - (*retry)++; - - eXosip_update (); /* fixed? */ - __eXosip_wakeup (); - return OSIP_SUCCESS; -} - -static int -_eXosip_publish_refresh (eXosip_dialog_t * jd, osip_transaction_t ** ptr, - int *retry) -{ - osip_transaction_t *out_tr = NULL; - osip_transaction_t *tr = NULL; - osip_message_t *msg = NULL; - osip_event_t *sipevent; - jinfo_t *ji = NULL; - - int cseq; - osip_via_t *via; - int i; - - if (!ptr) - return OSIP_BADPARAMETER; - - if (jd != NULL) - { - if (jd->d_out_trs == NULL) - return OSIP_BADPARAMETER; - } - - out_tr = *ptr; - - if (out_tr == NULL - || out_tr->orig_request == NULL || out_tr->last_response == NULL) - return OSIP_BADPARAMETER; - - if (retry && (*retry >= 3)) - return OSIP_UNDEFINED_ERROR; - - i = osip_message_clone (out_tr->orig_request, &msg); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for authentication\n")); - return i; - } - - via = (osip_via_t *) osip_list_get (&msg->vias, 0); - if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) - { - osip_message_free (msg); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: missing via or cseq header\n")); - return OSIP_SYNTAXERROR; - } - - /* increment cseq */ - cseq = atoi (msg->cseq->number); - osip_free (msg->cseq->number); - msg->cseq->number = strdup_printf ("%i", cseq + 1); - if (msg->cseq->number == NULL) - { - osip_message_free (msg); - return OSIP_NOMEM; - } - if (jd != NULL && jd->d_dialog != NULL) - { - jd->d_dialog->local_cseq++; - } - - i = eXosip_update_top_via (msg); - if (i != 0) - { - osip_message_free (msg); - return i; - } - - osip_list_special_free (&msg->authorizations, - (void *(*)(void *)) &osip_authorization_free); - osip_list_special_free (&msg->proxy_authorizations, - (void *(*)(void *)) &osip_proxy_authorization_free); - - if (out_tr != NULL && out_tr->last_response != NULL - && (out_tr->last_response->status_code == 401 - || out_tr->last_response->status_code == 407)) - { - eXosip_add_authentication_information (msg, out_tr->last_response); - } else - eXosip_add_authentication_information (msg, NULL); - - if (out_tr != NULL && out_tr->last_response != NULL - && out_tr->last_response->status_code == 412) - { - /* remove SIP-If-Match header */ - int pos = 0; - while (!osip_list_eol (&msg->headers, pos)) - { - osip_header_t *head = osip_list_get (&msg->headers, pos); - if (head != NULL && 0 == osip_strcasecmp (head->hname, "sip-if-match")) - { - i = osip_list_remove (&msg->headers, pos); - osip_header_free (head); - break; - } - pos++; - } - } - - if (out_tr != NULL && out_tr->last_response != NULL - && out_tr->last_response->status_code == 423) - { - /* increase expires value to "min-expires" value */ - osip_header_t *exp; - osip_header_t *min_exp; - - osip_message_header_get_byname (msg, "expires", 0, &exp); - osip_message_header_get_byname (out_tr->last_response, "min-expires", 0, - &min_exp); - if (exp != NULL && exp->hvalue != NULL && min_exp != NULL - && min_exp->hvalue != NULL) - { - osip_free (exp->hvalue); - exp->hvalue = osip_strdup (min_exp->hvalue); - } else - { - osip_message_free (msg); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: missing Min-Expires or Expires in PUBLISH\n")); - return OSIP_SYNTAXERROR; - } - } - - osip_message_force_update (msg); - - if (MSG_IS_INVITE (msg)) - i = _eXosip_transaction_init (&tr, ICT, eXosip.j_osip, msg); - else - i = _eXosip_transaction_init (&tr, NICT, eXosip.j_osip, msg); - - if (i != 0) - { - osip_message_free (msg); - return i; - } - - /* replace with the new tr */ - if (MSG_IS_PUBLISH (msg)) - { - /* old transaction is put in the garbage list */ - osip_list_add (&eXosip.j_transactions, out_tr, 0); - /* new transaction is put in the publish context */ - *ptr = tr; - } else - osip_list_add (&eXosip.j_transactions, tr, 0); - - sipevent = osip_new_outgoing_sipmessage (msg); - - ji = osip_transaction_get_your_instance (out_tr); - - osip_transaction_set_your_instance (out_tr, NULL); - osip_transaction_set_your_instance (tr, ji); - osip_transaction_add_event (tr, sipevent); - - if (retry) - (*retry)++; - - eXosip_update (); /* fixed? */ - __eXosip_wakeup (); - return OSIP_SUCCESS; -} - -static int -_eXosip_retry_register_with_auth (eXosip_event_t * je) -{ - eXosip_reg_t *jr = NULL; - int i; - - i = eXosip_reg_find_id (&jr, je->rid); - if (i < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: registration not found\n")); - return i; - } - - if (jr->r_retry < 3) - { - jr->r_retry++; - return eXosip_register_send_register (jr->r_id, NULL); - } - - return OSIP_UNDEFINED_ERROR; -} - -static int -_eXosip_retry_invite_with_auth (eXosip_event_t * je) +_eXosip_retry_with_auth(eXosip_dialog_t * jd, osip_transaction_t ** ptr, + int *retry) { - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - int *retry = NULL; - osip_transaction_t *tr = NULL; - int i; - - i = _eXosip_call_transaction_find (je->tid, &jc, &jd, &tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: call dialog not found\n")); - return i; - } - - if (jd && jd->d_dialog) - retry = &jd->d_retry; - else - retry = &jc->c_retry; - - if (*retry < 3) - { - (*retry)++; - return _eXosip_call_retry_request (jc, jd, tr); - } - return OSIP_UNDEFINED_ERROR; + osip_transaction_t *out_tr = NULL; + osip_transaction_t *tr = NULL; + osip_message_t *msg = NULL; + osip_event_t *sipevent; + jinfo_t *ji = NULL; + + int cseq; + osip_via_t *via; + int i; + + if (!ptr) + return OSIP_BADPARAMETER; + + if (jd != NULL) { + if (jd->d_out_trs == NULL) + return OSIP_UNDEFINED_ERROR; + } + + out_tr = *ptr; + + if (out_tr == NULL + || out_tr->orig_request == NULL || out_tr->last_response == NULL) + return OSIP_BADPARAMETER; + + if (retry && (*retry >= 3)) + return OSIP_UNDEFINED_ERROR; + + i = osip_message_clone(out_tr->orig_request, &msg); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for authentication\n")); + return i; + } + + via = (osip_via_t *) osip_list_get(&msg->vias, 0); + if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing via or cseq header\n")); + return OSIP_SYNTAXERROR; + } + + /* increment cseq */ + cseq = atoi(msg->cseq->number); + osip_free(msg->cseq->number); + msg->cseq->number = strdup_printf("%i", cseq + 1); + if (jd != NULL && jd->d_dialog != NULL) { + jd->d_dialog->local_cseq++; + } + + i = eXosip_update_top_via(msg); + if (i != 0) { + osip_message_free(msg); + return i; + } + + osip_list_special_free(&msg->authorizations, + (void (*)(void *)) &osip_authorization_free); + osip_list_special_free(&msg->proxy_authorizations, + (void (*)(void *)) &osip_proxy_authorization_free); + + if (out_tr != NULL && out_tr->last_response != NULL + && (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407)) { + i = eXosip_add_authentication_information(msg, out_tr->last_response); + if (i < 0) { + osip_message_free(msg); + return i; + } + } else { + i = eXosip_add_authentication_information(msg, NULL); + if (i < 0) { + osip_message_free(msg); + return i; + } + } + + + osip_message_force_update(msg); + + if (MSG_IS_INVITE(msg)) + i = _eXosip_transaction_init(&tr, ICT, eXosip.j_osip, msg); + else + i = _eXosip_transaction_init(&tr, NICT, eXosip.j_osip, msg); + + if (i != 0) { + osip_message_free(msg); + return i; + } + + /* replace with the new tr */ + if (MSG_IS_PUBLISH(msg)) { + /* old transaction is put in the garbage list */ + osip_list_add(&eXosip.j_transactions, out_tr, 0); + /* new transaction is put in the publish context */ + *ptr = tr; + } else + osip_list_add(&eXosip.j_transactions, tr, 0); + + sipevent = osip_new_outgoing_sipmessage(msg); + + ji = osip_transaction_get_your_instance(out_tr); + + osip_transaction_set_your_instance(out_tr, NULL); + osip_transaction_set_your_instance(tr, ji); + osip_transaction_add_event(tr, sipevent); + + if (retry) + (*retry)++; + + eXosip_update(); /* fixed? */ + __eXosip_wakeup(); + return OSIP_SUCCESS; } static int -_eXosip_redirect_invite (eXosip_event_t * je) +_eXosip_publish_refresh(eXosip_dialog_t * jd, osip_transaction_t ** ptr, + int *retry) { - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *tr = NULL; - int i; - - i = _eXosip_call_transaction_find (je->tid, &jc, &jd, &tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: call dialog not found\n")); - return i; - } - - return _eXosip_call_retry_request (jc, jd, tr); -} - -static int -_eXosip_retry_subscribe_with_auth (eXosip_event_t * je) -{ - eXosip_dialog_t *jd = NULL; - eXosip_subscribe_t *js = NULL; - int *retry = NULL; - osip_transaction_t *tr = NULL; - int i; - - i = _eXosip_subscribe_transaction_find (je->tid, &js, &jd, &tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: subscribe dialog not found\n")); - return i; - } - - if (jd && jd->d_dialog) - retry = &jd->d_retry; - else - retry = &js->s_retry; - - if (*retry < 3) - { - (*retry)++; - return _eXosip_subscribe_send_request_with_credential (js, jd, tr); - } - return OSIP_UNDEFINED_ERROR; -} - -static int -_eXosip_retry_publish_with_auth (eXosip_event_t * je) -{ - eXosip_pub_t *jp = NULL; - int i; - - i = _eXosip_pub_find_by_tid (&jp, je->tid); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: publish transaction not found\n")); - return i; - } - - return _eXosip_retry_with_auth (NULL, &jp->p_last_tr, NULL); -} - -static int -_eXosip_retry_notify_with_auth (eXosip_event_t * je) -{ - /* TODO untested */ - eXosip_dialog_t *jd = NULL; - eXosip_notify_t *jn = NULL; - osip_transaction_t *tr = NULL; - int i; - - i = _eXosip_insubscription_transaction_find (je->tid, &jn, &jd, &tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: notify dialog not found\n")); - return i; - } - - return _eXosip_insubscription_send_request_with_credential (jn, jd, tr); - -} - -static int -eXosip_retry_with_auth (eXosip_event_t * je) -{ - if (!je || !je->request || !je->response) - return OSIP_BADPARAMETER; - - if (je->rid > 0) - { - return _eXosip_retry_register_with_auth (je); - } else if (je->cid > 0) - { - return _eXosip_retry_invite_with_auth (je); - } + osip_transaction_t *out_tr = NULL; + osip_transaction_t *tr = NULL; + osip_message_t *msg = NULL; + osip_event_t *sipevent; + jinfo_t *ji = NULL; + + int cseq; + osip_via_t *via; + int i; + + if (!ptr) + return OSIP_BADPARAMETER; + + if (jd != NULL) { + if (jd->d_out_trs == NULL) + return OSIP_BADPARAMETER; + } + + out_tr = *ptr; + + if (out_tr == NULL + || out_tr->orig_request == NULL || out_tr->last_response == NULL) + return OSIP_BADPARAMETER; + + if (retry && (*retry >= 3)) + return OSIP_UNDEFINED_ERROR; + + i = osip_message_clone(out_tr->orig_request, &msg); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for authentication\n")); + return i; + } + + via = (osip_via_t *) osip_list_get(&msg->vias, 0); + if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing via or cseq header\n")); + return OSIP_SYNTAXERROR; + } + + /* increment cseq */ + cseq = atoi(msg->cseq->number); + osip_free(msg->cseq->number); + msg->cseq->number = strdup_printf("%i", cseq + 1); + if (msg->cseq->number == NULL) { + osip_message_free(msg); + return OSIP_NOMEM; + } + if (jd != NULL && jd->d_dialog != NULL) { + jd->d_dialog->local_cseq++; + } + + i = eXosip_update_top_via(msg); + if (i != 0) { + osip_message_free(msg); + return i; + } + + osip_list_special_free(&msg->authorizations, + (void (*)(void *)) &osip_authorization_free); + osip_list_special_free(&msg->proxy_authorizations, + (void (*)(void *)) &osip_proxy_authorization_free); + + if (out_tr != NULL && out_tr->last_response != NULL + && (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407)) { + eXosip_add_authentication_information(msg, out_tr->last_response); + } else + eXosip_add_authentication_information(msg, NULL); + + if (out_tr != NULL && out_tr->last_response != NULL + && out_tr->last_response->status_code == 412) { + /* remove SIP-If-Match header */ + int pos = 0; + while (!osip_list_eol(&msg->headers, pos)) { + osip_header_t *head = osip_list_get(&msg->headers, pos); + if (head != NULL && 0 == osip_strcasecmp(head->hname, "sip-if-match")) { + i = osip_list_remove(&msg->headers, pos); + osip_header_free(head); + break; + } + pos++; + } + } + + if (out_tr != NULL && out_tr->last_response != NULL + && out_tr->last_response->status_code == 423) { + /* increase expires value to "min-expires" value */ + osip_header_t *exp; + osip_header_t *min_exp; + + osip_message_header_get_byname(msg, "expires", 0, &exp); + osip_message_header_get_byname(out_tr->last_response, "min-expires", 0, + &min_exp); + if (exp != NULL && exp->hvalue != NULL && min_exp != NULL + && min_exp->hvalue != NULL) { + osip_free(exp->hvalue); + exp->hvalue = osip_strdup(min_exp->hvalue); + } else { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing Min-Expires or Expires in PUBLISH\n")); + return OSIP_SYNTAXERROR; + } + } + + osip_message_force_update(msg); + + if (MSG_IS_INVITE(msg)) + i = _eXosip_transaction_init(&tr, ICT, eXosip.j_osip, msg); + else + i = _eXosip_transaction_init(&tr, NICT, eXosip.j_osip, msg); + + if (i != 0) { + osip_message_free(msg); + return i; + } + + /* replace with the new tr */ + if (MSG_IS_PUBLISH(msg)) { + /* old transaction is put in the garbage list */ + osip_list_add(&eXosip.j_transactions, out_tr, 0); + /* new transaction is put in the publish context */ + *ptr = tr; + } else + osip_list_add(&eXosip.j_transactions, tr, 0); + + sipevent = osip_new_outgoing_sipmessage(msg); + + ji = osip_transaction_get_your_instance(out_tr); + + osip_transaction_set_your_instance(out_tr, NULL); + osip_transaction_set_your_instance(tr, ji); + osip_transaction_add_event(tr, sipevent); + + if (retry) + (*retry)++; + + eXosip_update(); /* fixed? */ + __eXosip_wakeup(); + return OSIP_SUCCESS; +} + +static int _eXosip_retry_register_with_auth(eXosip_event_t * je) +{ + eXosip_reg_t *jr = NULL; + int i; + + i = eXosip_reg_find_id(&jr, je->rid); + if (i < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: registration not found\n")); + return i; + } + + if (jr->r_retry < 3) { + jr->r_retry++; + return eXosip_register_send_register(jr->r_id, NULL); + } + + return OSIP_UNDEFINED_ERROR; +} + +static int _eXosip_retry_invite_with_auth(eXosip_event_t * je) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + int *retry = NULL; + osip_transaction_t *tr = NULL; + int i; + + i = _eXosip_call_transaction_find(je->tid, &jc, &jd, &tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: call dialog not found\n")); + return i; + } + + if (jd && jd->d_dialog) + retry = &jd->d_retry; + else + retry = &jc->c_retry; + + if (*retry < 3) { + (*retry)++; + return _eXosip_call_retry_request(jc, jd, tr); + } + return OSIP_UNDEFINED_ERROR; +} + +static int _eXosip_redirect_invite(eXosip_event_t * je) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *tr = NULL; + int i; + + i = _eXosip_call_transaction_find(je->tid, &jc, &jd, &tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: call dialog not found\n")); + return i; + } + + return _eXosip_call_retry_request(jc, jd, tr); +} + +static int _eXosip_retry_subscribe_with_auth(eXosip_event_t * je) +{ + eXosip_dialog_t *jd = NULL; + eXosip_subscribe_t *js = NULL; + int *retry = NULL; + osip_transaction_t *tr = NULL; + int i; + + i = _eXosip_subscribe_transaction_find(je->tid, &js, &jd, &tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: subscribe dialog not found\n")); + return i; + } + + if (jd && jd->d_dialog) + retry = &jd->d_retry; + else + retry = &js->s_retry; + + if (*retry < 3) { + (*retry)++; + return _eXosip_subscribe_send_request_with_credential(js, jd, tr); + } + return OSIP_UNDEFINED_ERROR; +} + +static int _eXosip_retry_publish_with_auth(eXosip_event_t * je) +{ + eXosip_pub_t *jp = NULL; + int i; + + i = _eXosip_pub_find_by_tid(&jp, je->tid); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: publish transaction not found\n")); + return i; + } + + return _eXosip_retry_with_auth(NULL, &jp->p_last_tr, NULL); +} + +static int _eXosip_retry_notify_with_auth(eXosip_event_t * je) +{ + /* TODO untested */ + eXosip_dialog_t *jd = NULL; + eXosip_notify_t *jn = NULL; + osip_transaction_t *tr = NULL; + int i; + + i = _eXosip_insubscription_transaction_find(je->tid, &jn, &jd, &tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: notify dialog not found\n")); + return i; + } + + return _eXosip_insubscription_send_request_with_credential(jn, jd, tr); + +} + +static int eXosip_retry_with_auth(eXosip_event_t * je) +{ + int res=OSIP_UNDEFINED_ERROR; + if (!je || !je->request || !je->response) + return OSIP_BADPARAMETER; + + if (je->rid > 0) { + return _eXosip_retry_register_with_auth(je); + } else if (je->cid > 0) { + res = _eXosip_retry_invite_with_auth(je); + if (res==OSIP_NOTFOUND) + { + osip_transaction_t *tr = NULL; + eXosip_transaction_find(je->tid, &tr); + if (tr != NULL) { + return _eXosip_retry_with_auth(NULL, &tr, NULL); + } + } + return res; + } #ifndef MINISIZE - else if (je->sid > 0) - { - return _eXosip_retry_subscribe_with_auth (je); - } else if (je->nid > 0) - { - return _eXosip_retry_notify_with_auth (je); - } else if (MSG_IS_PUBLISH (je->request)) - return _eXosip_retry_publish_with_auth (je); + else if (je->sid > 0) { + return _eXosip_retry_subscribe_with_auth(je); + } else if (je->nid > 0) { + return _eXosip_retry_notify_with_auth(je); + } else if (MSG_IS_PUBLISH(je->request)) + return _eXosip_retry_publish_with_auth(je); #endif - else - { - osip_transaction_t *tr = NULL; - eXosip_transaction_find (je->tid, &tr); - if (tr != NULL) - { - return _eXosip_retry_with_auth (NULL, &tr, NULL); - } - } - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Can't retry event %d with auth\n", je->type)); - return OSIP_UNDEFINED_ERROR; -} - -static int -_eXosip_redirect (eXosip_event_t * je) -{ - switch (je->type) - { - case EXOSIP_CALL_REDIRECTED: - return _eXosip_redirect_invite (je); - - case EXOSIP_CALL_MESSAGE_REDIRECTED: - case EXOSIP_MESSAGE_REDIRECTED: - case EXOSIP_SUBSCRIPTION_REDIRECTED: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: not implemented\n")); - return OSIP_UNDEFINED_ERROR; - - default: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Can't redirect event %d\n", je->type)); - return OSIP_UNDEFINED_ERROR; - } -} - -int -eXosip_default_action (eXosip_event_t * je) -{ - if (!je || !je->response) - return OSIP_BADPARAMETER; - - if (je->response->status_code == 401 || je->response->status_code == 407) - return eXosip_retry_with_auth (je); - else if (je->response->status_code >= 300 && je->response->status_code <= 399) - return _eXosip_redirect (je); - else - return 1; -} - -void -eXosip_automatic_refresh (void) -{ - eXosip_subscribe_t *js; - eXosip_dialog_t *jd; - - eXosip_reg_t *jr; - time_t now; - - now = time (NULL); - - for (js = eXosip.j_subscribes; js != NULL; js = js->next) - { - for (jd = js->s_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog != NULL && (jd->d_id >= 1)) /* finished call */ - { - osip_transaction_t *out_tr = NULL; - - out_tr = osip_list_get (jd->d_out_trs, 0); - if (out_tr == NULL) - out_tr = js->s_out_tr; - - if (js->s_reg_period == 0 || out_tr == NULL) - { - } else if (now - out_tr->birth_time > js->s_reg_period - 60) - { /* will expires in 60 sec: send refresh! */ - int i; - - i = _eXosip_subscribe_automatic_refresh (js, jd, out_tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not send subscribe for refresh\n")); - } - } - } - } - } - - for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) - { - if (jr->r_id >= 1 && jr->r_last_tr != NULL) - { - if (jr->r_reg_period == 0) - { - /* skip refresh! */ - } else if (now - jr->r_last_tr->birth_time > 900) - { - /* automatic refresh */ - eXosip_register_send_register (jr->r_id, NULL); - } else if (now - jr->r_last_tr->birth_time > jr->r_reg_period - 60) - { - /* automatic refresh */ - eXosip_register_send_register (jr->r_id, NULL); - } else if (now - jr->r_last_tr->birth_time > 120 && - (jr->r_last_tr->last_response == NULL - || (!MSG_IS_STATUS_2XX (jr->r_last_tr->last_response)))) - { - /* automatic refresh */ - eXosip_register_send_register (jr->r_id, NULL); - } - } - } + else { + osip_transaction_t *tr = NULL; + eXosip_transaction_find(je->tid, &tr); + if (tr != NULL) { + return _eXosip_retry_with_auth(NULL, &tr, NULL); + } + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Can't retry event %d with auth\n", je->type)); + return OSIP_UNDEFINED_ERROR; +} + +static int _eXosip_redirect(eXosip_event_t * je) +{ + switch (je->type) { + case EXOSIP_CALL_REDIRECTED: + return _eXosip_redirect_invite(je); + + case EXOSIP_CALL_MESSAGE_REDIRECTED: + case EXOSIP_MESSAGE_REDIRECTED: + case EXOSIP_SUBSCRIPTION_REDIRECTED: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: not implemented\n")); + return OSIP_UNDEFINED_ERROR; + + default: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Can't redirect event %d\n", je->type)); + return OSIP_UNDEFINED_ERROR; + } +} + +int eXosip_default_action(eXosip_event_t * je) +{ + if (!je || !je->response) + return OSIP_BADPARAMETER; + + if (je->response->status_code == 401 || je->response->status_code == 407) + return eXosip_retry_with_auth(je); + else if (je->response->status_code >= 300 && je->response->status_code <= 399) + return _eXosip_redirect(je); + else + return 1; +} + +void eXosip_automatic_refresh(void) +{ + eXosip_subscribe_t *js; + eXosip_dialog_t *jd; + + eXosip_reg_t *jr; + time_t now; + + now = time(NULL); + + for (js = eXosip.j_subscribes; js != NULL; js = js->next) { + for (jd = js->s_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog != NULL && (jd->d_id >= 1)) { /* finished call */ + osip_transaction_t *out_tr = NULL; + + out_tr = osip_list_get(jd->d_out_trs, 0); + if (out_tr == NULL) + out_tr = js->s_out_tr; + + if (js->s_reg_period == 0 || out_tr == NULL) { + } else if (now - out_tr->birth_time > js->s_reg_period - (js->s_reg_period/10)) { /* will expires in js->s_reg_period/10: send refresh! */ + int i; + + i = _eXosip_subscribe_automatic_refresh(js, jd, out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not send subscribe for refresh\n")); + } + } + } + } + } + + for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) { + if (jr->r_id >= 1 && jr->r_last_tr != NULL) { + if (jr->r_reg_period == 0) { + /* skip refresh! */ + } else if (now - jr->r_last_tr->birth_time > 900) { + /* automatic refresh */ + eXosip_register_send_register(jr->r_id, NULL); +#if TARGET_OS_IPHONE + } else if (now - jr->r_last_tr->birth_time > jr->r_reg_period - 630) { + eXosip_register_send_register(jr->r_id, NULL); +#endif + } else if (now - jr->r_last_tr->birth_time > jr->r_reg_period - (jr->r_reg_period/10)) { + /* automatic refresh at "timeout - 10%" */ + eXosip_register_send_register(jr->r_id, NULL); + } else if (now - jr->r_last_tr->birth_time > 120 && + (jr->r_last_tr->last_response == NULL + || (!MSG_IS_STATUS_2XX(jr->r_last_tr->last_response)))) { + /* automatic refresh */ + eXosip_register_send_register(jr->r_id, NULL); + } + } + } } #endif -void -eXosip_retransmit_lost200ok () +void eXosip_retransmit_lost200ok() { - eXosip_call_t *jc; - eXosip_dialog_t *jd; - time_t now; - - now = time (NULL); - - for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) - { - if (jc->c_id >= 1 && jc->c_dialogs != NULL) - { - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_id >= 1 && jd->d_dialog != NULL && jd->d_200Ok != NULL) - { - if (jd->d_count == 9) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: no ACK received during 20s: dropping call\n")); - /* hard for users to detect than I sent this BYE... */ - jd->d_count = 0; - osip_message_free (jd->d_200Ok); - jd->d_200Ok = NULL; - eXosip_call_terminate (jc->c_id, jd->d_id); - } else if (jd->d_timer < now) - { - /* a dialog exist: retransmit lost 200ok */ - jd->d_count++; - if (jd->d_count == 1) - jd->d_timer = time (NULL) + 1; - if (jd->d_count == 2) - jd->d_timer = time (NULL) + 2; - if (jd->d_count >= 3) - jd->d_timer = time (NULL) + 4; - jd = jc->c_dialogs; - /* TU retransmission */ - cb_snd_message (NULL, jd->d_200Ok, NULL, 0, -1); - } - } - } - } - } - return; + eXosip_call_t *jc; + eXosip_dialog_t *jd; + time_t now; + + now = time(NULL); + + for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) { + if (jc->c_id >= 1 && jc->c_dialogs != NULL) { + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_id >= 1 && jd->d_dialog != NULL && jd->d_200Ok != NULL) { + if (jd->d_count == 9) { + int i; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: no ACK received during 20s: dropping call\n")); + /* hard for users to detect than I sent this BYE... */ + jd->d_count = 0; + osip_message_free(jd->d_200Ok); + jd->d_200Ok = NULL; + i = eXosip_call_terminate(jc->c_id, jd->d_id); + if (i == OSIP_SUCCESS) + { + report_call_event(EXOSIP_CALL_CLOSED, jc, jd, NULL); + } + } else if (jd->d_timer < now) { + /* a dialog exist: retransmit lost 200ok */ + jd->d_count++; + if (jd->d_count == 1) + jd->d_timer = time(NULL) + 1; + if (jd->d_count == 2) + jd->d_timer = time(NULL) + 2; + if (jd->d_count >= 3) + jd->d_timer = time(NULL) + 4; + jd = jc->c_dialogs; + /* TU retransmission */ + cb_snd_message(NULL, jd->d_200Ok, NULL, 0, -1); + } + } + } + } + } + return; } -void -eXosip_automatic_action (void) +void eXosip_automatic_action(void) { - eXosip_call_t *jc; - eXosip_dialog_t *jd; + eXosip_call_t *jc; + eXosip_dialog_t *jd; #ifndef MINISIZE - eXosip_subscribe_t *js; - eXosip_notify_t *jn; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; #endif - eXosip_reg_t *jr; + eXosip_reg_t *jr; #ifndef MINISIZE - eXosip_pub_t *jpub; + eXosip_pub_t *jpub; #endif - time_t now; + time_t now; - now = time (NULL); + now = time(NULL); - for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) - { - if (jc->c_id < 1) - { - } else if (jc->c_dialogs == NULL || jc->c_dialogs->d_dialog == NULL) - { - /* an EARLY dialog may have failed with 401,407 or 3Xx */ - - osip_transaction_t *out_tr = NULL; - - out_tr = jc->c_out_tr; - - if (out_tr != NULL - && (out_tr->state == ICT_TERMINATED - || out_tr->state == NICT_TERMINATED - || out_tr->state == ICT_COMPLETED - || out_tr->state == NICT_COMPLETED) && - now - out_tr->birth_time < 120 && - out_tr->orig_request != NULL && - out_tr->last_response != NULL && - (out_tr->last_response->status_code == 401 - || out_tr->last_response->status_code == 407)) - { - /* retry with credential */ - if (jc->c_retry < 3) - { - int i; - - i = _eXosip_call_retry_request (jc, NULL, out_tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for authentication\n")); - } - jc->c_retry++; - } - } else if (out_tr != NULL - && (out_tr->state == ICT_TERMINATED - || out_tr->state == NICT_TERMINATED - || out_tr->state == ICT_COMPLETED - || out_tr->state == NICT_COMPLETED) && - now - out_tr->birth_time < 120 && - out_tr->orig_request != NULL && - out_tr->last_response != NULL && - (out_tr->last_response->status_code >= 300 - && out_tr->last_response->status_code <= 399)) - { - /* retry with credential */ - int i; - - i = _eXosip_call_retry_request (jc, NULL, out_tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for redirection\n")); - } - } - } - - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog == NULL) /* finished call */ - { - } else - { - osip_transaction_t *out_tr = NULL; - - out_tr = osip_list_get (jd->d_out_trs, 0); - if (out_tr == NULL) - out_tr = jc->c_out_tr; - - if (out_tr != NULL - && (out_tr->state == ICT_TERMINATED - || out_tr->state == NICT_TERMINATED - || out_tr->state == ICT_COMPLETED - || out_tr->state == NICT_COMPLETED) && - now - out_tr->birth_time < 120 && - out_tr->orig_request != NULL && - out_tr->last_response != NULL && - (out_tr->last_response->status_code == 401 - || out_tr->last_response->status_code == 407)) - { - /* retry with credential */ - if (jd->d_retry < 3) - { - int i; - - i = _eXosip_call_retry_request (jc, jd, out_tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for authentication\n")); - } - jd->d_retry++; - } - } else if (out_tr != NULL - && (out_tr->state == ICT_TERMINATED - || out_tr->state == NICT_TERMINATED - || out_tr->state == ICT_COMPLETED - || out_tr->state == NICT_COMPLETED) && - now - out_tr->birth_time < 120 && - out_tr->orig_request != NULL && - out_tr->last_response != NULL && - (out_tr->last_response->status_code >= 300 - && out_tr->last_response->status_code <= 399)) - { - /* retry with credential */ - int i; - - i = _eXosip_call_retry_request (jc, jd, out_tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for redirection\n")); - } - } - } - } - } + for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) { + if (jc->c_id < 1) { + } else if (jc->c_dialogs == NULL || jc->c_dialogs->d_dialog == NULL) { + /* an EARLY dialog may have failed with 401,407 or 3Xx */ + + osip_transaction_t *out_tr = NULL; + + out_tr = jc->c_out_tr; + + if (out_tr != NULL + && (out_tr->state == ICT_TERMINATED + || out_tr->state == NICT_TERMINATED + || out_tr->state == ICT_COMPLETED + || out_tr->state == NICT_COMPLETED) && + now - out_tr->birth_time < 120 && + out_tr->orig_request != NULL && + out_tr->last_response != NULL && + (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407)) { + /* retry with credential */ + if (jc->c_retry < 3) { + int i; + + i = _eXosip_call_retry_request(jc, NULL, out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for authentication\n")); + } + jc->c_retry++; + } + } else if (out_tr != NULL + && (out_tr->state == ICT_TERMINATED + || out_tr->state == NICT_TERMINATED + || out_tr->state == ICT_COMPLETED + || out_tr->state == NICT_COMPLETED) && + now - out_tr->birth_time < 120 && + out_tr->orig_request != NULL && + out_tr->last_response != NULL && + out_tr->last_response->status_code == 422) { + /* retry with higher Session-Expires / Min-SE */ + if (jc->c_retry < 3) { + int i; + + i = _eXosip_call_retry_request(jc, NULL, out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for updating Session-Expires\n")); + } + jc->c_retry++; + } + } else if (out_tr != NULL + && (out_tr->state == ICT_TERMINATED + || out_tr->state == NICT_TERMINATED + || out_tr->state == ICT_COMPLETED + || out_tr->state == NICT_COMPLETED) && + now - out_tr->birth_time < 120 && + out_tr->orig_request != NULL && + out_tr->last_response != NULL && + (out_tr->last_response->status_code >= 300 + && out_tr->last_response->status_code <= 399)) { + /* retry with credential */ + int i; + + i = _eXosip_call_retry_request(jc, NULL, out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for redirection\n")); + } + } + } + + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog == NULL) { /* finished call */ + } else { + osip_transaction_t *out_tr = NULL; + + out_tr = osip_list_get(jd->d_out_trs, 0); + if (out_tr == NULL) + out_tr = jc->c_out_tr; + + if (out_tr != NULL + && (out_tr->state == ICT_TERMINATED + || out_tr->state == NICT_TERMINATED + || out_tr->state == ICT_COMPLETED + || out_tr->state == NICT_COMPLETED) && + now - out_tr->birth_time < 120 && + out_tr->orig_request != NULL && + out_tr->last_response != NULL && + (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407)) { + /* retry with credential */ + if (jd->d_retry < 3) { + int i; + + i = _eXosip_call_retry_request(jc, jd, out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for authentication\n")); + } + jd->d_retry++; + } + } else if (out_tr != NULL + && (out_tr->state == ICT_TERMINATED + || out_tr->state == NICT_TERMINATED + || out_tr->state == ICT_COMPLETED + || out_tr->state == NICT_COMPLETED) && + now - out_tr->birth_time < 120 && + out_tr->orig_request != NULL && + out_tr->last_response != NULL && + out_tr->last_response->status_code == 422) { + /* retry with higher Session-Expires / Min-SE */ + if (jd->d_retry < 3) { + int i; + + i = _eXosip_call_retry_request(jc, jd, out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for updating Session-Expires\n")); + } + jd->d_retry++; + } + } else if (out_tr != NULL + && (out_tr->state == ICT_TERMINATED + || out_tr->state == NICT_TERMINATED + || out_tr->state == ICT_COMPLETED + || out_tr->state == NICT_COMPLETED) && + now - out_tr->birth_time < 120 && + out_tr->orig_request != NULL && + out_tr->last_response != NULL && + (out_tr->last_response->status_code >= 300 + && out_tr->last_response->status_code <= 399)) { + /* retry with credential */ + int i; + + i = _eXosip_call_retry_request(jc, jd, out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for redirection\n")); + } + } else { + /* check if we need session-timer */ + if (jd->d_refresher == -1) { + } else if (jd->d_refresher == 0) { + /* I'm the refresher */ + if (now - + (jd->d_session_timer_start + + jd->d_session_timer_length) > 0) { + /* means we tried hard... but certainly failed... */ + } else if ((jd->d_session_timer_start + + jd->d_session_timer_length) - now < + (jd->d_session_timer_length / 2)) { + osip_message_t *request = NULL; + + + eXosip_call_build_update(jd->d_id, &request); + if (request != NULL) { + char session_exp[32]; + int i; + memset(session_exp, 0, sizeof(session_exp)); + snprintf(session_exp, sizeof(session_exp) - 1, + "%i;refresher=uac", + jd->d_session_timer_length); + osip_message_set_header(request, "Session-Expires", + session_exp); + osip_message_set_supported(request, "timer"); + i = eXosip_call_send_request(jd->d_id, request); + if (i == 0) { + /* update timer */ + jd->d_session_timer_start = + time(NULL) + jd->d_session_timer_length; + } + } + } + } else if (jd->d_refresher == 1) { + /* remote is the refresher */ + } + } + } + } + } #ifndef MINISIZE - for (js = eXosip.j_subscribes; js != NULL; js = js->next) - { - if (js->s_id < 1) - { - } else if (js->s_dialogs == NULL) - { - osip_transaction_t *out_tr = NULL; - - out_tr = js->s_out_tr; - - if (out_tr != NULL - && (out_tr->state == NICT_TERMINATED - || out_tr->state == NICT_COMPLETED) && - now - out_tr->birth_time < 120 && - out_tr->orig_request != NULL && - out_tr->last_response != NULL && - (out_tr->last_response->status_code == 401 - || out_tr->last_response->status_code == 407)) - { - /* retry with credential */ - if (js->s_retry < 3) - { - int i; - - i = - _eXosip_subscribe_send_request_with_credential (js, NULL, - out_tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for authentication\n")); - } - js->s_retry++; - } - } - } - - for (jd = js->s_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog != NULL) /* finished call */ - { - if (jd->d_id >= 1) - { - osip_transaction_t *out_tr = NULL; - - out_tr = osip_list_get (jd->d_out_trs, 0); - if (out_tr == NULL) - out_tr = js->s_out_tr; - - if (out_tr != NULL - && (out_tr->state == NICT_TERMINATED - || out_tr->state == NICT_COMPLETED) && - now - out_tr->birth_time < 120 && - out_tr->orig_request != NULL && - out_tr->last_response != NULL && - (out_tr->last_response->status_code == 401 - || out_tr->last_response->status_code == 407)) - { - /* retry with credential */ - if (jd->d_retry < 3) - { - int i; - i = - _eXosip_subscribe_send_request_with_credential (js, jd, - out_tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, - NULL, - "eXosip: could not clone suscbribe for authentication\n")); - } - jd->d_retry++; - } - } else if (js->s_reg_period == 0 || out_tr == NULL) - { - } else if (now - out_tr->birth_time > js->s_reg_period - 60) - { /* will expires in 60 sec: send refresh! */ - int i; - - i = _eXosip_subscribe_automatic_refresh (js, jd, out_tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone subscribe for refresh\n")); - } - } - } - } - } - } - - - for (jn = eXosip.j_notifies; jn != NULL; jn = jn->next) - { - for (jd = jn->n_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog != NULL) /* finished call */ - { - if (jd->d_id >= 1) - { - osip_transaction_t *out_tr = NULL; - - out_tr = osip_list_get (jd->d_out_trs, 0); - - if (out_tr != NULL - && (out_tr->state == NICT_TERMINATED - || out_tr->state == NICT_COMPLETED) && - now - out_tr->birth_time < 120 && - out_tr->orig_request != NULL && - out_tr->last_response != NULL && - (out_tr->last_response->status_code == 401 - || out_tr->last_response->status_code == 407)) - { - /* retry with credential */ - if (jd->d_retry < 3) - { - int i; - - i = - _eXosip_insubscription_send_request_with_credential - (jn, jd, out_tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, - NULL, - "eXosip: could not clone notify for authentication\n")); - } - jd->d_retry++; - } - } - } - } - } - } + for (js = eXosip.j_subscribes; js != NULL; js = js->next) { + if (js->s_id < 1) { + } else if (js->s_dialogs == NULL) { + osip_transaction_t *out_tr = NULL; + + out_tr = js->s_out_tr; + + if (out_tr != NULL + && (out_tr->state == NICT_TERMINATED + || out_tr->state == NICT_COMPLETED) && + now - out_tr->birth_time < 120 && + out_tr->orig_request != NULL && + out_tr->last_response != NULL && + (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407 + || out_tr->last_response->status_code == 423)) { + /* retry with credential */ + if (js->s_retry < 3) { + int i; + + i = _eXosip_subscribe_send_request_with_credential(js, NULL, + out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for authentication\n")); + } + js->s_retry++; + } + } + } + + for (jd = js->s_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog != NULL) { /* finished call */ + if (jd->d_id >= 1) { + osip_transaction_t *out_tr = NULL; + + out_tr = osip_list_get(jd->d_out_trs, 0); + if (out_tr == NULL) + out_tr = js->s_out_tr; + + if (out_tr != NULL + && (out_tr->state == NICT_TERMINATED + || out_tr->state == NICT_COMPLETED) && + now - out_tr->birth_time < 120 && + out_tr->orig_request != NULL && + out_tr->last_response != NULL && + (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407)) { + /* retry with credential */ + if (jd->d_retry < 3) { + int i; + i = _eXosip_subscribe_send_request_with_credential(js, + jd, + out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, + NULL, + "eXosip: could not clone suscbribe for authentication\n")); + } + jd->d_retry++; + } + } else if (js->s_reg_period == 0 || out_tr == NULL) { + } else if (now - out_tr->birth_time > js->s_reg_period - (js->s_reg_period/10)) { /* will expires in js->s_reg_period/10 sec: send refresh! */ + int i; + + i = _eXosip_subscribe_automatic_refresh(js, jd, out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone subscribe for refresh\n")); + } + } + } + } + } + } + + + for (jn = eXosip.j_notifies; jn != NULL; jn = jn->next) { + for (jd = jn->n_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog != NULL) { /* finished call */ + if (jd->d_id >= 1) { + osip_transaction_t *out_tr = NULL; + + out_tr = osip_list_get(jd->d_out_trs, 0); + + if (out_tr != NULL + && (out_tr->state == NICT_TERMINATED + || out_tr->state == NICT_COMPLETED) && + now - out_tr->birth_time < 120 && + out_tr->orig_request != NULL && + out_tr->last_response != NULL && + (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407)) { + /* retry with credential */ + if (jd->d_retry < 3) { + int i; + + i = _eXosip_insubscription_send_request_with_credential + (jn, jd, out_tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, + NULL, + "eXosip: could not clone notify for authentication\n")); + } + jd->d_retry++; + } + } + } + } + } + } #endif - for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) - { - if (jr->r_id >= 1 && jr->r_last_tr != NULL) - { - if (jr->r_reg_period != 0 && now - jr->r_last_tr->birth_time > 900) - { - /* automatic refresh */ - eXosip_register_send_register (jr->r_id, NULL); - } else if (jr->r_reg_period != 0 - && now - jr->r_last_tr->birth_time > jr->r_reg_period - 60) - { - /* automatic refresh */ - eXosip_register_send_register (jr->r_id, NULL); - } else if (jr->r_reg_period != 0 - && now - jr->r_last_tr->birth_time > 120 - && (jr->r_last_tr->last_response == NULL - || (!MSG_IS_STATUS_2XX (jr->r_last_tr->last_response)))) - { - /* automatic refresh */ - eXosip_register_send_register (jr->r_id, NULL); - } else if (now - jr->r_last_tr->birth_time < 120 && - jr->r_last_tr->orig_request != NULL && - (jr->r_last_tr->last_response != NULL - && (jr->r_last_tr->last_response->status_code == 401 - || jr->r_last_tr->last_response->status_code == 407))) - { - if (jr->r_retry < 3) - { - /* TODO: improve support for several retries when - several credentials are needed */ - eXosip_register_send_register (jr->r_id, NULL); - jr->r_retry++; - } - } - } - } + for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) { + if (jr->r_id >= 1 && jr->r_last_tr != NULL) { + if (jr->r_reg_period != 0 && now - jr->r_last_tr->birth_time > 900) { + /* automatic refresh */ + eXosip_register_send_register(jr->r_id, NULL); + } else if (jr->r_reg_period != 0 + && now - jr->r_last_tr->birth_time > jr->r_reg_period - (jr->r_reg_period/10)) + { + /* automatic refresh */ + eXosip_register_send_register(jr->r_id, NULL); + } else if (jr->r_reg_period != 0 + && now - jr->r_last_tr->birth_time > 120 + && (jr->r_last_tr->last_response == NULL + || (!MSG_IS_STATUS_2XX(jr->r_last_tr->last_response)))) + { + /* automatic refresh */ + eXosip_register_send_register(jr->r_id, NULL); + } else if (now - jr->r_last_tr->birth_time < 120 && + jr->r_last_tr->orig_request != NULL && + (jr->r_last_tr->last_response != NULL + && (jr->r_last_tr->last_response->status_code == 401 + || jr->r_last_tr->last_response->status_code == 407 + || jr->r_last_tr->last_response->status_code == 423))) + { + if (jr->r_retry < 3) { + /* TODO: improve support for several retries when + several credentials are needed */ + eXosip_register_send_register(jr->r_id, NULL); + jr->r_retry++; + } + } + } + } #ifndef MINISIZE - for (jpub = eXosip.j_pub; jpub != NULL; jpub = jpub->next) - { - if (jpub->p_id >= 1 && jpub->p_last_tr != NULL) - { - if (jpub->p_period != 0 && now - jpub->p_last_tr->birth_time > 900) - { - /* automatic refresh */ - _eXosip_publish_refresh (NULL, &jpub->p_last_tr, NULL); - } else if (jpub->p_period != 0 - && now - jpub->p_last_tr->birth_time > jpub->p_period - 60) - { - /* automatic refresh */ - _eXosip_publish_refresh (NULL, &jpub->p_last_tr, NULL); - } else if (jpub->p_period != 0 - && now - jpub->p_last_tr->birth_time > 120 - && (jpub->p_last_tr->last_response == NULL - || (!MSG_IS_STATUS_2XX (jpub->p_last_tr->last_response)))) - { - /* automatic refresh */ - _eXosip_publish_refresh (NULL, &jpub->p_last_tr, NULL); - } else if (now - jpub->p_last_tr->birth_time < 120 && - jpub->p_last_tr->orig_request != NULL && - (jpub->p_last_tr->last_response != NULL - && (jpub->p_last_tr->last_response->status_code == 401 - || jpub->p_last_tr->last_response->status_code == 407))) - { - if (jpub->p_retry < 3) - { - /* TODO: improve support for several retries when - several credentials are needed */ - _eXosip_retry_with_auth (NULL, &jpub->p_last_tr, NULL); - jpub->p_retry++; - } - } else if (now - jpub->p_last_tr->birth_time < 120 && - jpub->p_last_tr->orig_request != NULL && - (jpub->p_last_tr->last_response != NULL - && (jpub->p_last_tr->last_response->status_code == 412 - || jpub->p_last_tr->last_response->status_code == 423))) - { - _eXosip_publish_refresh (NULL, &jpub->p_last_tr, NULL); - } - } - } + for (jpub = eXosip.j_pub; jpub != NULL; jpub = jpub->next) { + if (jpub->p_id >= 1 && jpub->p_last_tr != NULL) { + if (jpub->p_period != 0 && now - jpub->p_last_tr->birth_time > 900) { + /* automatic refresh */ + _eXosip_publish_refresh(NULL, &jpub->p_last_tr, NULL); + } else if (jpub->p_period != 0 + && now - jpub->p_last_tr->birth_time > jpub->p_period - (jpub->p_period/10)) + { + /* automatic refresh */ + _eXosip_publish_refresh(NULL, &jpub->p_last_tr, NULL); + } else if (jpub->p_period != 0 + && now - jpub->p_last_tr->birth_time > 120 + && (jpub->p_last_tr->last_response == NULL + || + (!MSG_IS_STATUS_2XX(jpub->p_last_tr->last_response)))) { + /* automatic refresh */ + _eXosip_publish_refresh(NULL, &jpub->p_last_tr, NULL); + } else if (now - jpub->p_last_tr->birth_time < 120 && + jpub->p_last_tr->orig_request != NULL && + (jpub->p_last_tr->last_response != NULL + && (jpub->p_last_tr->last_response->status_code == 401 + || jpub->p_last_tr->last_response->status_code == + 407))) { + if (jpub->p_retry < 3) { + /* TODO: improve support for several retries when + several credentials are needed */ + _eXosip_retry_with_auth(NULL, &jpub->p_last_tr, NULL); + jpub->p_retry++; + } + } else if (now - jpub->p_last_tr->birth_time < 120 && + jpub->p_last_tr->orig_request != NULL && + (jpub->p_last_tr->last_response != NULL + && (jpub->p_last_tr->last_response->status_code == 412 + || jpub->p_last_tr->last_response->status_code == + 423))) { + _eXosip_publish_refresh(NULL, &jpub->p_last_tr, NULL); + } + } + } #endif } -void -eXosip_update () +void eXosip_update() { - static int static_id = 1; - eXosip_call_t *jc; + static int static_id = 1; + eXosip_call_t *jc; #ifndef MINISIZE - eXosip_subscribe_t *js; - eXosip_notify_t *jn; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; #endif - eXosip_dialog_t *jd; - time_t now; + eXosip_dialog_t *jd; + time_t now; - if (static_id > 100000) - static_id = 1; /* loop */ + if (static_id == 32767) + static_id = 1; /* loop */ - now = time (NULL); - for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) - { - if (jc->c_id < 1) - { - jc->c_id = static_id; - static_id++; - } - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog != NULL) /* finished call */ - { - if (jd->d_id < 1) - { - jd->d_id = static_id; - static_id++; - } - } else - jd->d_id = -1; - } - } + now = time(NULL); + for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) { + if (jc->c_id < 1) { + jc->c_id = static_id; + static_id++; + } + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog != NULL) { /* finished call */ + if (jd->d_id < 1) { + jd->d_id = static_id; + static_id++; + } + } else + jd->d_id = -1; + } + } #ifndef MINISIZE - for (js = eXosip.j_subscribes; js != NULL; js = js->next) - { - if (js->s_id < 1) - { - js->s_id = static_id; - static_id++; - } - for (jd = js->s_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog != NULL) /* finished call */ - { - if (jd->d_id < 1) - { - jd->d_id = static_id; - static_id++; - } - } else - jd->d_id = -1; - } - } - - for (jn = eXosip.j_notifies; jn != NULL; jn = jn->next) - { - if (jn->n_id < 1) - { - jn->n_id = static_id; - static_id++; - } - for (jd = jn->n_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog != NULL) /* finished call */ - { - if (jd->d_id < 1) - { - jd->d_id = static_id; - static_id++; - } - } else - jd->d_id = -1; - } - } + for (js = eXosip.j_subscribes; js != NULL; js = js->next) { + if (js->s_id < 1) { + js->s_id = static_id; + static_id++; + } + for (jd = js->s_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog != NULL) { /* finished call */ + if (jd->d_id < 1) { + jd->d_id = static_id; + static_id++; + } + } else + jd->d_id = -1; + } + } + + for (jn = eXosip.j_notifies; jn != NULL; jn = jn->next) { + if (jn->n_id < 1) { + jn->n_id = static_id; + static_id++; + } + for (jd = jn->n_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog != NULL) { /* finished call */ + if (jd->d_id < 1) { + jd->d_id = static_id; + static_id++; + } + } else + jd->d_id = -1; + } + } #endif } -static jauthinfo_t * -eXosip_find_authentication_info (const char *username, const char *realm) +static jauthinfo_t *eXosip_find_authentication_info(const char *username, + const char *realm) { - jauthinfo_t *fallback = NULL; - jauthinfo_t *authinfo; - - for (authinfo = eXosip.authinfos; authinfo != NULL; authinfo = authinfo->next) - { - if (realm != NULL && authinfo->realm != NULL) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "INFO: authinfo: %s %s\n", realm, authinfo->realm)); - if (0 == osip_strcasecmp (authinfo->username, username)) - { - if (authinfo->realm == NULL || authinfo->realm[0] == '\0') - { - fallback = authinfo; - } else if (realm == NULL - || osip_strcasecmp (realm, authinfo->realm) == 0 - || 0 == osip_strncasecmp (realm + 1, authinfo->realm, - strlen (realm) - 2)) - { - return authinfo; - } - } - } - - /* no matching username has been found for this realm, - try with another username... */ - for (authinfo = eXosip.authinfos; authinfo != NULL; authinfo = authinfo->next) - { - if (realm != NULL && authinfo->realm != NULL) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "INFO: authinfo: %s %s\n", realm, authinfo->realm)); - if ((authinfo->realm == NULL || authinfo->realm[0] == '\0') - && fallback == NULL) - { - fallback = authinfo; - } else if (realm == NULL - || osip_strcasecmp (realm, authinfo->realm) == 0 - || 0 == osip_strncasecmp (realm + 1, authinfo->realm, - strlen (realm) - 2)) - { - return authinfo; - } - } + jauthinfo_t *fallback = NULL; + jauthinfo_t *authinfo; - return fallback; + for (authinfo = eXosip.authinfos; authinfo != NULL; authinfo = authinfo->next) { + if (realm != NULL && authinfo->realm != NULL) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "INFO: authinfo: %s %s\n", realm, authinfo->realm)); + if (0 == osip_strcasecmp(authinfo->username, username)) { + if (authinfo->realm == NULL || authinfo->realm[0] == '\0') { + fallback = authinfo; + } else if (realm == NULL + || osip_strcasecmp(realm, authinfo->realm) == 0 + || 0 == osip_strncasecmp(realm + 1, authinfo->realm, + strlen(realm) - 2)) { + return authinfo; + } + } + } + + /* no matching username has been found for this realm, + try with another username... */ + for (authinfo = eXosip.authinfos; authinfo != NULL; authinfo = authinfo->next) { + if (realm != NULL && authinfo->realm != NULL) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "INFO: authinfo: %s %s\n", realm, authinfo->realm)); + if ((authinfo->realm == NULL || authinfo->realm[0] == '\0') + && fallback == NULL) { + fallback = authinfo; + } else if (realm == NULL + || osip_strcasecmp(realm, authinfo->realm) == 0 + || 0 == osip_strncasecmp(realm + 1, authinfo->realm, + strlen(realm) - 2)) { + return authinfo; + } + } + + return fallback; } -int -eXosip_clear_authentication_info () -{ - jauthinfo_t *jauthinfo; - - for (jauthinfo = eXosip.authinfos; jauthinfo != NULL; - jauthinfo = eXosip.authinfos) - { - REMOVE_ELEMENT (eXosip.authinfos, jauthinfo); - osip_free (jauthinfo); - } - return OSIP_SUCCESS; +int eXosip_clear_authentication_info() +{ + jauthinfo_t *jauthinfo; + + for (jauthinfo = eXosip.authinfos; jauthinfo != NULL; + jauthinfo = eXosip.authinfos) { + REMOVE_ELEMENT(eXosip.authinfos, jauthinfo); + osip_free(jauthinfo); + } + return OSIP_SUCCESS; } int -eXosip_add_authentication_info (const char *username, const char *userid, - const char *passwd, const char *ha1, - const char *realm) -{ - jauthinfo_t *authinfos; - - if (username == NULL || username[0] == '\0') - return OSIP_BADPARAMETER; - if (userid == NULL || userid[0] == '\0') - return OSIP_BADPARAMETER; - - if (passwd != NULL && passwd[0] != '\0') - { - } else if (ha1 != NULL && ha1[0] != '\0') - { - } else - return OSIP_BADPARAMETER; - - authinfos = (jauthinfo_t *) osip_malloc (sizeof (jauthinfo_t)); - if (authinfos == NULL) - return OSIP_NOMEM; - memset (authinfos, 0, sizeof (jauthinfo_t)); - - snprintf (authinfos->username, 50, "%s", username); - snprintf (authinfos->userid, 50, "%s", userid); - if (passwd != NULL && passwd[0] != '\0') - snprintf (authinfos->passwd, 50, "%s", passwd); - else if (ha1 != NULL && ha1[0] != '\0') - snprintf (authinfos->ha1, 50, "%s", ha1); - if (realm != NULL && realm[0] != '\0') - snprintf (authinfos->realm, 50, "%s", realm); +eXosip_add_authentication_info(const char *username, const char *userid, + const char *passwd, const char *ha1, + const char *realm) +{ + jauthinfo_t *authinfos; + + if (username == NULL || username[0] == '\0') + return OSIP_BADPARAMETER; + if (userid == NULL || userid[0] == '\0') + return OSIP_BADPARAMETER; + + if (passwd != NULL && passwd[0] != '\0') { + } else if (ha1 != NULL && ha1[0] != '\0') { + } else + return OSIP_BADPARAMETER; + + authinfos = (jauthinfo_t *) osip_malloc(sizeof(jauthinfo_t)); + if (authinfos == NULL) + return OSIP_NOMEM; + memset(authinfos, 0, sizeof(jauthinfo_t)); + + snprintf(authinfos->username, 50, "%s", username); + snprintf(authinfos->userid, 50, "%s", userid); + if (passwd != NULL && passwd[0] != '\0') + snprintf(authinfos->passwd, 50, "%s", passwd); + else if (ha1 != NULL && ha1[0] != '\0') + snprintf(authinfos->ha1, 50, "%s", ha1); + if (realm != NULL && realm[0] != '\0') + snprintf(authinfos->realm, 50, "%s", realm); - ADD_ELEMENT (eXosip.authinfos, authinfos); - return OSIP_SUCCESS; + ADD_ELEMENT(eXosip.authinfos, authinfos); + return OSIP_SUCCESS; } int -eXosip_add_authentication_information (osip_message_t * req, - osip_message_t * last_response) +eXosip_add_authentication_information(osip_message_t * req, + osip_message_t * last_response) { - osip_authorization_t *aut = NULL; - osip_www_authenticate_t *wwwauth = NULL; - osip_proxy_authorization_t *proxy_aut = NULL; - osip_proxy_authenticate_t *proxyauth = NULL; - jauthinfo_t *authinfo = NULL; - int pos; - int i; - - if (req == NULL - || req->from == NULL - || req->from->url == NULL || req->from->url->username == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "authinfo: Invalid message\n")); - return OSIP_BADPARAMETER; - } - - if (last_response == NULL) - { - /* we can add all credential that belongs to the same call-id */ - struct eXosip_http_auth *http_auth; - int pos; - - /* update entries with same call_id */ - for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) - { - http_auth = &eXosip.http_auths[pos]; - if (http_auth->pszCallId[0] == '\0') - continue; - if (osip_strcasecmp (http_auth->pszCallId, req->call_id->number) == 0) - { - char *uri; - - authinfo = eXosip_find_authentication_info (req->from->url->username, - http_auth->wa->realm); - if (authinfo == NULL) - { - if (http_auth->wa->realm != NULL) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "authinfo: No authentication found for %s %s\n", - req->from->url->username, http_auth->wa->realm)); - return OSIP_NOTFOUND; - } - - i = osip_uri_to_str (req->req_uri, &uri); - if (i != 0) - return i; - - http_auth->iNonceCount++; - if (http_auth->answer_code == 401) - /*osip_strcasecmp(req->sip_method, "REGISTER")==0) */ - i = __eXosip_create_authorization_header (http_auth->wa, uri, - authinfo->userid, - authinfo->passwd, - authinfo->ha1, &aut, - req->sip_method, - http_auth->pszCNonce, - http_auth->iNonceCount); - else - i = __eXosip_create_proxy_authorization_header (http_auth->wa, uri, - authinfo->userid, - authinfo->passwd, - authinfo->ha1, - &aut, - req->sip_method, - http_auth->pszCNonce, - http_auth->iNonceCount); - - osip_free (uri); - if (i != 0) - return i; - - if (aut != NULL) - { - if (osip_strcasecmp (req->sip_method, "REGISTER") == 0) - osip_list_add (&req->authorizations, aut, -1); - else - osip_list_add (&req->proxy_authorizations, aut, -1); - osip_message_force_update (req); - } - } - } - return OSIP_SUCCESS; - } - - pos = 0; - osip_message_get_www_authenticate (last_response, pos, &wwwauth); - osip_message_get_proxy_authenticate (last_response, pos, &proxyauth); - if (wwwauth == NULL && proxyauth == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "authinfo: No WWW-Authenticate or Proxy-Authenticate\n")); - return OSIP_SYNTAXERROR; - } - - while (wwwauth != NULL) - { - char *uri; - - authinfo = eXosip_find_authentication_info (req->from->url->username, - wwwauth->realm); - if (authinfo == NULL) - { - if (wwwauth->realm != NULL) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "authinfo: No authentication found for %s %s\n", - req->from->url->username, wwwauth->realm)); - return OSIP_NOTFOUND; - } - - i = osip_uri_to_str (req->req_uri, &uri); - if (i != 0) - return i; - - i = __eXosip_create_authorization_header (wwwauth, uri, - authinfo->userid, - authinfo->passwd, - authinfo->ha1, &aut, - req->sip_method, "0a4f113b", 1); - osip_free (uri); - if (i != 0) - return i; - - if (aut != NULL) - { - osip_list_add (&req->authorizations, aut, -1); - osip_message_force_update (req); - } + osip_authorization_t *aut = NULL; + osip_www_authenticate_t *wwwauth = NULL; + osip_proxy_authorization_t *proxy_aut = NULL; + osip_proxy_authenticate_t *proxyauth = NULL; + jauthinfo_t *authinfo = NULL; + int pos; + int i; + + if (req == NULL + || req->from == NULL + || req->from->url == NULL || req->from->url->username == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "authinfo: Invalid message\n")); + return OSIP_BADPARAMETER; + } + + if (last_response == NULL) { + /* we can add all credential that belongs to the same call-id */ + struct eXosip_http_auth *http_auth; + int pos; + + /* update entries with same call_id */ + for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) { + http_auth = &eXosip.http_auths[pos]; + if (http_auth->pszCallId[0] == '\0') + continue; + if (osip_strcasecmp(http_auth->pszCallId, req->call_id->number) == 0) { + char *uri; + + authinfo = + eXosip_find_authentication_info(req->from->url->username, + http_auth->wa->realm); + if (authinfo == NULL) { + if (http_auth->wa->realm != NULL) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "authinfo: No authentication found for %s %s\n", + req->from->url->username, + http_auth->wa->realm)); + return OSIP_NOTFOUND; + } + + i = osip_uri_to_str(req->req_uri, &uri); + if (i != 0) + return i; + + http_auth->iNonceCount++; + if (http_auth->answer_code == 401) + /*osip_strcasecmp(req->sip_method, "REGISTER")==0) */ + i = __eXosip_create_authorization_header(http_auth->wa, uri, + authinfo->userid, + authinfo->passwd, + authinfo->ha1, &aut, + req->sip_method, + http_auth->pszCNonce, + http_auth->iNonceCount); + else + i = __eXosip_create_proxy_authorization_header(http_auth->wa, + uri, + authinfo->userid, + authinfo->passwd, + authinfo->ha1, + &aut, + req->sip_method, + http_auth->pszCNonce, + http_auth->iNonceCount); + + osip_free(uri); + if (i != 0) + return i; + + if (aut != NULL) { + if (osip_strcasecmp(req->sip_method, "REGISTER") == 0) + osip_list_add(&req->authorizations, aut, -1); + else + osip_list_add(&req->proxy_authorizations, aut, -1); + osip_message_force_update(req); + } + } + } + return OSIP_SUCCESS; + } + + pos = 0; + osip_message_get_www_authenticate(last_response, pos, &wwwauth); + osip_message_get_proxy_authenticate(last_response, pos, &proxyauth); + if (wwwauth == NULL && proxyauth == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "authinfo: No WWW-Authenticate or Proxy-Authenticate\n")); + return OSIP_SYNTAXERROR; + } + + while (wwwauth != NULL) { + char *uri; + + authinfo = eXosip_find_authentication_info(req->from->url->username, + wwwauth->realm); + if (authinfo == NULL) { + if (wwwauth->realm != NULL) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "authinfo: No authentication found for %s %s\n", + req->from->url->username, wwwauth->realm)); + return OSIP_NOTFOUND; + } + + i = osip_uri_to_str(req->req_uri, &uri); + if (i != 0) + return i; + + i = __eXosip_create_authorization_header(wwwauth, uri, + authinfo->userid, + authinfo->passwd, + authinfo->ha1, &aut, + req->sip_method, "0a4f113b", 1); + osip_free(uri); + if (i != 0) + return i; + + if (aut != NULL) { + osip_list_add(&req->authorizations, aut, -1); + osip_message_force_update(req); + } #if defined(AVOID_REFRESH_WITHOUT_CREDENTIAL) - if (wwwauth->qop_options != NULL) - { + if (wwwauth->qop_options != NULL) { #endif - if (osip_strcasecmp (req->sip_method, "REGISTER") == 0 - || osip_strcasecmp (req->sip_method, "INVITE") == 0 - || osip_strcasecmp (req->sip_method, "SUBSCRIBE") == 0) - _eXosip_store_nonce (req->call_id->number, wwwauth, 401); - else - { - osip_generic_param_t *to_tag = NULL; - osip_from_param_get_byname (req->to, "tag", &to_tag); - if (to_tag != NULL) - { - /* if message is part of a dialog */ - _eXosip_store_nonce (req->call_id->number, wwwauth, 401); - } - } + if (osip_strcasecmp(req->sip_method, "REGISTER") == 0 + || osip_strcasecmp(req->sip_method, "INVITE") == 0 + || osip_strcasecmp(req->sip_method, "SUBSCRIBE") == 0) + _eXosip_store_nonce(req->call_id->number, wwwauth, 401); + else { + osip_generic_param_t *to_tag = NULL; + osip_from_param_get_byname(req->to, "tag", &to_tag); + if (to_tag != NULL) { + /* if message is part of a dialog */ + _eXosip_store_nonce(req->call_id->number, wwwauth, 401); + } + } #if defined(AVOID_REFRESH_WITHOUT_CREDENTIAL) - } + } #endif - pos++; - osip_message_get_www_authenticate (last_response, pos, &wwwauth); - } - - pos = 0; - while (proxyauth != NULL) - { - char *uri; - - authinfo = eXosip_find_authentication_info (req->from->url->username, - proxyauth->realm); - if (authinfo == NULL) - { - if (proxyauth->realm != NULL) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "authinfo: No authentication found for %s %s\n", - req->from->url->username, proxyauth->realm)); - return OSIP_NOTFOUND; - } - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "authinfo: %s\n", authinfo->username)); - i = osip_uri_to_str (req->req_uri, &uri); - if (i != 0) - return i; - - i = __eXosip_create_proxy_authorization_header (proxyauth, uri, - authinfo->userid, - authinfo->passwd, - authinfo->ha1, - &proxy_aut, req->sip_method, - "0a4f113b", 1); - osip_free (uri); - if (i != 0) - return i; - - if (proxy_aut != NULL) - { - osip_list_add (&req->proxy_authorizations, proxy_aut, -1); - osip_message_force_update (req); - } + pos++; + osip_message_get_www_authenticate(last_response, pos, &wwwauth); + } + + pos = 0; + while (proxyauth != NULL) { + char *uri; + + authinfo = eXosip_find_authentication_info(req->from->url->username, + proxyauth->realm); + if (authinfo == NULL) { + if (proxyauth->realm != NULL) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "authinfo: No authentication found for %s %s\n", + req->from->url->username, proxyauth->realm)); + return OSIP_NOTFOUND; + } + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "authinfo: %s\n", authinfo->username)); + i = osip_uri_to_str(req->req_uri, &uri); + if (i != 0) + return i; + + i = __eXosip_create_proxy_authorization_header(proxyauth, uri, + authinfo->userid, + authinfo->passwd, + authinfo->ha1, + &proxy_aut, req->sip_method, + "0a4f113b", 1); + osip_free(uri); + if (i != 0) + return i; + + if (proxy_aut != NULL) { + osip_list_add(&req->proxy_authorizations, proxy_aut, -1); + osip_message_force_update(req); + } #if defined(AVOID_REFRESH_WITHOUT_CREDENTIAL) - if (proxyauth->qop_options != NULL) - { + if (proxyauth->qop_options != NULL) { #endif - if (osip_strcasecmp (req->sip_method, "REGISTER") == 0 - || osip_strcasecmp (req->sip_method, "INVITE") == 0 - || osip_strcasecmp (req->sip_method, "SUBSCRIBE") == 0) - _eXosip_store_nonce (req->call_id->number, proxyauth, 407); - else - { - osip_generic_param_t *to_tag = NULL; - osip_from_param_get_byname (req->to, "tag", &to_tag); - if (to_tag != NULL) - { - /* if message is part of a dialog */ - _eXosip_store_nonce (req->call_id->number, proxyauth, 407); - } - } + if (osip_strcasecmp(req->sip_method, "REGISTER") == 0 + || osip_strcasecmp(req->sip_method, "INVITE") == 0 + || osip_strcasecmp(req->sip_method, "SUBSCRIBE") == 0) + _eXosip_store_nonce(req->call_id->number, proxyauth, 407); + else { + osip_generic_param_t *to_tag = NULL; + osip_from_param_get_byname(req->to, "tag", &to_tag); + if (to_tag != NULL) { + /* if message is part of a dialog */ + _eXosip_store_nonce(req->call_id->number, proxyauth, 407); + } + } #if defined(AVOID_REFRESH_WITHOUT_CREDENTIAL) - } + } #endif - pos++; - osip_message_get_proxy_authenticate (last_response, pos, &proxyauth); - } - - return OSIP_SUCCESS; -} - -int -eXosip_update_top_via (osip_message_t * sip) -{ - unsigned int number; - char tmp[40]; - osip_generic_param_t *br = NULL; - osip_via_t *via = (osip_via_t *) osip_list_get (&sip->vias, 0); - - if (via == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "missing via in SIP message\n")); - return OSIP_SYNTAXERROR; - } - /* browse parameter and replace "branch" */ - osip_via_param_get_byname (via, "branch", &br); - - if (br == NULL || br->gvalue == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "missing branch parameter via in SIP message\n")); - return OSIP_SYNTAXERROR; - } - - osip_free (br->gvalue); - number = osip_build_random_number (); - - sprintf (tmp, "z9hG4bK%u", number); - br->gvalue = osip_strdup (tmp); - return OSIP_SUCCESS; + pos++; + osip_message_get_proxy_authenticate(last_response, pos, &proxyauth); + } + + return OSIP_SUCCESS; +} + +int eXosip_update_top_via(osip_message_t * sip) +{ + unsigned int number; + char tmp[40]; + osip_generic_param_t *br = NULL; + osip_via_t *via = (osip_via_t *) osip_list_get(&sip->vias, 0); + + if (via == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "missing via in SIP message\n")); + return OSIP_SYNTAXERROR; + } + /* browse parameter and replace "branch" */ + osip_via_param_get_byname(via, "branch", &br); + + if (br == NULL || br->gvalue == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "missing branch parameter via in SIP message\n")); + return OSIP_SYNTAXERROR; + } + + osip_free(br->gvalue); + number = osip_build_random_number(); + + snprintf(tmp, 40, "z9hG4bK%u", number); + br->gvalue = osip_strdup(tmp); + return OSIP_SUCCESS; +} + +/* vivox: mark all registrations as needing refreshing */ +void eXosip_mark_all_registrations_expired() +{ + eXosip_reg_t *jr; + int wakeup = 0; + + for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) { + if (jr->r_id >= 1 && jr->r_last_tr != NULL) { + jr->r_last_tr->birth_time -= jr->r_reg_period; + wakeup = 1; + } + } + if (wakeup) { + __eXosip_wakeup (); + } } diff -Nru libexosip2-3.3.0/src/eXpublish_api.c libexosip2-3.6.0/src/eXpublish_api.c --- libexosip2-3.3.0/src/eXpublish_api.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXpublish_api.c 2011-09-27 23:56:28.000000000 +0000 @@ -30,166 +30,149 @@ extern eXosip_t eXosip; int -eXosip_build_publish (osip_message_t ** message, - const char *to, - const char *from, - const char *route, - const char *event, - const char *expires, const char *ctype, const char *body) +eXosip_build_publish(osip_message_t ** message, + const char *to, + const char *from, + const char *route, + const char *event, + const char *expires, const char *ctype, const char *body) { - int i; + int i; - *message = NULL; + *message = NULL; - if (to == NULL || to[0] == '\0') - return OSIP_BADPARAMETER; - if (from == NULL || from[0] == '\0') - return OSIP_BADPARAMETER; - if (event == NULL || event[0] == '\0') - return OSIP_BADPARAMETER; - if (ctype == NULL || ctype[0] == '\0') - { - if (body != NULL && body[0] != '\0') - return OSIP_BADPARAMETER; - } else - { - if (body == NULL || body[0] == '\0') - return OSIP_BADPARAMETER; - } - - i = generating_publish (message, to, from, route); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot send message (cannot build PUBLISH)! ")); - return i; - } - - if (body != NULL && body[0] != '\0' && ctype != NULL && ctype[0] != '\0') - { - osip_message_set_content_type (*message, ctype); - osip_message_set_body (*message, body, strlen (body)); - /* - osip_message_set_header (*message, "Content-Disposition", - "render;handling=required"); - */ - } - if (expires != NULL && expires[0] != '\0') - osip_message_set_expires (*message, expires); - else - osip_message_set_expires (*message, "3600"); + if (to == NULL || to[0] == '\0') + return OSIP_BADPARAMETER; + if (from == NULL || from[0] == '\0') + return OSIP_BADPARAMETER; + if (event == NULL || event[0] == '\0') + return OSIP_BADPARAMETER; + if (ctype == NULL || ctype[0] == '\0') { + if (body != NULL && body[0] != '\0') + return OSIP_BADPARAMETER; + } else { + if (body == NULL || body[0] == '\0') + return OSIP_BADPARAMETER; + } + + i = generating_publish(message, to, from, route); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot send message (cannot build PUBLISH)! ")); + return i; + } + + if (body != NULL && body[0] != '\0' && ctype != NULL && ctype[0] != '\0') { + osip_message_set_content_type(*message, ctype); + osip_message_set_body(*message, body, strlen(body)); + /* + osip_message_set_header (*message, "Content-Disposition", + "render;handling=required"); + */ + } + if (expires != NULL && expires[0] != '\0') + osip_message_set_expires(*message, expires); + else + osip_message_set_expires(*message, "3600"); - osip_message_set_header (*message, "Event", event); + osip_message_set_header(*message, "Event", event); - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_publish (osip_message_t * message, const char *to) +int eXosip_publish(osip_message_t * message, const char *to) { - osip_transaction_t *transaction; - osip_event_t *sipevent; - int i; - eXosip_pub_t *pub = NULL; - - if (message == NULL) - return OSIP_BADPARAMETER; - if (message->cseq == NULL || message->cseq->number == NULL) - { - osip_message_free (message); - return OSIP_SYNTAXERROR; - } - if (to == NULL) - { - osip_message_free (message); - return OSIP_BADPARAMETER; - } - - i = _eXosip_pub_find_by_aor (&pub, to); - if (i != 0 || pub == NULL) - { - osip_header_t *expires; - - osip_message_get_expires (message, 0, &expires); - if (expires == NULL || expires->hvalue == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: missing expires header in PUBLISH!")); - osip_message_free (message); - return OSIP_SYNTAXERROR; - } else - { - /* start a new publication context */ - i = _eXosip_pub_init (&pub, to, expires->hvalue); - if (i != 0) - { - osip_message_free (message); - return i; - } - ADD_ELEMENT (eXosip.j_pub, pub); - } - } else - { - if (pub->p_sip_etag != NULL && pub->p_sip_etag[0] != '\0') - { - /* increase cseq */ - osip_message_set_header (message, "SIP-If-Match", pub->p_sip_etag); - } - - { - osip_header_t *expires; - - osip_message_get_expires (message, 0, &expires); - if (expires == NULL || expires->hvalue == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: missing expires header in PUBLISH!")); - osip_message_free (message); - return OSIP_SYNTAXERROR; - } - pub->p_period = atoi (expires->hvalue); - } - - if (pub->p_last_tr != NULL && pub->p_last_tr->cseq != NULL - && pub->p_last_tr->cseq->number != NULL) - { - int osip_cseq_num = osip_atoi (pub->p_last_tr->cseq->number); - int length = strlen (pub->p_last_tr->cseq->number); - - osip_cseq_num++; - osip_free (message->cseq->number); - message->cseq->number = (char *) osip_malloc (length + 2); /* +2 like for 9 to 10 */ - if (message->cseq->number == NULL) - { - osip_message_free (message); - return OSIP_NOMEM; - } - sprintf (message->cseq->number, "%i", osip_cseq_num); - } - } - - i = _eXosip_transaction_init (&transaction, NICT, eXosip.j_osip, message); - if (i != 0) - { - osip_message_free (message); - return i; - } - - if (pub->p_last_tr != NULL) - osip_list_add (&eXosip.j_transactions, pub->p_last_tr, 0); - pub->p_last_tr = transaction; - - sipevent = osip_new_outgoing_sipmessage (message); - sipevent->transactionid = transaction->transactionid; - - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, NULL, NULL, NULL)); - osip_transaction_add_event (transaction, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_t *transaction; + osip_event_t *sipevent; + int i; + eXosip_pub_t *pub = NULL; + + if (message == NULL) + return OSIP_BADPARAMETER; + if (message->cseq == NULL || message->cseq->number == NULL) { + osip_message_free(message); + return OSIP_SYNTAXERROR; + } + if (to == NULL) { + osip_message_free(message); + return OSIP_BADPARAMETER; + } + + i = _eXosip_pub_find_by_aor(&pub, to); + if (i != 0 || pub == NULL) { + osip_header_t *expires; + + osip_message_get_expires(message, 0, &expires); + if (expires == NULL || expires->hvalue == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing expires header in PUBLISH!")); + osip_message_free(message); + return OSIP_SYNTAXERROR; + } else { + /* start a new publication context */ + i = _eXosip_pub_init(&pub, to, expires->hvalue); + if (i != 0) { + osip_message_free(message); + return i; + } + ADD_ELEMENT(eXosip.j_pub, pub); + } + } else { + if (pub->p_sip_etag != NULL && pub->p_sip_etag[0] != '\0') { + /* increase cseq */ + osip_message_set_header(message, "SIP-If-Match", pub->p_sip_etag); + } + + { + osip_header_t *expires; + + osip_message_get_expires(message, 0, &expires); + if (expires == NULL || expires->hvalue == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing expires header in PUBLISH!")); + osip_message_free(message); + return OSIP_SYNTAXERROR; + } + pub->p_period = atoi(expires->hvalue); + } + + if (pub->p_last_tr != NULL && pub->p_last_tr->cseq != NULL + && pub->p_last_tr->cseq->number != NULL) { + int osip_cseq_num = osip_atoi(pub->p_last_tr->cseq->number); + int length = strlen(pub->p_last_tr->cseq->number); + + osip_cseq_num++; + osip_free(message->cseq->number); + message->cseq->number = (char *) osip_malloc(length + 2); /* +2 like for 9 to 10 */ + if (message->cseq->number == NULL) { + osip_message_free(message); + return OSIP_NOMEM; + } + snprintf(message->cseq->number, length+2, "%i", osip_cseq_num); + } + } + + i = _eXosip_transaction_init(&transaction, NICT, eXosip.j_osip, message); + if (i != 0) { + osip_message_free(message); + return i; + } + + if (pub->p_last_tr != NULL) + osip_list_add(&eXosip.j_transactions, pub->p_last_tr, 0); + pub->p_last_tr = transaction; + + sipevent = osip_new_outgoing_sipmessage(message); + sipevent->transactionid = transaction->transactionid; + + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, NULL, NULL, NULL)); + osip_transaction_add_event(transaction, sipevent); + __eXosip_wakeup(); + return OSIP_SUCCESS; } #endif diff -Nru libexosip2-3.3.0/src/eXrefer_api.c libexosip2-3.6.0/src/eXrefer_api.c --- libexosip2-3.3.0/src/eXrefer_api.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXrefer_api.c 2010-01-06 14:57:57.000000000 +0000 @@ -30,49 +30,46 @@ extern eXosip_t eXosip; int -eXosip_refer_build_request (osip_message_t ** refer, const char *refer_to, - const char *from, const char *to, const char *proxy) +eXosip_refer_build_request(osip_message_t ** refer, const char *refer_to, + const char *from, const char *to, const char *proxy) { - int i; + int i; - *refer = NULL; - i = generating_request_out_of_dialog (refer, "REFER", to, "UDP", from, proxy); - if (i != 0) - { - return i; - } + *refer = NULL; + i = generating_request_out_of_dialog(refer, "REFER", to, "UDP", from, proxy); + if (i != 0) { + return i; + } - osip_message_set_header (*refer, "Refer-to", refer_to); - return OSIP_SUCCESS; + osip_message_set_header(*refer, "Refer-to", refer_to); + return OSIP_SUCCESS; } -int -eXosip_refer_send_request (osip_message_t * refer) +int eXosip_refer_send_request(osip_message_t * refer) { - osip_transaction_t *transaction; - osip_event_t *sipevent; - int i; - - if (refer == NULL) - return OSIP_BADPARAMETER; - - i = _eXosip_transaction_init (&transaction, NICT, eXosip.j_osip, refer); - if (i != 0) - { - osip_message_free (refer); - return i; - } - - osip_list_add (&eXosip.j_transactions, transaction, 0); - - sipevent = osip_new_outgoing_sipmessage (refer); - sipevent->transactionid = transaction->transactionid; - - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, NULL, NULL, NULL)); - osip_transaction_add_event (transaction, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_t *transaction; + osip_event_t *sipevent; + int i; + + if (refer == NULL) + return OSIP_BADPARAMETER; + + i = _eXosip_transaction_init(&transaction, NICT, eXosip.j_osip, refer); + if (i != 0) { + osip_message_free(refer); + return i; + } + + osip_list_add(&eXosip.j_transactions, transaction, 0); + + sipevent = osip_new_outgoing_sipmessage(refer); + sipevent->transactionid = transaction->transactionid; + + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, NULL, NULL, NULL)); + osip_transaction_add_event(transaction, sipevent); + __eXosip_wakeup(); + return OSIP_SUCCESS; } #endif diff -Nru libexosip2-3.3.0/src/eXregister_api.c libexosip2-3.6.0/src/eXregister_api.c --- libexosip2-3.3.0/src/eXregister_api.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXregister_api.c 2011-10-04 07:56:59.000000000 +0000 @@ -27,324 +27,329 @@ extern eXosip_t eXosip; -static int _eXosip_register_build_register (eXosip_reg_t * jr, - osip_message_t ** _reg); +static int _eXosip_register_build_register(eXosip_reg_t * jr, + osip_message_t ** _reg); -static eXosip_reg_t * -eXosip_reg_find (int rid) +static eXosip_reg_t *eXosip_reg_find(int rid) { - eXosip_reg_t *jr; + eXosip_reg_t *jr; - for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) - { - if (jr->r_id == rid) - { - return jr; - } - } - return NULL; + for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) { + if (jr->r_id == rid) { + return jr; + } + } + return NULL; } -int -eXosip_register_remove (int rid) +int eXosip_register_remove(int rid) { - eXosip_reg_t *jr; + eXosip_reg_t *jr; - if (rid <= 0) - return OSIP_BADPARAMETER; + if (rid <= 0) + return OSIP_BADPARAMETER; - jr = eXosip_reg_find (rid); - if (jr == NULL) - return OSIP_NOTFOUND; - jr->r_reg_period = 0; - REMOVE_ELEMENT (eXosip.j_reg, jr); - eXosip_reg_free (jr); - jr = NULL; - return OSIP_SUCCESS; + jr = eXosip_reg_find(rid); + if (jr == NULL) + return OSIP_NOTFOUND; + jr->r_reg_period = 0; + REMOVE_ELEMENT(eXosip.j_reg, jr); + eXosip_reg_free(jr); + jr = NULL; + return OSIP_SUCCESS; } static int -_eXosip_register_build_register (eXosip_reg_t * jr, osip_message_t ** _reg) +_eXosip_register_build_register(eXosip_reg_t * jr, osip_message_t ** _reg) { - osip_message_t *reg = NULL; - int i; + osip_message_t *reg = NULL; + int i; - *_reg = NULL; + *_reg = NULL; - if (jr == NULL) - return OSIP_BADPARAMETER; + if (jr == NULL) + return OSIP_BADPARAMETER; - if (jr->r_last_tr != NULL) - { - if (jr->r_last_tr->state != NICT_TERMINATED - && jr->r_last_tr->state != NICT_COMPLETED) - return OSIP_WRONG_STATE; - else - { - osip_message_t *last_response = NULL; - osip_transaction_t *tr; - - i = osip_message_clone (jr->r_last_tr->orig_request, ®); - if (i != 0) - return i; - if (jr->r_last_tr->last_response != NULL) - { - i = - osip_message_clone (jr->r_last_tr->last_response, &last_response); - if (i != 0) - { - osip_message_free (reg); - return i; - } - } - - __eXosip_delete_jinfo (jr->r_last_tr); - tr = jr->r_last_tr; - jr->r_last_tr = NULL; - osip_list_add (&eXosip.j_transactions, tr, 0); - - /* modify the REGISTER request */ - { - int osip_cseq_num = osip_atoi (reg->cseq->number); - int length = strlen (reg->cseq->number); - - - osip_list_special_free (®->authorizations, - (void *(*)(void *)) &osip_authorization_free); - osip_list_special_free (®->proxy_authorizations, - (void *(*)(void *)) - &osip_proxy_authorization_free); - - - i = eXosip_update_top_via (reg); - if (i != 0) - { - osip_message_free (reg); - if (last_response != NULL) - osip_message_free (last_response); - return i; - } - - osip_cseq_num++; - osip_free (reg->cseq->number); - reg->cseq->number = (char *) osip_malloc (length + 2); /* +2 like for 9 to 10 */ - if (reg->cseq->number == NULL) - { - osip_message_free (reg); - if (last_response != NULL) - osip_message_free (last_response); - return OSIP_NOMEM; - } - sprintf (reg->cseq->number, "%i", osip_cseq_num); - - { - osip_header_t *exp; - - osip_message_header_get_byname (reg, "expires", 0, &exp); - if (exp != NULL) - { - if (exp->hvalue != NULL) - osip_free (exp->hvalue); - exp->hvalue = (char *) osip_malloc (10); - if (exp->hvalue == NULL) - { - osip_message_free (reg); - if (last_response != NULL) - osip_message_free (last_response); - return OSIP_NOMEM; - } - snprintf (exp->hvalue, 9, "%i", jr->r_reg_period); - } - } - - osip_message_force_update (reg); - } - - if (last_response != NULL) - { - if (last_response->status_code == 401 - || last_response->status_code == 407) - { - eXosip_add_authentication_information (reg, last_response); - } else - eXosip_add_authentication_information (reg, NULL); - osip_message_free (last_response); - } - } - } - if (reg == NULL) - { - i = generating_register (jr, ®, eXosip.transport, - jr->r_aor, jr->r_registrar, jr->r_contact, - jr->r_reg_period); - if (i != 0) - return i; - } + if (jr->r_last_tr != NULL) { + if (jr->r_last_tr->state != NICT_TERMINATED + && jr->r_last_tr->state != NICT_COMPLETED) + return OSIP_WRONG_STATE; + else { + osip_message_t *last_response = NULL; + osip_transaction_t *tr; + + i = osip_message_clone(jr->r_last_tr->orig_request, ®); + if (i != 0) + return i; + if (jr->r_last_tr->last_response != NULL) { + i = osip_message_clone(jr->r_last_tr->last_response, + &last_response); + if (i != 0) { + osip_message_free(reg); + return i; + } + } + + __eXosip_delete_jinfo(jr->r_last_tr); + tr = jr->r_last_tr; + jr->r_last_tr = NULL; + osip_list_add(&eXosip.j_transactions, tr, 0); + + /* modify the REGISTER request */ + { + int osip_cseq_num = osip_atoi(reg->cseq->number); + int length = strlen(reg->cseq->number); + + + osip_list_special_free(®->authorizations, (void (*)(void *)) + &osip_authorization_free); + osip_list_special_free(®->proxy_authorizations, + (void (*)(void *)) + &osip_proxy_authorization_free); + + + i = eXosip_update_top_via(reg); + if (i != 0) { + osip_message_free(reg); + if (last_response != NULL) + osip_message_free(last_response); + return i; + } + + osip_cseq_num++; + osip_free(reg->cseq->number); + reg->cseq->number = (char *) osip_malloc(length + 2); /* +2 like for 9 to 10 */ + if (reg->cseq->number == NULL) { + osip_message_free(reg); + if (last_response != NULL) + osip_message_free(last_response); + return OSIP_NOMEM; + } + snprintf(reg->cseq->number, length + 2, "%i", osip_cseq_num); + + + if (last_response != NULL && last_response->status_code == 423) { + /* increase expires value to "min-expires" value */ + osip_header_t *exp; + osip_header_t *min_exp; + + osip_message_header_get_byname(reg, "expires", 0, &exp); + osip_message_header_get_byname(last_response, "min-expires", 0, + &min_exp); + if (exp != NULL && exp->hvalue != NULL && min_exp != NULL + && min_exp->hvalue != NULL) { + osip_free(exp->hvalue); + exp->hvalue = osip_strdup(min_exp->hvalue); + jr->r_reg_period = atoi(min_exp->hvalue); + } else { + osip_message_free(reg); + if (last_response != NULL) + osip_message_free(last_response); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing Min-Expires or Expires in REGISTER\n")); + return OSIP_SYNTAXERROR; + } + } else { + osip_header_t *exp; + + osip_message_header_get_byname(reg, "expires", 0, &exp); + if (exp != NULL) { + if (exp->hvalue != NULL) + osip_free(exp->hvalue); + exp->hvalue = (char *) osip_malloc(10); + if (exp->hvalue == NULL) { + osip_message_free(reg); + if (last_response != NULL) + osip_message_free(last_response); + return OSIP_NOMEM; + } + snprintf(exp->hvalue, 9, "%i", jr->r_reg_period); + } + } + + osip_message_force_update(reg); + } + + if (last_response != NULL) { + if (last_response->status_code == 401 + || last_response->status_code == 407) { + eXosip_add_authentication_information(reg, last_response); + } else + eXosip_add_authentication_information(reg, NULL); + osip_message_free(last_response); + } + } + } + if (reg == NULL) { + i = generating_register(jr, ®, eXosip.transport, + jr->r_aor, jr->r_registrar, jr->r_contact, + jr->r_reg_period); + if (i != 0) + return i; + } - *_reg = reg; - return OSIP_SUCCESS; + *_reg = reg; + return OSIP_SUCCESS; } int -eXosip_register_build_initial_register (const char *from, const char *proxy, - const char *contact, int expires, - osip_message_t ** reg) +eXosip_register_build_initial_register_withqvalue(const char *from, const char *proxy, + const char *contact, int expires, + const char *qvalue, + osip_message_t ** reg) { - eXosip_reg_t *jr = NULL; - int i; + eXosip_reg_t *jr = NULL; + int i; - *reg = NULL; + *reg = NULL; - if (from == NULL || proxy == NULL) - return OSIP_BADPARAMETER; + if (from == NULL || proxy == NULL) + return OSIP_BADPARAMETER; - /* Avoid adding the same registration info twice to prevent mem leaks */ - for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) - { - if (strcmp (jr->r_aor, from) == 0 && strcmp (jr->r_registrar, proxy) == 0) - { - REMOVE_ELEMENT (eXosip.j_reg, jr); - eXosip_reg_free (jr); - jr = NULL; - break; - } - } - if (jr == NULL) - { - /* Add new registration info */ - i = eXosip_reg_init (&jr, from, proxy, contact); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot register! ")); - return i; - } - ADD_ELEMENT (eXosip.j_reg, jr); - } - - /* build register */ - jr->r_reg_period = expires; - if (jr->r_reg_period <= 0) /* too low */ - jr->r_reg_period = 0; - else if (jr->r_reg_period < 100) /* too low */ - jr->r_reg_period = 100; - - i = _eXosip_register_build_register (jr, reg); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot build REGISTER!\n")); - *reg = NULL; - return i; - } +#ifdef REJECT_DOUBLE_REGISTRATION + /* Avoid adding the same registration info twice to prevent mem leaks */ + for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) { + if (strcmp(jr->r_aor, from) == 0 && strcmp(jr->r_registrar, proxy) == 0) { + REMOVE_ELEMENT(eXosip.j_reg, jr); + eXosip_reg_free(jr); + jr = NULL; + break; + } + } +#endif + + if (jr == NULL) { + /* Add new registration info */ + i = eXosip_reg_init(&jr, from, proxy, contact); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot register! ")); + return i; + } + ADD_ELEMENT(eXosip.j_reg, jr); + } + + /* build register */ + jr->r_reg_period = expires; + if (jr->r_reg_period <= 0) /* too low */ + jr->r_reg_period = 0; + else if (jr->r_reg_period < 30) /* too low */ + jr->r_reg_period = 30; + + if(qvalue) + osip_strncpy(jr->r_qvalue, qvalue, sizeof(jr->r_qvalue)); + + i = _eXosip_register_build_register(jr, reg); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot build REGISTER!\n")); + *reg = NULL; + return i; + } - return jr->r_id; + return jr->r_id; } int -eXosip_register_build_register (int rid, int expires, osip_message_t ** reg) +eXosip_register_build_initial_register(const char *from, const char *proxy, + const char *contact, int expires, + osip_message_t ** reg) { - eXosip_reg_t *jr; - int i; + return eXosip_register_build_initial_register_withqvalue(from, proxy, contact, expires, NULL, reg); +} - *reg = NULL; +int eXosip_register_build_register(int rid, int expires, osip_message_t ** reg) +{ + eXosip_reg_t *jr; + int i; - if (rid <= 0) - return OSIP_BADPARAMETER; + *reg = NULL; - jr = eXosip_reg_find (rid); - if (jr == NULL) - return OSIP_NOTFOUND; - jr->r_reg_period = expires; - if (jr->r_reg_period == 0) - { - } /* unregistration */ - else if (jr->r_reg_period > 3600) - jr->r_reg_period = 3600; - else if (jr->r_reg_period < 100) /* too low */ - jr->r_reg_period = 100; - - if (jr->r_last_tr != NULL) - { - if (jr->r_last_tr->state != NICT_TERMINATED - && jr->r_last_tr->state != NICT_COMPLETED) - { - return OSIP_WRONG_STATE; - } - } - - i = _eXosip_register_build_register (jr, reg); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot build REGISTER!")); - *reg = NULL; - return i; - } - return OSIP_SUCCESS; + if (rid <= 0) + return OSIP_BADPARAMETER; + + jr = eXosip_reg_find(rid); + if (jr == NULL) + return OSIP_NOTFOUND; + jr->r_reg_period = expires; + if (jr->r_reg_period == 0) { + } /* unregistration */ + else if (jr->r_reg_period > 3600) + jr->r_reg_period = 3600; + else if (jr->r_reg_period < 30) /* too low */ + jr->r_reg_period = 30; + + if (jr->r_last_tr != NULL) { + if (jr->r_last_tr->state != NICT_TERMINATED + && jr->r_last_tr->state != NICT_COMPLETED) { + return OSIP_WRONG_STATE; + } + } + + i = _eXosip_register_build_register(jr, reg); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot build REGISTER!")); + *reg = NULL; + return i; + } + return OSIP_SUCCESS; } -int -eXosip_register_send_register (int rid, osip_message_t * reg) +int eXosip_register_send_register(int rid, osip_message_t * reg) { - osip_transaction_t *transaction; - osip_event_t *sipevent; - eXosip_reg_t *jr; - int i; - - if (rid <= 0) - { - osip_message_free (reg); - return OSIP_BADPARAMETER; - } - - jr = eXosip_reg_find (rid); - if (jr == NULL) - { - osip_message_free (reg); - return OSIP_NOTFOUND; - } - - if (jr->r_last_tr != NULL) - { - if (jr->r_last_tr->state != NICT_TERMINATED - && jr->r_last_tr->state != NICT_COMPLETED) - { - osip_message_free (reg); - return OSIP_WRONG_STATE; - } - } - - if (reg == NULL) - { - i = _eXosip_register_build_register (jr, ®); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot build REGISTER!")); - return i; - } - } - - i = _eXosip_transaction_init (&transaction, NICT, eXosip.j_osip, reg); - if (i != 0) - { - osip_message_free (reg); - return i; - } - - jr->r_last_tr = transaction; - - /* send REGISTER */ - sipevent = osip_new_outgoing_sipmessage (reg); - sipevent->transactionid = transaction->transactionid; - osip_message_force_update (reg); - - osip_transaction_add_event (transaction, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_t *transaction; + osip_event_t *sipevent; + eXosip_reg_t *jr; + int i; + + if (rid <= 0) { + osip_message_free(reg); + return OSIP_BADPARAMETER; + } + + jr = eXosip_reg_find(rid); + if (jr == NULL) { + osip_message_free(reg); + return OSIP_NOTFOUND; + } + + if (jr->r_last_tr != NULL) { + if (jr->r_last_tr->state != NICT_TERMINATED + && jr->r_last_tr->state != NICT_COMPLETED) { + osip_message_free(reg); + return OSIP_WRONG_STATE; + } + } + + if (reg == NULL) { + i = _eXosip_register_build_register(jr, ®); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot build REGISTER!")); + return i; + } + } + + i = _eXosip_transaction_init(&transaction, NICT, eXosip.j_osip, reg); + if (i != 0) { + osip_message_free(reg); + return i; + } + + jr->r_last_tr = transaction; + + /* send REGISTER */ + sipevent = osip_new_outgoing_sipmessage(reg); + sipevent->transactionid = transaction->transactionid; + osip_message_force_update(reg); + + osip_transaction_add_event(transaction, sipevent); + __eXosip_wakeup(); + return OSIP_SUCCESS; } diff -Nru libexosip2-3.3.0/src/eXsubscription_api.c libexosip2-3.6.0/src/eXsubscription_api.c --- libexosip2-3.3.0/src/eXsubscription_api.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXsubscription_api.c 2011-06-22 13:03:50.000000000 +0000 @@ -29,487 +29,496 @@ extern eXosip_t eXosip; int -_eXosip_subscribe_transaction_find (int tid, eXosip_subscribe_t ** js, - eXosip_dialog_t ** jd, - osip_transaction_t ** tr) +_eXosip_subscribe_transaction_find(int tid, eXosip_subscribe_t ** js, + eXosip_dialog_t ** jd, osip_transaction_t ** tr) { - for (*js = eXosip.j_subscribes; *js != NULL; *js = (*js)->next) - { - if ((*js)->s_inc_tr != NULL && (*js)->s_inc_tr->transactionid == tid) - { - *tr = (*js)->s_inc_tr; - *jd = (*js)->s_dialogs; - return OSIP_SUCCESS; - } - if ((*js)->s_out_tr != NULL && (*js)->s_out_tr->transactionid == tid) - { - *tr = (*js)->s_out_tr; - *jd = (*js)->s_dialogs; - return OSIP_SUCCESS; - } - for (*jd = (*js)->s_dialogs; *jd != NULL; *jd = (*jd)->next) - { - osip_transaction_t *transaction; - int pos = 0; - - while (!osip_list_eol ((*jd)->d_inc_trs, pos)) - { - transaction = - (osip_transaction_t *) osip_list_get ((*jd)->d_inc_trs, pos); - if (transaction != NULL && transaction->transactionid == tid) - { - *tr = transaction; - return OSIP_SUCCESS; - } - pos++; - } - - pos = 0; - while (!osip_list_eol ((*jd)->d_out_trs, pos)) - { - transaction = - (osip_transaction_t *) osip_list_get ((*jd)->d_out_trs, pos); - if (transaction != NULL && transaction->transactionid == tid) - { - *tr = transaction; - return OSIP_SUCCESS; - } - pos++; - } - } - } - *jd = NULL; - *js = NULL; - return OSIP_NOTFOUND; + for (*js = eXosip.j_subscribes; *js != NULL; *js = (*js)->next) { + if ((*js)->s_inc_tr != NULL && (*js)->s_inc_tr->transactionid == tid) { + *tr = (*js)->s_inc_tr; + *jd = (*js)->s_dialogs; + return OSIP_SUCCESS; + } + if ((*js)->s_out_tr != NULL && (*js)->s_out_tr->transactionid == tid) { + *tr = (*js)->s_out_tr; + *jd = (*js)->s_dialogs; + return OSIP_SUCCESS; + } + for (*jd = (*js)->s_dialogs; *jd != NULL; *jd = (*jd)->next) { + osip_transaction_t *transaction; + int pos = 0; + + while (!osip_list_eol((*jd)->d_inc_trs, pos)) { + transaction = + (osip_transaction_t *) osip_list_get((*jd)->d_inc_trs, pos); + if (transaction != NULL && transaction->transactionid == tid) { + *tr = transaction; + return OSIP_SUCCESS; + } + pos++; + } + + pos = 0; + while (!osip_list_eol((*jd)->d_out_trs, pos)) { + transaction = + (osip_transaction_t *) osip_list_get((*jd)->d_out_trs, pos); + if (transaction != NULL && transaction->transactionid == tid) { + *tr = transaction; + return OSIP_SUCCESS; + } + pos++; + } + } + } + *jd = NULL; + *js = NULL; + return OSIP_NOTFOUND; } -int -eXosip_subscribe_remove (int did) +int eXosip_subscribe_remove(int did) { - eXosip_dialog_t *jd = NULL; - eXosip_subscribe_t *js = NULL; + eXosip_dialog_t *jd = NULL; + eXosip_subscribe_t *js = NULL; - if (did <= 0) - return OSIP_BADPARAMETER; + if (did <= 0) + return OSIP_BADPARAMETER; - if (did > 0) - { - eXosip_subscribe_dialog_find (did, &js, &jd); - } - if (js == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No outgoing subscription here?\n")); - return OSIP_NOTFOUND; - } - REMOVE_ELEMENT (eXosip.j_subscribes, js); - eXosip_subscribe_free (js); - return OSIP_SUCCESS; + if (did > 0) { + eXosip_subscribe_dialog_find(did, &js, &jd); + } + if (js == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No outgoing subscription here?\n")); + return OSIP_NOTFOUND; + } + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + return OSIP_SUCCESS; } int -eXosip_subscribe_build_initial_request (osip_message_t ** sub, const char *to, - const char *from, const char *route, - const char *event, int expires) +eXosip_subscribe_build_initial_request(osip_message_t ** sub, const char *to, + const char *from, const char *route, + const char *event, int expires) { - char tmp[10]; - int i; - osip_to_t *_to = NULL; - - *sub = NULL; - if (to == NULL || *to == '\0') - return OSIP_BADPARAMETER; - if (from == NULL || *from == '\0') - return OSIP_BADPARAMETER; - if (event == NULL || *event == '\0') - return OSIP_BADPARAMETER; - if (route == NULL || *route == '\0') - route = NULL; - - i = osip_to_init (&_to); - if (i != 0) - return i; - - i = osip_to_parse (_to, to); - if (i != 0) - { - osip_to_free (_to); - return i; - } - - i = - generating_request_out_of_dialog (sub, "SUBSCRIBE", to, eXosip.transport, from, - route); - osip_to_free (_to); - if (i != 0) - return i; - _eXosip_dialog_add_contact (*sub, NULL); + char tmp[10]; + int i; + osip_to_t *_to = NULL; + + *sub = NULL; + if (to == NULL || *to == '\0') + return OSIP_BADPARAMETER; + if (from == NULL || *from == '\0') + return OSIP_BADPARAMETER; + if (event == NULL || *event == '\0') + return OSIP_BADPARAMETER; + if (route == NULL || *route == '\0') + route = NULL; + + i = osip_to_init(&_to); + if (i != 0) + return i; + + i = osip_to_parse(_to, to); + if (i != 0) { + osip_to_free(_to); + return i; + } + + i = generating_request_out_of_dialog(sub, "SUBSCRIBE", to, eXosip.transport, + from, route); + osip_to_free(_to); + if (i != 0) + return i; + _eXosip_dialog_add_contact(*sub, NULL); - snprintf (tmp, 10, "%i", expires); - osip_message_set_expires (*sub, tmp); + snprintf(tmp, 10, "%i", expires); + osip_message_set_expires(*sub, tmp); - osip_message_set_header (*sub, "Event", event); + osip_message_set_header(*sub, "Event", event); - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_subscribe_send_initial_request (osip_message_t * subscribe) +int eXosip_subscribe_send_initial_request(osip_message_t * subscribe) { - eXosip_subscribe_t *js = NULL; - osip_transaction_t *transaction; - osip_event_t *sipevent; - int i; - - i = eXosip_subscribe_init (&js); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot subscribe.")); - osip_message_free (subscribe); - return i; - } - - i = _eXosip_transaction_init (&transaction, NICT, eXosip.j_osip, subscribe); - if (i != 0) - { - eXosip_subscribe_free (js); - osip_message_free (subscribe); - return i; - } - - js->s_reg_period = 3600; - _eXosip_subscribe_set_refresh_interval (js, subscribe); - js->s_out_tr = transaction; - - sipevent = osip_new_outgoing_sipmessage (subscribe); - sipevent->transactionid = transaction->transactionid; - - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, NULL, js, NULL)); - osip_transaction_add_event (transaction, sipevent); - - ADD_ELEMENT (eXosip.j_subscribes, js); - eXosip_update (); /* fixed? */ - __eXosip_wakeup (); - return js->s_id; + eXosip_subscribe_t *js = NULL; + osip_transaction_t *transaction; + osip_event_t *sipevent; + int i; + + i = eXosip_subscribe_init(&js); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot subscribe.")); + osip_message_free(subscribe); + return i; + } + + i = _eXosip_transaction_init(&transaction, NICT, eXosip.j_osip, subscribe); + if (i != 0) { + eXosip_subscribe_free(js); + osip_message_free(subscribe); + return i; + } + + js->s_reg_period = 3600; + _eXosip_subscribe_set_refresh_interval(js, subscribe); + js->s_out_tr = transaction; + + sipevent = osip_new_outgoing_sipmessage(subscribe); + sipevent->transactionid = transaction->transactionid; + + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, NULL, js, NULL)); + osip_transaction_add_event(transaction, sipevent); + + ADD_ELEMENT(eXosip.j_subscribes, js); + eXosip_update(); /* fixed? */ + __eXosip_wakeup(); + return js->s_id; } -int -eXosip_subscribe_build_refresh_request (int did, osip_message_t ** sub) +int eXosip_subscribe_build_refresh_request(int did, osip_message_t ** sub) { - eXosip_dialog_t *jd = NULL; - eXosip_subscribe_t *js = NULL; + eXosip_dialog_t *jd = NULL; + eXosip_subscribe_t *js = NULL; - osip_transaction_t *transaction; - char *transport; - int i; - - *sub = NULL; - - if (did <= 0) - return OSIP_BADPARAMETER; - - if (did > 0) - { - eXosip_subscribe_dialog_find (did, &js, &jd); - } - if (jd == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No subscribe here?\n")); - return OSIP_NOTFOUND; - } - - transaction = NULL; - transaction = eXosip_find_last_out_subscribe (js, jd); - - if (transaction != NULL) - { - if (transaction->state != NICT_TERMINATED && - transaction->state != NIST_TERMINATED && - transaction->state != NICT_COMPLETED && - transaction->state != NIST_COMPLETED) - return OSIP_WRONG_STATE; - } - - transport = NULL; - if (transaction != NULL && transaction->orig_request != NULL) - transport = _eXosip_transport_protocol (transaction->orig_request); - - transaction = NULL; - - if (transport == NULL) - i = - _eXosip_build_request_within_dialog (sub, "SUBSCRIBE", jd->d_dialog, "UDP"); - else - i = - _eXosip_build_request_within_dialog (sub, "SUBSCRIBE", jd->d_dialog, - transport); + osip_transaction_t *transaction; + char *transport; + int i; + + *sub = NULL; + + if (did <= 0) + return OSIP_BADPARAMETER; + + if (did > 0) { + eXosip_subscribe_dialog_find(did, &js, &jd); + } + if (jd == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No subscribe here?\n")); + return OSIP_NOTFOUND; + } + + transaction = NULL; + transaction = eXosip_find_last_out_subscribe(js, jd); + + if (transaction != NULL) { + if (transaction->state != NICT_TERMINATED && + transaction->state != NIST_TERMINATED && + transaction->state != NICT_COMPLETED && + transaction->state != NIST_COMPLETED) + return OSIP_WRONG_STATE; + } + + transport = NULL; + if (transaction != NULL && transaction->orig_request != NULL) + transport = _eXosip_transport_protocol(transaction->orig_request); + + if (transport == NULL) + i = _eXosip_build_request_within_dialog(sub, "SUBSCRIBE", jd->d_dialog, + "UDP"); + else + i = _eXosip_build_request_within_dialog(sub, "SUBSCRIBE", jd->d_dialog, + transport); + + if (i != 0) + return i; + + if (transaction!=NULL && transaction->orig_request!=NULL) { + int pos = 0; + osip_header_t *_header = NULL; + + pos = osip_message_get_supported(transaction->orig_request, pos, &_header); + while (pos >= 0 && _header != NULL) { + osip_header_t *_header2; + + i = osip_header_clone(_header, &_header2); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Error in Supported header\n")); + break; + } + osip_list_add(&(*sub)->headers, _header2, -1); + _header = NULL; + pos++; + pos = osip_message_get_supported(transaction->orig_request, pos, &_header); + } + } - if (i != 0) - return i; + eXosip_add_authentication_information(*sub, NULL); - - eXosip_add_authentication_information (*sub, NULL); - - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -int -eXosip_subscribe_send_refresh_request (int did, osip_message_t * sub) +int eXosip_subscribe_send_refresh_request(int did, osip_message_t * sub) { - eXosip_dialog_t *jd = NULL; - eXosip_subscribe_t *js = NULL; + eXosip_dialog_t *jd = NULL; + eXosip_subscribe_t *js = NULL; - osip_transaction_t *transaction; - osip_event_t *sipevent; - int i; - - if (did <= 0) - return OSIP_BADPARAMETER; - - if (did > 0) - { - eXosip_subscribe_dialog_find (did, &js, &jd); - } - if (jd == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No subscribe here?\n")); - osip_message_free (sub); - return OSIP_NOTFOUND; - } - - transaction = NULL; - transaction = eXosip_find_last_out_subscribe (js, jd); - - if (transaction != NULL) - { - if (transaction->state != NICT_TERMINATED && - transaction->state != NIST_TERMINATED && - transaction->state != NICT_COMPLETED && - transaction->state != NIST_COMPLETED) - { - osip_message_free (sub); - return OSIP_WRONG_STATE; - } - transaction = NULL; - } - - transaction = NULL; - i = _eXosip_transaction_init (&transaction, NICT, eXosip.j_osip, sub); - - if (i != 0) - { - osip_message_free (sub); - return i; - } - - js->s_reg_period = 3600; - _eXosip_subscribe_set_refresh_interval (js, sub); - osip_list_add (jd->d_out_trs, transaction, 0); - - sipevent = osip_new_outgoing_sipmessage (sub); - sipevent->transactionid = transaction->transactionid; - - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, jd, js, NULL)); - osip_transaction_add_event (transaction, sipevent); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_t *transaction; + osip_event_t *sipevent; + int i; + + if (did <= 0) + return OSIP_BADPARAMETER; + + if (did > 0) { + eXosip_subscribe_dialog_find(did, &js, &jd); + } + if (jd == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No subscribe here?\n")); + osip_message_free(sub); + return OSIP_NOTFOUND; + } + + transaction = NULL; + transaction = eXosip_find_last_out_subscribe(js, jd); + + if (transaction != NULL) { + if (transaction->state != NICT_TERMINATED && + transaction->state != NIST_TERMINATED && + transaction->state != NICT_COMPLETED && + transaction->state != NIST_COMPLETED) { + osip_message_free(sub); + return OSIP_WRONG_STATE; + } + transaction = NULL; + } + + transaction = NULL; + i = _eXosip_transaction_init(&transaction, NICT, eXosip.j_osip, sub); + + if (i != 0) { + osip_message_free(sub); + return i; + } + + js->s_reg_period = 3600; + _eXosip_subscribe_set_refresh_interval(js, sub); + osip_list_add(jd->d_out_trs, transaction, 0); + + sipevent = osip_new_outgoing_sipmessage(sub); + sipevent->transactionid = transaction->transactionid; + + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, jd, js, NULL)); + osip_transaction_add_event(transaction, sipevent); + __eXosip_wakeup(); + return OSIP_SUCCESS; } int -_eXosip_subscribe_automatic_refresh (eXosip_subscribe_t * js, - eXosip_dialog_t * jd, - osip_transaction_t * out_tr) +_eXosip_subscribe_automatic_refresh(eXosip_subscribe_t * js, + eXosip_dialog_t * jd, + osip_transaction_t * out_tr) { - osip_message_t *sub = NULL; - osip_header_t *expires; - int i; - if (js == NULL || jd == NULL || out_tr == NULL || out_tr->orig_request == NULL) - return OSIP_BADPARAMETER; - - i = eXosip_subscribe_build_refresh_request (jd->d_id, &sub); - if (i != 0) - return i; - - i = osip_message_get_expires (out_tr->orig_request, 0, &expires); - if (expires != NULL && expires->hvalue != NULL) - { - osip_message_set_expires (sub, expires->hvalue); - } - - { - int pos = 0; - osip_accept_t *_accept = NULL; - - i = osip_message_get_accept (out_tr->orig_request, pos, &_accept); - while (i >= 0 && _accept != NULL) - { - osip_accept_t *_accept2; - - i = osip_accept_clone (_accept, &_accept2); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Error in Accept header\n")); - break; - } - osip_list_add (&sub->accepts, _accept2, -1); - _accept = NULL; - pos++; - i = osip_message_get_accept (out_tr->orig_request, pos, &_accept); - } - } - - { - int pos = 0; - osip_header_t *_event = NULL; - - pos = - osip_message_header_get_byname (out_tr->orig_request, "Event", 0, &_event); - while (pos >= 0 && _event != NULL) - { - osip_header_t *_event2; - - i = osip_header_clone (_event, &_event2); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Error in Event header\n")); - break; - } - osip_list_add (&sub->headers, _event2, -1); - _event = NULL; - pos++; - pos = - osip_message_header_get_byname (out_tr->orig_request, "Event", pos, - &_event); - } - } + osip_message_t *sub = NULL; + osip_header_t *expires; + int i; + if (js == NULL || jd == NULL || out_tr == NULL || out_tr->orig_request == NULL) + return OSIP_BADPARAMETER; + + i = eXosip_subscribe_build_refresh_request(jd->d_id, &sub); + if (i != 0) + return i; + + i = osip_message_get_expires(out_tr->orig_request, 0, &expires); + if (expires != NULL && expires->hvalue != NULL) { + osip_message_set_expires(sub, expires->hvalue); + } + + { + int pos = 0; + osip_accept_t *_accept = NULL; + + i = osip_message_get_accept(out_tr->orig_request, pos, &_accept); + while (i >= 0 && _accept != NULL) { + osip_accept_t *_accept2; + + i = osip_accept_clone(_accept, &_accept2); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Error in Accept header\n")); + break; + } + osip_list_add(&sub->accepts, _accept2, -1); + _accept = NULL; + pos++; + i = osip_message_get_accept(out_tr->orig_request, pos, &_accept); + } + } + + { + int pos = 0; + osip_header_t *_event = NULL; + + pos = + osip_message_header_get_byname(out_tr->orig_request, "Event", 0, + &_event); + while (pos >= 0 && _event != NULL) { + osip_header_t *_event2; + + i = osip_header_clone(_event, &_event2); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Error in Event header\n")); + break; + } + osip_list_add(&sub->headers, _event2, -1); + _event = NULL; + pos++; + pos = + osip_message_header_get_byname(out_tr->orig_request, "Event", pos, + &_event); + } + } - i = eXosip_subscribe_send_refresh_request (jd->d_id, sub); - return i; + i = eXosip_subscribe_send_refresh_request(jd->d_id, sub); + return i; } int -_eXosip_subscribe_send_request_with_credential (eXosip_subscribe_t * js, - eXosip_dialog_t * jd, - osip_transaction_t * out_tr) +_eXosip_subscribe_send_request_with_credential(eXosip_subscribe_t * js, + eXosip_dialog_t * jd, + osip_transaction_t * out_tr) { - osip_transaction_t *tr = NULL; - osip_message_t *msg = NULL; - osip_event_t *sipevent; - - int cseq; - osip_via_t *via; - int i; - - if (js == NULL) - return OSIP_BADPARAMETER; - if (jd != NULL) - { - if (jd->d_out_trs == NULL) - return OSIP_BADPARAMETER; - } - - if (out_tr == NULL) - { - out_tr = eXosip_find_last_out_subscribe (js, jd); - } - - if (out_tr == NULL - || out_tr->orig_request == NULL || out_tr->last_response == NULL) - return OSIP_NOTFOUND; - - i = osip_message_clone (out_tr->orig_request, &msg); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: could not clone msg for authentication\n")); - return i; - } - - { - osip_generic_param_t *tag = NULL; - - osip_to_get_tag (msg->to, &tag); - if (NULL == tag && jd != NULL && jd->d_dialog != NULL - && jd->d_dialog->remote_tag != NULL) - { - osip_to_set_tag (msg->to, osip_strdup (jd->d_dialog->remote_tag)); - } - } - - via = (osip_via_t *) osip_list_get (&msg->vias, 0); - if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) - { - osip_message_free (msg); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: missing via or cseq header\n")); - return OSIP_SYNTAXERROR; - } - - /* increment cseq */ - cseq = atoi (msg->cseq->number); - osip_free (msg->cseq->number); - msg->cseq->number = strdup_printf ("%i", cseq + 1); - if (msg->cseq->number == NULL) - { - osip_message_free (msg); - return OSIP_NOMEM; - } - - if (jd != NULL && jd->d_dialog != NULL) - { - jd->d_dialog->local_cseq++; - } - - i = eXosip_update_top_via (msg); - if (i != 0) - { - osip_message_free (msg); - return i; - } - - eXosip_add_authentication_information (msg, out_tr->last_response); - osip_message_force_update (msg); - - i = _eXosip_transaction_init (&tr, NICT, eXosip.j_osip, msg); - - if (i != 0) - { - osip_message_free (msg); - return i; - } - - if (out_tr == js->s_out_tr) - { - /* replace with the new tr */ - osip_list_add (&eXosip.j_transactions, js->s_out_tr, 0); - js->s_out_tr = tr; - } else - { - /* add the new tr for the current dialog */ - osip_list_add (jd->d_out_trs, tr, 0); - } - - sipevent = osip_new_outgoing_sipmessage (msg); - - osip_transaction_set_your_instance (tr, __eXosip_new_jinfo (NULL, jd, js, NULL)); - osip_transaction_add_event (tr, sipevent); - - eXosip_update (); /* fixed? */ - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_transaction_t *tr = NULL; + osip_message_t *msg = NULL; + osip_event_t *sipevent; + + int cseq; + osip_via_t *via; + int i; + + if (js == NULL) + return OSIP_BADPARAMETER; + if (jd != NULL) { + if (jd->d_out_trs == NULL) + return OSIP_BADPARAMETER; + } + + if (out_tr == NULL) { + out_tr = eXosip_find_last_out_subscribe(js, jd); + } + + if (out_tr == NULL + || out_tr->orig_request == NULL || out_tr->last_response == NULL) + return OSIP_NOTFOUND; + + i = osip_message_clone(out_tr->orig_request, &msg); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: could not clone msg for authentication\n")); + return i; + } + + { + osip_generic_param_t *tag = NULL; + + osip_to_get_tag(msg->to, &tag); + if (NULL == tag && jd != NULL && jd->d_dialog != NULL + && jd->d_dialog->remote_tag != NULL) { + osip_to_set_tag(msg->to, osip_strdup(jd->d_dialog->remote_tag)); + } + } + + via = (osip_via_t *) osip_list_get(&msg->vias, 0); + if (via == NULL || msg->cseq == NULL || msg->cseq->number == NULL) { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing via or cseq header\n")); + return OSIP_SYNTAXERROR; + } + + /* increment cseq */ + cseq = atoi(msg->cseq->number); + osip_free(msg->cseq->number); + msg->cseq->number = strdup_printf("%i", cseq + 1); + if (msg->cseq->number == NULL) { + osip_message_free(msg); + return OSIP_NOMEM; + } + + if (jd != NULL && jd->d_dialog != NULL) { + jd->d_dialog->local_cseq++; + } + + i = eXosip_update_top_via(msg); + if (i != 0) { + osip_message_free(msg); + return i; + } + + osip_list_special_free(&msg->authorizations, + (void (*)(void *)) &osip_authorization_free); + osip_list_special_free(&msg->proxy_authorizations, + (void (*)(void *)) &osip_proxy_authorization_free); + + if (out_tr->last_response->status_code == 401 + || out_tr->last_response->status_code == 407) { + eXosip_add_authentication_information(msg, out_tr->last_response); + } else + eXosip_add_authentication_information(msg, NULL); + + + if (out_tr != NULL && out_tr->last_response != NULL + && out_tr->last_response->status_code == 423) { + /* increase expires value to "min-expires" value */ + osip_header_t *exp; + osip_header_t *min_exp; + + osip_message_header_get_byname(msg, "expires", 0, &exp); + osip_message_header_get_byname(out_tr->last_response, "min-expires", 0, + &min_exp); + if (exp != NULL && exp->hvalue != NULL && min_exp != NULL + && min_exp->hvalue != NULL) { + osip_free(exp->hvalue); + exp->hvalue = osip_strdup(min_exp->hvalue); + } else { + osip_message_free(msg); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing Min-Expires or Expires in PUBLISH\n")); + return OSIP_SYNTAXERROR; + } + } + + + osip_message_force_update(msg); + + i = _eXosip_transaction_init(&tr, NICT, eXosip.j_osip, msg); + + if (i != 0) { + osip_message_free(msg); + return i; + } + + if (out_tr == js->s_out_tr) { + /* replace with the new tr */ + osip_list_add(&eXosip.j_transactions, js->s_out_tr, 0); + js->s_out_tr = tr; + } else { + /* add the new tr for the current dialog */ + osip_list_add(jd->d_out_trs, tr, 0); + } + + sipevent = osip_new_outgoing_sipmessage(msg); + + osip_transaction_set_your_instance(tr, __eXosip_new_jinfo(NULL, jd, js, NULL)); + osip_transaction_add_event(tr, sipevent); + + eXosip_update(); /* fixed? */ + __eXosip_wakeup(); + return OSIP_SUCCESS; } #endif diff -Nru libexosip2-3.3.0/src/eXtl.c libexosip2-3.6.0/src/eXtl.c --- libexosip2-3.3.0/src/eXtl.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXtl.c 2010-01-06 14:57:57.000000000 +0000 @@ -21,7 +21,7 @@ #include "eXtransport.h" struct eXtl_protocol *eXtl_protos[] = { - &eXtl_udp, - &eXtl_tcp, - NULL + &eXtl_udp, + &eXtl_tcp, + NULL }; diff -Nru libexosip2-3.3.0/src/eXtl_dtls.c libexosip2-3.6.0/src/eXtl_dtls.c --- libexosip2-3.3.0/src/eXtl_dtls.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXtl_dtls.c 2011-10-04 07:56:59.000000000 +0000 @@ -60,11 +60,11 @@ #include "inet_ntop.h" #endif -SSL_CTX *initialize_client_ctx (const char *keyfile, const char *certfile, - const char *password, int transport); +SSL_CTX *initialize_client_ctx(const char *keyfile, const char *certfile, + const char *password, int transport); -SSL_CTX *initialize_server_ctx (const char *keyfile, const char *certfile, - const char *password, int transport); +SSL_CTX *initialize_server_ctx(const char *keyfile, const char *certfile, + const char *password, int transport); extern eXosip_t eXosip; @@ -78,13 +78,12 @@ static SSL_CTX *client_ctx; /* persistent connection */ -struct socket_tab -{ - char remote_ip[65]; - int remote_port; - SSL *ssl_conn; - int ssl_state; - int ssl_type; +struct socket_tab { + char remote_ip[65]; + int remote_port; + SSL *ssl_conn; + int ssl_state; + int ssl_type; }; @@ -94,648 +93,588 @@ static struct socket_tab dtls_socket_tab[EXOSIP_MAX_SOCKETS]; -static int -dtls_tl_init (void) +static int dtls_tl_init(void) { - dtls_socket = 0; - server_ctx = NULL; - client_ctx = NULL; - memset (&ai_addr, 0, sizeof (struct sockaddr_storage)); - memset (&dtls_socket_tab, 0, sizeof (struct socket_tab) * EXOSIP_MAX_SOCKETS); - memset (dtls_firewall_ip, 0, sizeof (dtls_firewall_ip)); - memset (dtls_firewall_port, 0, sizeof (dtls_firewall_port)); - return OSIP_SUCCESS; + dtls_socket = 0; + server_ctx = NULL; + client_ctx = NULL; + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + memset(&dtls_socket_tab, 0, sizeof(struct socket_tab) * EXOSIP_MAX_SOCKETS); + memset(dtls_firewall_ip, 0, sizeof(dtls_firewall_ip)); + memset(dtls_firewall_port, 0, sizeof(dtls_firewall_port)); + return OSIP_SUCCESS; } -int static -print_ssl_error (int err) +int static print_ssl_error(int err) { - switch (err) - { - case SSL_ERROR_NONE: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL ERROR NONE - OK\n")); - break; - case SSL_ERROR_ZERO_RETURN: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL ERROR ZERO RETURN - SHUTDOWN\n")); - break; - case SSL_ERROR_WANT_READ: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL want read\n")); - break; - case SSL_ERROR_WANT_WRITE: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL want write\n")); - break; - case SSL_ERROR_SSL: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL ERROR\n")); - break; - case SSL_ERROR_SYSCALL: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL ERROR SYSCALL\n")); - break; - default: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL problem\n")); - } - return OSIP_SUCCESS; + switch (err) { + case SSL_ERROR_NONE: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL ERROR NONE - OK\n")); + break; + case SSL_ERROR_ZERO_RETURN: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL ERROR ZERO RETURN - SHUTDOWN\n")); + break; + case SSL_ERROR_WANT_READ: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL want read\n")); + break; + case SSL_ERROR_WANT_WRITE: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL want write\n")); + break; + case SSL_ERROR_SSL: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL ERROR\n")); + break; + case SSL_ERROR_SYSCALL: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL ERROR SYSCALL\n")); + break; + default: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL problem\n")); + } + return OSIP_SUCCESS; } -static int -shutdown_free_server_dtls (int pos) +static int shutdown_free_server_dtls(int pos) { - int i, err; + int i, err; - if (dtls_socket_tab[pos].ssl_type == 1) - { - if (dtls_socket_tab[pos].ssl_conn != NULL) - { + if (dtls_socket_tab[pos].ssl_type == 1) { + if (dtls_socket_tab[pos].ssl_conn != NULL) { #ifdef SSLDEBUG - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "DTLS server SSL_shutdown\n")); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO3, NULL, + "DTLS-UDP server SSL_shutdown\n")); #endif - i = SSL_shutdown (dtls_socket_tab[pos].ssl_conn); + i = SSL_shutdown(dtls_socket_tab[pos].ssl_conn); - if (i <= 0) - { - err = SSL_get_error (dtls_socket_tab[pos].ssl_conn, i); - print_ssl_error (err); + if (i <= 0) { + err = SSL_get_error(dtls_socket_tab[pos].ssl_conn, i); + print_ssl_error(err); #ifdef SSLDEBUG - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "DTLS server shutdown <= 0\n")); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "DTLS-UDP server shutdown <= 0\n")); #endif - } else - { + } else { #ifdef SSLDEBUG - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "DTLS server shutdown > 0\n")); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO3, NULL, + "DTLS-UDP server shutdown > 0\n")); #endif - } + } - SSL_free (dtls_socket_tab[pos].ssl_conn); + SSL_free(dtls_socket_tab[pos].ssl_conn); #if 0 - if (dtls_socket_tab[pos].ssl_ctx != NULL) - SSL_CTX_free (dtls_socket_tab[pos].ssl_ctx); + if (dtls_socket_tab[pos].ssl_ctx != NULL) + SSL_CTX_free(dtls_socket_tab[pos].ssl_ctx); #endif - memset (&(dtls_socket_tab[pos]), 0, sizeof (struct socket_tab)); + memset(&(dtls_socket_tab[pos]), 0, sizeof(struct socket_tab)); - return OSIP_SUCCESS; - } else - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "DTLS server shutdown: invalid SSL object!\n")); - return -1; - } - } - return -1; + return OSIP_SUCCESS; + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "DTLS-UDP server shutdown: invalid SSL object!\n")); + return -1; + } + } + return -1; } -static int -shutdown_free_client_dtls (int pos) +static int shutdown_free_client_dtls(int pos) { - int i, err; - BIO *rbio; + int i, err; + BIO *rbio; - struct addrinfo *addrinfo; - struct __eXosip_sockaddr addr; + struct addrinfo *addrinfo; + struct __eXosip_sockaddr addr; - if (dtls_socket_tab[pos].ssl_type == 2) - { - if (dtls_socket_tab[pos].ssl_conn != NULL) - { + if (dtls_socket_tab[pos].ssl_type == 2) { + if (dtls_socket_tab[pos].ssl_conn != NULL) { - i = eXosip_get_addrinfo (&addrinfo, - dtls_socket_tab[pos].remote_ip, - dtls_socket_tab[pos].remote_port, IPPROTO_UDP); - if (i != 0) - { - return -1; - } + i = eXosip_get_addrinfo(&addrinfo, + dtls_socket_tab[pos].remote_ip, + dtls_socket_tab[pos].remote_port, IPPROTO_UDP); + if (i != 0) { + return -1; + } - memcpy (&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); - eXosip_freeaddrinfo (addrinfo); + memcpy(&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); + eXosip_freeaddrinfo(addrinfo); - rbio = BIO_new_dgram (dtls_socket, BIO_NOCLOSE); + rbio = BIO_new_dgram(dtls_socket, BIO_NOCLOSE); - BIO_dgram_set_peer (rbio, &addr); + BIO_dgram_set_peer(rbio, &addr); - (dtls_socket_tab[pos].ssl_conn)->rbio = rbio; + (dtls_socket_tab[pos].ssl_conn)->rbio = rbio; - i = SSL_shutdown (dtls_socket_tab[pos].ssl_conn); + i = SSL_shutdown(dtls_socket_tab[pos].ssl_conn); - if (i <= 0) - { - err = SSL_get_error (dtls_socket_tab[pos].ssl_conn, i); + if (i <= 0) { + err = SSL_get_error(dtls_socket_tab[pos].ssl_conn, i); #ifdef SSLDEBUG - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "DTLS client shutdown error %d <= 0\n", i)); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "DTLS-UDP client shutdown error %d <= 0\n", i)); #endif - print_ssl_error (err); - } else - { + print_ssl_error(err); + } else { #ifdef SSLDEBUG - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "DTLS client shutdown > 0\n")); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO3, NULL, + "DTLS-UDP client shutdown > 0\n")); #endif - } + } - SSL_free (dtls_socket_tab[pos].ssl_conn); + SSL_free(dtls_socket_tab[pos].ssl_conn); #if 0 - if (dtls_socket_tab[pos].ssl_ctx != NULL) - SSL_CTX_free (dtls_socket_tab[pos].ssl_ctx); + if (dtls_socket_tab[pos].ssl_ctx != NULL) + SSL_CTX_free(dtls_socket_tab[pos].ssl_ctx); #endif - memset (&(dtls_socket_tab[pos]), 0, sizeof (struct socket_tab)); + memset(&(dtls_socket_tab[pos]), 0, sizeof(struct socket_tab)); - return OSIP_SUCCESS; - } else - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "DTLS client shutdown: invalid SSL object!\n")); - return -1; - } - } - return -1; + return OSIP_SUCCESS; + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "DTLS-UDP client shutdown: invalid SSL object!\n")); + return -1; + } + } + return -1; } -static int -dtls_tl_free (void) +static int dtls_tl_free(void) { - int pos; - if (server_ctx != NULL) - SSL_CTX_free (server_ctx); - - if (client_ctx != NULL) - SSL_CTX_free (client_ctx); - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (dtls_socket_tab[pos].ssl_conn != NULL) - { - shutdown_free_client_dtls (pos); - shutdown_free_server_dtls (pos); - } - } - memset (&dtls_socket_tab, 0, sizeof (struct socket_tab) * EXOSIP_MAX_SOCKETS); - - memset (dtls_firewall_ip, 0, sizeof (dtls_firewall_ip)); - memset (dtls_firewall_port, 0, sizeof (dtls_firewall_port)); - memset (&ai_addr, 0, sizeof (struct sockaddr_storage)); - if (dtls_socket > 0) - close (dtls_socket); - dtls_socket = 0; - return OSIP_SUCCESS; + int pos; + if (server_ctx != NULL) + SSL_CTX_free(server_ctx); + + if (client_ctx != NULL) + SSL_CTX_free(client_ctx); + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (dtls_socket_tab[pos].ssl_conn != NULL) { + shutdown_free_client_dtls(pos); + shutdown_free_server_dtls(pos); + } + } + memset(&dtls_socket_tab, 0, sizeof(struct socket_tab) * EXOSIP_MAX_SOCKETS); + + memset(dtls_firewall_ip, 0, sizeof(dtls_firewall_ip)); + memset(dtls_firewall_port, 0, sizeof(dtls_firewall_port)); + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + if (dtls_socket > 0) + close(dtls_socket); + dtls_socket = 0; + return OSIP_SUCCESS; } -static int -dtls_tl_open (void) +static int dtls_tl_open(void) { - int res; - struct addrinfo *addrinfo = NULL; - struct addrinfo *curinfo; - int sock = -1; - - if (eXtl_dtls.proto_port < 0) - eXtl_dtls.proto_port = 5061; - - server_ctx = initialize_server_ctx (SERVER_KEYFILE, SERVER_CERTFILE, PASSWORD, - IPPROTO_TCP); - client_ctx = initialize_client_ctx (CLIENT_KEYFILE, CLIENT_CERTFILE, PASSWORD, - IPPROTO_TCP); - - res = eXosip_get_addrinfo (&addrinfo, - eXtl_dtls.proto_ifs, - eXtl_dtls.proto_port, eXtl_dtls.proto_num); - if (res) - return -1; - - for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) - { - socklen_t len; - - if (curinfo->ai_protocol && curinfo->ai_protocol != eXtl_dtls.proto_num) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); - continue; - } - - sock = (int) socket (curinfo->ai_family, curinfo->ai_socktype, - curinfo->ai_protocol); - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot create socket %s!\n", strerror (errno))); - continue; - } + int res; + struct addrinfo *addrinfo = NULL; + struct addrinfo *curinfo; + int sock = -1; + + if (eXtl_dtls.proto_port < 0) + eXtl_dtls.proto_port = 5061; + + server_ctx = initialize_server_ctx(SERVER_KEYFILE, SERVER_CERTFILE, PASSWORD, + IPPROTO_UDP); + client_ctx = initialize_client_ctx(CLIENT_KEYFILE, CLIENT_CERTFILE, PASSWORD, + IPPROTO_UDP); + + res = eXosip_get_addrinfo(&addrinfo, + eXtl_dtls.proto_ifs, + eXtl_dtls.proto_port, eXtl_dtls.proto_num); + if (res) + return -1; + + for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) { + socklen_t len; + + if (curinfo->ai_protocol && curinfo->ai_protocol != eXtl_dtls.proto_num) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); + continue; + } + + sock = (int) socket(curinfo->ai_family, curinfo->ai_socktype, + curinfo->ai_protocol); + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot create socket %s!\n", strerror(errno))); + continue; + } - if (curinfo->ai_family == AF_INET6) - { + if (curinfo->ai_family == AF_INET6) { #ifdef IPV6_V6ONLY - if (setsockopt_ipv6only (sock)) - { - close (sock); - sock = -1; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot set socket option %s!\n", - strerror (errno))); - continue; - } -#endif /* IPV6_V6ONLY */ - } - - res = bind (sock, curinfo->ai_addr, curinfo->ai_addrlen); - if (res < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - eXtl_dtls.proto_ifs, curinfo->ai_family, strerror (errno))); - close (sock); - sock = -1; - continue; - } - len = sizeof (ai_addr); - res = getsockname (sock, (struct sockaddr *) &ai_addr, &len); - if (res != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot get socket name (%s)\n", strerror (errno))); - memcpy (&ai_addr, curinfo->ai_addr, curinfo->ai_addrlen); - } - - if (eXtl_dtls.proto_num == IPPROTO_TCP) - { - res = listen (sock, SOMAXCONN); - if (res < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - eXtl_dtls.proto_ifs, curinfo->ai_family, - strerror (errno))); - close (sock); - sock = -1; - continue; - } - } - - break; - } - - eXosip_freeaddrinfo (addrinfo); - - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind on port: %i\n", eXtl_dtls.proto_port)); - return -1; - } - - dtls_socket = sock; - - if (eXtl_dtls.proto_port == 0) - { - /* get port number from socket */ - if (eXtl_dtls.proto_family == AF_INET) - eXtl_dtls.proto_port = ntohs (((struct sockaddr_in *) &ai_addr)->sin_port); - else - eXtl_dtls.proto_port = - ntohs (((struct sockaddr_in6 *) &ai_addr)->sin6_port); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: Binding on port %i!\n", eXtl_dtls.proto_port)); - } - - snprintf (dtls_firewall_port, sizeof (dtls_firewall_port), "%i", - eXtl_dtls.proto_port); - return OSIP_SUCCESS; + if (setsockopt_ipv6only(sock)) { + close(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot set socket option %s!\n", + strerror(errno))); + continue; + } +#endif /* IPV6_V6ONLY */ + } + + res = bind(sock, curinfo->ai_addr, curinfo->ai_addrlen); + if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot bind socket node:%s family:%d %s\n", + eXtl_dtls.proto_ifs, curinfo->ai_family, strerror(errno))); + close(sock); + sock = -1; + continue; + } + len = sizeof(ai_addr); + res = getsockname(sock, (struct sockaddr *) &ai_addr, &len); + if (res != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot get socket name (%s)\n", strerror(errno))); + memcpy(&ai_addr, curinfo->ai_addr, curinfo->ai_addrlen); + } + + if (eXtl_dtls.proto_num == IPPROTO_TCP) { + res = listen(sock, SOMAXCONN); + if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot bind socket node:%s family:%d %s\n", + eXtl_dtls.proto_ifs, curinfo->ai_family, + strerror(errno))); + close(sock); + sock = -1; + continue; + } + } + + break; + } + + eXosip_freeaddrinfo(addrinfo); + + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot bind on port: %i\n", eXtl_dtls.proto_port)); + return -1; + } + + dtls_socket = sock; + + if (eXtl_dtls.proto_port == 0) { + /* get port number from socket */ + if (eXtl_dtls.proto_family == AF_INET) + eXtl_dtls.proto_port = + ntohs(((struct sockaddr_in *) &ai_addr)->sin_port); + else + eXtl_dtls.proto_port = + ntohs(((struct sockaddr_in6 *) &ai_addr)->sin6_port); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: Binding on port %i!\n", eXtl_dtls.proto_port)); + } + + snprintf(dtls_firewall_port, sizeof(dtls_firewall_port), "%i", + eXtl_dtls.proto_port); + return OSIP_SUCCESS; } #define EXOSIP_AS_A_SERVER 1 #define EXOSIP_AS_A_CLIENT 2 -static int -dtls_tl_set_fdset (fd_set * osip_fdset, int *fd_max) +static int dtls_tl_set_fdset(fd_set * osip_fdset, fd_set * osip_wrset, int *fd_max) { - if (dtls_socket <= 0) - return -1; + if (dtls_socket <= 0) + return -1; - eXFD_SET (dtls_socket, osip_fdset); + eXFD_SET(dtls_socket, osip_fdset); - if (dtls_socket > *fd_max) - *fd_max = dtls_socket; + if (dtls_socket > *fd_max) + *fd_max = dtls_socket; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -static int -dtls_tl_read_message (fd_set * osip_fdset) +static int dtls_tl_read_message(fd_set * osip_fdset, fd_set * osip_wrset) { - char *enc_buf; - char *dec_buf; - int i; - int enc_buf_len; - - if (dtls_socket <= 0) - return -1; - - if (FD_ISSET (dtls_socket, osip_fdset)) - { - struct sockaddr_storage sa; + char *enc_buf; + char *dec_buf; + int i; + int enc_buf_len; + + if (dtls_socket <= 0) + return -1; + + if (FD_ISSET(dtls_socket, osip_fdset)) { + struct sockaddr_storage sa; #ifdef __linux - socklen_t slen; + socklen_t slen; #else - int slen; + int slen; #endif - if (eXtl_dtls.proto_family == AF_INET) - slen = sizeof (struct sockaddr_in); - else - slen = sizeof (struct sockaddr_in6); - - enc_buf = (char *) osip_malloc (SIP_MESSAGE_MAX_LENGTH * sizeof (char) + 1); - if (enc_buf == NULL) - return OSIP_NOMEM; - - enc_buf_len = recvfrom (dtls_socket, enc_buf, - SIP_MESSAGE_MAX_LENGTH, 0, - (struct sockaddr *) &sa, &slen); - - if (enc_buf_len > 5) - { - char src6host[NI_MAXHOST]; - int recvport = 0; - int err; - - BIO *rbio; - struct socket_tab *socket_tab_used = NULL; - int pos; - - osip_strncpy (enc_buf + enc_buf_len, "\0", 1); - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Received message: \n%s\n", enc_buf)); - - memset (src6host, 0, sizeof (src6host)); - - if (eXtl_dtls.proto_family == AF_INET) - recvport = ntohs (((struct sockaddr_in *) &sa)->sin_port); - else - recvport = ntohs (((struct sockaddr_in6 *) &sa)->sin6_port); + if (eXtl_dtls.proto_family == AF_INET) + slen = sizeof(struct sockaddr_in); + else + slen = sizeof(struct sockaddr_in6); + + enc_buf = (char *) osip_malloc(SIP_MESSAGE_MAX_LENGTH * sizeof(char) + 1); + if (enc_buf == NULL) + return OSIP_NOMEM; + + enc_buf_len = recvfrom(dtls_socket, enc_buf, + SIP_MESSAGE_MAX_LENGTH, 0, + (struct sockaddr *) &sa, &slen); + + if (enc_buf_len > 5) { + char src6host[NI_MAXHOST]; + int recvport = 0; + int err; + + BIO *rbio; + struct socket_tab *socket_tab_used = NULL; + int pos; + + enc_buf[enc_buf_len] = '\0'; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Received message: \n%s\n", enc_buf)); + + memset(src6host, 0, sizeof(src6host)); + + if (eXtl_dtls.proto_family == AF_INET) + recvport = ntohs(((struct sockaddr_in *) &sa)->sin_port); + else + recvport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port); #if defined(__arc__) - { - struct sockaddr_in *fromsa = (struct sockaddr_in *) &sa; - char *tmp; - tmp = inet_ntoa (fromsa->sin_addr); - if (tmp == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Message received from: NULL:%i inet_ntoa failure\n", - recvport)); - } else - { - snprintf (src6host, sizeof (src6host), "%s", tmp); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, - recvport)); - } - } + { + struct sockaddr_in *fromsa = (struct sockaddr_in *) &sa; + char *tmp; + tmp = inet_ntoa(fromsa->sin_addr); + if (tmp == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Message received from: NULL:%i inet_ntoa failure\n", + recvport)); + } else { + snprintf(src6host, sizeof(src6host), "%s", tmp); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, + recvport)); + } + } #else - err = getnameinfo ((struct sockaddr *) &sa, slen, - src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + err = getnameinfo((struct sockaddr *) &sa, slen, + src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); - if (err != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Message received from: NULL:%i getnameinfo failure\n", - recvport)); - snprintf (src6host, sizeof (src6host), "127.0.0.1"); - } else - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, recvport)); - } + if (err != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Message received from: NULL:%i getnameinfo failure\n", + recvport)); + snprintf(src6host, sizeof(src6host), "127.0.0.1"); + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, recvport)); + } #endif - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, recvport)); - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (dtls_socket_tab[pos].ssl_conn != NULL) - { - if (dtls_socket_tab[pos].remote_port == recvport && - (strcmp (dtls_socket_tab[pos].remote_ip, src6host) == 0)) - { - socket_tab_used = &dtls_socket_tab[pos]; - break; - } - } - } - - if (socket_tab_used == NULL) - { - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (dtls_socket_tab[pos].ssl_conn == NULL) - { - /* should accept this connection? */ - break; - } - } - - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "creating DTLS socket at index: %i\n", pos)); - if (pos < 0) - { - /* delete an old one! */ - pos = 0; - if (dtls_socket_tab[pos].ssl_conn != NULL) - { - shutdown_free_client_dtls (pos); - shutdown_free_server_dtls (pos); - } - - memset (&dtls_socket_tab[pos], 0, sizeof (struct socket_tab)); - } - } - - if (dtls_socket_tab[pos].ssl_conn == NULL) - { - BIO *wbio; - if (!SSL_CTX_check_private_key (server_ctx)) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL CTX private key check error\n")); - osip_free (enc_buf); - return -1; - } - - /* behave as a server: */ - dtls_socket_tab[pos].ssl_conn = SSL_new (server_ctx); - if (dtls_socket_tab[pos].ssl_conn == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL_new error\n")); - osip_free (enc_buf); - return -1; - } + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, recvport)); + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (dtls_socket_tab[pos].ssl_conn != NULL) { + if (dtls_socket_tab[pos].remote_port == recvport && + (strcmp(dtls_socket_tab[pos].remote_ip, src6host) == 0)) { + socket_tab_used = &dtls_socket_tab[pos]; + break; + } + } + } + + if (socket_tab_used == NULL) { + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (dtls_socket_tab[pos].ssl_conn == NULL) { + /* should accept this connection? */ + break; + } + } + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO3, NULL, + "creating DTLS-UDP socket at index: %i\n", pos)); + if (pos < 0) { + /* delete an old one! */ + pos = 0; + if (dtls_socket_tab[pos].ssl_conn != NULL) { + shutdown_free_client_dtls(pos); + shutdown_free_server_dtls(pos); + } + + memset(&dtls_socket_tab[pos], 0, sizeof(struct socket_tab)); + } + } + + if (dtls_socket_tab[pos].ssl_conn == NULL) { + BIO *wbio; + if (!SSL_CTX_check_private_key(server_ctx)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL CTX private key check error\n")); + osip_free(enc_buf); + return -1; + } + + /* behave as a server: */ + dtls_socket_tab[pos].ssl_conn = SSL_new(server_ctx); + if (dtls_socket_tab[pos].ssl_conn == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL_new error\n")); + osip_free(enc_buf); + return -1; + } - /* No MTU query */ + /* No MTU query */ #ifdef SSL_OP_NO_QUERY_MTU - SSL_set_options (dtls_socket_tab[pos].ssl_conn, SSL_OP_NO_QUERY_MTU); - SSL_set_mtu (dtls_socket_tab[pos].ssl_conn, 2000); + SSL_set_options(dtls_socket_tab[pos].ssl_conn, + SSL_OP_NO_QUERY_MTU); + SSL_set_mtu(dtls_socket_tab[pos].ssl_conn, 2000); #endif - /* MTU query */ - /* BIO_ctrl(sbio, BIO_CTRL_DGRAM_MTU_DISCOVER, 0, NULL); */ + /* MTU query */ + /* BIO_ctrl(sbio, BIO_CTRL_DGRAM_MTU_DISCOVER, 0, NULL); */ #ifdef SSL_OP_COOKIE_EXCHANGE - SSL_set_options (dtls_socket_tab[pos].ssl_conn, - SSL_OP_COOKIE_EXCHANGE); + SSL_set_options(dtls_socket_tab[pos].ssl_conn, + SSL_OP_COOKIE_EXCHANGE); #endif - wbio = BIO_new_dgram (dtls_socket, BIO_NOCLOSE); - BIO_dgram_set_peer (wbio, &sa); - SSL_set_bio (dtls_socket_tab[pos].ssl_conn, NULL, wbio); - - SSL_set_accept_state (dtls_socket_tab[pos].ssl_conn); - - dtls_socket_tab[pos].ssl_state = 0; - dtls_socket_tab[pos].ssl_type = EXOSIP_AS_A_SERVER; - - osip_strncpy (dtls_socket_tab[pos].remote_ip, src6host, - sizeof (dtls_socket_tab[pos].remote_ip) - 1); - dtls_socket_tab[pos].remote_port = recvport; - - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "New DTLS connection accepted\n")); - - } - - dec_buf = - (char *) osip_malloc (SIP_MESSAGE_MAX_LENGTH * sizeof (char) + 1); - if (dec_buf == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Allocation error\n")); - osip_free (enc_buf); - return OSIP_NOMEM; - } - rbio = BIO_new_mem_buf (enc_buf, enc_buf_len); - BIO_set_mem_eof_return (rbio, -1); - - dtls_socket_tab[pos].ssl_conn->rbio = rbio; - - i = - SSL_read (dtls_socket_tab[pos].ssl_conn, dec_buf, - SIP_MESSAGE_MAX_LENGTH); - /* done with the rbio */ - BIO_free (dtls_socket_tab[pos].ssl_conn->rbio); - dtls_socket_tab[pos].ssl_conn->rbio = BIO_new (BIO_s_mem ()); - - if (i > 5) - { - osip_strncpy (dec_buf + i, "\0", 1); + wbio = BIO_new_dgram(dtls_socket, BIO_NOCLOSE); + BIO_dgram_set_peer(wbio, &sa); + SSL_set_bio(dtls_socket_tab[pos].ssl_conn, NULL, wbio); + + SSL_set_accept_state(dtls_socket_tab[pos].ssl_conn); + + dtls_socket_tab[pos].ssl_state = 0; + dtls_socket_tab[pos].ssl_type = EXOSIP_AS_A_SERVER; + + osip_strncpy(dtls_socket_tab[pos].remote_ip, src6host, + sizeof(dtls_socket_tab[pos].remote_ip) - 1); + dtls_socket_tab[pos].remote_port = recvport; + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "New DTLS-UDP connection accepted\n")); + + } + + dec_buf = + (char *) osip_malloc(SIP_MESSAGE_MAX_LENGTH * sizeof(char) + 1); + if (dec_buf == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Allocation error\n")); + osip_free(enc_buf); + return OSIP_NOMEM; + } + rbio = BIO_new_mem_buf(enc_buf, enc_buf_len); + BIO_set_mem_eof_return(rbio, -1); + + dtls_socket_tab[pos].ssl_conn->rbio = rbio; + + i = SSL_read(dtls_socket_tab[pos].ssl_conn, dec_buf, + SIP_MESSAGE_MAX_LENGTH); + /* done with the rbio */ + BIO_free(dtls_socket_tab[pos].ssl_conn->rbio); + dtls_socket_tab[pos].ssl_conn->rbio = BIO_new(BIO_s_mem()); + + if (i > 5) { + dec_buf[i] = '\0'; - _eXosip_handle_incoming_message (dec_buf, i, dtls_socket, src6host, - recvport); + _eXosip_handle_incoming_message(dec_buf, i, dtls_socket, src6host, + recvport); - } + } #ifndef MINISIZE - else if (i <= 0) - { - err = SSL_get_error (dtls_socket_tab[pos].ssl_conn, i); - print_ssl_error (err); - if (err == SSL_ERROR_SYSCALL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, - NULL, "DTLS SYSCALL on SSL_read\n")); - } else if (err == SSL_ERROR_SSL || err == SSL_ERROR_ZERO_RETURN) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, - NULL, "DTLS closed\n")); - - shutdown_free_client_dtls (pos); - shutdown_free_server_dtls (pos); - - memset (&(dtls_socket_tab[pos]), 0, - sizeof (dtls_socket_tab[pos])); - } - } else - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Dummy SIP message received\n")); - } + else if (i <= 0) { + err = SSL_get_error(dtls_socket_tab[pos].ssl_conn, i); + print_ssl_error(err); + if (err == SSL_ERROR_SYSCALL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, + NULL, "DTLS-UDP SYSCALL on SSL_read\n")); + } else if (err == SSL_ERROR_SSL || err == SSL_ERROR_ZERO_RETURN) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, + NULL, "DTLS-UDP closed\n")); + + shutdown_free_client_dtls(pos); + shutdown_free_server_dtls(pos); + + memset(&(dtls_socket_tab[pos]), 0, + sizeof(dtls_socket_tab[pos])); + } + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Dummy SIP message received\n")); + } #endif - osip_free (dec_buf); - osip_free (enc_buf); + osip_free(dec_buf); + osip_free(enc_buf); - } - } + } + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -static int -eXtl_update_local_target (osip_message_t * req) +static int eXtl_update_local_target(osip_message_t * req) { - int pos = 0; + int pos = 0; + + if (dtls_firewall_ip != '\0') { - if (dtls_firewall_ip != '\0') - { + while (!osip_list_eol(&req->contacts, pos)) { + osip_contact_t *co; - while (!osip_list_eol (&req->contacts, pos)) - { - osip_contact_t *co; - - co = (osip_contact_t *) osip_list_get (&req->contacts, pos); - pos++; - if (co != NULL && co->url != NULL && co->url->host != NULL - && 0 == osip_strcasecmp (co->url->host, dtls_firewall_ip)) - { - if (co->url->port == NULL && - 0 != osip_strcasecmp (dtls_firewall_port, "5061")) - { - co->url->port = osip_strdup (dtls_firewall_port); - } else if (co->url->port != NULL && - 0 != osip_strcasecmp (dtls_firewall_port, co->url->port)) - { - osip_free (co->url->port); - co->url->port = osip_strdup (dtls_firewall_port); - } - } - } - } + co = (osip_contact_t *) osip_list_get(&req->contacts, pos); + pos++; + if (co != NULL && co->url != NULL && co->url->host != NULL + && 0 == osip_strcasecmp(co->url->host, dtls_firewall_ip)) { + if (co->url->port == NULL && + 0 != osip_strcasecmp(dtls_firewall_port, "5061")) { + co->url->port = osip_strdup(dtls_firewall_port); + } else if (co->url->port != NULL && + 0 != osip_strcasecmp(dtls_firewall_port, co->url->port)) + { + osip_free(co->url->port); + co->url->port = osip_strdup(dtls_firewall_port); + } + } + } + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } #ifndef INET6_ADDRSTRLEN @@ -743,374 +682,477 @@ #endif static int -dtls_tl_send_message (osip_transaction_t * tr, osip_message_t * sip, char *host, - int port, int out_socket) +dtls_tl_send_message(osip_transaction_t * tr, osip_message_t * sip, char *host, + int port, int out_socket) { - int len = 0; - size_t length = 0; - struct addrinfo *addrinfo; - struct __eXosip_sockaddr addr; - char *message; - - char ipbuf[INET6_ADDRSTRLEN]; - int i; - - int pos; - struct socket_tab *socket_tab_used = NULL; - BIO *sbio = NULL; - - if (dtls_socket <= 0) - return -1; - - if (host == NULL) - { - host = sip->req_uri->host; - if (sip->req_uri->port != NULL) - port = osip_atoi (sip->req_uri->port); - else - port = 5061; - } - - if (port == 5060) - port = 5061; - - if (MSG_IS_REQUEST (sip)) - { - if (MSG_IS_REGISTER (sip) - || MSG_IS_INVITE (sip) || MSG_IS_SUBSCRIBE (sip) || MSG_IS_NOTIFY (sip)) - eXtl_update_local_target (sip); - } + int len = 0; + size_t length = 0; + struct addrinfo *addrinfo; + struct __eXosip_sockaddr addr; + char *message; + + char ipbuf[INET6_ADDRSTRLEN]; + int i; + osip_naptr_t *naptr_record=NULL; + + int pos; + struct socket_tab *socket_tab_used = NULL; + BIO *sbio = NULL; + + if (dtls_socket <= 0) + return -1; + + if (host == NULL) { + host = sip->req_uri->host; + if (sip->req_uri->port != NULL) + port = osip_atoi(sip->req_uri->port); + else + port = 5061; + } + + if (port == 5060) + port = 5061; + + if (MSG_IS_REQUEST(sip)) { + if (MSG_IS_REGISTER(sip) + || MSG_IS_INVITE(sip) || MSG_IS_SUBSCRIBE(sip) || MSG_IS_NOTIFY(sip)) + eXtl_update_local_target(sip); + } - i = -1; + i = -1; #ifndef MINISIZE - if (tr != NULL && tr->record.name[0] != '\0' - && tr->record.srventry[0].srv[0] != '\0') - { - /* always choose the first here. - if a network error occur, remove first entry and - replace with next entries. - */ - osip_srv_entry_t *srv; - int n = 0; - for (srv = &tr->record.srventry[0]; - n < 10 && tr->record.srventry[0].srv[0]; srv = &tr->record.srventry[0]) - { - i = eXosip_get_addrinfo (&addrinfo, srv->srv, srv->port, IPPROTO_UDP); - if (i == 0) - { - host = srv->srv; - port = srv->port; - break; - } - memmove (&tr->record.srventry[0], &tr->record.srventry[1], - 9 * sizeof (osip_srv_entry_t)); - memset (&tr->record.srventry[9], 0, sizeof (osip_srv_entry_t)); - i = -1; - /* copy next element */ - n++; - } - } + if (tr==NULL) + { + _eXosip_srv_lookup(sip, &naptr_record); + + if (naptr_record!=NULL) { + eXosip_dnsutils_dns_process(naptr_record, 1); + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_dns_process(naptr_record, 1); + } + + if (naptr_record!=NULL && naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + { + /* 4: check if we have the one we want... */ + if (naptr_record->sipdtls_record.name[0] != '\0' + && naptr_record->sipdtls_record.srventry[naptr_record->sipdtls_record.index].srv[0] != '\0') { + /* always choose the first here. + if a network error occur, remove first entry and + replace with next entries. + */ + osip_srv_entry_t *srv; + int n = 0; + for (srv = &naptr_record->sipdtls_record.srventry[naptr_record->sipdtls_record.index]; + n < 10 && naptr_record->sipdtls_record.srventry[naptr_record->sipdtls_record.index].srv[0]; + srv = &naptr_record->sipdtls_record.srventry[naptr_record->sipdtls_record.index]) { + if (srv->ipaddress[0]) + i = eXosip_get_addrinfo(&addrinfo, srv->ipaddress, srv->port, IPPROTO_UDP); + else + i = eXosip_get_addrinfo(&addrinfo, srv->srv, srv->port, IPPROTO_UDP); + if (i == 0) { + host = srv->srv; + port = srv->port; + break; + } + + i = eXosip_dnsutils_rotate_srv(&naptr_record->sipdtls_record); + if (i<=0) + { + return -1; + } + if (i>=n) + { + return -1; + } + i = -1; + /* copy next element */ + n++; + } + } + } + + if (naptr_record!=NULL && naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + } + else + { + naptr_record = tr->naptr_record; + } + + if (naptr_record!=NULL) + { + /* 1: make sure there is no pending DNS */ + eXosip_dnsutils_dns_process(naptr_record, 0); + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_dns_process(naptr_record, 0); + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_UNKNOWN) + { + /* fallback to DNS A */ + if (naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + if (tr!=NULL) + tr->naptr_record=NULL; + /* must never happen? */ + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_INPROGRESS) + { + /* 2: keep waiting (naptr answer not received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE) + { + /* 3: keep waiting (naptr answer received/no srv answer received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + { + /* 3: keep waiting (naptr answer received/no srv answer received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + { + /* 4: check if we have the one we want... */ + if (naptr_record->sipdtls_record.name[0] != '\0' + && naptr_record->sipdtls_record.srventry[naptr_record->sipdtls_record.index].srv[0] != '\0') { + /* always choose the first here. + if a network error occur, remove first entry and + replace with next entries. + */ + osip_srv_entry_t *srv; + int n = 0; + for (srv = &naptr_record->sipdtls_record.srventry[naptr_record->sipdtls_record.index]; + n < 10 && naptr_record->sipdtls_record.srventry[naptr_record->sipdtls_record.index].srv[0]; + srv = &naptr_record->sipdtls_record.srventry[naptr_record->sipdtls_record.index]) { + if (srv->ipaddress[0]) + i = eXosip_get_addrinfo(&addrinfo, srv->ipaddress, srv->port, IPPROTO_UDP); + else + i = eXosip_get_addrinfo(&addrinfo, srv->srv, srv->port, IPPROTO_UDP); + if (i == 0) { + host = srv->srv; + port = srv->port; + break; + } + + i = eXosip_dnsutils_rotate_srv(&naptr_record->sipdtls_record); + if (i<=0) + { + return -1; + } + if (i>=n) + { + return -1; + } + i = -1; + /* copy next element */ + n++; + } + } + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NOTSUPPORTED + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_RETRYLATER) + { + /* 5: fallback to DNS A */ + if (naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + if (tr!=NULL) + tr->naptr_record=NULL; + } + } #endif - /* if SRV was used, distination may be already found */ - if (i != 0) - { - i = eXosip_get_addrinfo (&addrinfo, host, port, IPPROTO_UDP); - } - - if (i != 0) - { - return -1; - } - - memcpy (&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); - len = addrinfo->ai_addrlen; - - eXosip_freeaddrinfo (addrinfo); - - /* remove preloaded route if there is no tag in the To header - */ - { - osip_route_t *route = NULL; - osip_generic_param_t *tag = NULL; - osip_message_get_route (sip, 0, &route); - - osip_to_get_tag (sip->to, &tag); - if (tag == NULL && route != NULL && route->url != NULL) - { - osip_list_remove (&sip->routes, 0); - } - i = osip_message_to_str (sip, &message, &length); - if (tag == NULL && route != NULL && route->url != NULL) - { - osip_list_add (&sip->routes, route, 0); - } - } - - if (i != 0 || length <= 0) - { - return -1; - } - - switch (((struct sockaddr *) &addr)->sa_family) - { - case AF_INET: - inet_ntop (((struct sockaddr *) &addr)->sa_family, - &(((struct sockaddr_in *) &addr)->sin_addr), ipbuf, - sizeof (ipbuf)); - break; - case AF_INET6: - inet_ntop (((struct sockaddr *) &addr)->sa_family, - &(((struct sockaddr_in6 *) &addr)->sin6_addr), ipbuf, - sizeof (ipbuf)); - break; - default: - strncpy (ipbuf, "(unknown)", sizeof (ipbuf)); - break; - } - - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message sent: \n%s (to dest=%s:%i)\n", - message, ipbuf, port)); - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (dtls_socket_tab[pos].ssl_conn != NULL - && dtls_socket_tab[pos].ssl_type == EXOSIP_AS_A_SERVER) - { - if (dtls_socket_tab[pos].remote_port == port && - (strcmp (dtls_socket_tab[pos].remote_ip, ipbuf) == 0)) - { - BIO *rbio; - socket_tab_used = &dtls_socket_tab[pos]; - rbio = BIO_new_dgram (dtls_socket, BIO_NOCLOSE); - BIO_dgram_set_peer (rbio, &addr); - dtls_socket_tab[pos].ssl_conn->rbio = rbio; - break; - } - } - } - if (socket_tab_used == NULL) - { - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (dtls_socket_tab[pos].ssl_conn != NULL - && dtls_socket_tab[pos].ssl_type == EXOSIP_AS_A_CLIENT) - { - if (dtls_socket_tab[pos].remote_port == port && - (strcmp (dtls_socket_tab[pos].remote_ip, ipbuf) == 0)) - { - BIO *rbio; - socket_tab_used = &dtls_socket_tab[pos]; - rbio = BIO_new_dgram (dtls_socket, BIO_NOCLOSE); - BIO_dgram_set_peer (rbio, &addr); - dtls_socket_tab[pos].ssl_conn->rbio = rbio; - break; - } - } - } - } - - if (socket_tab_used == NULL) - { - /* delete an old one! */ - pos = 0; - if (dtls_socket_tab[pos].ssl_conn != NULL) - { - shutdown_free_client_dtls (pos); - shutdown_free_server_dtls (pos); - } - - memset (&dtls_socket_tab[pos], 0, sizeof (struct socket_tab)); - } - - if (dtls_socket_tab[pos].ssl_conn == NULL) - { - /* create a new one */ - SSL_CTX_set_read_ahead (client_ctx, 1); - dtls_socket_tab[pos].ssl_conn = SSL_new (client_ctx); - - if (dtls_socket_tab[pos].ssl_conn == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "DTLS SSL_new error\n")); - - if (dtls_socket_tab[pos].ssl_conn != NULL) - { - shutdown_free_client_dtls (pos); - shutdown_free_server_dtls (pos); - } - - memset (&dtls_socket_tab[pos], 0, sizeof (struct socket_tab)); - - osip_free (message); - return -1; - } - - if (connect (dtls_socket, (struct sockaddr *) &addr, sizeof (addr)) == -1) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "DTLS connect error\n")); - if (dtls_socket_tab[pos].ssl_conn != NULL) - { - shutdown_free_client_dtls (pos); - shutdown_free_server_dtls (pos); - } - - memset (&dtls_socket_tab[pos], 0, sizeof (struct socket_tab)); - - osip_free (message); - return -1; - } - - SSL_set_options (dtls_socket_tab[pos].ssl_conn, SSL_OP_NO_QUERY_MTU); - SSL_set_mtu (dtls_socket_tab[pos].ssl_conn, 2000); - SSL_set_connect_state (dtls_socket_tab[pos].ssl_conn); - sbio = BIO_new_dgram (dtls_socket, BIO_NOCLOSE); - BIO_ctrl_set_connected (sbio, 1, (struct sockaddr *) &addr); - SSL_set_bio (dtls_socket_tab[pos].ssl_conn, sbio, sbio); - - dtls_socket_tab[pos].ssl_type = 2; - dtls_socket_tab[pos].ssl_state = 2; - - osip_strncpy (dtls_socket_tab[pos].remote_ip, ipbuf, - sizeof (dtls_socket_tab[pos].remote_ip) - 1); - dtls_socket_tab[pos].remote_port = port; - } - - i = SSL_write (dtls_socket_tab[pos].ssl_conn, message, length); - - if (i < 0) - { - i = SSL_get_error (dtls_socket_tab[pos].ssl_conn, i); - print_ssl_error (i); - if (i == SSL_ERROR_SSL || i == SSL_ERROR_SYSCALL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "DTLS SSL_write error\n")); - if (dtls_socket_tab[pos].ssl_conn != NULL) - { - shutdown_free_client_dtls (pos); - shutdown_free_server_dtls (pos); - } + /* if SRV was used, destination may be already found */ + if (i != 0) { + i = eXosip_get_addrinfo(&addrinfo, host, port, IPPROTO_UDP); + } + + if (i != 0) { + return -1; + } + + memcpy(&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); + len = addrinfo->ai_addrlen; + + eXosip_freeaddrinfo(addrinfo); + + /* remove preloaded route if there is no tag in the To header + */ + { + osip_route_t *route = NULL; + osip_generic_param_t *tag = NULL; + osip_message_get_route(sip, 0, &route); + + osip_to_get_tag(sip->to, &tag); + if (tag == NULL && route != NULL && route->url != NULL) { + osip_list_remove(&sip->routes, 0); + } + i = osip_message_to_str(sip, &message, &length); + if (tag == NULL && route != NULL && route->url != NULL) { + osip_list_add(&sip->routes, route, 0); + } + } + + if (i != 0 || length <= 0) { + return -1; + } + + switch (((struct sockaddr *) &addr)->sa_family) { + case AF_INET: + inet_ntop(((struct sockaddr *) &addr)->sa_family, + &(((struct sockaddr_in *) &addr)->sin_addr), ipbuf, + sizeof(ipbuf)); + break; + case AF_INET6: + inet_ntop(((struct sockaddr *) &addr)->sa_family, + &(((struct sockaddr_in6 *) &addr)->sin6_addr), ipbuf, + sizeof(ipbuf)); + break; + default: + strncpy(ipbuf, "(unknown)", sizeof(ipbuf)); + break; + } + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message sent: \n%s (to dest=%s:%i)\n", + message, ipbuf, port)); + + if (osip_strcasecmp(host, ipbuf)!=0 && MSG_IS_REQUEST(sip)) { + if (MSG_IS_REGISTER(sip)) { + struct eXosip_dns_cache entry; + + memset(&entry, 0, sizeof(struct eXosip_dns_cache)); + snprintf(entry.host, sizeof(entry.host), "%s", host); + snprintf(entry.ip, sizeof(entry.ip), "%s", ipbuf); + eXosip_set_option(EXOSIP_OPT_ADD_DNS_CACHE, (void *) &entry); + } + } + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (dtls_socket_tab[pos].ssl_conn != NULL + && dtls_socket_tab[pos].ssl_type == EXOSIP_AS_A_SERVER) { + if (dtls_socket_tab[pos].remote_port == port && + (strcmp(dtls_socket_tab[pos].remote_ip, ipbuf) == 0)) { + BIO *rbio; + socket_tab_used = &dtls_socket_tab[pos]; + rbio = BIO_new_dgram(dtls_socket, BIO_NOCLOSE); + BIO_dgram_set_peer(rbio, &addr); + dtls_socket_tab[pos].ssl_conn->rbio = rbio; + break; + } + } + } + if (socket_tab_used == NULL) { + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (dtls_socket_tab[pos].ssl_conn != NULL + && dtls_socket_tab[pos].ssl_type == EXOSIP_AS_A_CLIENT) { + if (dtls_socket_tab[pos].remote_port == port && + (strcmp(dtls_socket_tab[pos].remote_ip, ipbuf) == 0)) { + BIO *rbio; + socket_tab_used = &dtls_socket_tab[pos]; + rbio = BIO_new_dgram(dtls_socket, BIO_NOCLOSE); + BIO_dgram_set_peer(rbio, &addr); + dtls_socket_tab[pos].ssl_conn->rbio = rbio; + break; + } + } + } + } + + if (socket_tab_used == NULL) { + /* delete an old one! */ + pos = 0; + if (dtls_socket_tab[pos].ssl_conn != NULL) { + shutdown_free_client_dtls(pos); + shutdown_free_server_dtls(pos); + } + + memset(&dtls_socket_tab[pos], 0, sizeof(struct socket_tab)); + } + + if (dtls_socket_tab[pos].ssl_conn == NULL) { + /* create a new one */ + SSL_CTX_set_read_ahead(client_ctx, 1); + dtls_socket_tab[pos].ssl_conn = SSL_new(client_ctx); + + if (dtls_socket_tab[pos].ssl_conn == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "DTLS-UDP SSL_new error\n")); + + if (dtls_socket_tab[pos].ssl_conn != NULL) { + shutdown_free_client_dtls(pos); + shutdown_free_server_dtls(pos); + } + + memset(&dtls_socket_tab[pos], 0, sizeof(struct socket_tab)); + + osip_free(message); + return -1; + } + + if (connect(dtls_socket, (struct sockaddr *) &addr, sizeof(addr)) == -1) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "DTLS-UDP connect error\n")); + if (dtls_socket_tab[pos].ssl_conn != NULL) { + shutdown_free_client_dtls(pos); + shutdown_free_server_dtls(pos); + } + + memset(&dtls_socket_tab[pos], 0, sizeof(struct socket_tab)); + + osip_free(message); + return -1; + } + + SSL_set_options(dtls_socket_tab[pos].ssl_conn, SSL_OP_NO_QUERY_MTU); + SSL_set_mtu(dtls_socket_tab[pos].ssl_conn, 2000); + SSL_set_connect_state(dtls_socket_tab[pos].ssl_conn); + sbio = BIO_new_dgram(dtls_socket, BIO_NOCLOSE); + BIO_ctrl_set_connected(sbio, 1, (struct sockaddr *) &addr); + SSL_set_bio(dtls_socket_tab[pos].ssl_conn, sbio, sbio); + + dtls_socket_tab[pos].ssl_type = 2; + dtls_socket_tab[pos].ssl_state = 2; + + osip_strncpy(dtls_socket_tab[pos].remote_ip, ipbuf, + sizeof(dtls_socket_tab[pos].remote_ip) - 1); + dtls_socket_tab[pos].remote_port = port; + } + + i = SSL_write(dtls_socket_tab[pos].ssl_conn, message, length); + + if (i < 0) { + i = SSL_get_error(dtls_socket_tab[pos].ssl_conn, i); + print_ssl_error(i); + if (i == SSL_ERROR_SSL || i == SSL_ERROR_SYSCALL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "DTLS-UDP SSL_write error\n")); + if (dtls_socket_tab[pos].ssl_conn != NULL) { + shutdown_free_client_dtls(pos); + shutdown_free_server_dtls(pos); + } - memset (&dtls_socket_tab[pos], 0, sizeof (struct socket_tab)); + memset(&dtls_socket_tab[pos], 0, sizeof(struct socket_tab)); - } + } #ifndef MINISIZE - /* delete first SRV entry that is not reachable */ - if (tr != NULL && tr->record.name[0] != '\0' - && tr->record.srventry[0].srv[0] != '\0') - { - memmove (&tr->record.srventry[0], &tr->record.srventry[1], - 9 * sizeof (osip_srv_entry_t)); - memset (&tr->record.srventry[9], 0, sizeof (osip_srv_entry_t)); - osip_free (message); - return OSIP_SUCCESS; /* retry for next retransmission! */ - } + if (naptr_record!=NULL) + { + /* rotate on failure! */ + if (eXosip_dnsutils_rotate_srv(&naptr_record->sipdtls_record)>0) + { + osip_free(message); + return OSIP_SUCCESS; /* retry for next retransmission! */ + } + } #endif - /* SIP_NETWORK_ERROR; */ - osip_free (message); - return -1; - } - - if (eXosip.keep_alive > 0) - { - if (MSG_IS_REGISTER (sip)) - { - eXosip_reg_t *reg = NULL; - - if (_eXosip_reg_find (®, tr) == 0) - { - memcpy (&(reg->addr), &addr, len); - reg->len = len; - } - } - } + /* SIP_NETWORK_ERROR; */ + osip_free(message); + return -1; + } + + if (eXosip.keep_alive > 0) { + if (MSG_IS_REGISTER(sip)) { + eXosip_reg_t *reg = NULL; + + if (_eXosip_reg_find(®, tr) == 0) { + memcpy(&(reg->addr), &addr, len); + reg->len = len; + } + } + } - osip_free (message); - return OSIP_SUCCESS; + osip_free(message); + return OSIP_SUCCESS; } -static int -dtls_tl_keepalive (void) +static int dtls_tl_keepalive(void) { - char buf[4] = "jaK"; - eXosip_reg_t *jr; - for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) - { - if (jr->len > 0) - { - if (sendto (dtls_socket, (const void *) buf, 4, 0, - (struct sockaddr *) &(jr->addr), jr->len) > 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: Keep Alive sent on DTLS!\n")); - } - } - } - return OSIP_SUCCESS; + char buf[4] = "jaK"; + eXosip_reg_t *jr; + + if (eXosip.keep_alive <= 0) { + return 0; + } + + if (dtls_socket <= 0) + return OSIP_UNDEFINED_ERROR; + + for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) { + if (jr->len > 0) { + if (sendto(dtls_socket, (const void *) buf, 4, 0, + (struct sockaddr *) &(jr->addr), jr->len) > 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: Keep Alive sent on DTLS-UDP!\n")); + } + } + } + return OSIP_SUCCESS; } -static int -dtls_tl_set_socket (int socket) +static int dtls_tl_set_socket(int socket) { - dtls_socket = socket; + dtls_socket = socket; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -static int -dtls_tl_masquerade_contact (const char *public_address, int port) +static int dtls_tl_masquerade_contact(const char *public_address, int port) { - if (public_address == NULL || public_address[0] == '\0') - { - memset (dtls_firewall_ip, '\0', sizeof (dtls_firewall_ip)); - return OSIP_SUCCESS; - } - snprintf (dtls_firewall_ip, sizeof (dtls_firewall_ip), "%s", public_address); - if (port > 0) - { - snprintf (dtls_firewall_port, sizeof (dtls_firewall_port), "%i", port); - } - return OSIP_SUCCESS; + if (public_address == NULL || public_address[0] == '\0') { + memset(dtls_firewall_ip, '\0', sizeof(dtls_firewall_ip)); + memset(dtls_firewall_port, '\0', sizeof(dtls_firewall_port)); + if (eXtl_dtls.proto_port > 0) + snprintf(dtls_firewall_port, sizeof(dtls_firewall_port), "%i", + eXtl_dtls.proto_port); + return OSIP_SUCCESS; + } + snprintf(dtls_firewall_ip, sizeof(dtls_firewall_ip), "%s", public_address); + if (port > 0) { + snprintf(dtls_firewall_port, sizeof(dtls_firewall_port), "%i", port); + } + return OSIP_SUCCESS; } static int -dtls_tl_get_masquerade_contact (char *ip, int ip_size, char *port, int port_size) +dtls_tl_get_masquerade_contact(char *ip, int ip_size, char *port, int port_size) { - memset (ip, 0, ip_size); - memset (port, 0, port_size); + memset(ip, 0, ip_size); + memset(port, 0, port_size); - if (dtls_firewall_ip != '\0') - snprintf (ip, ip_size, "%s", dtls_firewall_ip); + if (dtls_firewall_ip != '\0') + snprintf(ip, ip_size, "%s", dtls_firewall_ip); - if (dtls_firewall_port != '\0') - snprintf (port, port_size, "%s", dtls_firewall_port); - return OSIP_SUCCESS; + if (dtls_firewall_port != '\0') + snprintf(port, port_size, "%s", dtls_firewall_port); + return OSIP_SUCCESS; } struct eXtl_protocol eXtl_dtls = { - 1, - 5061, - "UDP-DTLS", - "0.0.0.0", - IPPROTO_UDP, - AF_INET, - 0, - 0, - - &dtls_tl_init, - &dtls_tl_free, - &dtls_tl_open, - &dtls_tl_set_fdset, - &dtls_tl_read_message, - &dtls_tl_send_message, - &dtls_tl_keepalive, - &dtls_tl_set_socket, - &dtls_tl_masquerade_contact, - &dtls_tl_get_masquerade_contact + 1, + 5061, + "DTLS-UDP", + "0.0.0.0", + IPPROTO_UDP, + AF_INET, + 0, + 0, + + &dtls_tl_init, + &dtls_tl_free, + &dtls_tl_open, + &dtls_tl_set_fdset, + &dtls_tl_read_message, + &dtls_tl_send_message, + &dtls_tl_keepalive, + &dtls_tl_set_socket, + &dtls_tl_masquerade_contact, + &dtls_tl_get_masquerade_contact }; #endif diff -Nru libexosip2-3.3.0/src/eXtl_tcp.c libexosip2-3.6.0/src/eXtl_tcp.c --- libexosip2-3.3.0/src/eXtl_tcp.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXtl_tcp.c 2011-10-05 16:43:21.000000000 +0000 @@ -25,8 +25,38 @@ #include "eXosip2.h" #include "eXtransport.h" -#if defined(_WIN32_WCE) +#ifdef HAVE_FCNTL_H +#include +#endif + +#ifdef WIN32 +#include +#endif + +#if defined(_WIN32_WCE) || defined(WIN32) #define strerror(X) "-1" +#define ex_errno WSAGetLastError() +#define is_wouldblock_error(r) ((r)==WSAEINTR||(r)==WSAEWOULDBLOCK) +#define is_connreset_error(r) ((r)==WSAECONNRESET || (r)==WSAECONNABORTED || (r)==WSAETIMEDOUT || (r)==WSAENETRESET || (r)==WSAENOTCONN) +#else +#define ex_errno errno +#define closesocket close +#endif +#ifndef is_wouldblock_error +#define is_wouldblock_error(r) ((r)==EINTR||(r)==EWOULDBLOCK||(r)==EAGAIN) +#define is_connreset_error(r) ((r)==ECONNRESET || (r)==ECONNABORTED || (r)==ETIMEDOUT || (r)==ENETRESET || (r)==ENOTCONN) +#endif + +extern eXosip_t eXosip; + +#ifdef __APPLE_CC__ +#include "TargetConditionals.h" +#endif + +#if TARGET_OS_IPHONE +#include +#include +#define MULTITASKING_ENABLED #endif static int tcp_socket; @@ -36,677 +66,1490 @@ static char tcp_firewall_port[10]; /* persistent connection */ -struct socket_tab -{ - int socket; - char remote_ip[65]; - int remote_port; +struct _tcp_sockets { + int socket; + struct sockaddr ai_addr; + size_t ai_addrlen; + char remote_ip[65]; + int remote_port; + char *buf; /* recv buffer */ + size_t bufsize; /* allocated size of buf */ + size_t buflen; /* current length of buf */ + char *sendbuf; /* send buffer */ + size_t sendbufsize; + size_t sendbuflen; +#ifdef MULTITASKING_ENABLED + CFReadStreamRef readStream; + CFWriteStreamRef writeStream; +#endif }; +#ifndef SOCKET_TIMEOUT +/* when stream has sequence error: */ +/* having SOCKET_TIMEOUT > 0 helps the system to recover */ +#define SOCKET_TIMEOUT 0 +#endif + #ifndef EXOSIP_MAX_SOCKETS #define EXOSIP_MAX_SOCKETS 100 #endif -static struct socket_tab tcp_socket_tab[EXOSIP_MAX_SOCKETS]; +static int _tcp_tl_send_sockinfo (struct _tcp_sockets *sockinfo, const char *msg, int msglen); -static int -tcp_tl_init (void) +static struct _tcp_sockets tcp_socket_tab[EXOSIP_MAX_SOCKETS]; + +static int tcp_tl_init(void) { - tcp_socket = 0; - memset (&ai_addr, 0, sizeof (struct sockaddr_storage)); - memset (&tcp_socket_tab, 0, sizeof (struct socket_tab) * EXOSIP_MAX_SOCKETS); - memset (tcp_firewall_ip, 0, sizeof (tcp_firewall_ip)); - memset (tcp_firewall_port, 0, sizeof (tcp_firewall_port)); - return OSIP_SUCCESS; + tcp_socket = 0; + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + memset(&tcp_socket_tab, 0, sizeof(struct _tcp_sockets) * EXOSIP_MAX_SOCKETS); + memset(tcp_firewall_ip, 0, sizeof(tcp_firewall_ip)); + memset(tcp_firewall_port, 0, sizeof(tcp_firewall_port)); + return OSIP_SUCCESS; } -static int -tcp_tl_free (void) +static void _tcp_tl_close_sockinfo(struct _tcp_sockets *sockinfo) { - int pos; - memset (tcp_firewall_ip, 0, sizeof (tcp_firewall_ip)); - memset (tcp_firewall_port, 0, sizeof (tcp_firewall_port)); - memset (&ai_addr, 0, sizeof (struct sockaddr_storage)); - if (tcp_socket > 0) - close (tcp_socket); - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tcp_socket_tab[pos].socket > 0) - { - close (tcp_socket_tab[pos].socket); - } - } - memset (&tcp_socket_tab, 0, sizeof (struct socket_tab) * EXOSIP_MAX_SOCKETS); - return OSIP_SUCCESS; + closesocket(sockinfo->socket); + if (sockinfo->buf!=NULL) + osip_free(sockinfo->buf); + if (sockinfo->sendbuf!=NULL) + osip_free(sockinfo->sendbuf); +#ifdef MULTITASKING_ENABLED + if (sockinfo->readStream!=NULL) + { + CFReadStreamClose(sockinfo->readStream); + CFRelease(sockinfo->readStream); + } + if (sockinfo->writeStream!=NULL) + { + CFWriteStreamClose(sockinfo->writeStream); + CFRelease(sockinfo->writeStream); + } +#endif + memset(sockinfo, 0, sizeof(*sockinfo)); } -static int -tcp_tl_open (void) +static int tcp_tl_free(void) +{ + int pos; + memset(tcp_firewall_ip, 0, sizeof(tcp_firewall_ip)); + memset(tcp_firewall_port, 0, sizeof(tcp_firewall_port)); + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + if (tcp_socket > 0) + closesocket(tcp_socket); + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket > 0) { + _tcp_tl_close_sockinfo(&tcp_socket_tab[pos]); + } + } + + return OSIP_SUCCESS; +} + +static int tcp_tl_open(void) { - int res; - struct addrinfo *addrinfo = NULL; - struct addrinfo *curinfo; - int sock = -1; - - if (eXtl_tcp.proto_port < 0) - eXtl_tcp.proto_port = 5060; - - - res = eXosip_get_addrinfo (&addrinfo, - eXtl_tcp.proto_ifs, - eXtl_tcp.proto_port, eXtl_tcp.proto_num); - if (res) - return -1; - - for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) - { - socklen_t len; - - if (curinfo->ai_protocol && curinfo->ai_protocol != eXtl_tcp.proto_num) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); - continue; - } - - sock = (int) socket (curinfo->ai_family, curinfo->ai_socktype, - curinfo->ai_protocol); - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot create socket %s!\n", strerror (errno))); - continue; - } + int res; + struct addrinfo *addrinfo = NULL; + struct addrinfo *curinfo; + int sock = -1; + + if (eXtl_tcp.proto_port < 0) + eXtl_tcp.proto_port = 5060; + + + res = eXosip_get_addrinfo(&addrinfo, + eXtl_tcp.proto_ifs, + eXtl_tcp.proto_port, eXtl_tcp.proto_num); + if (res) + return -1; + + for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) { + socklen_t len; + + if (curinfo->ai_protocol && curinfo->ai_protocol != eXtl_tcp.proto_num) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "Skipping protocol %d\n", curinfo->ai_protocol)); + continue; + } + + sock = (int) socket(curinfo->ai_family, curinfo->ai_socktype, + curinfo->ai_protocol); + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot create socket %s!\n", strerror(ex_errno))); + continue; + } - if (curinfo->ai_family == AF_INET6) - { + if (curinfo->ai_family == AF_INET6) { #ifdef IPV6_V6ONLY - if (setsockopt_ipv6only (sock)) - { - close (sock); - sock = -1; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot set socket option %s!\n", - strerror (errno))); - continue; - } -#endif /* IPV6_V6ONLY */ - } - - res = bind (sock, curinfo->ai_addr, curinfo->ai_addrlen); - if (res < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - eXtl_tcp.proto_ifs, curinfo->ai_family, strerror (errno))); - close (sock); - sock = -1; - continue; - } - len = sizeof (ai_addr); - res = getsockname (sock, (struct sockaddr *) &ai_addr, &len); - if (res != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot get socket name (%s)\n", strerror (errno))); - memcpy (&ai_addr, curinfo->ai_addr, curinfo->ai_addrlen); - } - - if (eXtl_tcp.proto_num == IPPROTO_TCP) - { - res = listen (sock, SOMAXCONN); - if (res < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - eXtl_tcp.proto_ifs, curinfo->ai_family, - strerror (errno))); - close (sock); - sock = -1; - continue; - } - } - - break; - } - - eXosip_freeaddrinfo (addrinfo); - - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind on port: %i\n", eXtl_tcp.proto_port)); - return -1; - } - - tcp_socket = sock; - - if (eXtl_tcp.proto_port == 0) - { - /* get port number from socket */ - if (eXtl_tcp.proto_family == AF_INET) - eXtl_tcp.proto_port = ntohs (((struct sockaddr_in *) &ai_addr)->sin_port); - else - eXtl_tcp.proto_port = - ntohs (((struct sockaddr_in6 *) &ai_addr)->sin6_port); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: Binding on port %i!\n", eXtl_tcp.proto_port)); - } - - snprintf (tcp_firewall_port, sizeof (tcp_firewall_port), "%i", - eXtl_tcp.proto_port); - return OSIP_SUCCESS; + if (setsockopt_ipv6only(sock)) { + closesocket(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot set socket option %s!\n", strerror(ex_errno))); + continue; + } +#endif /* IPV6_V6ONLY */ + } + + res = bind(sock, curinfo->ai_addr, curinfo->ai_addrlen); + if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot bind socket node:%s family:%d %s\n", + eXtl_tcp.proto_ifs, curinfo->ai_family, + strerror(ex_errno))); + closesocket(sock); + sock = -1; + continue; + } + len = sizeof(ai_addr); + res = getsockname(sock, (struct sockaddr *) &ai_addr, &len); + if (res != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot get socket name (%s)\n", strerror(ex_errno))); + memcpy(&ai_addr, curinfo->ai_addr, curinfo->ai_addrlen); + } + + if (eXtl_tcp.proto_num == IPPROTO_TCP) { + res = listen(sock, SOMAXCONN); + if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot bind socket node:%s family:%d %s\n", + eXtl_tcp.proto_ifs, curinfo->ai_family, + strerror(ex_errno))); + closesocket(sock); + sock = -1; + continue; + } + } + + break; + } + + eXosip_freeaddrinfo(addrinfo); + + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot bind on port: %i\n", eXtl_tcp.proto_port)); + return -1; + } + + tcp_socket = sock; + + if (eXtl_tcp.proto_port == 0) { + /* get port number from socket */ + if (eXtl_tcp.proto_family == AF_INET) + eXtl_tcp.proto_port = + ntohs(((struct sockaddr_in *) &ai_addr)->sin_port); + else + eXtl_tcp.proto_port = + ntohs(((struct sockaddr_in6 *) &ai_addr)->sin6_port); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Binding on port %i!\n", eXtl_tcp.proto_port)); + } + + snprintf(tcp_firewall_port, sizeof(tcp_firewall_port), "%i", + eXtl_tcp.proto_port); + return OSIP_SUCCESS; } -static int -tcp_tl_set_fdset (fd_set * osip_fdset, int *fd_max) +static int tcp_tl_set_fdset(fd_set * osip_fdset, fd_set * osip_wrset, int *fd_max) { - int pos; - if (tcp_socket <= 0) - return -1; - - eXFD_SET (tcp_socket, osip_fdset); - - if (tcp_socket > *fd_max) - *fd_max = tcp_socket; - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tcp_socket_tab[pos].socket > 0) - { - eXFD_SET (tcp_socket_tab[pos].socket, osip_fdset); - if (tcp_socket_tab[pos].socket > *fd_max) - *fd_max = tcp_socket_tab[pos].socket; - } - } + int pos; + if (tcp_socket <= 0) + return -1; + + eXFD_SET(tcp_socket, osip_fdset); + + if (tcp_socket > *fd_max) + *fd_max = tcp_socket; + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket > 0) { + eXFD_SET(tcp_socket_tab[pos].socket, osip_fdset); + if (tcp_socket_tab[pos].socket > *fd_max) + *fd_max = tcp_socket_tab[pos].socket; + if (tcp_socket_tab[pos].sendbuflen > 0) + eXFD_SET (tcp_socket_tab[pos].socket, osip_wrset); + } + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -static int -tcp_tl_read_message (fd_set * osip_fdset) +/* Like strstr, but works for haystack that may contain binary data and is + not NUL-terminated. */ +static char *buffer_find(const char *haystack, size_t haystack_len, const char *needle) +{ + const char *search = haystack, *end = haystack + haystack_len; + char *p; + size_t len = strlen(needle); + + while (search < end && + (p = memchr(search, *needle, end - search)) != NULL) { + if (p + len > end) + break; + if (memcmp(p, needle, len) == 0) + return (p); + search = p + 1; + } + + return (NULL); +} + +#define END_HEADERS_STR "\r\n\r\n" +#define CLEN_HEADER_STR "\r\ncontent-length:" +#define CLEN_HEADER_COMPACT_STR "\r\nl:" +#define CLEN_HEADER_STR2 "\r\ncontent-length " +#define CLEN_HEADER_COMPACT_STR2 "\r\nl " +#define const_strlen(x) (sizeof((x)) - 1) + +/* consume any complete messages in sockinfo->buf and + return the total number of bytes consumed */ +static int handle_messages(struct _tcp_sockets *sockinfo) +{ + int consumed = 0; + char *buf = sockinfo->buf; + size_t buflen = sockinfo->buflen; + char *end_headers; + while (buflen > 0 && (end_headers = buffer_find(buf, buflen, END_HEADERS_STR)) != NULL) { + int clen, msglen; + char *clen_header; + + if (buf == end_headers) + { + /* skip tcp standard keep-alive */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket %s:%i: standard keep alive received (CRLFCRLF)\n", + sockinfo->remote_ip, sockinfo->remote_port, buf)); + consumed += 4; + buflen -= 4; + buf += 4; + continue; + } + + /* stuff a nul in so we can use osip_strcasestr */ + *end_headers = '\0'; + + /* ok we have complete headers, find content-length: or l: */ + clen_header = osip_strcasestr(buf, CLEN_HEADER_STR); + if (!clen_header) + clen_header = osip_strcasestr(buf, CLEN_HEADER_STR2); + if (!clen_header) + clen_header = osip_strcasestr(buf, CLEN_HEADER_COMPACT_STR); + if (!clen_header) + clen_header = osip_strcasestr(buf, CLEN_HEADER_COMPACT_STR2); + if (clen_header != NULL) + { + clen_header = strchr(clen_header, ':'); + clen_header++; + } + if (!clen_header) + { + /* Oops, no content-length header. Presume 0 (below) so we + consume the headers and make forward progress. This permits + server-side keepalive of "\r\n\r\n". */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket %s:%i: message has no content-length: <%s>\n", + sockinfo->remote_ip, sockinfo->remote_port, buf)); + } + clen = clen_header ? atoi(clen_header) : 0; + + /* undo our overwrite and advance end_headers */ + *end_headers = END_HEADERS_STR[0]; + end_headers += const_strlen(END_HEADERS_STR); + + /* do we have the whole message? */ + msglen = end_headers - buf + clen; + if (msglen > buflen) { + /* nope */ + return consumed; + } + /* yep; handle the message */ + _eXosip_handle_incoming_message(buf, msglen, sockinfo->socket, + sockinfo->remote_ip, sockinfo->remote_port); + consumed += msglen; + buflen -= msglen; + buf += msglen; + } + + return consumed; +} + +static int _tcp_tl_recv(struct _tcp_sockets *sockinfo) +{ + int r; + if (!sockinfo->buf) { + sockinfo->buf = (char *) osip_malloc(SIP_MESSAGE_MAX_LENGTH); + if (sockinfo->buf == NULL) + return OSIP_NOMEM; + sockinfo->bufsize = SIP_MESSAGE_MAX_LENGTH; + sockinfo->buflen = 0; + } + + /* buffer is 100% full -> realloc with more size */ + if (sockinfo->bufsize - sockinfo->buflen<=0) + { + sockinfo->buf = (char *)osip_realloc(sockinfo->buf, sockinfo->bufsize+1000); + if (sockinfo->buf == NULL) + return OSIP_NOMEM; + sockinfo->bufsize = sockinfo->bufsize+1000; + } + + /* buffer is 100% empty-> realloc with initial size */ + if (sockinfo->buflen == 0 && sockinfo->bufsize>SIP_MESSAGE_MAX_LENGTH) + { + osip_free(sockinfo->buf); + sockinfo->buf = (char *) osip_malloc(SIP_MESSAGE_MAX_LENGTH); + if (sockinfo->buf == NULL) + return OSIP_NOMEM; + sockinfo->bufsize = SIP_MESSAGE_MAX_LENGTH; + } + + r = recv(sockinfo->socket, sockinfo->buf + sockinfo->buflen, sockinfo->bufsize - sockinfo->buflen, 0); + if (r == 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket %s:%i: eof\n", sockinfo->remote_ip, sockinfo->remote_port)); + _tcp_tl_close_sockinfo(sockinfo); + eXosip_mark_all_registrations_expired(); + return OSIP_UNDEFINED_ERROR; + } else if (r < 0) { + int status = ex_errno; + if (is_wouldblock_error(status)) + return OSIP_SUCCESS; + /* Do we need next line ? */ + /* else if (is_connreset_error(status)) */ + eXosip_mark_all_registrations_expired(); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket %s:%i: error %d\n", sockinfo->remote_ip, sockinfo->remote_port, status)); + _tcp_tl_close_sockinfo(sockinfo); + return OSIP_UNDEFINED_ERROR; + } else { + int consumed; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket %s:%i: read %d bytes\n", sockinfo->remote_ip, sockinfo->remote_port, r)); + sockinfo->buflen += r; + consumed = handle_messages(sockinfo); + if (consumed == 0) { + return OSIP_SUCCESS; + } else { + if (sockinfo->buflen > consumed) { + memmove(sockinfo->buf, sockinfo->buf + consumed, sockinfo->buflen - consumed); + sockinfo->buflen -= consumed; + } else { + sockinfo->buflen = 0; + } + return OSIP_SUCCESS; + } + } +} + +static int tcp_tl_read_message(fd_set * osip_fdset, fd_set * osip_wrset) { - int pos = 0; - char *buf; + int pos = 0; - if (FD_ISSET (tcp_socket, osip_fdset)) - { - /* accept incoming connection */ - char src6host[NI_MAXHOST]; - int recvport = 0; - struct sockaddr_storage sa; - int sock; - int i; + if (FD_ISSET(tcp_socket, osip_fdset)) { + /* accept incoming connection */ + char src6host[NI_MAXHOST]; + int recvport = 0; + struct sockaddr_storage sa; + int sock; + int i; #ifdef __linux - socklen_t slen; + socklen_t slen; #else - int slen; + int slen; +#endif + if (eXtl_tcp.proto_family == AF_INET) + slen = sizeof(struct sockaddr_in); + else + slen = sizeof(struct sockaddr_in6); + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket == 0) + break; + } + if (pos == EXOSIP_MAX_SOCKETS) { + /* delete an old one! */ + pos = 0; + if (tcp_socket_tab[pos].socket > 0) { + _tcp_tl_close_sockinfo(&tcp_socket_tab[pos]); + } + memset(&tcp_socket_tab[pos], 0, sizeof(tcp_socket_tab[pos])); + } + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO3, NULL, + "creating TCP socket at index: %i\n", pos)); + sock = accept(tcp_socket, (struct sockaddr *) &sa, &slen); + if (sock < 0) { +#if defined(EBADF) + int status = ex_errno; #endif - if (eXtl_tcp.proto_family == AF_INET) - slen = sizeof (struct sockaddr_in); - else - slen = sizeof (struct sockaddr_in6); - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tcp_socket_tab[pos].socket == 0) - break; - } - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "creating TCP socket at index: %i\n", pos)); - sock = accept (tcp_socket, (struct sockaddr *) &sa, &slen); - if (sock < 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Error accepting TCP socket\n")); - } else - { - tcp_socket_tab[pos].socket = sock; - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "New TCP connection accepted\n")); - - memset (src6host, 0, sizeof (src6host)); - - if (eXtl_tcp.proto_family == AF_INET) - recvport = ntohs (((struct sockaddr_in *) &sa)->sin_port); - else - recvport = ntohs (((struct sockaddr_in6 *) &sa)->sin6_port); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Error accepting TCP socket\n")); +#if defined(EBADF) + if (status==EBADF) + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Error accepting TCP socket: EBADF\n")); + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + if (tcp_socket > 0) + closesocket(tcp_socket); + tcp_tl_open(); + } +#endif + } else { + tcp_socket_tab[pos].socket = sock; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "New TCP connection accepted\n")); + + memset(src6host, 0, sizeof(src6host)); + + if (eXtl_tcp.proto_family == AF_INET) + recvport = ntohs(((struct sockaddr_in *) &sa)->sin_port); + else + recvport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port); #if defined(__arc__) - { - struct sockaddr_in *fromsa = (struct sockaddr_in *) &sa; - char *tmp; - tmp = inet_ntoa (fromsa->sin_addr); - if (tmp == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Message received from: NULL:%i inet_ntoa failure\n", - recvport)); - } else - { - snprintf (src6host, sizeof (src6host), "%s", tmp); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, - recvport)); - osip_strncpy (tcp_socket_tab[pos].remote_ip, src6host, - sizeof (tcp_socket_tab[pos].remote_ip) - 1); - tcp_socket_tab[pos].remote_port = recvport; - } - } + { + struct sockaddr_in *fromsa = (struct sockaddr_in *) &sa; + char *tmp; + tmp = inet_ntoa(fromsa->sin_addr); + if (tmp == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Message received from: NULL:%i inet_ntoa failure\n", + recvport)); + } else { + snprintf(src6host, sizeof(src6host), "%s", tmp); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, + recvport)); + osip_strncpy(tcp_socket_tab[pos].remote_ip, src6host, + sizeof(tcp_socket_tab[pos].remote_ip) - 1); + tcp_socket_tab[pos].remote_port = recvport; + } + } #else - i = getnameinfo ((struct sockaddr *) &sa, slen, - src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + i = getnameinfo((struct sockaddr *) &sa, slen, + src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Message received from: NULL:%i getnameinfo failure\n", - recvport)); - snprintf (src6host, sizeof (src6host), "127.0.0.1"); - } else - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, recvport)); - osip_strncpy (tcp_socket_tab[pos].remote_ip, src6host, - sizeof (tcp_socket_tab[pos].remote_ip) - 1); - tcp_socket_tab[pos].remote_port = recvport; - } -#endif - } - } - - - - buf = NULL; - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tcp_socket_tab[pos].socket > 0 - && FD_ISSET (tcp_socket_tab[pos].socket, osip_fdset)) - { - int i; - - if (buf == NULL) - buf = - (char *) osip_malloc (SIP_MESSAGE_MAX_LENGTH * sizeof (char) + 1); - if (buf == NULL) - return OSIP_NOMEM; - - i = recv (tcp_socket_tab[pos].socket, buf, SIP_MESSAGE_MAX_LENGTH, 0); - if (i > 5) - { - osip_strncpy (buf + i, "\0", 1); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Received TCP message: \n%s\n", buf)); - _eXosip_handle_incoming_message (buf, i, - tcp_socket_tab[pos].socket, - tcp_socket_tab[pos].remote_ip, - tcp_socket_tab[pos].remote_port); - } else if (i < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Could not read socket - close it\n")); - close (tcp_socket_tab[pos].socket); - memset (&(tcp_socket_tab[pos]), 0, sizeof (tcp_socket_tab[pos])); - } else if (i == 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "End of stream (read 0 byte from %s:%i)\n", - tcp_socket_tab[pos].remote_ip, - tcp_socket_tab[pos].remote_port)); - close (tcp_socket_tab[pos].socket); - memset (&(tcp_socket_tab[pos]), 0, sizeof (tcp_socket_tab[pos])); - } -#ifndef MINISIZE - else - { - /* we expect at least one byte, otherwise there's no doubt that it is not a sip message ! */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Dummy SIP message received (size=%i)\n", i)); - } + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Message received from: NULL:%i getnameinfo failure\n", + recvport)); + snprintf(src6host, sizeof(src6host), "127.0.0.1"); + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, recvport)); + osip_strncpy(tcp_socket_tab[pos].remote_ip, src6host, + sizeof(tcp_socket_tab[pos].remote_ip) - 1); + tcp_socket_tab[pos].remote_port = recvport; + } #endif - } - } + } + } - if (buf != NULL) - osip_free (buf); + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket > 0) { + if (FD_ISSET(tcp_socket_tab[pos].socket, osip_wrset)) + _tcp_tl_send_sockinfo(&tcp_socket_tab[pos], NULL, 0); + if (FD_ISSET(tcp_socket_tab[pos].socket, osip_fdset)) + _tcp_tl_recv(&tcp_socket_tab[pos]); + } + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -static int -_tcp_tl_find_socket (char *host, int port) +static struct _tcp_sockets *_tcp_tl_find_sockinfo(int sock) { - int pos; + int pos; - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tcp_socket_tab[pos].socket != 0) - { - if (0 == osip_strcasecmp (tcp_socket_tab[pos].remote_ip, host) - && port == tcp_socket_tab[pos].remote_port) - return tcp_socket_tab[pos].socket; - } - } - return -1; + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket == sock) { + return &tcp_socket_tab[pos]; + } + } + return NULL; } -static int -_tcp_tl_connect_socket (char *host, int port) +static int _tcp_tl_find_socket(char *host, int port) +{ + int pos; + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket != 0) { + if (0 == osip_strcasecmp(tcp_socket_tab[pos].remote_ip, host) + && port == tcp_socket_tab[pos].remote_port) + return pos; + } + } + return -1; +} + +static int _tcp_tl_is_connected(int sock) +{ + int res; + struct timeval tv; + fd_set wrset; + int valopt; + socklen_t sock_len; + tv.tv_sec = SOCKET_TIMEOUT / 1000; + tv.tv_usec = (SOCKET_TIMEOUT % 1000) * 1000; + + FD_ZERO(&wrset); + FD_SET(sock, &wrset); + + res = select(sock + 1, NULL, &wrset, NULL, &tv); + if (res > 0) { + sock_len = sizeof(int); + if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void *) (&valopt), &sock_len) + == 0) { + if (valopt) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node / %s[%d]\n", + strerror(ex_errno), ex_errno)); + return -1; + } else { + return 0; + } + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node / error in getsockopt %s[%d]\n", + strerror(ex_errno), ex_errno)); + return -1; + } + } else if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node / error in select %s[%d]\n", + strerror(ex_errno), ex_errno)); + return -1; + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node / select timeout (%d ms)\n", + SOCKET_TIMEOUT)); + return 1; + } +} + +static int _tcp_tl_check_connected() { - int pos; + int pos; + int res; + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket > 0 + && tcp_socket_tab[pos].ai_addrlen > 0) { + res = connect(tcp_socket_tab[pos].socket, &tcp_socket_tab[pos].ai_addr, tcp_socket_tab[pos].ai_addrlen); + if (res < 0) { + int status = ex_errno; +#if defined(_WIN32_WCE) || defined(WIN32) + if (status == WSAEISCONN) { + tcp_socket_tab[pos].ai_addrlen=0; /* already connected */ + continue; + } +#else + if (status == EISCONN) { + tcp_socket_tab[pos].ai_addrlen=0; /* already connected */ + continue; + } +#endif +#if defined(_WIN32_WCE) || defined(WIN32) + if (status != WSAEWOULDBLOCK && status != WSAEALREADY && status != WSAEINVAL) { +#else + if (status != EINPROGRESS && status != EALREADY) { +#endif + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "_tcp_tl_check_connected: Cannot connect socket node:%s:%i, socket %d [pos=%d], family:%d, %s[%d]\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port, + tcp_socket_tab[pos].socket, + pos, + tcp_socket_tab[pos].ai_addr.sa_family, + strerror(status), + status)); + _tcp_tl_close_sockinfo(&tcp_socket_tab[pos]); + continue; + } else { + res = _tcp_tl_is_connected(tcp_socket_tab[pos].socket); + if (res > 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "_tcp_tl_check_connected: socket node:%s:%i, socket %d [pos=%d], family:%d, in progress\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port, + tcp_socket_tab[pos].socket, + pos, + tcp_socket_tab[pos].ai_addr.sa_family)); + continue; + } else if (res == 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "_tcp_tl_check_connected: socket node:%s:%i , socket %d [pos=%d], family:%d, connected\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port, + tcp_socket_tab[pos].socket, + pos, + tcp_socket_tab[pos].ai_addr.sa_family)); + /* stop calling "connect()" */ + tcp_socket_tab[pos].ai_addrlen=0; + continue; + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "_tcp_tl_check_connected: socket node:%s:%i, socket %d [pos=%d], family:%d, error\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port, + tcp_socket_tab[pos].socket, + pos, + tcp_socket_tab[pos].ai_addr.sa_family)); + _tcp_tl_close_sockinfo(&tcp_socket_tab[pos]); + continue; + } + } + } + else + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "_tcp_tl_check_connected: socket node:%s:%i , socket %d [pos=%d], family:%d, connected (with connect)\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port, + tcp_socket_tab[pos].socket, + pos, + tcp_socket_tab[pos].ai_addr.sa_family)); + /* stop calling "connect()" */ + tcp_socket_tab[pos].ai_addrlen=0; + } + } + } + return 0; +} - int res; - struct addrinfo *addrinfo = NULL; - struct addrinfo *curinfo; - int sock = -1; - - char src6host[NI_MAXHOST]; - memset (src6host, 0, sizeof (src6host)); - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tcp_socket_tab[pos].socket == 0) - { - break; - } - } - - if (pos == EXOSIP_MAX_SOCKETS) - return -1; - - res = eXosip_get_addrinfo (&addrinfo, host, port, IPPROTO_TCP); - if (res) - return -1; - - - for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) - { - if (curinfo->ai_protocol && curinfo->ai_protocol != IPPROTO_TCP) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); - continue; - } - - res = getnameinfo ((struct sockaddr *) curinfo->ai_addr, curinfo->ai_addrlen, - src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); - - if (res == 0) - { - int i = _tcp_tl_find_socket (src6host, port); - if (i >= 0) - { - eXosip_freeaddrinfo (addrinfo); - return i; - } - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "New binding with %s\n", src6host)); - } - - sock = (int) socket (curinfo->ai_family, curinfo->ai_socktype, - curinfo->ai_protocol); - if (sock < 0) - { -#if !defined(OSIP_MT) || defined(_WIN32_WCE) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot create socket!\n")); +static int _tcp_tl_connect_socket(char *host, int port) +{ + int pos; + int res; + struct addrinfo *addrinfo = NULL; + struct addrinfo *curinfo; + int sock = -1; + struct sockaddr selected_ai_addr; + size_t selected_ai_addrlen; + + char src6host[NI_MAXHOST]; + memset(src6host, 0, sizeof(src6host)); + + selected_ai_addrlen=0; + memset(&selected_ai_addr, 0, sizeof(struct sockaddr)); + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket == 0) { + break; + } + } + + if (pos == EXOSIP_MAX_SOCKETS) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "tcp_socket_tab is full - cannot create new socket!\n")); +#ifdef DELETE_OLD_SOCKETS + /* delete an old one! */ + pos = 0; + if (tcp_socket_tab[pos].socket > 0) { + _tcp_tl_close_sockinfo(&tcp_socket_tab[pos]); + } + memset(&tcp_socket_tab[pos], 0, sizeof(tcp_socket_tab[pos])); #else - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot create socket %s!\n", strerror (errno))); + return -1; #endif - continue; - } + } + + res = eXosip_get_addrinfo(&addrinfo, host, port, IPPROTO_TCP); + if (res) + return -1; + + + for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) { + if (curinfo->ai_protocol && curinfo->ai_protocol != IPPROTO_TCP) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Skipping protocol %d\n", curinfo->ai_protocol)); + continue; + } + + res = + getnameinfo((struct sockaddr *) curinfo->ai_addr, curinfo->ai_addrlen, + src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + + if (res == 0) { + int i = _tcp_tl_find_socket(src6host, port); + if (i >= 0) { + eXosip_freeaddrinfo(addrinfo); + return i; + } + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "New binding with %s:%i\n", src6host, port)); + } + + sock = (int) socket(curinfo->ai_family, curinfo->ai_socktype, + curinfo->ai_protocol); + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot create socket %s!\n", strerror(ex_errno))); + continue; + } - if (curinfo->ai_family == AF_INET6) - { + if (curinfo->ai_family == AF_INET6) { #ifdef IPV6_V6ONLY - if (setsockopt_ipv6only (sock)) - { - close (sock); - sock = -1; -#if !defined(OSIP_MT) || defined(_WIN32_WCE) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot set socket option!\n")); + if (setsockopt_ipv6only(sock)) { + closesocket(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot set socket option %s!\n", strerror(ex_errno))); + continue; + } +#endif /* IPV6_V6ONLY */ + } + + /* set NON-BLOCKING MODE */ +#if defined(_WIN32_WCE) || defined(WIN32) + { + unsigned long nonBlock = 1; + int val; + + ioctlsocket(sock, FIONBIO, &nonBlock); + + val = 1; + if (setsockopt + (sock, SOL_SOCKET, SO_KEEPALIVE, (char *) &val, + sizeof(val)) == -1) { + closesocket(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot get socket flag!\n")); + continue; + } + } +#if !defined(_WIN32_WCE) + { + DWORD err = 0L; + DWORD dwBytes = 0L; + struct tcp_keepalive kalive = { 0 }; + struct tcp_keepalive kaliveOut = { 0 }; + kalive.onoff = 1; + kalive.keepalivetime = 30000; /* Keep Alive in 5.5 sec. */ + kalive.keepaliveinterval = 3000; /* Resend if No-Reply */ + err = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, + sizeof(kalive), &kaliveOut, sizeof(kaliveOut), &dwBytes, + NULL, NULL); + if (err != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, NULL, + "Cannot set keepalive interval!\n")); + } + } +#endif #else - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot set socket option %s!\n", - strerror (errno))); -#endif - continue; - } -#endif /* IPV6_V6ONLY */ - } - - res = connect (sock, curinfo->ai_addr, curinfo->ai_addrlen); - if (res < 0) - { -#if !defined(OSIP_MT) || defined(_WIN32_WCE) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot bind socket node:%s family:%d\n", - host, curinfo->ai_family)); + { + int val; + + val = fcntl(sock, F_GETFL); + if (val < 0) { + closesocket(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot get socket flag!\n")); + continue; + } + val |= O_NONBLOCK; + if (fcntl(sock, F_SETFL, val) < 0) { + closesocket(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot set socket flag!\n")); + continue; + } +#if 0 + val = 1; + if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == + -1) + val = 30; /* 30 sec before starting probes */ + setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &val, sizeof(val)); + val = 2; /* 2 probes max */ + setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &val, sizeof(val)); + val = 10; /* 10 seconds between each probe */ + setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &val, sizeof(val)); +#endif +#if SO_NOSIGPIPE + val = 1; + setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(int)); +#endif + } +#endif + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s , socket %d, family:%d set to non blocking mode\n", + host, sock, curinfo->ai_family)); + res = connect(sock, curinfo->ai_addr, curinfo->ai_addrlen); + if (res < 0) { +#if defined(_WIN32_WCE) || defined(WIN32) + if (ex_errno != WSAEWOULDBLOCK) { #else - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - host, curinfo->ai_family, strerror (errno))); -#endif - close (sock); - sock = -1; - continue; - } - - break; - } - - eXosip_freeaddrinfo (addrinfo); - - if (sock > 0) - { - tcp_socket_tab[pos].socket = sock; - - if (src6host[0] == '\0') - osip_strncpy (tcp_socket_tab[pos].remote_ip, host, - sizeof (tcp_socket_tab[pos].remote_ip) - 1); - else - osip_strncpy (tcp_socket_tab[pos].remote_ip, src6host, - sizeof (tcp_socket_tab[pos].remote_ip) - 1); - - tcp_socket_tab[pos].remote_port = port; - return sock; - } + if (ex_errno != EINPROGRESS) { +#endif + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node:%s family:%d %s[%d]\n", + host, curinfo->ai_family, strerror(ex_errno), + ex_errno)); + closesocket(sock); + sock = -1; + continue; + } else { + res = _tcp_tl_is_connected(sock); + if (res > 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s, socket %d [pos=%d], family:%d, in progress\n", + host, sock, pos, curinfo->ai_family)); + selected_ai_addrlen = curinfo->ai_addrlen; + memcpy(&selected_ai_addr, curinfo->ai_addr, sizeof(struct sockaddr)); + break; + } else if (res == 0) { +#ifdef MULTITASKING_ENABLED + tcp_socket_tab[pos].readStream = NULL; + tcp_socket_tab[pos].writeStream = NULL; + CFStreamCreatePairWithSocket(kCFAllocatorDefault, sock, + &tcp_socket_tab[pos].readStream, &tcp_socket_tab[pos].writeStream); + if (tcp_socket_tab[pos].readStream!=NULL) + CFReadStreamSetProperty(tcp_socket_tab[pos].readStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); + if (tcp_socket_tab[pos].writeStream!=NULL) + CFWriteStreamSetProperty(tcp_socket_tab[pos].writeStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); + if (CFReadStreamOpen (tcp_socket_tab[pos].readStream)) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "CFReadStreamOpen Succeeded!\n")); + } + + CFWriteStreamOpen (tcp_socket_tab[pos].writeStream) ; +#endif + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket node:%s , socket %d [pos=%d], family:%d, connected\n", + host, sock, pos, curinfo->ai_family)); + break; + } else { + closesocket(sock); + sock = -1; + continue; + } + } + } + + break; + } + + eXosip_freeaddrinfo(addrinfo); + + if (sock > 0) { + tcp_socket_tab[pos].socket = sock; + + tcp_socket_tab[pos].ai_addrlen = selected_ai_addrlen; + memset(&tcp_socket_tab[pos].ai_addr, 0, sizeof(struct sockaddr)); + if (selected_ai_addrlen>0) + memcpy(&tcp_socket_tab[pos].ai_addr, &selected_ai_addr, selected_ai_addrlen); + + if (src6host[0] == '\0') + osip_strncpy(tcp_socket_tab[pos].remote_ip, host, + sizeof(tcp_socket_tab[pos].remote_ip) - 1); + else + osip_strncpy(tcp_socket_tab[pos].remote_ip, src6host, + sizeof(tcp_socket_tab[pos].remote_ip) - 1); - return -1; + tcp_socket_tab[pos].remote_port = port; + + + return pos; + } + + return -1; } static int -tcp_tl_send_message (osip_transaction_t * tr, osip_message_t * sip, char *host, - int port, int out_socket) +_tcp_tl_send_sockinfo (struct _tcp_sockets *sockinfo, const char *msg, int msglen) { - size_t length = 0; - char *message; - int i; - - if (host == NULL) - { - host = sip->req_uri->host; - if (sip->req_uri->port != NULL) - port = osip_atoi (sip->req_uri->port); - else - port = 5060; - } - - /* remove preloaded route if there is no tag in the To header - */ - { - osip_route_t *route = NULL; - osip_generic_param_t *tag = NULL; - osip_message_get_route (sip, 0, &route); - - osip_to_get_tag (sip->to, &tag); - if (tag == NULL && route != NULL && route->url != NULL) - { - osip_list_remove (&sip->routes, 0); - } - i = osip_message_to_str (sip, &message, &length); - if (tag == NULL && route != NULL && route->url != NULL) - { - osip_list_add (&sip->routes, route, 0); - } - } - - if (i != 0 || length <= 0) - { - return -1; - } - - /* Step 1: find existing socket to send message */ - if (out_socket <= 0) - { - out_socket = _tcp_tl_find_socket (host, port); - - /* Step 2: create new socket with host:port */ - if (out_socket <= 0) - { - out_socket = _tcp_tl_connect_socket (host, port); - } - - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message sent: \n%s (to dest=%s:%i)\n", - message, host, port)); - } else - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message sent: \n%s (reusing REQUEST connection)\n", - message)); - } - - if (out_socket <= 0) - { - return -1; - } + int i; + while (1) { + i = send(sockinfo->socket, (const void *) msg, msglen, 0); + if (i < 0) { + int status = ex_errno; + if (is_wouldblock_error(status)) { + struct timeval tv; + fd_set wrset; + tv.tv_sec = SOCKET_TIMEOUT / 1000; + tv.tv_usec = (SOCKET_TIMEOUT % 1000) * 1000; + if (tv.tv_usec==0) + tv.tv_usec += 10000; + + FD_ZERO(&wrset); + FD_SET(sockinfo->socket, &wrset); + + i = select(sockinfo->socket + 1, NULL, &wrset, NULL, &tv); + if (i > 0) { + continue; + } else if (i < 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "TCP select error: %s:%i\n", + strerror(ex_errno), ex_errno)); + return -1; + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "TCP timeout: %d ms\n", SOCKET_TIMEOUT)); + continue; + } + } else { + /* SIP_NETWORK_ERROR; */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "TCP error: %s\n", strerror(status))); + return -1; + } + } else if (i == 0) { + break; /* what's the meaning here? */ + } else if (i < msglen) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "TCP partial write: wrote %i instead of %i\n", i, msglen)); + msglen -= i; + msg += i; + continue; + } + break; + } + return OSIP_SUCCESS; +} +static int +_tcp_tl_send (int sock, const char *msg, int msglen) +{ + struct _tcp_sockets *sockinfo = _tcp_tl_find_sockinfo (sock); + if (sockinfo == NULL) { + OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, + "could not find sockinfo for socket %d! dropping message\n", sock)); + return -1; + } + return _tcp_tl_send_sockinfo (sockinfo, msg, msglen); +} - if (0 > send (out_socket, (const void *) message, length, 0)) - { -#ifdef WIN32 - if (WSAECONNREFUSED == WSAGetLastError ()) -#else - if (ECONNREFUSED == errno) +static int +tcp_tl_send_message(osip_transaction_t * tr, osip_message_t * sip, char *host, + int port, int out_socket) +{ + size_t length = 0; + char *message = NULL; + int i; + int pos=-1; + osip_naptr_t *naptr_record=NULL; + + if (host == NULL) { + host = sip->req_uri->host; + if (sip->req_uri->port != NULL) + port = osip_atoi(sip->req_uri->port); + else + port = 5060; + } + + i = -1; +#ifndef MINISIZE + if (tr==NULL) + { + _eXosip_srv_lookup(sip, &naptr_record); + + if (naptr_record!=NULL) { + eXosip_dnsutils_dns_process(naptr_record, 1); + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_dns_process(naptr_record, 1); + } + + if (naptr_record!=NULL && naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + { + /* 4: check if we have the one we want... */ + if (naptr_record->siptcp_record.name[0] != '\0' + && naptr_record->siptcp_record.srventry[naptr_record->siptcp_record.index].srv[0] != '\0') { + /* always choose the first here. + if a network error occur, remove first entry and + replace with next entries. + */ + osip_srv_entry_t *srv; + srv = &naptr_record->siptcp_record.srventry[naptr_record->siptcp_record.index]; + if (srv->ipaddress[0]) { + host = srv->ipaddress; + port = srv->port; + } + else { + host = srv->srv; + port = srv->port; + } + } + } + + if (naptr_record!=NULL && naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + } + else + { + naptr_record = tr->naptr_record; + } + + + if (naptr_record!=NULL) + { + /* 1: make sure there is no pending DNS */ + eXosip_dnsutils_dns_process(naptr_record, 0); + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_dns_process(naptr_record, 0); + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_UNKNOWN) + { + /* fallback to DNS A */ + if (naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + if (tr!=NULL) + tr->naptr_record=NULL; + /* must never happen? */ + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_INPROGRESS) + { + /* 2: keep waiting (naptr answer not received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE) + { + /* 3: keep waiting (naptr answer received/no srv answer received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + { + /* 3: keep waiting (naptr answer received/no srv answer received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + { + /* 4: check if we have the one we want... */ + if (naptr_record->siptcp_record.name[0] != '\0' + && naptr_record->siptcp_record.srventry[naptr_record->siptcp_record.index].srv[0] != '\0') { + /* always choose the first here. + if a network error occur, remove first entry and + replace with next entries. + */ + osip_srv_entry_t *srv; + srv = &naptr_record->siptcp_record.srventry[naptr_record->siptcp_record.index]; + if (srv->ipaddress[0]) { + host = srv->ipaddress; + port = srv->port; + } + else { + host = srv->srv; + port = srv->port; + } + } + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NOTSUPPORTED + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_RETRYLATER) + { + /* 5: fallback to DNS A */ + if (naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + if (tr!=NULL) + tr->naptr_record=NULL; + } + } #endif - { - /* This can be considered as an error, but for the moment, - I prefer that the application continue to try sending - message again and again... so we are not in a error case. - Nevertheless, this error should be announced! - ALSO, UAS may not have any other options than retry always - on the same port. - */ - osip_free (message); - return 1; - } else - { - /* SIP_NETWORK_ERROR; */ -#if !defined(_WIN32_WCE) - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "TCP error: \n%s\n", strerror (errno))); + + /* remove preloaded route if there is no tag in the To header + */ + { + osip_route_t *route = NULL; + osip_generic_param_t *tag = NULL; + osip_message_get_route(sip, 0, &route); + + osip_to_get_tag(sip->to, &tag); + if (tag == NULL && route != NULL && route->url != NULL) { + osip_list_remove(&sip->routes, 0); + } + i = osip_message_to_str(sip, &message, &length); + if (tag == NULL && route != NULL && route->url != NULL) { + osip_list_add(&sip->routes, route, 0); + } + } + + if (i != 0 || length <= 0) { + osip_free(message); + return -1; + } + + /* verify all current connections */ + _tcp_tl_check_connected(); + + if (out_socket > 0) { + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket != 0) { + if (tcp_socket_tab[pos].socket == out_socket) { + out_socket = tcp_socket_tab[pos].socket; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "reusing REQUEST connection (to dest=%s:%i)\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port)); + break; + } + } + } + if (pos == EXOSIP_MAX_SOCKETS) + out_socket = 0; + } + + /* Step 1: find existing socket to send message */ + if (out_socket <= 0) { + pos = _tcp_tl_find_socket(host, port); + if (pos>=0) + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "reusing connection (to dest=%s:%i)\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port)); + } + + /* Step 2: create new socket with host:port */ + if (pos < 0) { + pos = _tcp_tl_connect_socket(host, port); + } + if (pos>=0) + out_socket = tcp_socket_tab[pos].socket; + } + + + if (out_socket <= 0) { + osip_free(message); + return -1; + } + + i = _tcp_tl_is_connected(out_socket); + if (i > 0) { + time_t now; + now = time(NULL); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s, socket %d [pos=%d], in progress\n", + host, out_socket, pos)); + osip_free(message); + if (tr != NULL && now - tr->birth_time > 10 && now - tr->birth_time < 13) + { + /* avoid doing this twice... */ + if (naptr_record!=NULL && MSG_IS_REGISTER(sip)) + { + if (eXosip_dnsutils_rotate_srv(&naptr_record->siptcp_record)>0) + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Doing TCP failover: %s:%i->%s:%i\n", + host, port, + naptr_record->siptcp_record.srventry[naptr_record->siptcp_record.index].srv, + naptr_record->siptcp_record.srventry[naptr_record->siptcp_record.index].port)); + return OSIP_SUCCESS + 1; /* retry for next retransmission! */ + } + } + + return -1; + } + return 1; + } else if (i == 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s , socket %d [pos=%d], connected\n", + host, out_socket, pos)); + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "socket node:%s, socket %d [pos=%d], socket error\n", + host, out_socket, pos)); + osip_free(message); + return -1; + } + + +#ifdef MULTITASKING_ENABLED + + if (pos>=0 && tcp_socket_tab[pos].readStream==NULL) + { + tcp_socket_tab[pos].readStream = NULL; + tcp_socket_tab[pos].writeStream = NULL; + CFStreamCreatePairWithSocket(kCFAllocatorDefault, out_socket, + &tcp_socket_tab[pos].readStream, &tcp_socket_tab[pos].writeStream); + if (tcp_socket_tab[pos].readStream!=NULL) + CFReadStreamSetProperty(tcp_socket_tab[pos].readStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); + if (tcp_socket_tab[pos].writeStream!=NULL) + CFWriteStreamSetProperty(tcp_socket_tab[pos].writeStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); + if (CFReadStreamOpen (tcp_socket_tab[pos].readStream)) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "CFReadStreamOpen Succeeded!\n")); + } + + CFWriteStreamOpen (tcp_socket_tab[pos].writeStream) ; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket node:%s:%i , socket %d [pos=%d], family:?, connected\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port, + tcp_socket_tab[pos].socket, pos)); + } #endif - osip_free (message); - return -1; - } - } + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message sent: (to dest=%s:%i) \n%s\n", + host, port, message)); + i = _tcp_tl_send(out_socket, (const void *)message, length); + osip_free(message); + return i; +} - osip_free (message); - return OSIP_SUCCESS; +#ifdef ENABLE_KEEP_ALIVE_OPTIONS_METHOD +static int _tcp_tl_get_socket_info(int socket, char *host, int hostsize, int *port) +{ + struct sockaddr addr; + int nameLen = sizeof(addr); + int ret; + if(socket <= 0 || host== NULL || hostsize <= 0 || port == NULL) + return OSIP_BADPARAMETER; + ret = getsockname(socket, &addr, &nameLen); + if (ret != 0) + { + /* ret = ex_errno; */ + return OSIP_UNDEFINED_ERROR; + } + else + { + ret = getnameinfo((struct sockaddr *) &addr, nameLen, + host, hostsize, NULL, 0, NI_NUMERICHOST); + if (ret!=0) + return OSIP_UNDEFINED_ERROR; + + if (addr.sa_family == AF_INET) + (*port) = ntohs(((struct sockaddr_in *) &addr)->sin_port); + else + (*port) = ntohs(((struct sockaddr_in6 *) &addr)->sin6_port); + } + return OSIP_SUCCESS; } +#endif -static int -tcp_tl_keepalive (void) +static int tcp_tl_keepalive(void) { - return OSIP_SUCCESS; + char buf[5] = "\r\n\r\n"; + int pos; + int i; + + if (tcp_socket <= 0) + return OSIP_UNDEFINED_ERROR; + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tcp_socket_tab[pos].socket > 0) { + i = _tcp_tl_is_connected(tcp_socket_tab[pos].socket); + if (i > 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "tcp_tl_keepalive socket node:%s:%i, socket %d [pos=%d], in progress\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port, + tcp_socket_tab[pos].socket, pos)); + continue; + } else if (i == 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "tcp_tl_keepalive socket node:%s:%i , socket %d [pos=%d], connected\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port, + tcp_socket_tab[pos].socket, pos)); + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "tcp_tl_keepalive socket node:%s:%i, socket %d [pos=%d], socket error\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].remote_port, + tcp_socket_tab[pos].socket, pos)); + _tcp_tl_close_sockinfo(&tcp_socket_tab[pos]); + continue; + } + if (eXosip.keep_alive > 0) { +#ifdef ENABLE_KEEP_ALIVE_OPTIONS_METHOD + if (eXosip.keep_alive_options != 0) + { + osip_message_t *options; + char from[NI_MAXHOST]; + char to[NI_MAXHOST]; + char locip[NI_MAXHOST]; + int locport; + char *message; + size_t length; + + options = NULL; + memset(to, '\0', sizeof(to)); + memset(from, '\0', sizeof(from)); + memset(locip, '\0', sizeof(locip)); + locport = 0; + + snprintf(to, sizeof(to), "", tcp_socket_tab[pos].remote_ip, tcp_socket_tab[pos].remote_port); + _tcp_tl_get_socket_info(tcp_socket_tab[pos].socket, locip, sizeof(locip), &locport); + if (locip[0] == '\0') + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_WARNING, NULL, + "tcp_tl_keepalive socket node:%s , socket %d [pos=%d], failed to create sip options message\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].socket, + pos)); + continue; + } + + snprintf(from, sizeof(from), "", locip, locport); + + eXosip_lock(); + /* Generate an options message */ + if(eXosip_options_build_request(&options,to,from,NULL) == OSIP_SUCCESS) + { + message = NULL; + length = 0; + /* Convert message to str for direct sending over correct socket */ + if(osip_message_to_str( options, &message, &length ) == OSIP_SUCCESS) + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "tcp_tl_keepalive socket node:%s , socket %d [pos=%d], sending sip options\n\r%s", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].socket, + pos, + message)); + i = send(tcp_socket_tab[pos].socket, (const void *) message, length, 0); + osip_free(message); + if(i > 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: Keep Alive sent on TCP!\n")); + } + } + else + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_WARNING, NULL, + "tcp_tl_keepalive socket node:%s , socket %d [pos=%d], failed to convert sip options message\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].socket, + pos)); + } + } + else + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_WARNING, NULL, + "tcp_tl_keepalive socket node:%s , socket %d [pos=%d], failed to create sip options message\n", + tcp_socket_tab[pos].remote_ip, + tcp_socket_tab[pos].socket, + pos)); + } + eXosip_unlock(); + continue; + } +#endif + i = send(tcp_socket_tab[pos].socket, (const void *) buf, 4, 0); + } + } + } + return OSIP_SUCCESS; } -static int -tcp_tl_set_socket (int socket) +static int tcp_tl_set_socket(int socket) { - tcp_socket = socket; + tcp_socket = socket; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -static int -tcp_tl_masquerade_contact (const char *public_address, int port) +static int tcp_tl_masquerade_contact(const char *public_address, int port) { - if (public_address == NULL || public_address[0] == '\0') - { - memset (tcp_firewall_ip, '\0', sizeof (tcp_firewall_ip)); - return OSIP_SUCCESS; - } - snprintf (tcp_firewall_ip, sizeof (tcp_firewall_ip), "%s", public_address); - if (port > 0) - { - snprintf (tcp_firewall_port, sizeof (tcp_firewall_port), "%i", port); - } - return OSIP_SUCCESS; + if (public_address == NULL || public_address[0] == '\0') { + memset(tcp_firewall_ip, '\0', sizeof(tcp_firewall_ip)); + memset(tcp_firewall_port, '\0', sizeof(tcp_firewall_port)); + if (eXtl_tcp.proto_port > 0) + snprintf(tcp_firewall_port, sizeof(tcp_firewall_port), "%i", + eXtl_tcp.proto_port); + return OSIP_SUCCESS; + } + snprintf(tcp_firewall_ip, sizeof(tcp_firewall_ip), "%s", public_address); + if (port > 0) { + snprintf(tcp_firewall_port, sizeof(tcp_firewall_port), "%i", port); + } + return OSIP_SUCCESS; } static int -tcp_tl_get_masquerade_contact (char *ip, int ip_size, char *port, int port_size) +tcp_tl_get_masquerade_contact(char *ip, int ip_size, char *port, int port_size) { - memset (ip, 0, ip_size); - memset (port, 0, port_size); + memset(ip, 0, ip_size); + memset(port, 0, port_size); - if (tcp_firewall_ip != '\0') - snprintf (ip, ip_size, "%s", tcp_firewall_ip); + if (tcp_firewall_ip[0] != '\0') + snprintf(ip, ip_size, "%s", tcp_firewall_ip); - if (tcp_firewall_port != '\0') - snprintf (port, port_size, "%s", tcp_firewall_port); - return OSIP_SUCCESS; + if (tcp_firewall_port[0] != '\0') + snprintf(port, port_size, "%s", tcp_firewall_port); + return OSIP_SUCCESS; } struct eXtl_protocol eXtl_tcp = { - 1, - 5060, - "TCP", - "0.0.0.0", - IPPROTO_TCP, - AF_INET, - 0, - 0, - - &tcp_tl_init, - &tcp_tl_free, - &tcp_tl_open, - &tcp_tl_set_fdset, - &tcp_tl_read_message, - &tcp_tl_send_message, - &tcp_tl_keepalive, - &tcp_tl_set_socket, - &tcp_tl_masquerade_contact, - &tcp_tl_get_masquerade_contact + 1, + 5060, + "TCP", + "0.0.0.0", + IPPROTO_TCP, + AF_INET, + 0, + 0, + + &tcp_tl_init, + &tcp_tl_free, + &tcp_tl_open, + &tcp_tl_set_fdset, + &tcp_tl_read_message, + &tcp_tl_send_message, + &tcp_tl_keepalive, + &tcp_tl_set_socket, + &tcp_tl_masquerade_contact, + &tcp_tl_get_masquerade_contact }; diff -Nru libexosip2-3.3.0/src/eXtl_tls.c libexosip2-3.6.0/src/eXtl_tls.c --- libexosip2-3.3.0/src/eXtl_tls.c 2008-10-28 17:48:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXtl_tls.c 2011-10-05 14:36:48.000000000 +0000 @@ -17,6 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef WIN32 +#ifndef UNICODE +#define UNICODE +#endif +#endif #ifdef ENABLE_MPATROL #include @@ -25,8 +30,34 @@ #include "eXosip2.h" #include "eXtransport.h" +#include + +#ifdef HAVE_FCNTL_H +#include +#endif + +#ifdef WIN32 +#include +#include +#endif + +#if defined(_WIN32_WCE) || defined(WIN32) +#define strerror(X) "-1" +#define ex_errno WSAGetLastError() +#define is_wouldblock_error(r) ((r)==WSAEINTR||(r)==WSAEWOULDBLOCK) +#define is_connreset_error(r) ((r)==WSAECONNRESET || (r)==WSAECONNABORTED || (r)==WSAETIMEDOUT || (r)==WSAENETRESET || (r)==WSAENOTCONN) +#else +#define ex_errno errno +#define closesocket close +#endif +#ifndef is_wouldblock_error +#define is_wouldblock_error(r) ((r)==EINTR||(r)==EWOULDBLOCK||(r)==EAGAIN) +#define is_connreset_error(r) ((r)==ECONNRESET || (r)==ECONNABORTED || (r)==ETIMEDOUT || (r)==ENETRESET || (r)==ENOTCONN) +#endif + #ifdef HAVE_OPENSSL_SSL_H +#define ex_verify_depth 10 #include #include #include @@ -45,15 +76,25 @@ #define RANDOM PATH"random.pem" #define DHFILE PATH"dh1024.pem"*/ -#if defined(_WIN32_WCE) -#define strerror(X) "-1" +extern eXosip_t eXosip; + +#ifdef __APPLE_CC__ +#include "TargetConditionals.h" +#endif + +#if TARGET_OS_IPHONE +#include +#include +#define MULTITASKING_ENABLED #endif -SSL_CTX *initialize_client_ctx (const char *keyfile, const char *certfile, - const char *password, int transport); +SSL_CTX *initialize_client_ctx(const char *keyfile, const char *certfile, + const char *password, int transport); + +SSL_CTX *initialize_server_ctx(const char *keyfile, const char *certfile, + const char *password, int transport); -SSL_CTX *initialize_server_ctx (const char *keyfile, const char *certfile, - const char *password, int transport); +int verify_cb(int preverify_ok, X509_STORE_CTX * store); static int tls_socket; static struct sockaddr_storage ai_addr; @@ -61,410 +102,1244 @@ static char tls_firewall_ip[64]; static char tls_firewall_port[10]; -static SSL_CTX *ssl_ctx; +static SSL_CTX *server_ctx; static SSL_CTX *client_ctx; static eXosip_tls_ctx_t eXosip_tls_ctx_params; +static char tls_local_cn_name[128]; +static char tls_client_local_cn_name[128]; -/* persistent connection */ -struct socket_tab -{ - int socket; - char remote_ip[65]; - int remote_port; - SSL *ssl_conn; - SSL_CTX *ssl_ctx; - int ssl_state; +static int tls_verify_client_certificate; +/* persistent connection */ +struct socket_tab { + int socket; + struct sockaddr ai_addr; + size_t ai_addrlen; + char remote_ip[65]; + int remote_port; + char *previous_content; + int previous_content_len; + SSL *ssl_conn; + SSL_CTX *ssl_ctx; + int ssl_state; + char *buf; /* recv buffer */ + size_t bufsize; /* allocated size of buf */ + size_t buflen; /* current length of buf */ + char *sendbuf; /* send buffer */ + size_t sendbufsize; + size_t sendbuflen; +#ifdef MULTITASKING_ENABLED + CFReadStreamRef readStream; + CFWriteStreamRef writeStream; +#endif }; +#ifndef SOCKET_TIMEOUT +/* when stream has sequence error: */ +/* having SOCKET_TIMEOUT > 0 helps the system to recover */ +#define SOCKET_TIMEOUT 0 +#endif + #ifndef EXOSIP_MAX_SOCKETS #define EXOSIP_MAX_SOCKETS 100 #endif static struct socket_tab tls_socket_tab[EXOSIP_MAX_SOCKETS]; -static int -tls_tl_init (void) +static int tls_tl_init(void) { - tls_socket = 0; - ssl_ctx = NULL; - client_ctx = NULL; - memset (&ai_addr, 0, sizeof (struct sockaddr_storage)); - memset (&tls_socket_tab, 0, sizeof (struct socket_tab) * EXOSIP_MAX_SOCKETS); - memset (tls_firewall_ip, 0, sizeof (tls_firewall_ip)); - memset (tls_firewall_port, 0, sizeof (tls_firewall_port)); - return OSIP_SUCCESS; + tls_socket = 0; + server_ctx = NULL; + client_ctx = NULL; + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + memset(&tls_socket_tab, 0, sizeof(struct socket_tab) * EXOSIP_MAX_SOCKETS); + memset(tls_firewall_ip, 0, sizeof(tls_firewall_ip)); + memset(tls_firewall_port, 0, sizeof(tls_firewall_port)); + memset(&eXosip_tls_ctx_params, 0, sizeof(eXosip_tls_ctx_t)); + memset(&tls_local_cn_name, 0, sizeof(tls_local_cn_name)); + memset(&tls_client_local_cn_name, 0, sizeof(tls_client_local_cn_name)); + tls_verify_client_certificate = 0; + return OSIP_SUCCESS; +} + +static void _tls_tl_close_sockinfo (struct socket_tab *sockinfo) +{ + if (sockinfo->socket>0) + { + if (sockinfo->ssl_conn != NULL) { + SSL_shutdown(sockinfo->ssl_conn); + SSL_shutdown(sockinfo->ssl_conn); + SSL_free(sockinfo->ssl_conn); + } + if (sockinfo->ssl_ctx != NULL) + SSL_CTX_free(sockinfo->ssl_ctx); + closesocket(sockinfo->socket); + } + if (sockinfo->buf!=NULL) + osip_free(sockinfo->buf); + if (sockinfo->sendbuf!=NULL) + osip_free(sockinfo->sendbuf); +#ifdef MULTITASKING_ENABLED + if (sockinfo->readStream!=NULL) + { + CFReadStreamClose(sockinfo->readStream); + CFRelease(sockinfo->readStream); + } + if (sockinfo->writeStream!=NULL) + { + CFWriteStreamClose(sockinfo->writeStream); + CFRelease(sockinfo->writeStream); + } +#endif + memset(sockinfo, 0, sizeof(*sockinfo)); } -static int -tls_tl_free (void) +static int tls_tl_free(void) { - int pos; - if (ssl_ctx != NULL) - SSL_CTX_free (ssl_ctx); + int pos; + if (server_ctx != NULL) + SSL_CTX_free(server_ctx); + server_ctx = NULL; - if (client_ctx != NULL) - SSL_CTX_free (client_ctx); + if (client_ctx != NULL) + SSL_CTX_free(client_ctx); + client_ctx = NULL; - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tls_socket_tab[pos].socket > 0) - { - if (tls_socket_tab[pos].ssl_conn != NULL) - { - SSL_shutdown (tls_socket_tab[pos].ssl_conn); - SSL_shutdown (tls_socket_tab[pos].ssl_conn); - SSL_free (tls_socket_tab[pos].ssl_conn); - } - if (tls_socket_tab[pos].ssl_ctx != NULL) - SSL_CTX_free (tls_socket_tab[pos].ssl_ctx); - close (tls_socket_tab[pos].socket); - } - } - - //free error strings (OpenSSL-lib) - EVP_cleanup (); - ERR_free_strings (); - ERR_remove_state (0); - //clear the encryption data (OpenSSL-lib) - - CRYPTO_cleanup_all_ex_data (); - - - memset (&tls_socket_tab, 0, sizeof (struct socket_tab) * EXOSIP_MAX_SOCKETS); - - memset (tls_firewall_ip, 0, sizeof (tls_firewall_ip)); - memset (tls_firewall_port, 0, sizeof (tls_firewall_port)); - memset (&ai_addr, 0, sizeof (struct sockaddr_storage)); - if (tls_socket > 0) - close (tls_socket); - - //free the memory from our SSL parameters - memset (&eXosip_tls_ctx_params, 0, sizeof (eXosip_tls_ctx_t)); - return OSIP_SUCCESS; -} + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + _tls_tl_close_sockinfo(&tls_socket_tab[pos]); + } -static int -password_cb (char *buf, int num, int rwflag, void *userdata) -{ - char *passwd = (char *) userdata; - if (passwd == NULL || passwd[0] == '\0') - { - return OSIP_SUCCESS; - } - strncpy (buf, passwd, num); - buf[num - 1] = '\0'; - return strlen (buf); -} +#if 0 + /* this would break other ssl usage */ + EVP_cleanup(); + ERR_free_strings(); + ERR_remove_state(0); -static void -load_dh_params (SSL_CTX * ctx, char *file) -{ - DH *ret = 0; - BIO *bio; + CRYPTO_cleanup_all_ex_data(); +#endif - if ((bio = BIO_new_file (file, "r")) == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't open DH file!\n")); - } else - { - ret = PEM_read_bio_DHparams (bio, NULL, NULL, NULL); - BIO_free (bio); - if (SSL_CTX_set_tmp_dh (ctx, ret) < 0) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't set DH param!\n")); - } -} + memset(&tls_socket_tab, 0, sizeof(struct socket_tab) * EXOSIP_MAX_SOCKETS); -static void -generate_eph_rsa_key (SSL_CTX * ctx) -{ - RSA *rsa; + memset(tls_firewall_ip, 0, sizeof(tls_firewall_ip)); + memset(tls_firewall_port, 0, sizeof(tls_firewall_port)); + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + if (tls_socket > 0) + close(tls_socket); + tls_socket = 0; + + memset(&eXosip_tls_ctx_params, 0, sizeof(eXosip_tls_ctx_t)); + memset(&tls_local_cn_name, 0, sizeof(tls_local_cn_name)); + memset(&tls_client_local_cn_name, 0, sizeof(tls_client_local_cn_name)); + + tls_verify_client_certificate = 0; + return OSIP_SUCCESS; +} + +static void tls_dump_cert_info(const char *s, X509 * cert) +{ + char *subj; + char *issuer; + + subj = X509_NAME_oneline(X509_get_subject_name(cert), 0, 0); + issuer = X509_NAME_oneline(X509_get_issuer_name(cert), 0, 0); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "%s subject:%s\n", s ? s : "", subj)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "%s issuer: %s\n", s ? s : "", issuer)); + OPENSSL_free(subj); + OPENSSL_free(issuer); +} + +static int _tls_add_certificates(SSL_CTX * ctx) +{ + int count = 0; +#ifdef WIN32 + PCCERT_CONTEXT pCertCtx; + X509 *cert = NULL; + HCERTSTORE hStore = CertOpenSystemStore(0, L"CA"); + + for (pCertCtx = CertEnumCertificatesInStore(hStore, NULL); + pCertCtx != NULL; + pCertCtx = CertEnumCertificatesInStore(hStore, pCertCtx)) { + cert = d2i_X509(NULL, (const unsigned char **) &pCertCtx->pbCertEncoded, + pCertCtx->cbCertEncoded); + if (cert == NULL) { + continue; + } + /*tls_dump_cert_info("CA", cert); */ + + if (!X509_STORE_add_cert(ctx->cert_store, cert)) { + continue; + } + count++; + X509_free(cert); + } + + CertCloseStore(hStore, 0); + + hStore = CertOpenSystemStore(0, L"ROOT"); + + for (pCertCtx = CertEnumCertificatesInStore(hStore, NULL); + pCertCtx != NULL; + pCertCtx = CertEnumCertificatesInStore(hStore, pCertCtx)) { + cert = d2i_X509(NULL, (const unsigned char **) &pCertCtx->pbCertEncoded, + pCertCtx->cbCertEncoded); + if (cert == NULL) { + continue; + } + /*tls_dump_cert_info("ROOT", cert); */ + + if (!X509_STORE_add_cert(ctx->cert_store, cert)) { + continue; + } + count++; + X509_free(cert); + } + + CertCloseStore(hStore, 0); + + hStore = CertOpenSystemStore(0, L"MY"); + + for (pCertCtx = CertEnumCertificatesInStore(hStore, NULL); + pCertCtx != NULL; + pCertCtx = CertEnumCertificatesInStore(hStore, pCertCtx)) { + cert = d2i_X509(NULL, (const unsigned char **) &pCertCtx->pbCertEncoded, + pCertCtx->cbCertEncoded); + if (cert == NULL) { + continue; + } + /*tls_dump_cert_info("MY", cert); */ + + if (!X509_STORE_add_cert(ctx->cert_store, cert)) { + continue; + } + count++; + X509_free(cert); + } + + CertCloseStore(hStore, 0); + + hStore = CertOpenSystemStore(0, L"Trustedpublisher"); + + for (pCertCtx = CertEnumCertificatesInStore(hStore, NULL); + pCertCtx != NULL; + pCertCtx = CertEnumCertificatesInStore(hStore, pCertCtx)) { + cert = d2i_X509(NULL, (const unsigned char **) &pCertCtx->pbCertEncoded, + pCertCtx->cbCertEncoded); + if (cert == NULL) { + continue; + } + /*tls_dump_cert_info("Trustedpublisher", cert); */ + + if (!X509_STORE_add_cert(ctx->cert_store, cert)) { + continue; + } + count++; + X509_free(cert); + } - rsa = RSA_generate_key (512, RSA_F4, NULL, NULL); + CertCloseStore(hStore, 0); +#endif + return count; +} - if (rsa != NULL) - { - if (!SSL_CTX_set_tmp_rsa (ctx, rsa)) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't set RSA key!\n")); +#ifdef WIN32 - RSA_free (rsa); - } -} +struct rsa_ctx { + const CERT_CONTEXT *cert; + HCRYPTPROV crypt_prov; + DWORD key_spec; + BOOL free_crypt_prov; + HCRYPTKEY hCryptKey; +}; -eXosip_tls_ctx_error -eXosip_set_tls_ctx (eXosip_tls_ctx_t * ctx) +static int rsa_pub_enc(int flen, const unsigned char *from, + unsigned char *to, RSA * rsa, int padding) { - eXosip_tls_credentials_t *ownClient = &eXosip_tls_ctx_params.client; - eXosip_tls_credentials_t *ownServer = &eXosip_tls_ctx_params.server; - - //get the credentials - eXosip_tls_credentials_t *client = &ctx->client; - eXosip_tls_credentials_t *server = &ctx->server; - - //check if public AND private keys are valid - if ((client->cert[0] != '\0' && client->priv_key[0] == '\0') || - (client->cert[0] == '\0' && client->priv_key[0] != '\0')) - { - //no, one is missing - return TLS_ERR_MISSING_AUTH_PART; - } - //check if a password is set, when a private key is present - if (client->priv_key[0] != '\0' && client->priv_key_pw[0] == '\0') - { - return TLS_ERR_NO_PW; - } - //check if public AND private keys are valid - if ((server->cert[0] != '\0' && server->priv_key[0] == '\0') || - (server->cert[0] == '\0' && server->priv_key[0] != '\0')) - { - //no, one is missing - return TLS_ERR_MISSING_AUTH_PART; - } - //check if a password is set, when a private key is present - if (server->priv_key[0] != '\0' && server->priv_key_pw[0] == '\0') - { - return TLS_ERR_NO_PW; - } - //check if the file for diffie hellman is present - /*if(ctx->dh_param[0] == '\0') { - return TLS_ERR_NO_DH_PARAM; - } */ - - //check if a file with random data is present --> will be verified when random file is needed (see tls_tl_open) - /*if(ctx->random_file[0] == '\0') { - return TLS_ERR_NO_RAND; - } */ - - //check if a file with the list of possible rootCAs is available - /*if(ctx->root_ca_cert[0] == '\0') { - return TLS_ERR_NO_ROOT_CA; - } */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "rsa_pub_enc - not implemented")); + return 0; +} + +static int rsa_pub_dec(int flen, const unsigned char *from, + unsigned char *to, RSA * rsa, int padding) +{ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "rsa_pub_dec - not implemented")); + return 0; +} + +static int rsa_priv_enc(int flen, const unsigned char *from, + unsigned char *to, RSA * rsa, int padding) +{ + struct rsa_ctx *priv = (struct rsa_ctx *) rsa->meth->app_data; + HCRYPTHASH hash; + DWORD hash_size, len, i; + unsigned char *buf = NULL; + int ret = 0; + + if (priv == NULL) { + RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, ERR_R_PASSED_NULL_PARAMETER); + return 0; + } + + if (padding != RSA_PKCS1_PADDING) { + RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, RSA_R_UNKNOWN_PADDING_TYPE); + return 0; + } + + if (flen != 16 /* MD5 */ + 20 /* SHA-1 */ ) { + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "rsa_priv_enc - only MD5-SHA1 hash supported")); + RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, RSA_R_INVALID_MESSAGE_LENGTH); + return 0; + } + + if (!CryptCreateHash(priv->crypt_prov, CALG_SSL3_SHAMD5, 0, 0, &hash)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "CryptCreateHash failed")); + return 0; + } + + len = sizeof(hash_size); + if (!CryptGetHashParam(hash, HP_HASHSIZE, (BYTE *) & hash_size, &len, 0)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "CryptGetHashParam failed")); + goto err; + } + + if (hash_size != flen) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "CryptoAPI: Invalid hash size (%u != %d)", + (unsigned) hash_size, flen)); + RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, RSA_R_INVALID_MESSAGE_LENGTH); + goto err; + } + if (!CryptSetHashParam(hash, HP_HASHVAL, (BYTE *) from, 0)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "CryptSetHashParam failed")); + goto err; + } + + len = RSA_size(rsa); + buf = osip_malloc(len); + if (buf == NULL) { + RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, ERR_R_MALLOC_FAILURE); + goto err; + } + + if (!CryptSignHash(hash, priv->key_spec, NULL, 0, buf, &len)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "CryptSignHash failed")); + goto err; + } + + for (i = 0; i < len; i++) + to[i] = buf[len - i - 1]; + ret = len; + + err: + osip_free(buf); + CryptDestroyHash(hash); + + return ret; +} + +static int rsa_priv_dec(int flen, const unsigned char *from, + unsigned char *to, RSA * rsa, int padding) +{ + struct rsa_ctx *priv = (struct rsa_ctx *) rsa->meth->app_data; + BOOL ret; + DWORD cbData = flen; + int i; + unsigned char *buf = NULL; + + if (padding != RSA_PKCS1_PADDING) + return -1; + if (priv->hCryptKey == 0) + return -1; + + buf = osip_malloc(cbData * 4); + for (i = 0; i < flen; i++) + buf[flen - i - 1] = from[i]; + + ret = CryptDecrypt(priv->hCryptKey, 0, TRUE, 0, buf, &flen); + if (!ret) + return -1; + + memcpy(to, buf, flen); + + osip_free(buf); + return flen; +} + +static void rsa_free_data(struct rsa_ctx *priv) +{ + if (priv == NULL) + return; + if (priv->hCryptKey) + CryptDestroyKey(priv->hCryptKey); + if (priv->crypt_prov && priv->free_crypt_prov) + CryptReleaseContext(priv->crypt_prov, 0); + if (priv->cert) + CertFreeCertificateContext(priv->cert); + osip_free(priv); +} + +static int rsa_finish(RSA * rsa) +{ + rsa_free_data((struct rsa_ctx *) rsa->meth->app_data); + osip_free((void *) rsa->meth); + rsa->meth = NULL; + return 1; +} - /* clean up configuration */ - memset (&eXosip_tls_ctx_params, 0, sizeof (eXosip_tls_ctx_t)); +#endif - //check if client has own certificate - if (client->cert[0] != '\0') - { - snprintf (ownClient->cert, sizeof (ownClient->cert), "%s", client->cert); - snprintf (ownClient->priv_key, sizeof (ownClient->priv_key), "%s", - client->priv_key); - snprintf (ownClient->priv_key_pw, sizeof (ownClient->priv_key_pw), "%s", - client->priv_key_pw); - } else if (server->cert[0] != '\0') - { - //no, has no certificates -> copy the chars of the server - snprintf (ownClient->cert, sizeof (ownClient->cert), "%s", server->cert); - snprintf (ownClient->priv_key, sizeof (ownClient->priv_key), "%s", - server->priv_key); - snprintf (ownClient->priv_key_pw, sizeof (ownClient->priv_key_pw), "%s", - server->priv_key_pw); - } - //check if server has own certificate - if (server->cert[0] != '\0') - { - snprintf (ownServer->cert, sizeof (ownServer->cert), "%s", server->cert); - snprintf (ownServer->cert, sizeof (ownServer->cert), "%s", server->priv_key); - snprintf (ownServer->cert, sizeof (ownServer->cert), "%s", - server->priv_key_pw); - } else if (client->cert[0] != '\0') - { - //no, has no certificates -> copy the chars of the client - snprintf (ownServer->cert, sizeof (ownServer->cert), "%s", client->cert); - snprintf (ownServer->cert, sizeof (ownServer->cert), "%s", client->priv_key); - snprintf (ownServer->cert, sizeof (ownServer->cert), "%s", - client->priv_key_pw); - } +static X509 *_tls_set_certificate(SSL_CTX * ctx, const char *cn) +{ +#ifdef WIN32 + PCCERT_CONTEXT pCertCtx; + X509 *cert = NULL; + HCERTSTORE hStore = CertOpenSystemStore(0, L"CA"); + + for (pCertCtx = CertEnumCertificatesInStore(hStore, NULL); + pCertCtx != NULL; + pCertCtx = CertEnumCertificatesInStore(hStore, pCertCtx)) { + char peer_CN[65]; + cert = d2i_X509(NULL, (const unsigned char **) &pCertCtx->pbCertEncoded, + pCertCtx->cbCertEncoded); + if (cert == NULL) { + continue; + } + + memset(peer_CN, 0, sizeof(peer_CN)); + X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, + peer_CN, sizeof(peer_CN)); + if (osip_strcasecmp(cn, peer_CN) == 0) { + break; + } + X509_free(cert); + cert = NULL; + } + + CertCloseStore(hStore, 0); + + if (cert == NULL) { + hStore = CertOpenSystemStore(0, L"ROOT"); + for (pCertCtx = CertEnumCertificatesInStore(hStore, NULL); + pCertCtx != NULL; + pCertCtx = CertEnumCertificatesInStore(hStore, pCertCtx)) { + char peer_CN[65]; + cert = + d2i_X509(NULL, (const unsigned char **) &pCertCtx->pbCertEncoded, + pCertCtx->cbCertEncoded); + if (cert == NULL) { + continue; + } + + memset(peer_CN, 0, sizeof(peer_CN)); + X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, + peer_CN, sizeof(peer_CN)); + if (osip_strcasecmp(cn, peer_CN) == 0) { + break; + } + X509_free(cert); + cert = NULL; + } + + CertCloseStore(hStore, 0); + } + + if (cert == NULL) { + hStore = CertOpenSystemStore(0, L"MY"); + + for (pCertCtx = CertEnumCertificatesInStore(hStore, NULL); + pCertCtx != NULL; + pCertCtx = CertEnumCertificatesInStore(hStore, pCertCtx)) { + char peer_CN[65]; + cert = + d2i_X509(NULL, (const unsigned char **) &pCertCtx->pbCertEncoded, + pCertCtx->cbCertEncoded); + if (cert == NULL) { + continue; + } + + memset(peer_CN, 0, sizeof(peer_CN)); + X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, + peer_CN, sizeof(peer_CN)); + if (osip_strcasecmp(cn, peer_CN) == 0) { + break; + } + X509_free(cert); + cert = NULL; + } + + CertCloseStore(hStore, 0); + } + + if (cert == NULL) { + hStore = CertOpenSystemStore(0, L"Trustedpublisher"); + + for (pCertCtx = CertEnumCertificatesInStore(hStore, NULL); + pCertCtx != NULL; + pCertCtx = CertEnumCertificatesInStore(hStore, pCertCtx)) { + char peer_CN[65]; + cert = + d2i_X509(NULL, (const unsigned char **) &pCertCtx->pbCertEncoded, + pCertCtx->cbCertEncoded); + if (cert == NULL) { + continue; + } + + memset(peer_CN, 0, sizeof(peer_CN)); + X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, + peer_CN, sizeof(peer_CN)); + if (osip_strcasecmp(cn, peer_CN) == 0) { + break; + } + X509_free(cert); + cert = NULL; + } + + CertCloseStore(hStore, 0); + } + + if (cert == NULL) + return NULL; + + { + RSA *rsa = NULL, *pub_rsa; + struct rsa_ctx *priv; + RSA_METHOD *rsa_meth; + + priv = osip_malloc(sizeof(*priv)); + rsa_meth = osip_malloc(sizeof(*rsa_meth)); + if (priv == NULL || rsa_meth == NULL) { + CertFreeCertificateContext(pCertCtx); + osip_free(priv); + osip_free(rsa_meth); + X509_free(cert); + return NULL; + } + memset(priv, 0, sizeof(*priv)); + memset(rsa_meth, 0, sizeof(*rsa_meth)); + + priv->cert = pCertCtx; + + if (CryptAcquireCertificatePrivateKey + (pCertCtx, CRYPT_ACQUIRE_COMPARE_KEY_FLAG, NULL, &priv->crypt_prov, + &priv->key_spec, &priv->free_crypt_prov) == 0) { + CertFreeCertificateContext(priv->cert); + osip_free(priv); + osip_free(rsa_meth); + X509_free(cert); + return NULL; + } + + if (!CryptGetUserKey(priv->crypt_prov, priv->key_spec, &priv->hCryptKey)) { + CertFreeCertificateContext(priv->cert); + if (priv->crypt_prov && priv->free_crypt_prov) + CryptReleaseContext(priv->crypt_prov, 0); + osip_free(priv); + osip_free(rsa_meth); + X509_free(cert); + return NULL; + } + + rsa_meth->name = "Microsoft CryptoAPI RSA Method"; + rsa_meth->rsa_pub_enc = rsa_pub_enc; + rsa_meth->rsa_pub_dec = rsa_pub_dec; + rsa_meth->rsa_priv_enc = rsa_priv_enc; + rsa_meth->rsa_priv_dec = rsa_priv_dec; + rsa_meth->finish = rsa_finish; + rsa_meth->flags = RSA_METHOD_FLAG_NO_CHECK; + rsa_meth->app_data = (char *) priv; + + rsa = RSA_new(); + if (rsa == NULL) { + CertFreeCertificateContext(priv->cert); + if (priv->crypt_prov && priv->free_crypt_prov) + CryptReleaseContext(priv->crypt_prov, 0); + osip_free(priv); + osip_free(rsa_meth); + X509_free(cert); + RSA_free(rsa); + return NULL; + } + + if (!SSL_CTX_use_certificate(ctx, cert)) { + CertFreeCertificateContext(priv->cert); + if (priv->crypt_prov && priv->free_crypt_prov) + CryptReleaseContext(priv->crypt_prov, 0); + osip_free(priv); + osip_free(rsa_meth); + X509_free(cert); + return NULL; + } + + pub_rsa = cert->cert_info->key->pkey->pkey.rsa; + + rsa->n = BN_dup(pub_rsa->n); + rsa->e = BN_dup(pub_rsa->e); + if (!RSA_set_method(rsa, rsa_meth)) { + CertFreeCertificateContext(priv->cert); + if (priv->crypt_prov && priv->free_crypt_prov) + CryptReleaseContext(priv->crypt_prov, 0); + osip_free(priv); + osip_free(rsa_meth); + RSA_free(rsa); + X509_free(cert); + SSL_CTX_free(ctx); + return NULL; + } + + if (!SSL_CTX_use_RSAPrivateKey(ctx, rsa)) { + RSA_free(rsa); + X509_free(cert); + SSL_CTX_free(ctx); + return NULL; + } + RSA_free(rsa); - snprintf (eXosip_tls_ctx_params.dh_param, sizeof (ctx->dh_param), "%s", - ctx->dh_param); - snprintf (eXosip_tls_ctx_params.random_file, sizeof (ctx->random_file), "%s", - ctx->random_file); - snprintf (eXosip_tls_ctx_params.root_ca_cert, sizeof (ctx->root_ca_cert), "%s", - ctx->root_ca_cert); + return cert; + } - return TLS_OK; +#endif + return NULL; } -SSL_CTX * -initialize_client_ctx (const char *keyfile, const char *certfile, - const char *password, int transport) +int verify_cb(int preverify_ok, X509_STORE_CTX * store) { - SSL_METHOD *meth = NULL; - SSL_CTX *ctx; - - if (transport == IPPROTO_UDP) - { -#if !(OPENSSL_VERSION_NUMBER < 0x00908000L) - meth = DTLSv1_client_method (); -#endif - } else if (transport == IPPROTO_TCP) - { - meth = TLSv1_client_method (); - } else - { - return NULL; - } - - ctx = SSL_CTX_new (meth); - - if (ctx == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't create SSL_CTX!\n")); - return NULL; - } - /* SSL_CTX_set_read_ahead(ctx, 1); */ - - SSL_CTX_set_default_passwd_cb_userdata (ctx, (void *) password); - SSL_CTX_set_default_passwd_cb (ctx, password_cb); + char buf[256]; + X509 *err_cert; + int err, depth; + SSL *ssl; + + err_cert = X509_STORE_CTX_get_current_cert(store); + err = X509_STORE_CTX_get_error(store); + depth = X509_STORE_CTX_get_error_depth(store); + + ssl = X509_STORE_CTX_get_ex_data(store, SSL_get_ex_data_X509_STORE_CTX_idx()); + X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256); + + if (depth > ex_verify_depth /* depth -1 */ ) { + preverify_ok = 0; + err = X509_V_ERR_CERT_CHAIN_TOO_LONG; + X509_STORE_CTX_set_error(store, err); + } + if (!preverify_ok) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "verify error:num=%d:%s:depth=%d:%s\n", err, + X509_verify_cert_error_string(err), depth, buf)); + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "depth=%d:%s\n", depth, buf)); + } + /* + * At this point, err contains the last verification error. We can use + * it for something special + */ + if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT)) { + X509_NAME_oneline(X509_get_issuer_name(store->current_cert), buf, 256); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "issuer= %s\n", buf)); + } + + if (tls_verify_client_certificate > 0) + return preverify_ok; + + if (!preverify_ok && (err == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN)) { + X509_NAME_oneline(X509_get_issuer_name(store->current_cert), buf, 256); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "issuer= %s\n", buf)); + preverify_ok = 1; + X509_STORE_CTX_set_error(store, X509_V_OK); + } + + if (!preverify_ok && (err == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)) { + X509_NAME_oneline(X509_get_issuer_name(store->current_cert), buf, 256); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "issuer= %s\n", buf)); + preverify_ok = 1; + X509_STORE_CTX_set_error(store, X509_V_OK); + } + + if (!preverify_ok && (err == X509_V_ERR_CERT_HAS_EXPIRED)) { + X509_NAME_oneline(X509_get_issuer_name(store->current_cert), buf, 256); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "issuer= %s\n", buf)); + preverify_ok = 1; + X509_STORE_CTX_set_error(store, X509_V_OK); + } + + return preverify_ok; +} + +static int password_cb(char *buf, int num, int rwflag, void *userdata) +{ + char *passwd = (char *) userdata; + if (passwd == NULL || passwd[0] == '\0') { + return OSIP_SUCCESS; + } + strncpy(buf, passwd, num); + buf[num - 1] = '\0'; + return strlen(buf); +} + +static void load_dh_params(SSL_CTX * ctx, char *file) +{ + DH *ret = 0; + BIO *bio; + + if ((bio = BIO_new_file(file, "r")) == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't open DH file!\n")); + } else { + ret = PEM_read_bio_DHparams(bio, NULL, NULL, NULL); + BIO_free(bio); + if (SSL_CTX_set_tmp_dh(ctx, ret) < 0) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't set DH param!\n")); + } +} + +static void build_dh_params(SSL_CTX * ctx) +{ + int codes = 0; + DH* dh = DH_new(); + if (!dh) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: DH_new failed!\n")); + return; + } + if (!DH_generate_parameters_ex(dh, 2, DH_GENERATOR_2, 0)) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: DH_generate_parameters_ex failed!\n")); + DH_free(dh); + return; + } + + if (!DH_check(dh, &codes)) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: DH_check failed!\n")); + DH_free(dh); + return; + } + if (!DH_generate_key(dh)) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: DH_generate_key failed!\n")); + DH_free(dh); + return; + } + SSL_CTX_set_tmp_dh(ctx, dh); + DH_free(dh); + + return; +} + +#if (OPENSSL_VERSION_NUMBER < 0x00908000l || defined(ANDROID)) +RSA *RSA_generate_key(int bits, unsigned long e_value, + void (*callback)(int,int,void *), void *cb_arg) +{ + BN_GENCB cb; + int i; + RSA *rsa = RSA_new(); + BIGNUM *e = BN_new(); + if(!rsa || !e) goto err; - if (certfile[0] != '\0') + /* The problem is when building with 8, 16, or 32 BN_ULONG, + * unsigned long can be larger */ + for (i=0; i<(int)sizeof(unsigned long)*8; i++) { - // Load our keys and certificates - if (!(SSL_CTX_use_certificate_file (ctx, certfile, SSL_FILETYPE_PEM))) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't read client certificate file %s!\n", - certfile)); - } - - if (!(SSL_CTX_use_PrivateKey_file (ctx, keyfile, SSL_FILETYPE_PEM))) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't read client pkey file %s!\n", keyfile)); - - if (!(SSL_CTX_use_RSAPrivateKey_file (ctx, keyfile, SSL_FILETYPE_PEM))) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't read client RSA key file %s!\n", keyfile)); + if (e_value & (1UL<client; + eXosip_tls_credentials_t *server = &ctx->server; + + /* check if public AND private keys are valid */ + if ((client->cert[0] != '\0' && client->priv_key[0] == '\0') || + (client->cert[0] == '\0' && client->priv_key[0] != '\0')) { + /* no, one is missing */ + return TLS_ERR_MISSING_AUTH_PART; + } + /* check if a password is set, when a private key is present */ + if (client->priv_key[0] != '\0' && client->priv_key_pw[0] == '\0') { + return TLS_ERR_NO_PW; + } + /* check if public AND private keys are valid */ + if ((server->cert[0] != '\0' && server->priv_key[0] == '\0') || + (server->cert[0] == '\0' && server->priv_key[0] != '\0')) { + /* no, one is missing */ + return TLS_ERR_MISSING_AUTH_PART; + } + /* check if a password is set, when a private key is present */ + if (server->priv_key[0] != '\0' && server->priv_key_pw[0] == '\0') { + return TLS_ERR_NO_PW; + } + /* check if the file for diffie hellman is present */ + /*if(ctx->dh_param[0] == '\0') { + return TLS_ERR_NO_DH_PARAM; + } */ + + /* check if a file with random data is present --> will be verified when random file is needed (see tls_tl_open) */ + /*if(ctx->random_file[0] == '\0') { + return TLS_ERR_NO_RAND; + } */ + + /* check if a file with the list of possible rootCAs is available */ + /*if(ctx->root_ca_cert[0] == '\0') { + return TLS_ERR_NO_ROOT_CA; + } */ + + /* clean up configuration */ + memset(&eXosip_tls_ctx_params, 0, sizeof(eXosip_tls_ctx_t)); + + /* check if client has own certificate */ + if (client->cert[0] != '\0') { + snprintf(ownClient->cert, sizeof(ownClient->cert), "%s", client->cert); + snprintf(ownClient->priv_key, sizeof(ownClient->priv_key), "%s", + client->priv_key); + snprintf(ownClient->priv_key_pw, sizeof(ownClient->priv_key_pw), "%s", + client->priv_key_pw); + } else if (server->cert[0] != '\0') { + /* no, has no certificates -> copy the chars of the server */ + snprintf(ownClient->cert, sizeof(ownClient->cert), "%s", server->cert); + snprintf(ownClient->priv_key, sizeof(ownClient->priv_key), "%s", + server->priv_key); + snprintf(ownClient->priv_key_pw, sizeof(ownClient->priv_key_pw), "%s", + server->priv_key_pw); + } + /* check if server has own certificate */ + if (server->cert[0] != '\0') { + snprintf(ownServer->cert, sizeof(ownServer->cert), "%s", server->cert); + snprintf(ownServer->priv_key, sizeof(ownServer->priv_key), "%s", + server->priv_key); + snprintf(ownServer->priv_key_pw, sizeof(ownServer->priv_key_pw), "%s", + server->priv_key_pw); + } else if (client->cert[0] != '\0') { + /* no, has no certificates -> copy the chars of the client */ + snprintf(ownServer->cert, sizeof(ownServer->cert), "%s", client->cert); + snprintf(ownServer->priv_key, sizeof(ownServer->priv_key), "%s", + client->priv_key); + snprintf(ownServer->priv_key_pw, sizeof(ownServer->priv_key_pw), "%s", + client->priv_key_pw); + } + + snprintf(eXosip_tls_ctx_params.dh_param, sizeof(ctx->dh_param), "%s", + ctx->dh_param); + snprintf(eXosip_tls_ctx_params.random_file, sizeof(ctx->random_file), "%s", + ctx->random_file); + snprintf(eXosip_tls_ctx_params.root_ca_cert, sizeof(ctx->root_ca_cert), "%s", + ctx->root_ca_cert); + + return TLS_OK; +} + +eXosip_tls_ctx_error eXosip_tls_use_server_certificate(const char + *local_certificate_cn) +{ + memset(&tls_local_cn_name, 0, sizeof(tls_local_cn_name)); + if (local_certificate_cn == NULL) + return TLS_OK; + osip_strncpy(tls_local_cn_name, local_certificate_cn, sizeof(tls_local_cn_name)-1); + return TLS_OK; +} + +eXosip_tls_ctx_error eXosip_tls_use_client_certificate(const char + *local_certificate_cn) +{ + memset(&tls_client_local_cn_name, 0, sizeof(tls_client_local_cn_name)); + if (local_certificate_cn == NULL) + return TLS_OK; + osip_strncpy(tls_client_local_cn_name, local_certificate_cn, sizeof(tls_client_local_cn_name)-1); + return TLS_OK; +} + +eXosip_tls_ctx_error eXosip_tls_verify_certificate(int + _tls_verify_client_certificate) +{ + tls_verify_client_certificate = _tls_verify_client_certificate; + return TLS_OK; +} + +SSL_CTX *initialize_client_ctx(const char *keyfile, const char *certfile, + const char *password, int transport) +{ + SSL_METHOD *meth = NULL; + X509 *cert = NULL; + SSL_CTX *ctx; - if (transport == IPPROTO_UDP) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "DTLSv1 server method\n")); + if (transport == IPPROTO_UDP) { #if !(OPENSSL_VERSION_NUMBER < 0x00908000L) - meth = DTLSv1_server_method (); + meth = DTLSv1_client_method(); #endif - } else if (transport == IPPROTO_TCP) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "TLS server method\n")); - meth = TLSv1_server_method (); - } else - { - return NULL; - } - - ctx = SSL_CTX_new (meth); + } else if (transport == IPPROTO_TCP) { + meth = TLSv1_client_method(); + } else { + return NULL; + } + + ctx = SSL_CTX_new(meth); + + if (ctx == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't create SSL_CTX!\n")); + return NULL; + } + + if (password[0] != '\0') { + SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *) password); + SSL_CTX_set_default_passwd_cb(ctx, password_cb); + } + + if (tls_client_local_cn_name[0] != '\0') { + cert = _tls_set_certificate(ctx, tls_client_local_cn_name); + } + + if (cert==NULL && certfile[0] != '\0') { + /* Load our keys and certificates */ + if (!(SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM))) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't read client certificate file %s!\n", + certfile)); + } + + if (!(SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM))) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't read client pkey file %s!\n", keyfile)); + + if (!(SSL_CTX_use_RSAPrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM))) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't read client RSA key file %s!\n", + keyfile)); + } + + if (cert!=NULL) + { + X509_free(cert); + cert = NULL; + } - if (ctx == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't create SSL_CTX!\n")); - return NULL; - } - - SSL_CTX_set_default_passwd_cb_userdata (ctx, (void *) password); - SSL_CTX_set_default_passwd_cb (ctx, password_cb); - - if (transport == IPPROTO_UDP) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "DTLS read ahead\n")); - SSL_CTX_set_read_ahead (ctx, 1); - } +#if 0 +ANDROID + BIO *bio = BIO_new_file("/system/etc/security/cacerts.bks", "r"); - /* Load our keys and certificates */ - if (!(SSL_CTX_use_certificate_file (ctx, certfile, SSL_FILETYPE_PEM))) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't read certificate file!\n")); - } + unsigned char* p = d2i_PKCS7_bio(NULL, bio, - /* Load the CAs we trust */ - if (! - (SSL_CTX_load_verify_locations (ctx, eXosip_tls_ctx_params.root_ca_cert, 0))) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't read CA list\n")); - } - SSL_CTX_set_verify_depth (ctx, 5); + //BIO_from_keystore("/system/etc/security/cacerts.bks"); + STACK_OF(X509_INFO) *stack = NULL; + int i; + if (bio) { + stack = PEM_X509_INFO_read_bio(bio, NULL, NULL, NULL); + BIO_free(bio); + } + if (!stack) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't keystore from /system/etc/security/cacerts.bks\n")); + } else { + int count = sk_X509_INFO_num(stack); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Loading %d X509 certificates\n", count)); + for (i = 0; i < count; ++i) { + X509_INFO *info = sk_X509_INFO_value(stack, i); + if (info->x509) { + X509_STORE_add_cert(ctx->cert_store, info->x509); + } + if (info->crl) { + X509_STORE_add_crl(ctx->cert_store, info->crl); + } + sk_X509_INFO_pop_free(stack, X509_INFO_free); + } + } +#endif - SSL_CTX_set_options (ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | - SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION | - SSL_OP_CIPHER_SERVER_PREFERENCE); - if (!(SSL_CTX_use_PrivateKey_file (ctx, keyfile, SSL_FILETYPE_PEM))) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't read key file: %s\n", keyfile)); - return OSIP_SUCCESS; - } + /* Load the CAs we trust */ + { + char *caFile = 0, *caFolder = 0; + +#ifdef WIN32 + WIN32_FIND_DATA FileData; + HANDLE hSearch; + char szDirPath[1024]; + WCHAR wUnicodeDirPath[2048]; + snprintf(szDirPath, sizeof(szDirPath), "%s", eXosip_tls_ctx_params.root_ca_cert); + + MultiByteToWideChar(CP_UTF8, 0, szDirPath, -1, wUnicodeDirPath, 2048); + hSearch = FindFirstFile(wUnicodeDirPath, &FileData); + if (hSearch != INVALID_HANDLE_VALUE) + { + if ((FileData.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) + caFolder = eXosip_tls_ctx_params.root_ca_cert; + else + caFile = eXosip_tls_ctx_params.root_ca_cert; + } else { + caFile = eXosip_tls_ctx_params.root_ca_cert; + } +#else + int fd = open(eXosip_tls_ctx_params.root_ca_cert, O_RDONLY); + if (fd >= 0) { + struct stat fileStat; + if (fstat(fd, &fileStat) < 0) { + + } else { + if (S_ISDIR(fileStat.st_mode)) { + caFolder = eXosip_tls_ctx_params.root_ca_cert; + } else { + caFile = eXosip_tls_ctx_params.root_ca_cert; + } + } + close(fd); + } +#endif - if (!SSL_CTX_check_private_key (ctx)) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "check_private_key: Key '%s' does not match the public key of the certificate\n", - SSL_FILETYPE_PEM)); - return NULL; - } - load_dh_params (ctx, eXosip_tls_ctx_params.dh_param); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "eXosip: Trusted CA %s : '%s'\n", caFolder?"folder":"file", eXosip_tls_ctx_params.root_ca_cert)); + + if (! + (SSL_CTX_load_verify_locations + (ctx, caFile, caFolder))) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't read CA list ('%s')\n", eXosip_tls_ctx_params.root_ca_cert)); + + { + int verify_mode = SSL_VERIFY_NONE; + verify_mode = SSL_VERIFY_PEER; + + SSL_CTX_set_verify(ctx, verify_mode, &verify_cb); + SSL_CTX_set_verify_depth(ctx, ex_verify_depth + 1); + } + } + + SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | + SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION | + SSL_OP_CIPHER_SERVER_PREFERENCE); + + if(!SSL_CTX_set_cipher_list(ctx,"ALL")) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "set_cipher_list: cannot set anonymous DH cipher\n")); + SSL_CTX_free(ctx); + return NULL; + } + + if (_tls_add_certificates(ctx) <= 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot load certificates from Microsoft Certificate Store")); + } + + return ctx; +} + +SSL_CTX *initialize_server_ctx(const char *keyfile, const char *certfile, + const char *password, int transport) +{ + SSL_METHOD *meth = NULL; + SSL_CTX *ctx; + X509 *cert = NULL; + + int s_server_session_id_context = 1; + + if (transport == IPPROTO_UDP) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO3, NULL, + "DTLS-UDP server method\n")); +#if !(OPENSSL_VERSION_NUMBER < 0x00908000L) + meth = DTLSv1_server_method(); +#endif + } else if (transport == IPPROTO_TCP) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO3, NULL, + "TLS server method\n")); + meth = TLSv1_server_method(); + } else { + return NULL; + } + + ctx = SSL_CTX_new(meth); + + if (ctx == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't create SSL_CTX!\n")); + SSL_CTX_free(ctx); + return NULL; + } + + if (transport == IPPROTO_UDP) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO3, NULL, + "DTLS-UDP read ahead\n")); + SSL_CTX_set_read_ahead(ctx, 1); + } + + if (tls_local_cn_name[0] != '\0') { + cert = _tls_set_certificate(ctx, tls_local_cn_name); + } + if (cert == NULL && certfile[0] != '\0') { + if (!(SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM))) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't read certificate file!\n")); + SSL_CTX_free(ctx); + return NULL; + } + /* THIS CODE IS WRONG??? */ + /* SSL_CTX_free(ctx); */ + /* return NULL; */ + } + + if (_tls_add_certificates(ctx) <= 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot load certificates from Microsoft Certificate Store")); + } + + generate_eph_rsa_key(ctx); + + SSL_CTX_set_session_id_context(ctx, (void *) &s_server_session_id_context, + sizeof s_server_session_id_context); + + if (password[0] != '\0') { + SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *) password); + SSL_CTX_set_default_passwd_cb(ctx, password_cb); + } + + /* Load the CAs we trust */ + if (! + (SSL_CTX_load_verify_locations + (ctx, eXosip_tls_ctx_params.root_ca_cert, 0))) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't read CA list\n")); + } + { + int verify_mode = SSL_VERIFY_NONE; + /*verify_mode = SSL_VERIFY_PEER; */ + + SSL_CTX_set_verify(ctx, verify_mode, &verify_cb); + SSL_CTX_set_verify_depth(ctx, ex_verify_depth + 1); + } + + SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | + SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION | + SSL_OP_CIPHER_SERVER_PREFERENCE); + + if (cert == NULL && keyfile[0] != '\0') { + if (!(SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM))) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't read key file: %s\n", keyfile)); + SSL_CTX_free(ctx); + return NULL; + } + } + + if (cert != NULL || certfile[0] != '\0') { + if (!SSL_CTX_check_private_key(ctx)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "check_private_key: Key does not match the public key of the certificate\n")); + SSL_CTX_free(ctx); + return NULL; + } + } + + if (cert == NULL && certfile[0] == '\0') { + if(!SSL_CTX_set_cipher_list(ctx,"ADH")) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "set_cipher_list: cannot set anonymous DH cipher\n")); + SSL_CTX_free(ctx); + return NULL; + } + } + + if (cert!=NULL) + { + X509_free(cert); + cert = NULL; + } + + if (cert == NULL && certfile[0] == '\0') + build_dh_params(ctx); + else + load_dh_params(ctx, eXosip_tls_ctx_params.dh_param); - generate_eph_rsa_key (ctx); + generate_eph_rsa_key(ctx); - SSL_CTX_set_session_id_context (ctx, (void *) &s_server_session_id_context, - sizeof s_server_session_id_context); + SSL_CTX_set_session_id_context(ctx, (void *) &s_server_session_id_context, + sizeof s_server_session_id_context); - return ctx; + return ctx; } /** @@ -484,1083 +1359,1766 @@ * Preprocessor directives. *@return < 0 if an error occured **/ -static int -tls_tl_open (void) +static int tls_tl_open(void) { - int res; - struct addrinfo *addrinfo = NULL; - struct addrinfo *curinfo; - int sock = -1; - - if (eXtl_tls.proto_port < 0) - eXtl_tls.proto_port = 5061; - - // initialization (outside initialize_server_ctx) - SSL_library_init (); - SSL_load_error_strings (); + int res; + struct addrinfo *addrinfo = NULL; + struct addrinfo *curinfo; + int sock = -1; + + if (eXtl_tls.proto_port < 0) + eXtl_tls.proto_port = 5061; + + /* initialization (outside initialize_server_ctx) */ + SSL_library_init(); + SSL_load_error_strings(); + + server_ctx = initialize_server_ctx(eXosip_tls_ctx_params.server.priv_key, + eXosip_tls_ctx_params.server.cert, + eXosip_tls_ctx_params.server.priv_key_pw, + IPPROTO_TCP); + + /* always initialize the client */ + client_ctx = initialize_client_ctx(eXosip_tls_ctx_params.client.priv_key, + eXosip_tls_ctx_params.client.cert, + eXosip_tls_ctx_params.client.priv_key_pw, + IPPROTO_TCP); - if (eXosip_tls_ctx_params.server.cert[0] != '\0') - { - ssl_ctx = initialize_server_ctx (eXosip_tls_ctx_params.server.priv_key, - eXosip_tls_ctx_params.server.cert, - eXosip_tls_ctx_params.server.priv_key_pw, - IPPROTO_TCP); - } - //always initialize the client - client_ctx = initialize_client_ctx (eXosip_tls_ctx_params.client.priv_key, - eXosip_tls_ctx_params.client.cert, - eXosip_tls_ctx_params.server.priv_key_pw, - IPPROTO_TCP); - -//only necessary under Windows-based OS, unix-like systems use /dev/random or /dev/urandom +/*only necessary under Windows-based OS, unix-like systems use /dev/random or /dev/urandom */ #if defined(WIN32) || defined(_WINDOWS) #if 0 - //check if a file with random data is present --> will be verified when random file is needed - if (eXosip_tls_ctx_params.random_file[0] == '\0') - { - return TLS_ERR_NO_RAND; - } + /* check if a file with random data is present --> will be verified when random file is needed */ + if (eXosip_tls_ctx_params.random_file[0] == '\0') { + return TLS_ERR_NO_RAND; + } #endif - /* Load randomness */ - if (!(RAND_load_file (eXosip_tls_ctx_params.random_file, 1024 * 1024))) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Couldn't load randomness\n")); + /* Load randomness */ + if (!(RAND_load_file(eXosip_tls_ctx_params.random_file, 1024 * 1024))) + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Couldn't load randomness\n")); #endif - res = eXosip_get_addrinfo (&addrinfo, - eXtl_tls.proto_ifs, - eXtl_tls.proto_port, eXtl_tls.proto_num); - if (res) - return -1; - - for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) - { - socklen_t len; - - if (curinfo->ai_protocol && curinfo->ai_protocol != eXtl_tls.proto_num) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); - continue; - } - - sock = (int) socket (curinfo->ai_family, curinfo->ai_socktype, - curinfo->ai_protocol); - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot create socket %s!\n", strerror (errno))); - continue; - } + res = eXosip_get_addrinfo(&addrinfo, + eXtl_tls.proto_ifs, + eXtl_tls.proto_port, eXtl_tls.proto_num); + if (res) + return -1; + + for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) { + socklen_t len; + + if (curinfo->ai_protocol && curinfo->ai_protocol != eXtl_tls.proto_num) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); + continue; + } + + sock = (int) socket(curinfo->ai_family, curinfo->ai_socktype, + curinfo->ai_protocol); + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot create socket %s!\n", strerror(ex_errno))); + continue; + } - if (curinfo->ai_family == AF_INET6) - { + if (curinfo->ai_family == AF_INET6) { #ifdef IPV6_V6ONLY - if (setsockopt_ipv6only (sock)) - { - close (sock); - sock = -1; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot set socket option %s!\n", - strerror (errno))); - continue; - } -#endif /* IPV6_V6ONLY */ - } - - res = bind (sock, curinfo->ai_addr, curinfo->ai_addrlen); - if (res < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - eXtl_tls.proto_ifs, curinfo->ai_family, strerror (errno))); - close (sock); - sock = -1; - continue; - } - len = sizeof (ai_addr); - res = getsockname (sock, (struct sockaddr *) &ai_addr, &len); - if (res != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot get socket name (%s)\n", strerror (errno))); - memcpy (&ai_addr, curinfo->ai_addr, curinfo->ai_addrlen); - } - - if (eXtl_tls.proto_num == IPPROTO_TCP) - { - res = listen (sock, SOMAXCONN); - if (res < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - eXtl_tls.proto_ifs, curinfo->ai_family, - strerror (errno))); - close (sock); - sock = -1; - continue; - } - } - - break; - } - - eXosip_freeaddrinfo (addrinfo); - - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind on port: %i\n", eXtl_tls.proto_port)); - return -1; - } - - tls_socket = sock; - - if (eXtl_tls.proto_port == 0) - { - /* get port number from socket */ - if (eXtl_tls.proto_family == AF_INET) - eXtl_tls.proto_port = ntohs (((struct sockaddr_in *) &ai_addr)->sin_port); - else - eXtl_tls.proto_port = - ntohs (((struct sockaddr_in6 *) &ai_addr)->sin6_port); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: Binding on port %i!\n", eXtl_tls.proto_port)); - } - - snprintf (tls_firewall_port, sizeof (tls_firewall_port), "%i", - eXtl_tls.proto_port); - return OSIP_SUCCESS; -} - -static int -tls_tl_set_fdset (fd_set * osip_fdset, int *fd_max) -{ - int pos; - if (tls_socket <= 0) - return -1; - - eXFD_SET (tls_socket, osip_fdset); - - if (tls_socket > *fd_max) - *fd_max = tls_socket; - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tls_socket_tab[pos].socket > 0) - { - eXFD_SET (tls_socket_tab[pos].socket, osip_fdset); - if (tls_socket_tab[pos].socket > *fd_max) - *fd_max = tls_socket_tab[pos].socket; - } - } - - return OSIP_SUCCESS; -} - -int static -print_ssl_error (int err) -{ - switch (err) - { - case SSL_ERROR_NONE: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL ERROR NONE - OK\n")); - break; - case SSL_ERROR_ZERO_RETURN: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL ERROR ZERO RETURN - SHUTDOWN\n")); - break; - case SSL_ERROR_WANT_READ: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL want read\n")); - break; - case SSL_ERROR_WANT_WRITE: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL want write\n")); - break; - case SSL_ERROR_SSL: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL ERROR\n")); - break; - case SSL_ERROR_SYSCALL: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL ERROR SYSCALL\n")); - break; - default: - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL problem\n")); - } - return OSIP_SUCCESS; -} - -static int -tls_tl_read_message (fd_set * osip_fdset) -{ - int pos = 0; - char *buf; + if (setsockopt_ipv6only(sock)) { + close(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot set socket option %s!\n", + strerror(ex_errno))); + continue; + } +#endif /* IPV6_V6ONLY */ + } + + res = bind(sock, curinfo->ai_addr, curinfo->ai_addrlen); + if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot bind socket node:%s family:%d %s\n", + eXtl_tls.proto_ifs, curinfo->ai_family, strerror(ex_errno))); + close(sock); + sock = -1; + continue; + } + len = sizeof(ai_addr); + res = getsockname(sock, (struct sockaddr *) &ai_addr, &len); + if (res != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot get socket name (%s)\n", strerror(ex_errno))); + memcpy(&ai_addr, curinfo->ai_addr, curinfo->ai_addrlen); + } + + if (eXtl_tls.proto_num == IPPROTO_TCP) { + res = listen(sock, SOMAXCONN); + if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot bind socket node:%s family:%d %s\n", + eXtl_tls.proto_ifs, curinfo->ai_family, + strerror(ex_errno))); + close(sock); + sock = -1; + continue; + } + } + + break; + } + + eXosip_freeaddrinfo(addrinfo); + + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot bind on port: %i\n", eXtl_tls.proto_port)); + return -1; + } + + tls_socket = sock; + + if (eXtl_tls.proto_port == 0) { + /* get port number from socket */ + if (eXtl_tls.proto_family == AF_INET) + eXtl_tls.proto_port = + ntohs(((struct sockaddr_in *) &ai_addr)->sin_port); + else + eXtl_tls.proto_port = + ntohs(((struct sockaddr_in6 *) &ai_addr)->sin6_port); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: Binding on port %i!\n", eXtl_tls.proto_port)); + } + + snprintf(tls_firewall_port, sizeof(tls_firewall_port), "%i", + eXtl_tls.proto_port); + return OSIP_SUCCESS; +} + +static int tls_tl_set_fdset(fd_set * osip_fdset, fd_set * osip_wrset, int *fd_max) +{ + int pos; + if (tls_socket <= 0) + return -1; + + eXFD_SET(tls_socket, osip_fdset); + + if (tls_socket > *fd_max) + *fd_max = tls_socket; + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tls_socket_tab[pos].socket > 0) { + eXFD_SET(tls_socket_tab[pos].socket, osip_fdset); + if (tls_socket_tab[pos].socket > *fd_max) + *fd_max = tls_socket_tab[pos].socket; + if (tls_socket_tab[pos].sendbuflen > 0) + eXFD_SET (tls_socket_tab[pos].socket, osip_wrset); + } + } + + return OSIP_SUCCESS; +} + +int static print_ssl_error(int err) +{ + switch (err) { + case SSL_ERROR_NONE: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL ERROR NONE - OK\n")); + break; + case SSL_ERROR_ZERO_RETURN: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL ERROR ZERO RETURN - SHUTDOWN\n")); + break; + case SSL_ERROR_WANT_READ: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL want read\n")); + break; + case SSL_ERROR_WANT_WRITE: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL want write\n")); + break; + case SSL_ERROR_SSL: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL ERROR\n")); + break; + case SSL_ERROR_SYSCALL: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL ERROR SYSCALL\n")); + break; + default: + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "SSL problem\n")); + } + return OSIP_SUCCESS; +} + + +static void tls_dump_verification_failure(long verification_result) +{ + char tmp[64]; + + snprintf(tmp, sizeof(tmp), "unknown errror"); + switch (verification_result) { + case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: + snprintf(tmp, sizeof(tmp), "unable to get issuer certificate"); + break; + case X509_V_ERR_UNABLE_TO_GET_CRL: + snprintf(tmp, sizeof(tmp), "unable to get certificate CRL"); + break; + case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE: + snprintf(tmp, sizeof(tmp), "unable to decrypt certificate's signature"); + break; + case X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE: + snprintf(tmp, sizeof(tmp), "unable to decrypt CRL's signature"); + break; + case X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY: + snprintf(tmp, sizeof(tmp), "unable to decode issuer public key"); + break; + case X509_V_ERR_CERT_SIGNATURE_FAILURE: + snprintf(tmp, sizeof(tmp), "certificate signature failure"); + break; + case X509_V_ERR_CRL_SIGNATURE_FAILURE: + snprintf(tmp, sizeof(tmp), "CRL signature failure"); + break; + case X509_V_ERR_CERT_NOT_YET_VALID: + snprintf(tmp, sizeof(tmp), "certificate is not yet valid"); + break; + case X509_V_ERR_CERT_HAS_EXPIRED: + snprintf(tmp, sizeof(tmp), "certificate has expired"); + break; + case X509_V_ERR_CRL_NOT_YET_VALID: + snprintf(tmp, sizeof(tmp), "CRL is not yet valid"); + break; + case X509_V_ERR_CRL_HAS_EXPIRED: + snprintf(tmp, sizeof(tmp), "CRL has expired"); + break; + case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: + snprintf(tmp, sizeof(tmp), + "format error in certificate's notBefore field"); + break; + case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: + snprintf(tmp, sizeof(tmp), "format error in certificate's notAfter field"); + break; + case X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD: + snprintf(tmp, sizeof(tmp), "format error in CRL's lastUpdate field"); + break; + case X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD: + snprintf(tmp, sizeof(tmp), "format error in CRL's nextUpdate field"); + break; + case X509_V_ERR_OUT_OF_MEM: + snprintf(tmp, sizeof(tmp), "out of memory"); + break; + case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: + snprintf(tmp, sizeof(tmp), "self signed certificate"); + break; + case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN: + snprintf(tmp, sizeof(tmp), "self signed certificate in certificate chain"); + break; + case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY: + snprintf(tmp, sizeof(tmp), "unable to get local issuer certificate"); + break; + case X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE: + snprintf(tmp, sizeof(tmp), "unable to verify the first certificate"); + break; + case X509_V_ERR_CERT_CHAIN_TOO_LONG: + snprintf(tmp, sizeof(tmp), "certificate chain too long"); + break; + case X509_V_ERR_CERT_REVOKED: + snprintf(tmp, sizeof(tmp), "certificate revoked"); + break; + case X509_V_ERR_INVALID_CA: + snprintf(tmp, sizeof(tmp), "invalid CA certificate"); + break; + case X509_V_ERR_PATH_LENGTH_EXCEEDED: + snprintf(tmp, sizeof(tmp), "path length constraint exceeded"); + break; + case X509_V_ERR_INVALID_PURPOSE: + snprintf(tmp, sizeof(tmp), "unsupported certificate purpose"); + break; + case X509_V_ERR_CERT_UNTRUSTED: + snprintf(tmp, sizeof(tmp), "certificate not trusted"); + break; + case X509_V_ERR_CERT_REJECTED: + snprintf(tmp, sizeof(tmp), "certificate rejected"); + break; + case X509_V_ERR_SUBJECT_ISSUER_MISMATCH: + snprintf(tmp, sizeof(tmp), "subject issuer mismatch"); + break; + case X509_V_ERR_AKID_SKID_MISMATCH: + snprintf(tmp, sizeof(tmp), + "authority and subject key identifier mismatch"); + break; + case X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH: + snprintf(tmp, sizeof(tmp), "authority and issuer serial number mismatch"); + break; + case X509_V_ERR_KEYUSAGE_NO_CERTSIGN: + snprintf(tmp, sizeof(tmp), + "key usage does not include certificate signing"); + break; + case X509_V_ERR_APPLICATION_VERIFICATION: + snprintf(tmp, sizeof(tmp), "application verification failure"); + break; + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "verification failure: %s\n", tmp)); +} + +static int _tls_tl_is_connected(int sock) +{ + int res; + struct timeval tv; + fd_set wrset; + int valopt; + socklen_t sock_len; + tv.tv_sec = SOCKET_TIMEOUT / 1000; + tv.tv_usec = (SOCKET_TIMEOUT % 1000) * 1000; + + FD_ZERO(&wrset); + FD_SET(sock, &wrset); + + res = select(sock + 1, NULL, &wrset, NULL, &tv); + if (res > 0) { + sock_len = sizeof(int); + if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void *) (&valopt), &sock_len) + == 0) { + if (valopt) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node / %s[%d]\n", + strerror(ex_errno), valopt)); + return -1; + } else { + return 0; + } + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node / error in getsockopt %s[%d]\n", + strerror(ex_errno), ex_errno)); + return -1; + } + } else if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node / error in select %s[%d]\n", + strerror(ex_errno), ex_errno)); + return -1; + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node / select timeout (%d ms)\n", + SOCKET_TIMEOUT)); + return 1; + } +} + +static int _tls_tl_check_connected() +{ + int pos; + int res; + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tls_socket_tab[pos].socket > 0 + && tls_socket_tab[pos].ai_addrlen > 0) { + if (tls_socket_tab[pos].ssl_state>0) + { + /* already connected */ + tls_socket_tab[pos].ai_addrlen = 0; + continue; + } + + res = connect(tls_socket_tab[pos].socket, &tls_socket_tab[pos].ai_addr, tls_socket_tab[pos].ai_addrlen); + if (res < 0) { + int status = ex_errno; +#if defined(_WIN32_WCE) || defined(WIN32) + if (status == WSAEISCONN) { + tls_socket_tab[pos].ai_addrlen=0; /* already connected */ + continue; + } +#else + if (status == EISCONN) { + tls_socket_tab[pos].ai_addrlen=0; /* already connected */ + continue; + } +#endif +#if defined(_WIN32_WCE) || defined(WIN32) + if (status != WSAEWOULDBLOCK && status != WSAEALREADY && status != WSAEINVAL) { +#else + if (status != EINPROGRESS && status != EALREADY) { +#endif + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "_tls_tl_check_connected: Cannot connect socket node:%s:%i, socket %d [pos=%d], family:%d, %s[%d]\n", + tls_socket_tab[pos].remote_ip, + tls_socket_tab[pos].remote_port, + tls_socket_tab[pos].socket, + pos, + tls_socket_tab[pos].ai_addr.sa_family, + strerror(status), + status)); + _tls_tl_close_sockinfo(&tls_socket_tab[pos]); + continue; + } else { + res = _tls_tl_is_connected(tls_socket_tab[pos].socket); + if (res > 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "_tls_tl_check_connected: socket node:%s:%i, socket %d [pos=%d], family:%d, in progress\n", + tls_socket_tab[pos].remote_ip, + tls_socket_tab[pos].remote_port, + tls_socket_tab[pos].socket, + pos, + tls_socket_tab[pos].ai_addr.sa_family)); + continue; + } else if (res == 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "_tls_tl_check_connected: socket node:%s:%i , socket %d [pos=%d], family:%d, connected\n", + tls_socket_tab[pos].remote_ip, + tls_socket_tab[pos].remote_port, + tls_socket_tab[pos].socket, + pos, + tls_socket_tab[pos].ai_addr.sa_family)); + /* stop calling "connect()" */ + tls_socket_tab[pos].ai_addrlen=0; + tls_socket_tab[pos].ssl_state=1; + continue; + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "_tls_tl_check_connected: socket node:%s:%i, socket %d [pos=%d], family:%d, error\n", + tls_socket_tab[pos].remote_ip, + tls_socket_tab[pos].remote_port, + tls_socket_tab[pos].socket, + pos, + tls_socket_tab[pos].ai_addr.sa_family)); + _tls_tl_close_sockinfo(&tls_socket_tab[pos]); + continue; + } + } + } + else + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "_tls_tl_check_connected: socket node:%s:%i , socket %d [pos=%d], family:%d, connected (with connect)\n", + tls_socket_tab[pos].remote_ip, + tls_socket_tab[pos].remote_port, + tls_socket_tab[pos].socket, + pos, + tls_socket_tab[pos].ai_addr.sa_family)); + /* stop calling "connect()" */ + tls_socket_tab[pos].ai_addrlen=0; + } + } + } + return 0; +} + +static int _tls_tl_ssl_connect_socket(struct socket_tab *sockinfo) +{ + X509 *cert; + BIO *sbio; + int res; + + if (sockinfo->ssl_ctx == NULL) { + sockinfo->ssl_ctx = + initialize_client_ctx(eXosip_tls_ctx_params.client.priv_key, + eXosip_tls_ctx_params.client.cert, + eXosip_tls_ctx_params.client.priv_key_pw, + IPPROTO_TCP); + + /* FIXME: changed parameter from ctx to client_ctx -> works now */ + sockinfo->ssl_conn = SSL_new(sockinfo->ssl_ctx); + if (sockinfo->ssl_conn == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL_new error\n")); + return -1; + } + sbio = BIO_new_socket(sockinfo->socket, BIO_NOCLOSE); + + if (sbio == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "BIO_new_socket error\n")); + return -1; + } + SSL_set_bio(sockinfo->ssl_conn, sbio, sbio); + + } + + if (SSL_is_init_finished(sockinfo->ssl_conn)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "SSL_is_init_finished already done\n")); + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "SSL_is_init_finished not already done\n")); + } + + do { + struct timeval tv; + int fd; + fd_set readfds; + + res = SSL_connect(sockinfo->ssl_conn); + res = SSL_get_error(sockinfo->ssl_conn, res); + if (res == SSL_ERROR_NONE) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "SSL_connect succeeded\n")); + break; + } + + if (res != SSL_ERROR_WANT_READ && res != SSL_ERROR_WANT_WRITE) { + print_ssl_error(res); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL_connect error\n")); + return -1; + } + + tv.tv_sec = SOCKET_TIMEOUT / 1000; + tv.tv_usec = (SOCKET_TIMEOUT % 1000) * 1000; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "SSL_connect retry\n")); + + fd = SSL_get_fd(sockinfo->ssl_conn); + FD_ZERO(&readfds); + FD_SET(fd, &readfds); + res = select(fd + 1, &readfds, NULL, NULL, &tv); + if (res < 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "SSL_connect select(read) error (%s)\n", + strerror(ex_errno))); + return -1; + } else if (res > 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "SSL_connect (read done)\n")); + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "SSL_connect (timeout not data to read) (%d ms)\n", + SOCKET_TIMEOUT)); + return 1; + } + } while (!SSL_is_init_finished(sockinfo->ssl_conn)); + + if (SSL_is_init_finished(sockinfo->ssl_conn)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "SSL_is_init_finished done\n")); + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "SSL_is_init_finished failed\n")); + } + + cert = SSL_get_peer_certificate(sockinfo->ssl_conn); + if (cert != 0) { + int cert_err; + tls_dump_cert_info("tls_connect: remote certificate: ", cert); + + cert_err = SSL_get_verify_result(sockinfo->ssl_conn); + if (cert_err != X509_V_OK) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Failed to verify remote certificate\n")); + tls_dump_verification_failure(cert_err); + + if (eXosip_tls_ctx_params.server.cert[0] != '\0') { + X509_free(cert); + return -1; + } else if (cert_err != X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT + && cert_err != X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN + && cert_err != X509_V_ERR_CRL_HAS_EXPIRED + && cert_err != X509_V_ERR_CERT_HAS_EXPIRED + && cert_err != X509_V_ERR_CERT_REVOKED + && cert_err != X509_V_ERR_CERT_UNTRUSTED + && cert_err != X509_V_ERR_CERT_REJECTED) { + X509_free(cert); + return -1; + } + /*else -> I want to keep going ONLY when API didn't specified + any SSL server certificate */ + } +#if 0 + { + char peer_CN[65]; + memset(peer_CN, 0, sizeof(peer_CN)); + X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, + peer_CN, sizeof(peer_CN)); + if (osip_strcasecmp(sockinfo->remote_ip, peer_CN) != 0) { + SSL_set_verify_result(m_pSSL, + X509_V_ERR_APPLICATION_VERIFICATION + 1); + } + } +#endif - if (FD_ISSET (tls_socket, osip_fdset)) - { - /* accept incoming connection */ - char src6host[NI_MAXHOST]; - int recvport = 0; - struct sockaddr_storage sa; - int sock; - int i; + X509_free(cert); + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "No certificate received\n")); + /* X509_free is not necessary because no cert-object was created -> cert == NULL */ + if (eXosip_tls_ctx_params.server.cert[0] == '\0') { +#ifdef ENABLE_ADH + /* how can we guess a user want ADH... specific APIs.. */ + sockinfo->ssl_state = 3; + return 0; +#endif + } + + return -1; + } + + sockinfo->ssl_state = 3; + return 0; +} + +/* Like strstr, but works for haystack that may contain binary data and is + not NUL-terminated. */ +static char *buffer_find(const char *haystack, size_t haystack_len, const char *needle) +{ + const char *search = haystack, *end = haystack + haystack_len; + char *p; + size_t len = strlen(needle); + + while (search < end && + (p = memchr(search, *needle, end - search)) != NULL) { + if (p + len > end) + break; + if (memcmp(p, needle, len) == 0) + return (p); + search = p + 1; + } + + return (NULL); +} + +#define END_HEADERS_STR "\r\n\r\n" +#define CLEN_HEADER_STR "\r\ncontent-length:" +#define CLEN_HEADER_COMPACT_STR "\r\nl:" +#define CLEN_HEADER_STR2 "\r\ncontent-length " +#define CLEN_HEADER_COMPACT_STR2 "\r\nl " +#define const_strlen(x) (sizeof((x)) - 1) + +/* consume any complete messages in sockinfo->buf and + return the total number of bytes consumed */ +static int handle_messages(struct socket_tab *sockinfo) +{ + int consumed = 0; + char *buf = sockinfo->buf; + size_t buflen = sockinfo->buflen; + char *end_headers; + while (buflen > 0 && (end_headers = buffer_find(buf, buflen, END_HEADERS_STR)) != NULL) { + int clen, msglen; + char *clen_header; + + if (buf == end_headers) + { + /* skip tcp standard keep-alive */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket %s:%i: standard keep alive received (CRLFCRLF)\n", + sockinfo->remote_ip, sockinfo->remote_port, buf)); + consumed += 4; + buflen -= 4; + buf += 4; + continue; + } + + /* stuff a nul in so we can use osip_strcasestr */ + *end_headers = '\0'; + + /* ok we have complete headers, find content-length: or l: */ + clen_header = osip_strcasestr(buf, CLEN_HEADER_STR); + if (!clen_header) + clen_header = osip_strcasestr(buf, CLEN_HEADER_STR2); + if (!clen_header) + clen_header = osip_strcasestr(buf, CLEN_HEADER_COMPACT_STR); + if (!clen_header) + clen_header = osip_strcasestr(buf, CLEN_HEADER_COMPACT_STR2); + if (clen_header != NULL) + { + clen_header = strchr(clen_header, ':'); + clen_header++; + } + if (!clen_header) + { + /* Oops, no content-length header. Presume 0 (below) so we + consume the headers and make forward progress. This permits + server-side keepalive of "\r\n\r\n". */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket %s:%i: message has no content-length: <%s>\n", + sockinfo->remote_ip, sockinfo->remote_port, buf)); + } + clen = clen_header ? atoi(clen_header) : 0; + + /* undo our overwrite and advance end_headers */ + *end_headers = END_HEADERS_STR[0]; + end_headers += const_strlen(END_HEADERS_STR); + + /* do we have the whole message? */ + msglen = end_headers - buf + clen; + if (msglen > buflen) { + /* nope */ + return consumed; + } + /* yep; handle the message */ + _eXosip_handle_incoming_message(buf, msglen, sockinfo->socket, + sockinfo->remote_ip, sockinfo->remote_port); + consumed += msglen; + buflen -= msglen; + buf += msglen; + } + + return consumed; +} + +static int _tls_tl_recv(struct socket_tab *sockinfo) +{ + int r; + int rlen, err; + if (!sockinfo->buf) { + sockinfo->buf = (char *) osip_malloc(SIP_MESSAGE_MAX_LENGTH); + if (sockinfo->buf == NULL) + return OSIP_NOMEM; + sockinfo->bufsize = SIP_MESSAGE_MAX_LENGTH; + sockinfo->buflen = 0; + } + + /* buffer is 100% full -> realloc with more size */ + if (sockinfo->bufsize - sockinfo->buflen<=0) + { + sockinfo->buf = (char *)osip_realloc(sockinfo->buf, sockinfo->bufsize+1000); + if (sockinfo->buf == NULL) + return OSIP_NOMEM; + sockinfo->bufsize = sockinfo->bufsize+1000; + } + + /* buffer is 100% empty-> realloc with initial size */ + if (sockinfo->buflen == 0 && sockinfo->bufsize>SIP_MESSAGE_MAX_LENGTH) + { + osip_free(sockinfo->buf); + sockinfo->buf = (char *) osip_malloc(SIP_MESSAGE_MAX_LENGTH); + if (sockinfo->buf == NULL) + return OSIP_NOMEM; + sockinfo->bufsize = SIP_MESSAGE_MAX_LENGTH; + } + + + /* do TLS handshake? */ + + if (sockinfo->ssl_state == 0) { + r = _tls_tl_is_connected(sockinfo->socket); + if (r > 0) { + return OSIP_SUCCESS; + } else if (r == 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s , socket %d [pos=%d], connected\n", + sockinfo->remote_ip, + sockinfo->socket, -1)); + sockinfo->ssl_state = 1; + sockinfo->ai_addrlen = 0; + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "socket node:%s, socket %d [pos=%d], socket error\n", + sockinfo->remote_ip, + sockinfo->socket, -1)); + _tls_tl_close_sockinfo(sockinfo); + return OSIP_SUCCESS; + } + } + + if (sockinfo->ssl_state == 1) { + r = _tls_tl_ssl_connect_socket(sockinfo); + if (r < 0) { + _tls_tl_close_sockinfo(sockinfo); + return OSIP_SUCCESS; + } + } + + if (sockinfo->ssl_state == 2) { + r = SSL_do_handshake(sockinfo->ssl_conn); + if (r <= 0) { + r = SSL_get_error(sockinfo->ssl_conn, r); + print_ssl_error(r); + + _tls_tl_close_sockinfo(sockinfo); + return OSIP_SUCCESS; + } + sockinfo->ssl_state = 3; + } + + if (sockinfo->ssl_state != 3) + return OSIP_SUCCESS; + + + + r = 0; + rlen = 0; + + do { + r = SSL_read(sockinfo->ssl_conn, sockinfo->buf + sockinfo->buflen + rlen, + sockinfo->bufsize - sockinfo->buflen - rlen); + if (r <= 0) { + err = SSL_get_error(sockinfo->ssl_conn, r); + if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) { + break; + } else { + print_ssl_error(err); + /* + The TLS/SSL connection has been closed. If the protocol version + is SSL 3.0 or TLS 1.0, this result code is returned only if a + closure alert has occurred in the protocol, i.e. if the + connection has been closed cleanly. Note that in this case + SSL_ERROR_ZERO_RETURN does not necessarily indicate that the + underlying transport has been closed. */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, + NULL, "TLS closed\n")); + + _tls_tl_close_sockinfo(sockinfo); + + rlen = 0; /* discard any remaining data ? */ + break; + } + } else { + rlen += r; + } + } + while (SSL_pending(sockinfo->ssl_conn)); + + if (r == 0) { + //OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + // "socket %s:%i: eof\n", sockinfo->remote_ip, sockinfo->remote_port)); + //_tls_tl_close_sockinfo(sockinfo); + //eXosip_mark_all_registrations_expired(); + return OSIP_UNDEFINED_ERROR; + } else if (r < 0) { + //int status = ex_errno; + //if (is_wouldblock_error(status)) + // return OSIP_SUCCESS; + /* Do we need next line ? */ + /* else if (is_connreset_error(status)) */ + //eXosip_mark_all_registrations_expired(); + //OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + // "socket %s:%i: error %d\n", sockinfo->remote_ip, sockinfo->remote_port, status)); + //_tls_tl_close_sockinfo(sockinfo); + return OSIP_UNDEFINED_ERROR; + } else { + int consumed; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "socket %s:%i: read %d bytes\n", sockinfo->remote_ip, sockinfo->remote_port, r)); + sockinfo->buflen += rlen; + consumed = handle_messages(sockinfo); + if (consumed == 0) { + return OSIP_SUCCESS; + } else { + if (sockinfo->buflen > consumed) { + memmove(sockinfo->buf, sockinfo->buf + consumed, sockinfo->buflen - consumed); + sockinfo->buflen -= consumed; + } else { + sockinfo->buflen = 0; + } + return OSIP_SUCCESS; + } + } +} + +static int tls_tl_read_message(fd_set * osip_fdset, fd_set * osip_wrset) +{ + int pos = 0; + + if (FD_ISSET(tls_socket, osip_fdset)) { + /* accept incoming connection */ + char src6host[NI_MAXHOST]; + int recvport = 0; + struct sockaddr_storage sa; + int sock; + int i; #ifdef __linux - socklen_t slen; + socklen_t slen; #else - int slen; + int slen; #endif - SSL *ssl = NULL; - BIO *sbio; + SSL *ssl = NULL; + BIO *sbio; - if (eXtl_tls.proto_family == AF_INET) - slen = sizeof (struct sockaddr_in); - else - slen = sizeof (struct sockaddr_in6); - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tls_socket_tab[pos].socket <= 0) - break; - } - if (pos < 0) - { - /* delete an old one! */ - pos = 0; - if (tls_socket_tab[pos].socket > 0) - { - if (tls_socket_tab[pos].ssl_conn != NULL) - { - SSL_shutdown (tls_socket_tab[pos].ssl_conn); - SSL_shutdown (tls_socket_tab[pos].ssl_conn); - SSL_free (tls_socket_tab[pos].ssl_conn); - SSL_CTX_free (tls_socket_tab[pos].ssl_ctx); - } - close (tls_socket_tab[pos].socket); - } - memset (&tls_socket_tab[pos], 0, sizeof (struct socket_tab)); - } - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "creating TLS socket at index: %i\n", pos)); - - sock = accept (tls_socket, (struct sockaddr *) &sa, &slen); - if (sock < 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Error accepting TLS socket\n")); - } else - { - if (ssl_ctx != NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "TLS connection rejected\n")); - close (sock); - return -1; - } - - if (!SSL_CTX_check_private_key (ssl_ctx)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL CTX private key check error\n")); - } - - ssl = SSL_new (ssl_ctx); - if (ssl == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Cannot create ssl connection context\n")); - return -1; - } - - if (!SSL_check_private_key (ssl)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL private key check error\n")); - } - - sbio = BIO_new_socket (sock, BIO_NOCLOSE); - if (sbio == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "BIO_new_socket error\n")); - } - - SSL_set_bio (ssl, sbio, sbio); /* cannot fail */ - - i = SSL_accept (ssl); - if (i <= 0) - { - i = SSL_get_error (ssl, i); - print_ssl_error (i); - - - SSL_shutdown (ssl); - close (sock); - SSL_free (ssl); - if (tls_socket_tab[pos].ssl_ctx != NULL) - SSL_CTX_free (tls_socket_tab[pos].ssl_ctx); - - tls_socket_tab[pos].ssl_conn = NULL; - tls_socket_tab[pos].ssl_ctx = NULL; - tls_socket_tab[pos].socket = 0; - - return -1; - } - - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "New TLS connection accepted\n")); - - tls_socket_tab[pos].socket = sock; - tls_socket_tab[pos].ssl_conn = ssl; - tls_socket_tab[pos].ssl_state = 2; - - - memset (src6host, 0, sizeof (src6host)); - - if (eXtl_tls.proto_family == AF_INET) - recvport = ntohs (((struct sockaddr_in *) &sa)->sin_port); - else - recvport = ntohs (((struct sockaddr_in6 *) &sa)->sin6_port); + if (eXtl_tls.proto_family == AF_INET) + slen = sizeof(struct sockaddr_in); + else + slen = sizeof(struct sockaddr_in6); + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tls_socket_tab[pos].socket <= 0) + break; + } + if (pos == EXOSIP_MAX_SOCKETS) { + /* delete an old one! */ + pos = 0; + if (tls_socket_tab[pos].socket > 0) { + _tls_tl_close_sockinfo(&tls_socket_tab[pos]); + } + memset(&tls_socket_tab[pos], 0, sizeof(struct socket_tab)); + } + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO3, NULL, + "creating TLS socket at index: %i\n", pos)); + sock = accept(tls_socket, (struct sockaddr *) &sa, &slen); + if (sock < 0) { +#if defined(EBADF) + int status = ex_errno; +#endif + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Error accepting TLS socket\n")); +#if defined(EBADF) + if (status==EBADF) + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Error accepting TLS socket: EBADF\n")); + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + if (tls_socket > 0) + closesocket(tls_socket); + tls_tl_open(); + } +#endif + } else { + if (server_ctx == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "TLS connection rejected\n")); + close(sock); + return -1; + } + + if (!SSL_CTX_check_private_key(server_ctx)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL CTX private key check error\n")); + } + + ssl = SSL_new(server_ctx); + if (ssl == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot create ssl connection context\n")); + return -1; + } + + if (!SSL_check_private_key(ssl)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL private key check error\n")); + } + + sbio = BIO_new_socket(sock, BIO_NOCLOSE); + if (sbio == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "BIO_new_socket error\n")); + } + + SSL_set_bio(ssl, sbio, sbio); /* cannot fail */ + + i = SSL_accept(ssl); + if (i <= 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "SSL_accept error: %s\n", + ERR_error_string(ERR_get_error(),NULL))); + i = SSL_get_error(ssl, i); + print_ssl_error(i); + + + SSL_shutdown(ssl); + close(sock); + SSL_free(ssl); + return -1; + } + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "New TLS connection accepted\n")); + + tls_socket_tab[pos].socket = sock; + tls_socket_tab[pos].ssl_conn = ssl; + tls_socket_tab[pos].ssl_state = 2; + + + memset(src6host, 0, sizeof(src6host)); + + if (eXtl_tls.proto_family == AF_INET) + recvport = ntohs(((struct sockaddr_in *) &sa)->sin_port); + else + recvport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port); #if defined(__arc__) - { - struct sockaddr_in *fromsa = (struct sockaddr_in *) &sa; - char *tmp; - tmp = inet_ntoa (fromsa->sin_addr); - if (tmp == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Message received from: NULL:%i inet_ntoa failure\n", - recvport)); - } else - { - snprintf (src6host, sizeof (src6host), "%s", tmp); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, - recvport)); - osip_strncpy (tls_socket_tab[pos].remote_ip, src6host, - sizeof (tls_socket_tab[pos].remote_ip) - 1); - tls_socket_tab[pos].remote_port = recvport; - } - } + { + struct sockaddr_in *fromsa = (struct sockaddr_in *) &sa; + char *tmp; + tmp = inet_ntoa(fromsa->sin_addr); + if (tmp == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Message received from: NULL:%i inet_ntoa failure\n", + recvport)); + } else { + snprintf(src6host, sizeof(src6host), "%s", tmp); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, + recvport)); + osip_strncpy(tls_socket_tab[pos].remote_ip, src6host, + sizeof(tls_socket_tab[pos].remote_ip) - 1); + tls_socket_tab[pos].remote_port = recvport; + } + } #else - i = getnameinfo ((struct sockaddr *) &sa, slen, - src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + i = getnameinfo((struct sockaddr *) &sa, slen, + src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Message received from: NULL:%i getnameinfo failure\n", - recvport)); - snprintf (src6host, sizeof (src6host), "127.0.0.1"); - } else - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, recvport)); - osip_strncpy (tls_socket_tab[pos].remote_ip, src6host, - sizeof (tls_socket_tab[pos].remote_ip) - 1); - tls_socket_tab[pos].remote_port = recvport; - } + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Message received from: NULL:%i getnameinfo failure\n", + recvport)); + snprintf(src6host, sizeof(src6host), "127.0.0.1"); + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, recvport)); + osip_strncpy(tls_socket_tab[pos].remote_ip, src6host, + sizeof(tls_socket_tab[pos].remote_ip) - 1); + tls_socket_tab[pos].remote_port = recvport; + } #endif - } - } - - - - buf = NULL; - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tls_socket_tab[pos].socket > 0 - && FD_ISSET (tls_socket_tab[pos].socket, osip_fdset)) - { - int i; - int rlen, err; - - if (buf == NULL) - buf = - (char *) osip_malloc (SIP_MESSAGE_MAX_LENGTH * sizeof (char) + 1); - if (buf == NULL) - return OSIP_NOMEM; - - /* do TLS handshake? */ - if (tls_socket_tab[pos].ssl_state == 2) - { - i = SSL_do_handshake (tls_socket_tab[pos].ssl_conn); - if (i <= 0) - { - i = SSL_get_error (tls_socket_tab[pos].ssl_conn, i); - print_ssl_error (i); - - SSL_shutdown (tls_socket_tab[pos].ssl_conn); - close (tls_socket_tab[pos].socket); - SSL_free (tls_socket_tab[pos].ssl_conn); - if (tls_socket_tab[pos].ssl_ctx != NULL) - SSL_CTX_free (tls_socket_tab[pos].ssl_ctx); - - memset (&(tls_socket_tab[pos]), 0, sizeof (tls_socket_tab[pos])); - continue; - } - tls_socket_tab[pos].ssl_state = 3; - - } - - if (tls_socket_tab[pos].ssl_state != 3) - continue; - - i = 0; - rlen = 0; - - do - { - i = SSL_read (tls_socket_tab[pos].ssl_conn, buf + rlen, - SIP_MESSAGE_MAX_LENGTH - rlen); - err = SSL_get_error (tls_socket_tab[pos].ssl_conn, i); - print_ssl_error (err); - switch (err) - { - case SSL_ERROR_NONE: - rlen += i; - break; - } - if (err == SSL_ERROR_SSL - || err == SSL_ERROR_SYSCALL || err == SSL_ERROR_ZERO_RETURN) - { - /* - The TLS/SSL connection has been closed. If the protocol version - is SSL 3.0 or TLS 1.0, this result code is returned only if a - closure alert has occurred in the protocol, i.e. if the - connection has been closed cleanly. Note that in this case - SSL_ERROR_ZERO_RETURN does not necessarily indicate that the - underlying transport has been closed. */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, - NULL, "TLS closed\n")); - - SSL_shutdown (tls_socket_tab[pos].ssl_conn); - close (tls_socket_tab[pos].socket); - SSL_free (tls_socket_tab[pos].ssl_conn); - if (tls_socket_tab[pos].ssl_ctx != NULL) - SSL_CTX_free (tls_socket_tab[pos].ssl_ctx); - - memset (&(tls_socket_tab[pos]), 0, sizeof (tls_socket_tab[pos])); - - rlen = 0; /* discard any remaining data ? */ - break; - } - } - while (SSL_pending (tls_socket_tab[pos].ssl_conn)); - - if (rlen > 5) - { - osip_strncpy (buf + rlen, "\0", 1); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Received TLS message: \n%s\n", buf)); - _eXosip_handle_incoming_message (buf, i, - tls_socket_tab[pos].socket, - tls_socket_tab[pos].remote_ip, - tls_socket_tab[pos].remote_port); - } - } - } - - if (buf != NULL) - osip_free (buf); - - return OSIP_SUCCESS; -} - - -static int -_tls_tl_find_socket (char *host, int port) -{ - int pos; - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tls_socket_tab[pos].socket != 0) - { - if (0 == osip_strcasecmp (tls_socket_tab[pos].remote_ip, host) - && port == tls_socket_tab[pos].remote_port) - return pos; - } - } - return -1; -} - -static void -tls_dump_cert_info (char *s, X509 * cert) -{ - char *subj; - char *issuer; - - subj = X509_NAME_oneline (X509_get_subject_name (cert), 0, 0); - issuer = X509_NAME_oneline (X509_get_issuer_name (cert), 0, 0); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "%s subject:%s\n", s ? s : "", subj)); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "%s issuer: %s\n", s ? s : "", issuer)); - OPENSSL_free (subj); - OPENSSL_free (issuer); -} - -static void -tls_dump_verification_failure (long verification_result) -{ - char tmp[64]; - - snprintf (tmp, sizeof (tmp), "unknown errror"); - switch (verification_result) - { - case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: - snprintf (tmp, sizeof (tmp), "unable to get issuer certificate"); - break; - case X509_V_ERR_UNABLE_TO_GET_CRL: - snprintf (tmp, sizeof (tmp), "unable to get certificate CRL"); - break; - case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE: - snprintf (tmp, sizeof (tmp), "unable to decrypt certificate's signature"); - break; - case X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE: - snprintf (tmp, sizeof (tmp), "unable to decrypt CRL's signature"); - break; - case X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY: - snprintf (tmp, sizeof (tmp), "unable to decode issuer public key"); - break; - case X509_V_ERR_CERT_SIGNATURE_FAILURE: - snprintf (tmp, sizeof (tmp), "certificate signature failure"); - break; - case X509_V_ERR_CRL_SIGNATURE_FAILURE: - snprintf (tmp, sizeof (tmp), "CRL signature failure"); - break; - case X509_V_ERR_CERT_NOT_YET_VALID: - snprintf (tmp, sizeof (tmp), "certificate is not yet valid"); - break; - case X509_V_ERR_CERT_HAS_EXPIRED: - snprintf (tmp, sizeof (tmp), "certificate has expired"); - break; - case X509_V_ERR_CRL_NOT_YET_VALID: - snprintf (tmp, sizeof (tmp), "CRL is not yet valid"); - break; - case X509_V_ERR_CRL_HAS_EXPIRED: - snprintf (tmp, sizeof (tmp), "CRL has expired"); - break; - case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: - snprintf (tmp, sizeof (tmp), - "format error in certificate's notBefore field"); - break; - case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: - snprintf (tmp, sizeof (tmp), - "format error in certificate's notAfter field"); - break; - case X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD: - snprintf (tmp, sizeof (tmp), "format error in CRL's lastUpdate field"); - break; - case X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD: - snprintf (tmp, sizeof (tmp), "format error in CRL's nextUpdate field"); - break; - case X509_V_ERR_OUT_OF_MEM: - snprintf (tmp, sizeof (tmp), "out of memory"); - break; - case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: - snprintf (tmp, sizeof (tmp), "self signed certificate"); - break; - case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN: - snprintf (tmp, sizeof (tmp), - "self signed certificate in certificate chain"); - break; - case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY: - snprintf (tmp, sizeof (tmp), "unable to get local issuer certificate"); - break; - case X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE: - snprintf (tmp, sizeof (tmp), "unable to verify the first certificate"); - break; - case X509_V_ERR_CERT_CHAIN_TOO_LONG: - snprintf (tmp, sizeof (tmp), "certificate chain too long"); - break; - case X509_V_ERR_CERT_REVOKED: - snprintf (tmp, sizeof (tmp), "certificate revoked"); - break; - case X509_V_ERR_INVALID_CA: - snprintf (tmp, sizeof (tmp), "invalid CA certificate"); - break; - case X509_V_ERR_PATH_LENGTH_EXCEEDED: - snprintf (tmp, sizeof (tmp), "path length constraint exceeded"); - break; - case X509_V_ERR_INVALID_PURPOSE: - snprintf (tmp, sizeof (tmp), "unsupported certificate purpose"); - break; - case X509_V_ERR_CERT_UNTRUSTED: - snprintf (tmp, sizeof (tmp), "certificate not trusted"); - break; - case X509_V_ERR_CERT_REJECTED: - snprintf (tmp, sizeof (tmp), "certificate rejected"); - break; - case X509_V_ERR_SUBJECT_ISSUER_MISMATCH: - snprintf (tmp, sizeof (tmp), "subject issuer mismatch"); - break; - case X509_V_ERR_AKID_SKID_MISMATCH: - snprintf (tmp, sizeof (tmp), - "authority and subject key identifier mismatch"); - break; - case X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH: - snprintf (tmp, sizeof (tmp), - "authority and issuer serial number mismatch"); - break; - case X509_V_ERR_KEYUSAGE_NO_CERTSIGN: - snprintf (tmp, sizeof (tmp), - "key usage does not include certificate signing"); - break; - case X509_V_ERR_APPLICATION_VERIFICATION: - snprintf (tmp, sizeof (tmp), "application verification failure"); - break; - } - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "verification failure: %s\n", tmp)); -} - - - -static int -_tls_tl_connect_socket (char *host, int port) -{ - int pos; - - int res; - struct addrinfo *addrinfo = NULL; - struct addrinfo *curinfo; - int sock = -1; - - BIO *sbio; - SSL *ssl; - SSL_CTX *ctx; - X509 *cert; - - char src6host[NI_MAXHOST]; - memset (src6host, 0, sizeof (src6host)); - - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tls_socket_tab[pos].socket == 0) - { - break; - } - } - - if (pos == EXOSIP_MAX_SOCKETS) - return -1; - - res = eXosip_get_addrinfo (&addrinfo, host, port, IPPROTO_TCP); - if (res) - return -1; - + } + } - for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) - { - if (curinfo->ai_protocol && curinfo->ai_protocol != IPPROTO_TCP) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); - continue; - } - - res = getnameinfo ((struct sockaddr *) curinfo->ai_addr, curinfo->ai_addrlen, - src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); - - if (res == 0) - { - int i = _tls_tl_find_socket (src6host, port); - if (i >= 0) - { - eXosip_freeaddrinfo (addrinfo); - return i; - } - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "New binding with %s\n", src6host)); - } - - sock = (int) socket (curinfo->ai_family, curinfo->ai_socktype, - curinfo->ai_protocol); - if (sock < 0) - { + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tls_socket_tab[pos].socket > 0) { + if (FD_ISSET(tls_socket_tab[pos].socket, osip_fdset)) + _tls_tl_recv(&tls_socket_tab[pos]); + } + } + + return OSIP_SUCCESS; +} + + +static int _tls_tl_find_socket(char *host, int port) +{ + int pos; + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tls_socket_tab[pos].socket != 0) { + if (0 == osip_strcasecmp(tls_socket_tab[pos].remote_ip, host) + && port == tls_socket_tab[pos].remote_port) + return pos; + } + } + return -1; +} + + +static int _tls_tl_connect_socket(char *host, int port) +{ + int pos; + int res; + struct addrinfo *addrinfo = NULL; + struct addrinfo *curinfo; + int sock = -1; + int ssl_state = 0; + struct sockaddr selected_ai_addr; + size_t selected_ai_addrlen; + + char src6host[NI_MAXHOST]; + memset(src6host, 0, sizeof(src6host)); + + selected_ai_addrlen=0; + memset(&selected_ai_addr, 0, sizeof(struct sockaddr)); + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tls_socket_tab[pos].socket == 0) { + break; + } + } + + if (pos == EXOSIP_MAX_SOCKETS) + return -1; + + res = eXosip_get_addrinfo(&addrinfo, host, port, IPPROTO_TCP); + if (res) + return -1; + + + for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) { + if (curinfo->ai_protocol && curinfo->ai_protocol != IPPROTO_TCP) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); + continue; + } + + res = + getnameinfo((struct sockaddr *) curinfo->ai_addr, curinfo->ai_addrlen, + src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + + if (res == 0) { + int i = _tls_tl_find_socket(src6host, port); + if (i >= 0) { + eXosip_freeaddrinfo(addrinfo); + return i; + } + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "New binding with %s\n", src6host)); + } + + sock = (int) socket(curinfo->ai_family, curinfo->ai_socktype, + curinfo->ai_protocol); + if (sock < 0) { #if !defined(OSIP_MT) || defined(_WIN32_WCE) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot create socket!\n")); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: Cannot create socket!\n")); #else - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot create socket %s!\n", strerror (errno))); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: Cannot create socket %s!\n", strerror(ex_errno))); #endif - continue; - } + continue; + } - if (curinfo->ai_family == AF_INET6) - { + if (curinfo->ai_family == AF_INET6) { #ifdef IPV6_V6ONLY - if (setsockopt_ipv6only (sock)) - { - close (sock); - sock = -1; + if (setsockopt_ipv6only(sock)) { + close(sock); + sock = -1; #if !defined(OSIP_MT) || defined(_WIN32_WCE) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot set socket option!\n")); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: Cannot set socket option!\n")); #else - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot set socket option %s!\n", - strerror (errno))); -#endif - continue; - } -#endif /* IPV6_V6ONLY */ - } - - res = connect (sock, curinfo->ai_addr, curinfo->ai_addrlen); - if (res < 0) - { -#if !defined(OSIP_MT) || defined(_WIN32_WCE) - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot bind socket node:%s family:%d\n", - host, curinfo->ai_family)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: Cannot set socket option %s!\n", + strerror(ex_errno))); +#endif + continue; + } +#endif /* IPV6_V6ONLY */ + } +#if defined(_WIN32_WCE) || defined(WIN32) + { + unsigned long nonBlock = 1; + int val; + + ioctlsocket(sock, FIONBIO, &nonBlock); + + val = 1; + if (setsockopt + (sock, SOL_SOCKET, SO_KEEPALIVE, (char *) &val, + sizeof(val)) == -1) { + close(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot get socket flag!\n")); + continue; + } + } +#if !defined(_WIN32_WCE) + { + DWORD err = 0L; + DWORD dwBytes = 0L; + struct tcp_keepalive kalive = { 0 }; + struct tcp_keepalive kaliveOut = { 0 }; + kalive.onoff = 1; + kalive.keepalivetime = 30000; /* Keep Alive in 5.5 sec. */ + kalive.keepaliveinterval = 3000; /* Resend if No-Reply */ + err = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, + sizeof(kalive), &kaliveOut, sizeof(kaliveOut), &dwBytes, + NULL, NULL); + if (err != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, NULL, + "Cannot set keepalive interval!\n")); + } + } +#endif #else - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - host, curinfo->ai_family, strerror (errno))); -#endif - close (sock); - sock = -1; - continue; - } + { + int val; - break; - } - - eXosip_freeaddrinfo (addrinfo); - - if (sock > 0) - { - ctx = initialize_client_ctx (eXosip_tls_ctx_params.client.priv_key, - eXosip_tls_ctx_params.client.cert, - eXosip_tls_ctx_params.server.priv_key_pw, - IPPROTO_TCP); - - //FIXME: changed parameter from ctx to client_ctx -> works now - ssl = SSL_new (ctx); - if (ssl == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL_new error\n")); - close (sock); - if (ctx != NULL) - SSL_CTX_free (ctx); - return -1; - } - sbio = BIO_new_socket (sock, BIO_NOCLOSE); - - if (sbio == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "BIO_new_socket error\n")); - SSL_shutdown (ssl); - close (sock); - SSL_free (ssl); - if (ctx != NULL) - SSL_CTX_free (ctx); - return -1; - } - SSL_set_bio (ssl, sbio, sbio); - res = SSL_connect (ssl); - if (res < 1) - { - res = SSL_get_error (ssl, res); - print_ssl_error (res); - - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "SSL_connect error\n")); - SSL_shutdown (ssl); - close (sock); - SSL_free (ssl); - if (ctx != NULL) - SSL_CTX_free (ctx); - return -1; - } - - cert = SSL_get_peer_certificate (ssl); - if (cert != 0) - { - int cert_err; - tls_dump_cert_info ("tls_connect: remote certificate: ", cert); - - cert_err = SSL_get_verify_result (ssl); - if (cert_err != X509_V_OK) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Failed to verify remote certificate\n")); - tls_dump_verification_failure (cert_err); - - if (eXosip_tls_ctx_params.server.cert[0] != '\0') - { - X509_free(cert); - return -1; - } - else if (cert_err != X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT - && cert_err != X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN - && cert_err != X509_V_ERR_CRL_HAS_EXPIRED - && cert_err != X509_V_ERR_CERT_HAS_EXPIRED - && cert_err != X509_V_ERR_CERT_REVOKED - && cert_err != X509_V_ERR_CERT_UNTRUSTED - && cert_err != X509_V_ERR_CERT_REJECTED) - { - X509_free (cert); - return -1; - } - /*else -> I want to keep going ONLY when API didn't specified - any SSL server certificate */ - } - X509_free (cert); - } else - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "No certificate received\n")); - //X509_free is not necessary because no cert-object was created -> cert == NULL - return -1; - } - - tls_socket_tab[pos].socket = sock; - - if (src6host[0] == '\0') - osip_strncpy (tls_socket_tab[pos].remote_ip, host, - sizeof (tls_socket_tab[pos].remote_ip) - 1); - else - osip_strncpy (tls_socket_tab[pos].remote_ip, src6host, - sizeof (tls_socket_tab[pos].remote_ip) - 1); - - tls_socket_tab[pos].remote_port = port; - tls_socket_tab[pos].ssl_conn = ssl; - tls_socket_tab[pos].ssl_state = 3; + val = fcntl(sock, F_GETFL); + if (val < 0) { + close(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot get socket flag!\n")); + continue; + } + val |= O_NONBLOCK; + if (fcntl(sock, F_SETFL, val) < 0) { + close(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot set socket flag!\n")); + continue; + } +#if 0 + val = 1; + if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == + -1) + val = 30; /* 30 sec before starting probes */ + setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &val, sizeof(val)); + val = 2; /* 2 probes max */ + setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &val, sizeof(val)); + val = 10; /* 10 seconds between each probe */ + setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &val, sizeof(val)); +#endif +#if SO_NOSIGPIPE + val = 1; + setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(int)); +#endif + } +#endif - return pos; - } + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: socket node:%s , socket %d, family:%d set to non blocking mode\n", + host, sock, curinfo->ai_family)); + res = connect(sock, curinfo->ai_addr, curinfo->ai_addrlen); + if (res < 0) { +#ifdef WIN32 + if (ex_errno != WSAEWOULDBLOCK) { +#else + if (ex_errno != EINPROGRESS) { +#endif + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "Cannot connect socket node:%s family:%d %s[%d]\n", + host, curinfo->ai_family, strerror(ex_errno), ex_errno)); + + close(sock); + sock = -1; + continue; + } else { + res = _tls_tl_is_connected(sock); + if (res > 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s, socket %d [pos=%d], family:%d, in progress\n", + host, sock, pos, curinfo->ai_family)); + selected_ai_addrlen = curinfo->ai_addrlen; + memcpy(&selected_ai_addr, curinfo->ai_addr, sizeof(struct sockaddr)); + break; + } else if (res == 0) { +#ifdef MULTITASKING_ENABLED + tls_socket_tab[pos].readStream = NULL; + tls_socket_tab[pos].writeStream = NULL; + CFStreamCreatePairWithSocket(kCFAllocatorDefault, sock, + &tls_socket_tab[pos].readStream, &tls_socket_tab[pos].writeStream); + if (tls_socket_tab[pos].readStream!=NULL) + CFReadStreamSetProperty(tls_socket_tab[pos].readStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); + if (tls_socket_tab[pos].writeStream!=NULL) + CFWriteStreamSetProperty(tls_socket_tab[pos].writeStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); + if (CFReadStreamOpen (tls_socket_tab[pos].readStream)) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "CFReadStreamOpen Succeeded!\n")); + } + + CFWriteStreamOpen (tls_socket_tab[pos].writeStream) ; +#endif + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s , socket %d [pos=%d], family:%d, connected\n", + host, sock, pos, curinfo->ai_family)); + ssl_state = 1; + break; + } else { + close(sock); + sock = -1; + continue; + } + } + } + + break; + } + + eXosip_freeaddrinfo(addrinfo); + + if (sock > 0) { + tls_socket_tab[pos].socket = sock; + + tls_socket_tab[pos].ai_addrlen = selected_ai_addrlen; + memset(&tls_socket_tab[pos].ai_addr, 0, sizeof(struct sockaddr)); + if (selected_ai_addrlen>0) + memcpy(&tls_socket_tab[pos].ai_addr, &selected_ai_addr, selected_ai_addrlen); + + if (src6host[0] == '\0') + osip_strncpy(tls_socket_tab[pos].remote_ip, host, + sizeof(tls_socket_tab[pos].remote_ip) - 1); + else + osip_strncpy(tls_socket_tab[pos].remote_ip, src6host, + sizeof(tls_socket_tab[pos].remote_ip) - 1); + + tls_socket_tab[pos].remote_port = port; + tls_socket_tab[pos].ssl_conn = NULL; + tls_socket_tab[pos].ssl_state = ssl_state; + tls_socket_tab[pos].ssl_ctx = NULL; + + if (tls_socket_tab[pos].ssl_state == 1) { /* TCP connected but not TLS connected */ + res = _tls_tl_ssl_connect_socket(&tls_socket_tab[pos]); + if (res < 0) { + _tls_tl_close_sockinfo(&tls_socket_tab[pos]); + return -1; + } + } + return pos; + } - return -1; + return -1; } static int -tls_tl_send_message (osip_transaction_t * tr, osip_message_t * sip, char *host, - int port, int out_socket) +tls_tl_send_message(osip_transaction_t * tr, osip_message_t * sip, char *host, + int port, int out_socket) { - size_t length = 0; - char *message; - int i; - - SSL *ssl = NULL; - - if (host == NULL) - { - host = sip->req_uri->host; - if (sip->req_uri->port != NULL) - port = osip_atoi (sip->req_uri->port); - else - port = 5061; - } - - if (port == 5060) - port = 5061; - - /* remove preloaded route if there is no tag in the To header - */ - { - osip_route_t *route = NULL; - osip_generic_param_t *tag = NULL; - osip_message_get_route (sip, 0, &route); - - osip_to_get_tag (sip->to, &tag); - if (tag == NULL && route != NULL && route->url != NULL) - { - osip_list_remove (&sip->routes, 0); - } - i = osip_message_to_str (sip, &message, &length); - if (tag == NULL && route != NULL && route->url != NULL) - { - osip_list_add (&sip->routes, route, 0); - } - } - - if (i != 0 || length <= 0) - { - return -1; - } - - if (out_socket > 0) - { - int pos; - for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) - { - if (tls_socket_tab[pos].socket != 0) - { - if (tls_socket_tab[pos].socket == out_socket) - { - out_socket = tls_socket_tab[pos].socket; - ssl = tls_socket_tab[pos].ssl_conn; - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message sent: \n%s (reusing REQUEST connection)\n", - message)); - break; - } - } - } - if (pos == EXOSIP_MAX_SOCKETS) - out_socket = 0; - } - - /* Step 1: find existing socket to send message */ - if (out_socket <= 0) - { - int pos = _tls_tl_find_socket (host, port); + size_t length = 0; + char *message; + int i; + + int pos; + osip_naptr_t *naptr_record=NULL; + + SSL *ssl = NULL; + + if (host == NULL) { + host = sip->req_uri->host; + if (sip->req_uri->port != NULL) + port = osip_atoi(sip->req_uri->port); + else + port = 5061; + } + + if (port == 5060) + port = 5061; + + i = -1; +#ifndef MINISIZE + if (tr==NULL) + { + _eXosip_srv_lookup(sip, &naptr_record); + + if (naptr_record!=NULL) { + eXosip_dnsutils_dns_process(naptr_record, 1); + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_dns_process(naptr_record, 1); + } + + if (naptr_record!=NULL && naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + { + /* 4: check if we have the one we want... */ + if (naptr_record->siptls_record.name[0] != '\0' + && naptr_record->siptls_record.srventry[naptr_record->siptls_record.index].srv[0] != '\0') { + /* always choose the first here. + if a network error occur, remove first entry and + replace with next entries. + */ + osip_srv_entry_t *srv; + srv = &naptr_record->siptls_record.srventry[naptr_record->siptls_record.index]; + if (srv->ipaddress[0]) { + host = srv->ipaddress; + port = srv->port; + } + else { + host = srv->srv; + port = srv->port; + } + } + } + + if (naptr_record!=NULL && naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + } + else + { + naptr_record = tr->naptr_record; + } + + if (naptr_record!=NULL) + { + /* 1: make sure there is no pending DNS */ + eXosip_dnsutils_dns_process(naptr_record, 0); + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_dns_process(naptr_record, 0); + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_UNKNOWN) + { + /* fallback to DNS A */ + if (naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + if (tr!=NULL) + tr->naptr_record=NULL; + /* must never happen? */ + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_INPROGRESS) + { + /* 2: keep waiting (naptr answer not received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE) + { + /* 3: keep waiting (naptr answer received/no srv answer received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + { + /* 3: keep waiting (naptr answer received/no srv answer received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + { + /* 4: check if we have the one we want... */ + if (naptr_record->siptls_record.name[0] != '\0' + && naptr_record->siptls_record.srventry[naptr_record->siptls_record.index].srv[0] != '\0') { + /* always choose the first here. + if a network error occur, remove first entry and + replace with next entries. + */ + osip_srv_entry_t *srv; + srv = &naptr_record->siptls_record.srventry[naptr_record->siptls_record.index]; + if (srv->ipaddress[0]) { + host = srv->ipaddress; + port = srv->port; + } + else { + host = srv->srv; + port = srv->port; + } + } + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NOTSUPPORTED + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_RETRYLATER) + { + /* 5: fallback to DNS A */ + if (naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + if (tr!=NULL) + tr->naptr_record=NULL; + } + } +#endif - /* Step 2: create new socket with host:port */ - if (pos < 0) - { - pos = _tls_tl_connect_socket (host, port); - } - if (pos >= 0) - { - out_socket = tls_socket_tab[pos].socket; - ssl = tls_socket_tab[pos].ssl_conn; - } - - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message sent: \n%s (to dest=%s:%i)\n", - message, host, port)); - } + /* remove preloaded route if there is no tag in the To header + */ + { + osip_route_t *route = NULL; + osip_generic_param_t *tag = NULL; + osip_message_get_route(sip, 0, &route); + + osip_to_get_tag(sip->to, &tag); + if (tag == NULL && route != NULL && route->url != NULL) { + osip_list_remove(&sip->routes, 0); + } + i = osip_message_to_str(sip, &message, &length); + if (tag == NULL && route != NULL && route->url != NULL) { + osip_list_add(&sip->routes, route, 0); + } + } + + if (i != 0 || length <= 0) { + return -1; + } + + /* verify all current connections */ + _tls_tl_check_connected(); + + if (out_socket > 0) { + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tls_socket_tab[pos].socket != 0) { + if (tls_socket_tab[pos].socket == out_socket) { + out_socket = tls_socket_tab[pos].socket; + ssl = tls_socket_tab[pos].ssl_conn; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "reusing REQUEST connection (to dest=%s:%i)\n", + tls_socket_tab[pos].remote_ip, + tls_socket_tab[pos].remote_port)); + break; + } + } + } + if (pos == EXOSIP_MAX_SOCKETS) + out_socket = 0; + } + + /* Step 1: find existing socket to send message */ + if (out_socket <= 0) { + pos = _tls_tl_find_socket(host, port); + + /* Step 2: create new socket with host:port */ + if (pos < 0) { + pos = _tls_tl_connect_socket(host, port); + } + if (pos >= 0) { + out_socket = tls_socket_tab[pos].socket; + ssl = tls_socket_tab[pos].ssl_conn; + } + } + + if (out_socket <= 0) { + osip_free(message); + return -1; + } + + if (tls_socket_tab[pos].ssl_state == 0) { + i = _tls_tl_is_connected(out_socket); + if (i > 0) { + time_t now; + now = time(NULL); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s, socket %d [pos=%d], in progress\n", + host, out_socket, pos)); + osip_free(message); + if (tr != NULL && now - tr->birth_time > 10 && now - tr->birth_time < 13) + { + /* avoid doing this twice... */ + if (naptr_record!=NULL && MSG_IS_REGISTER(sip)) + { + if (eXosip_dnsutils_rotate_srv(&naptr_record->siptls_record)>0) + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Doing TLS failover: %s:%i->%s:%i\n", + host, port, + naptr_record->siptls_record.srventry[naptr_record->siptls_record.index].srv, + naptr_record->siptls_record.srventry[naptr_record->siptls_record.index].port)); + return OSIP_SUCCESS + 1; /* retry for next retransmission! */ + } + } + return -1; + } + return 1; + } else if (i == 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s , socket %d [pos=%d], connected\n", + host, out_socket, pos)); + tls_socket_tab[pos].ssl_state = 1; + tls_socket_tab[pos].ai_addrlen = 0; + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "socket node:%s, socket %d [pos=%d], socket error\n", + host, out_socket, pos)); + osip_free(message); + return -1; + } + } + + if (tls_socket_tab[pos].ssl_state == 1) { /* TCP connected but not TLS connected */ + i = _tls_tl_ssl_connect_socket(&tls_socket_tab[pos]); + if (i < 0) { + _tls_tl_close_sockinfo(&tls_socket_tab[pos]); + osip_free(message); + return -1; + } else if (i > 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "socket node:%s, socket %d [pos=%d], connected (ssl in progress)\n", + host, out_socket, pos)); + osip_free(message); + return 1; + } + ssl = tls_socket_tab[pos].ssl_conn; + } + + if (ssl == NULL) { + osip_free(message); + return -1; + } + +#ifdef MULTITASKING_ENABLED + if (tls_socket_tab[pos].readStream==NULL) + { + tls_socket_tab[pos].readStream = NULL; + tls_socket_tab[pos].writeStream = NULL; + CFStreamCreatePairWithSocket(kCFAllocatorDefault, tls_socket_tab[pos].socket, + &tls_socket_tab[pos].readStream, &tls_socket_tab[pos].writeStream); + if (tls_socket_tab[pos].readStream!=NULL) + CFReadStreamSetProperty(tls_socket_tab[pos].readStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); + if (tls_socket_tab[pos].writeStream!=NULL) + CFWriteStreamSetProperty(tls_socket_tab[pos].writeStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP); + if (CFReadStreamOpen (tls_socket_tab[pos].readStream)) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "CFReadStreamOpen Succeeded!\n")); + } + + CFWriteStreamOpen (tls_socket_tab[pos].writeStream) ; + } +#endif + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message sent: (to dest=%s:%i) \n%s\n", + host, port, message)); + + SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY); + + while (1) { + i = SSL_write(ssl, (const void *) message, length); + + if (i <= 0) { + i = SSL_get_error(ssl, i); + if (i == SSL_ERROR_WANT_READ || i == SSL_ERROR_WANT_WRITE) + continue; + print_ssl_error(i); + + osip_free(message); + return -1; + } + break; + } + + osip_free(message); + return OSIP_SUCCESS; +} + +static int tls_tl_keepalive(void) +{ + char buf[5] = "\r\n\r\n"; + int pos; + int i; + + if (eXosip.keep_alive <= 0) { + return 0; + } + + if (tls_socket <= 0) + return OSIP_UNDEFINED_ERROR; + + for (pos = 0; pos < EXOSIP_MAX_SOCKETS; pos++) { + if (tls_socket_tab[pos].socket > 0 && tls_socket_tab[pos].ssl_state > 2) { + SSL_set_mode(tls_socket_tab[pos].ssl_conn, SSL_MODE_AUTO_RETRY); + + while (1) { + i = SSL_write(tls_socket_tab[pos].ssl_conn, (const void *) buf, 4); + + if (i <= 0) { + i = SSL_get_error(tls_socket_tab[pos].ssl_conn, i); + if (i == SSL_ERROR_WANT_READ || i == SSL_ERROR_WANT_WRITE) + continue; + print_ssl_error(i); + } + break; + } + } + } + return OSIP_SUCCESS; +} + +static int tls_tl_set_socket(int socket) +{ + tls_socket = socket; + + return OSIP_SUCCESS; +} + +static int tls_tl_masquerade_contact(const char *public_address, int port) +{ + if (public_address == NULL || public_address[0] == '\0') { + memset(tls_firewall_ip, '\0', sizeof(tls_firewall_ip)); + memset(tls_firewall_port, '\0', sizeof(tls_firewall_port)); + if (eXtl_tls.proto_port > 0) + snprintf(tls_firewall_port, sizeof(tls_firewall_port), "%i", + eXtl_tls.proto_port); + return OSIP_SUCCESS; + } + snprintf(tls_firewall_ip, sizeof(tls_firewall_ip), "%s", public_address); + if (port > 0) { + snprintf(tls_firewall_port, sizeof(tls_firewall_port), "%i", port); + } + return OSIP_SUCCESS; +} - if (out_socket <= 0 || ssl == NULL) - { - return -1; - } +static int +tls_tl_get_masquerade_contact(char *ip, int ip_size, char *port, int port_size) +{ + memset(ip, 0, ip_size); + memset(port, 0, port_size); - SSL_set_mode (ssl, SSL_MODE_AUTO_RETRY); + if (tls_firewall_ip[0] != '\0') + snprintf(ip, ip_size, "%s", tls_firewall_ip); - while (1) - { - i = SSL_write (ssl, (const void *) message, length); + if (tls_firewall_port[0] != '\0') + snprintf(port, port_size, "%s", tls_firewall_port); + return OSIP_SUCCESS; +} - if (i <= 0) - { - i = SSL_get_error (ssl, i); - print_ssl_error (i); - if (i == SSL_ERROR_WANT_READ) - continue; - - osip_free (message); - return -1; - } - break; - } +struct eXtl_protocol eXtl_tls = { + 1, + 5061, + "TLS", + "0.0.0.0", + IPPROTO_TCP, + AF_INET, + 0, + 0, + + &tls_tl_init, + &tls_tl_free, + &tls_tl_open, + &tls_tl_set_fdset, + &tls_tl_read_message, + &tls_tl_send_message, + &tls_tl_keepalive, + &tls_tl_set_socket, + &tls_tl_masquerade_contact, + &tls_tl_get_masquerade_contact +}; - osip_free (message); - return OSIP_SUCCESS; -} +#else -static int -tls_tl_keepalive (void) +eXosip_tls_ctx_error eXosip_tls_verify_certificate(int + _tls_verify_client_certificate) { - return OSIP_SUCCESS; + return -1; /* NOT IMPLEMENTED */ } -static int -tls_tl_set_socket (int socket) +eXosip_tls_ctx_error eXosip_tls_use_server_certificate(const char + *local_certificate_cn) { - tls_socket = socket; - - return OSIP_SUCCESS; + return -1; /* NOT IMPLEMENTED */ } -static int -tls_tl_masquerade_contact (const char *public_address, int port) +eXosip_tls_ctx_error eXosip_tls_use_client_certificate(const char + *local_certificate_cn) { - if (public_address == NULL || public_address[0] == '\0') - { - memset (tls_firewall_ip, '\0', sizeof (tls_firewall_ip)); - return OSIP_SUCCESS; - } - snprintf (tls_firewall_ip, sizeof (tls_firewall_ip), "%s", public_address); - if (port > 0) - { - snprintf (tls_firewall_port, sizeof (tls_firewall_port), "%i", port); - } - return OSIP_SUCCESS; + return -1; /* NOT IMPLEMENTED */ } -static int -tls_tl_get_masquerade_contact (char *ip, int ip_size, char *port, int port_size) -{ - memset (ip, 0, ip_size); - memset (port, 0, port_size); - - if (tls_firewall_ip[0] != '\0') - snprintf (ip, ip_size, "%s", tls_firewall_ip); - if (tls_firewall_port[0] != '\0') - snprintf (port, port_size, "%s", tls_firewall_port); - return OSIP_SUCCESS; +eXosip_tls_ctx_error eXosip_set_tls_ctx(eXosip_tls_ctx_t * ctx) +{ + return -1; /* NOT IMPLEMENTED */ } -struct eXtl_protocol eXtl_tls = { - 1, - 5061, - "TLS", - "0.0.0.0", - IPPROTO_TCP, - AF_INET, - 0, - 0, - - &tls_tl_init, - &tls_tl_free, - &tls_tl_open, - &tls_tl_set_fdset, - &tls_tl_read_message, - &tls_tl_send_message, - &tls_tl_keepalive, - &tls_tl_set_socket, - &tls_tl_masquerade_contact, - &tls_tl_get_masquerade_contact -}; - #endif diff -Nru libexosip2-3.3.0/src/eXtl_udp.c libexosip2-3.6.0/src/eXtl_udp.c --- libexosip2-3.3.0/src/eXtl_udp.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXtl_udp.c 2011-10-04 07:56:59.000000000 +0000 @@ -37,413 +37,403 @@ #define strerror(X) "-1" #endif +void udp_tl_learn_port_from_via(osip_message_t * sip); + static int udp_socket; static struct sockaddr_storage ai_addr; static char udp_firewall_ip[64]; static char udp_firewall_port[10]; -static int -udp_tl_init (void) +static int udp_tl_init(void) { - udp_socket = 0; - memset (&ai_addr, 0, sizeof (struct sockaddr_storage)); - memset (udp_firewall_ip, 0, sizeof (udp_firewall_ip)); - memset (udp_firewall_port, 0, sizeof (udp_firewall_port)); - return OSIP_SUCCESS; + udp_socket = 0; + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + memset(udp_firewall_ip, 0, sizeof(udp_firewall_ip)); + memset(udp_firewall_port, 0, sizeof(udp_firewall_port)); + return OSIP_SUCCESS; } -static int -udp_tl_free (void) +static int udp_tl_free(void) { - memset (udp_firewall_ip, 0, sizeof (udp_firewall_ip)); - memset (udp_firewall_port, 0, sizeof (udp_firewall_port)); - memset (&ai_addr, 0, sizeof (struct sockaddr_storage)); - if (udp_socket > 0) - close (udp_socket); - - return OSIP_SUCCESS; -} + memset(udp_firewall_ip, 0, sizeof(udp_firewall_ip)); + memset(udp_firewall_port, 0, sizeof(udp_firewall_port)); + memset(&ai_addr, 0, sizeof(struct sockaddr_storage)); + if (udp_socket > 0) + close(udp_socket); -static int -udp_tl_open (void) -{ - int res; - struct addrinfo *addrinfo = NULL; - struct addrinfo *curinfo; - int sock = -1; - - if (eXtl_udp.proto_port < 0) - eXtl_udp.proto_port = 5060; - - - res = eXosip_get_addrinfo (&addrinfo, - eXtl_udp.proto_ifs, - eXtl_udp.proto_port, eXtl_udp.proto_num); - if (res) - return -1; - - for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) - { - socklen_t len; - - if (curinfo->ai_protocol && curinfo->ai_protocol != eXtl_udp.proto_num) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); - continue; - } - - sock = (int) socket (curinfo->ai_family, curinfo->ai_socktype, - curinfo->ai_protocol); - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot create socket %s!\n", strerror (errno))); - continue; - } - - if (curinfo->ai_family == AF_INET6) - { -#ifdef IPV6_V6ONLY - if (setsockopt_ipv6only (sock)) - { - close (sock); - sock = -1; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot set socket option %s!\n", - strerror (errno))); - continue; - } -#endif /* IPV6_V6ONLY */ - } - - res = bind (sock, curinfo->ai_addr, curinfo->ai_addrlen); - if (res < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - eXtl_udp.proto_ifs, curinfo->ai_family, strerror (errno))); - close (sock); - sock = -1; - continue; - } - len = sizeof (ai_addr); - res = getsockname (sock, (struct sockaddr *) &ai_addr, &len); - if (res != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot get socket name (%s)\n", strerror (errno))); - memcpy (&ai_addr, curinfo->ai_addr, curinfo->ai_addrlen); - } - - if (eXtl_udp.proto_num != IPPROTO_UDP) - { - res = listen (sock, SOMAXCONN); - if (res < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind socket node:%s family:%d %s\n", - eXtl_udp.proto_ifs, curinfo->ai_family, - strerror (errno))); - close (sock); - sock = -1; - continue; - } - } - - break; - } - - eXosip_freeaddrinfo (addrinfo); - - if (sock < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: Cannot bind on port: %i\n", eXtl_udp.proto_port)); - return -1; - } - - udp_socket = sock; - - if (eXtl_udp.proto_port == 0) - { - /* get port number from socket */ - if (eXtl_udp.proto_family == AF_INET) - eXtl_udp.proto_port = ntohs (((struct sockaddr_in *) &ai_addr)->sin_port); - else - eXtl_udp.proto_port = - ntohs (((struct sockaddr_in6 *) &ai_addr)->sin6_port); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: Binding on port %i!\n", eXtl_udp.proto_port)); - } - snprintf (udp_firewall_port, sizeof (udp_firewall_port), "%i", - eXtl_udp.proto_port); - return OSIP_SUCCESS; + return OSIP_SUCCESS; } +#if !defined(WIN32) && !defined(_WIN32_WCE) +#define SOCKET_OPTION_VALUE void * +#else +#define SOCKET_OPTION_VALUE char * +#endif -static int -udp_tl_set_fdset (fd_set * osip_fdset, int *fd_max) +static int udp_tl_open(void) { - if (udp_socket <= 0) - return -1; + int res; + struct addrinfo *addrinfo = NULL; + struct addrinfo *curinfo; + int sock = -1; + + if (eXtl_udp.proto_port < 0) + eXtl_udp.proto_port = 5060; + + + res = eXosip_get_addrinfo(&addrinfo, + eXtl_udp.proto_ifs, + eXtl_udp.proto_port, eXtl_udp.proto_num); + if (res) + return -1; + + for (curinfo = addrinfo; curinfo; curinfo = curinfo->ai_next) { + socklen_t len; + + if (curinfo->ai_protocol && curinfo->ai_protocol != eXtl_udp.proto_num) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "eXosip: Skipping protocol %d\n", curinfo->ai_protocol)); + continue; + } + + sock = (int) socket(curinfo->ai_family, curinfo->ai_socktype, + curinfo->ai_protocol); + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot create socket %s!\n", strerror(errno))); + continue; + } - eXFD_SET (udp_socket, osip_fdset); - - if (udp_socket > *fd_max) - *fd_max = udp_socket; - - return OSIP_SUCCESS; -} - -void -udp_tl_learn_port_from_via (osip_message_t * sip) -{ - /* EXOSIP_OPT_UDP_LEARN_PORT option set */ - if (eXosip.learn_port > 0) - { - osip_via_t *via = NULL; - osip_generic_param_t *br; - - osip_message_get_via (sip, 0, &via); - if (via != NULL && via->protocol != NULL - && (osip_strcasecmp (via->protocol, "udp") == 0 - || osip_strcasecmp (via->protocol, "dtls-udp") == 0)) - { - osip_via_param_get_byname (via, "rport", &br); - if (br != NULL && br->gvalue != NULL) - { - struct eXosip_account_info ainfo; - memset (&ainfo, 0, sizeof (struct eXosip_account_info)); - snprintf (udp_firewall_port, 20, "%s", br->gvalue); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "SIP port modified from rport in SIP answer\r\n")); - - osip_via_param_get_byname (via, "received", &br); - if (br != NULL && br->gvalue != NULL - && sip->from != NULL && sip->from->url != NULL - && sip->from->url->host != NULL) - { - snprintf (ainfo.proxy, sizeof (ainfo.proxy), "%s", - sip->from->url->host); - ainfo.nat_port = atoi (udp_firewall_port); - snprintf (ainfo.nat_ip, sizeof (ainfo.nat_ip), "%s", br->gvalue); - eXosip_set_option (EXOSIP_OPT_ADD_ACCOUNT_INFO, &ainfo); - } - } - } - } - return; -} + if (curinfo->ai_family == AF_INET6) { +#ifdef IPV6_V6ONLY + if (setsockopt_ipv6only(sock)) { + close(sock); + sock = -1; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot set socket option %s!\n", + strerror(errno))); + continue; + } +#endif /* IPV6_V6ONLY */ + } + + res = bind(sock, curinfo->ai_addr, curinfo->ai_addrlen); + if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot bind socket node:%s family:%d %s\n", + eXtl_udp.proto_ifs, curinfo->ai_family, strerror(errno))); + close(sock); + sock = -1; + continue; + } + len = sizeof(ai_addr); + res = getsockname(sock, (struct sockaddr *) &ai_addr, &len); + if (res != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot get socket name (%s)\n", strerror(errno))); + memcpy(&ai_addr, curinfo->ai_addr, curinfo->ai_addrlen); + } + + if (eXtl_udp.proto_num != IPPROTO_UDP) { + res = listen(sock, SOMAXCONN); + if (res < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot bind socket node:%s family:%d %s\n", + eXtl_udp.proto_ifs, curinfo->ai_family, + strerror(errno))); + close(sock); + sock = -1; + continue; + } + } + + break; + } + + eXosip_freeaddrinfo(addrinfo); + + if (sock < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: Cannot bind on port: %i\n", eXtl_udp.proto_port)); + return -1; + } + + udp_socket = sock; + + if (eXtl_udp.proto_family == AF_INET) + { + int tos = (eXosip.dscp << 2) & 0xFC; + res = setsockopt(udp_socket, IPPROTO_IP, IP_TOS, (SOCKET_OPTION_VALUE)&tos, sizeof(tos)); + } else { + int tos = (eXosip.dscp << 2) & 0xFC; +#ifdef IPV6_TCLASS + res = setsockopt(udp_socket, IPPROTO_IPV6, IPV6_TCLASS, + (SOCKET_OPTION_VALUE)&tos, sizeof(tos)); +#else + retval = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS, + (SOCKET_OPTION_VALUE)&tos, sizeof(tos)); +#endif + } -static int -udp_tl_read_message (fd_set * osip_fdset) + if (eXtl_udp.proto_port == 0) { + /* get port number from socket */ + if (eXtl_udp.proto_family == AF_INET) + eXtl_udp.proto_port = + ntohs(((struct sockaddr_in *) &ai_addr)->sin_port); + else + eXtl_udp.proto_port = + ntohs(((struct sockaddr_in6 *) &ai_addr)->sin6_port); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: Binding on port %i!\n", eXtl_udp.proto_port)); + } + snprintf(udp_firewall_port, sizeof(udp_firewall_port), "%i", + eXtl_udp.proto_port); + return OSIP_SUCCESS; +} + + +static int udp_tl_set_fdset(fd_set * osip_fdset, fd_set * osip_wrset, int *fd_max) +{ + if (udp_socket <= 0) + return -1; + + eXFD_SET(udp_socket, osip_fdset); + + if (udp_socket > *fd_max) + *fd_max = udp_socket; + + return OSIP_SUCCESS; +} + +void udp_tl_learn_port_from_via(osip_message_t * sip) +{ + /* EXOSIP_OPT_UDP_LEARN_PORT option set */ + if (eXosip.learn_port > 0) { + osip_via_t *via = NULL; + osip_generic_param_t *br; + int i; + + i = osip_message_get_via(sip, 0, &via); + if (i >= 0 && via != NULL && via->protocol != NULL + && (osip_strcasecmp(via->protocol, "udp") == 0 + || osip_strcasecmp(via->protocol, "dtls-udp") == 0)) { + osip_via_param_get_byname(via, "rport", &br); + if (br != NULL && br->gvalue != NULL) { + struct eXosip_account_info ainfo; + memset(&ainfo, 0, sizeof(struct eXosip_account_info)); + snprintf(udp_firewall_port, sizeof(udp_firewall_port), "%s", br->gvalue); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "SIP port modified from rport in SIP answer\r\n")); + + osip_via_param_get_byname(via, "received", &br); + if (br != NULL && br->gvalue != NULL + && sip->from != NULL && sip->from->url != NULL + && sip->from->url->host != NULL) { + snprintf(ainfo.proxy, sizeof(ainfo.proxy), "%s", + sip->from->url->host); + ainfo.nat_port = atoi(udp_firewall_port); + snprintf(ainfo.nat_ip, sizeof(ainfo.nat_ip), "%s", br->gvalue); + eXosip_set_option(EXOSIP_OPT_ADD_ACCOUNT_INFO, &ainfo); + } + } + } + } + return; +} + +static int udp_tl_read_message(fd_set * osip_fdset, fd_set * osip_wrset) { - char *buf; - int i; + char *buf; + int i; - if (udp_socket <= 0) - return -1; + if (udp_socket <= 0) + return -1; - if (FD_ISSET (udp_socket, osip_fdset)) - { - struct sockaddr_storage sa; + if (FD_ISSET(udp_socket, osip_fdset)) { + struct sockaddr_storage sa; #ifdef __linux - socklen_t slen; + socklen_t slen; #else - int slen; + int slen; #endif - if (eXtl_udp.proto_family == AF_INET) - slen = sizeof (struct sockaddr_in); - else - slen = sizeof (struct sockaddr_in6); - - buf = (char *) osip_malloc (SIP_MESSAGE_MAX_LENGTH * sizeof (char) + 1); - if (buf == NULL) - return OSIP_NOMEM; - - i = recvfrom (udp_socket, buf, - SIP_MESSAGE_MAX_LENGTH, 0, (struct sockaddr *) &sa, &slen); - - if (i > 5) - { - char src6host[NI_MAXHOST]; - int recvport = 0; - int err; - - osip_strncpy (buf + i, "\0", 1); - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Received message: \n%s\n", buf)); - - memset (src6host, 0, sizeof (src6host)); - - if (eXtl_udp.proto_family == AF_INET) - recvport = ntohs (((struct sockaddr_in *) &sa)->sin_port); - else - recvport = ntohs (((struct sockaddr_in6 *) &sa)->sin6_port); + if (eXtl_udp.proto_family == AF_INET) + slen = sizeof(struct sockaddr_in); + else + slen = sizeof(struct sockaddr_in6); + + buf = (char *) osip_malloc(SIP_MESSAGE_MAX_LENGTH * sizeof(char) + 1); + if (buf == NULL) + return OSIP_NOMEM; + + i = recvfrom(udp_socket, buf, + SIP_MESSAGE_MAX_LENGTH, 0, (struct sockaddr *) &sa, &slen); + + if (i > 5) { + char src6host[NI_MAXHOST]; + int recvport = 0; + int err; + + buf[i] = '\0'; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Received message: \n%s\n", buf)); + + memset(src6host, 0, sizeof(src6host)); + + if (eXtl_udp.proto_family == AF_INET) + recvport = ntohs(((struct sockaddr_in *) &sa)->sin_port); + else + recvport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port); #if defined(__arc__) - { - struct sockaddr_in *fromsa = (struct sockaddr_in *) &sa; - char *tmp; - tmp = inet_ntoa (fromsa->sin_addr); - if (tmp == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Message received from: NULL:%i inet_ntoa failure\n", - recvport)); - } else - { - snprintf (src6host, sizeof (src6host), "%s", tmp); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, - recvport)); - } - } + { + struct sockaddr_in *fromsa = (struct sockaddr_in *) &sa; + char *tmp; + tmp = inet_ntoa(fromsa->sin_addr); + if (tmp == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Message received from: NULL:%i inet_ntoa failure\n", + recvport)); + } else { + snprintf(src6host, sizeof(src6host), "%s", tmp); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, + recvport)); + } + } #else - err = getnameinfo ((struct sockaddr *) &sa, slen, - src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + err = getnameinfo((struct sockaddr *) &sa, slen, + src6host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); - if (err != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Message received from: NULL:%i getnameinfo failure\n", - recvport)); - snprintf (src6host, sizeof (src6host), "127.0.0.1"); - } else - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, recvport)); - } -#endif - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", src6host, recvport)); + if (err != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Message received from: NULL:%i getnameinfo failure\n", + recvport)); + snprintf(src6host, sizeof(src6host), "127.0.0.1"); + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, recvport)); + } +#endif + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", src6host, recvport)); - _eXosip_handle_incoming_message (buf, i, udp_socket, src6host, recvport); + _eXosip_handle_incoming_message(buf, i, udp_socket, src6host, + recvport); - } + } #ifndef MINISIZE - else if (i < 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Could not read socket\n")); - } else - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Dummy SIP message received\n")); - } + else if (i < 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Could not read socket\n")); + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Dummy SIP message received\n")); + } #endif - osip_free (buf); - } + osip_free(buf); + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -static int -eXtl_update_local_target (osip_message_t * req) +static int eXtl_update_local_target(osip_message_t * req) { - int pos = 0; - - struct eXosip_account_info *ainfo = NULL; - char *proxy = NULL; - int i; - if (MSG_IS_REQUEST (req)) - { - if (req->from != NULL - && req->from->url != NULL && req->from->url->host != NULL) - proxy = req->from->url->host; - } else - { - if (req->to != NULL && req->to->url != NULL && req->to->url->host != NULL) - proxy = req->to->url->host; - } - - if (proxy != NULL) - { - for (i = 0; i < MAX_EXOSIP_ACCOUNT_INFO; i++) - { - if (eXosip.account_entries[i].proxy[0] != '\0') - { - if (strstr (eXosip.account_entries[i].proxy, proxy) != NULL - || strstr (proxy, eXosip.account_entries[i].proxy) != NULL) - { - /* use ainfo */ - if (eXosip.account_entries[i].nat_ip[0] != '\0') - { - ainfo = &eXosip.account_entries[i]; - break; - } - } - } - } - } - - if (udp_firewall_ip != '\0') - { - - while (!osip_list_eol (&req->contacts, pos)) - { - osip_contact_t *co; - - co = (osip_contact_t *) osip_list_get (&req->contacts, pos); - pos++; - if (co != NULL && co->url != NULL && co->url->host != NULL - && 0 == osip_strcasecmp (co->url->host, udp_firewall_ip)) - { - if (ainfo == NULL) - { - if (co->url->port == NULL && - 0 != osip_strcasecmp (udp_firewall_port, "5060")) - { - co->url->port = osip_strdup (udp_firewall_port); - } else if (co->url->port != NULL && - 0 != osip_strcasecmp (udp_firewall_port, - co->url->port)) - { - osip_free (co->url->port); - co->url->port = osip_strdup (udp_firewall_port); - } - } else - { - if (co->url->port == NULL && ainfo->nat_port != 5060) - { - co->url->port = osip_malloc (10); - if (co->url->port == NULL) - return OSIP_NOMEM; - snprintf (co->url->port, 9, "%i", ainfo->nat_port); - } else if (co->url->port != NULL && - ainfo->nat_port != atoi (co->url->port)) - { - osip_free (co->url->port); - co->url->port = osip_malloc (10); - if (co->url->port == NULL) - return OSIP_NOMEM; - snprintf (co->url->port, 9, "%i", ainfo->nat_port); - } - } - } - } - } + int pos = 0; + + struct eXosip_account_info *ainfo = NULL; + char *proxy = NULL; + int i; + if (MSG_IS_REQUEST(req)) { + if (req->from != NULL + && req->from->url != NULL && req->from->url->host != NULL) + proxy = req->from->url->host; + } else { + if (req->to != NULL && req->to->url != NULL && req->to->url->host != NULL) + proxy = req->to->url->host; + } + + if (proxy != NULL) { + for (i = 0; i < MAX_EXOSIP_ACCOUNT_INFO; i++) { + if (eXosip.account_entries[i].proxy[0] != '\0') { + if (strstr(eXosip.account_entries[i].proxy, proxy) != NULL + || strstr(proxy, eXosip.account_entries[i].proxy) != NULL) { + /* use ainfo */ + if (eXosip.account_entries[i].nat_ip[0] != '\0') { + ainfo = &eXosip.account_entries[i]; + break; + } + } + } + } + } + + if (udp_firewall_ip[0] != '\0') { + + while (!osip_list_eol(&req->contacts, pos)) { + osip_contact_t *co; + + co = (osip_contact_t *) osip_list_get(&req->contacts, pos); + pos++; + if (co != NULL && co->url != NULL && co->url->host != NULL +#if 0 + && 0 == osip_strcasecmp(co->url->host, udp_firewall_ip) +#endif + ) { + if (ainfo == NULL) { + if (co->url->port == NULL && + 0 != osip_strcasecmp(udp_firewall_port, "5060")) { + co->url->port = osip_strdup(udp_firewall_port); + } else if (co->url->port != NULL && + 0 != osip_strcasecmp(udp_firewall_port, + co->url->port)) { + osip_free(co->url->port); + co->url->port = osip_strdup(udp_firewall_port); + } + } else { + if (co->url->port == NULL && ainfo->nat_port != 5060) { + co->url->port = osip_malloc(10); + if (co->url->port == NULL) + return OSIP_NOMEM; + snprintf(co->url->port, 9, "%i", ainfo->nat_port); + } else if (co->url->port != NULL && + ainfo->nat_port != atoi(co->url->port)) { + osip_free(co->url->port); + co->url->port = osip_malloc(10); + if (co->url->port == NULL) + return OSIP_NOMEM; + snprintf(co->url->port, 9, "%i", ainfo->nat_port); + } +#if 1 + if (ainfo->nat_ip[0] != '\0') + { + osip_free(co->url->host); + co->url->host = osip_strdup(ainfo->nat_ip); + } + } + } +#endif + } + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } #ifndef INET6_ADDRSTRLEN @@ -451,267 +441,398 @@ #endif static int -udp_tl_send_message (osip_transaction_t * tr, osip_message_t * sip, char *host, - int port, int out_socket) +udp_tl_send_message(osip_transaction_t * tr, osip_message_t * sip, char *host, + int port, int out_socket) { - int len = 0; - size_t length = 0; - struct addrinfo *addrinfo; - struct __eXosip_sockaddr addr; - char *message; - - char ipbuf[INET6_ADDRSTRLEN]; - int i; - - if (udp_socket <= 0) - return -1; - - if (host == NULL) - { - host = sip->req_uri->host; - if (sip->req_uri->port != NULL) - port = osip_atoi (sip->req_uri->port); - else - port = 5060; - } + int len = 0; + size_t length = 0; + struct addrinfo *addrinfo; + struct __eXosip_sockaddr addr; + char *message = NULL; + + char ipbuf[INET6_ADDRSTRLEN]; + int i; + osip_naptr_t *naptr_record=NULL; + + if (udp_socket <= 0) + return -1; + + if (host == NULL) { + host = sip->req_uri->host; + if (sip->req_uri->port != NULL) + port = osip_atoi(sip->req_uri->port); + else + port = 5060; + } - eXtl_update_local_target (sip); + eXtl_update_local_target(sip); - i = -1; + i = -1; #ifndef MINISIZE - if (tr != NULL && tr->record.name[0] != '\0' - && tr->record.srventry[0].srv[0] != '\0') - { - /* always choose the first here. - if a network error occur, remove first entry and - replace with next entries. - */ - osip_srv_entry_t *srv; - int n = 0; - for (srv = &tr->record.srventry[0]; - n < 10 && tr->record.srventry[0].srv[0]; srv = &tr->record.srventry[0]) - { - i = eXosip_get_addrinfo (&addrinfo, srv->srv, srv->port, IPPROTO_UDP); - if (i == 0) - { - host = srv->srv; - port = srv->port; - break; - } - memmove (&tr->record.srventry[0], &tr->record.srventry[1], - 9 * sizeof (osip_srv_entry_t)); - memset (&tr->record.srventry[9], 0, sizeof (osip_srv_entry_t)); - i = -1; - /* copy next element */ - n++; - } - } -#endif - - /* if SRV was used, distination may be already found */ - if (i != 0) - { - i = eXosip_get_addrinfo (&addrinfo, host, port, IPPROTO_UDP); - } - - if (i != 0) - { - return -1; - } - - memcpy (&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); - len = addrinfo->ai_addrlen; - - eXosip_freeaddrinfo (addrinfo); - - /* remove preloaded route if there is no tag in the To header - */ - { - osip_route_t *route = NULL; - osip_generic_param_t *tag = NULL; - osip_message_get_route (sip, 0, &route); - - osip_to_get_tag (sip->to, &tag); - if (tag == NULL && route != NULL && route->url != NULL) - { - osip_list_remove (&sip->routes, 0); - } - i = osip_message_to_str (sip, &message, &length); - if (tag == NULL && route != NULL && route->url != NULL) - { - osip_list_add (&sip->routes, route, 0); - } - } - - if (i != 0 || length <= 0) - { - return -1; - } - - switch (((struct sockaddr *) &addr)->sa_family) - { - case AF_INET: - inet_ntop (((struct sockaddr *) &addr)->sa_family, - &(((struct sockaddr_in *) &addr)->sin_addr), ipbuf, - sizeof (ipbuf)); - break; - case AF_INET6: - inet_ntop (((struct sockaddr *) &addr)->sa_family, - &(((struct sockaddr_in6 *) &addr)->sin6_addr), ipbuf, - sizeof (ipbuf)); - break; - default: - strncpy (ipbuf, "(unknown)", sizeof (ipbuf)); - break; - } - - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message sent: (to dest=%s:%i)\n%s\n", - ipbuf, port, message)); - - if (tr != NULL) - { - if (tr->ict_context != NULL) - osip_ict_set_destination (tr->ict_context, osip_strdup (ipbuf), port); - if (tr->nict_context != NULL) - osip_nict_set_destination (tr->nict_context, osip_strdup (ipbuf), port); - } - - if (0 > - sendto (udp_socket, (const void *) message, length, 0, - (struct sockaddr *) &addr, len)) - { -#ifdef WIN32 - if (WSAECONNREFUSED == WSAGetLastError ()) -#else - if (ECONNREFUSED == errno) + if (tr==NULL) + { + _eXosip_srv_lookup(sip, &naptr_record); + + if (naptr_record!=NULL) { + eXosip_dnsutils_dns_process(naptr_record, 1); + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_dns_process(naptr_record, 1); + } + + if (naptr_record!=NULL && naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + { + /* 4: check if we have the one we want... */ + if (naptr_record->sipudp_record.name[0] != '\0' + && naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index].srv[0] != '\0') { + /* always choose the first here. + if a network error occur, remove first entry and + replace with next entries. + */ + osip_srv_entry_t *srv; + int n = 0; + for (srv = &naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index]; + n < 10 && naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index].srv[0]; + srv = &naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index]) { + if (srv->ipaddress[0]) + i = eXosip_get_addrinfo(&addrinfo, srv->ipaddress, srv->port, IPPROTO_UDP); + else + i = eXosip_get_addrinfo(&addrinfo, srv->srv, srv->port, IPPROTO_UDP); + if (i == 0) { + host = srv->srv; + port = srv->port; + break; + } + + i = eXosip_dnsutils_rotate_srv(&naptr_record->sipudp_record); + if (i<=0) + { + return -1; + } + if (i>=n) + { + return -1; + } + i = -1; + /* copy next element */ + n++; + } + } + } + + if (naptr_record!=NULL && naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + } + else + { + naptr_record = tr->naptr_record; + } + + if (naptr_record!=NULL) + { + /* 1: make sure there is no pending DNS */ + eXosip_dnsutils_dns_process(naptr_record, 0); + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_dns_process(naptr_record, 0); + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_UNKNOWN) + { + /* fallback to DNS A */ + if (naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + if (tr!=NULL) + tr->naptr_record=NULL; + /* must never happen? */ + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_INPROGRESS) + { + /* 2: keep waiting (naptr answer not received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE) + { + /* 3: keep waiting (naptr answer received/no srv answer received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + { + /* 3: keep waiting (naptr answer received/no srv answer received) */ + return OSIP_SUCCESS + 1; + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + { + /* 4: check if we have the one we want... */ + if (naptr_record->sipudp_record.name[0] != '\0' + && naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index].srv[0] != '\0') { + /* always choose the first here. + if a network error occur, remove first entry and + replace with next entries. + */ + osip_srv_entry_t *srv; + int n = 0; + for (srv = &naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index]; + n < 10 && naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index].srv[0]; + srv = &naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index]) { + if (srv->ipaddress[0]) + i = eXosip_get_addrinfo(&addrinfo, srv->ipaddress, srv->port, IPPROTO_UDP); + else + i = eXosip_get_addrinfo(&addrinfo, srv->srv, srv->port, IPPROTO_UDP); + if (i == 0) { + host = srv->srv; + port = srv->port; + break; + } + + i = eXosip_dnsutils_rotate_srv(&naptr_record->sipudp_record); + if (i<=0) + { + return -1; + } + if (i>=n) + { + return -1; + } + i = -1; + /* copy next element */ + n++; + } + } + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NOTSUPPORTED + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_RETRYLATER) + { + /* 5: fallback to DNS A */ + if (naptr_record->keep_in_cache==0) + osip_free(naptr_record); + naptr_record=NULL; + if (tr!=NULL) + tr->naptr_record=NULL; + } + } #endif - { - /* This can be considered as an error, but for the moment, - I prefer that the application continue to try sending - message again and again... so we are not in a error case. - Nevertheless, this error should be announced! - ALSO, UAS may not have any other options than retry always - on the same port. - */ - osip_free (message); - return 1; - } else - { + /* if SRV was used, destination may be already found */ + if (i != 0) { + i = eXosip_get_addrinfo(&addrinfo, host, port, IPPROTO_UDP); + } + + if (i != 0) { + return -1; + } + + memcpy(&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); + len = addrinfo->ai_addrlen; + + eXosip_freeaddrinfo(addrinfo); + + /* remove preloaded route if there is no tag in the To header + */ + { + osip_route_t *route = NULL; + osip_generic_param_t *tag = NULL; + osip_message_get_route(sip, 0, &route); + + osip_to_get_tag(sip->to, &tag); + if (tag == NULL && route != NULL && route->url != NULL) { + osip_list_remove(&sip->routes, 0); + } + i = osip_message_to_str(sip, &message, &length); + if (tag == NULL && route != NULL && route->url != NULL) { + osip_list_add(&sip->routes, route, 0); + } + } + + if (i != 0 || length <= 0) { + osip_free(message); + return -1; + } + + switch (((struct sockaddr *) &addr)->sa_family) { + case AF_INET: + inet_ntop(((struct sockaddr *) &addr)->sa_family, + &(((struct sockaddr_in *) &addr)->sin_addr), ipbuf, + sizeof(ipbuf)); + break; + case AF_INET6: + inet_ntop(((struct sockaddr *) &addr)->sa_family, + &(((struct sockaddr_in6 *) &addr)->sin6_addr), ipbuf, + sizeof(ipbuf)); + break; + default: + strncpy(ipbuf, "(unknown)", sizeof(ipbuf)); + break; + } + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message sent: (to dest=%s:%i)\n%s\n", + ipbuf, port, message)); + + if (osip_strcasecmp(host, ipbuf)!=0 && MSG_IS_REQUEST(sip)) { + if (MSG_IS_REGISTER(sip)) { + struct eXosip_dns_cache entry; + + memset(&entry, 0, sizeof(struct eXosip_dns_cache)); + snprintf(entry.host, sizeof(entry.host), "%s", host); + snprintf(entry.ip, sizeof(entry.ip), "%s", ipbuf); + eXosip_set_option(EXOSIP_OPT_ADD_DNS_CACHE, (void *) &entry); + } + } + + if (tr != NULL) { + if (tr->ict_context != NULL) + osip_ict_set_destination(tr->ict_context, osip_strdup(ipbuf), port); + if (tr->nict_context != NULL) + osip_nict_set_destination(tr->nict_context, osip_strdup(ipbuf), port); + } + + if (0 > + sendto(udp_socket, (const void *) message, length, 0, + (struct sockaddr *) &addr, len)) + { #ifndef MINISIZE - /* delete first SRV entry that is not reachable */ - if (tr != NULL && tr->record.name[0] != '\0' - && tr->record.srventry[0].srv[0] != '\0') - { - memmove (&tr->record.srventry[0], &tr->record.srventry[1], - 9 * sizeof (osip_srv_entry_t)); - memset (&tr->record.srventry[9], 0, sizeof (osip_srv_entry_t)); - osip_free (message); - return OSIP_SUCCESS; /* retry for next retransmission! */ - } -#endif - /* SIP_NETWORK_ERROR; */ - osip_free (message); - return -1; - } - } - - if (eXosip.keep_alive > 0) - { - if (MSG_IS_REGISTER (sip)) - { - eXosip_reg_t *reg = NULL; - - if (_eXosip_reg_find (®, tr) == 0) - { - memcpy (&(reg->addr), &addr, len); - reg->len = len; - } - } - } + if (naptr_record!=NULL) + { + /* rotate on failure! */ + if (eXosip_dnsutils_rotate_srv(&naptr_record->sipudp_record)>0) + { + osip_free(message); + return OSIP_SUCCESS + 1; /* retry for next retransmission! */ + } + } +#endif + /* SIP_NETWORK_ERROR; */ + osip_free(message); + return -1; + } + + if (eXosip.keep_alive > 0) { + if (MSG_IS_REGISTER(sip)) { + eXosip_reg_t *reg = NULL; + + if (_eXosip_reg_find(®, tr) == 0) { + memcpy(&(reg->addr), &addr, len); + reg->len = len; + } + } + } - osip_free (message); - return OSIP_SUCCESS; +#ifndef MINISIZE + if (naptr_record!=NULL) + { + if (tr!=NULL && MSG_IS_REGISTER(sip) && tr->last_response==NULL) + { + /* failover for outgoing transaction */ + time_t now; + now = time(NULL); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "not yet answered\n")); + if (tr != NULL && now - tr->birth_time > 10 && now - tr->birth_time < 13) + { + /* avoid doing this twice... */ + if (eXosip_dnsutils_rotate_srv(&naptr_record->sipudp_record)>0) + { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Doing failover: %s:%i->%s:%i\n", + host, port, + naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index].srv, + naptr_record->sipudp_record.srventry[naptr_record->sipudp_record.index].port)); + osip_free(message); + return OSIP_SUCCESS + 1; /* retry for next retransmission! */ + } + } + } + } +#endif + + osip_free(message); + return OSIP_SUCCESS; } -static int -udp_tl_keepalive (void) +static int udp_tl_keepalive(void) { - char buf[4] = "jaK"; - eXosip_reg_t *jr; - for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) - { - if (jr->len > 0) - { - if (sendto (udp_socket, (const void *) buf, 4, 0, - (struct sockaddr *) &(jr->addr), jr->len) > 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: Keep Alive sent on UDP!\n")); - } - } - } - return OSIP_SUCCESS; + char buf[4] = "jaK"; + eXosip_reg_t *jr; + + if (eXosip.keep_alive <= 0) { + return 0; + } + + if (udp_socket <= 0) + return OSIP_UNDEFINED_ERROR; + + for (jr = eXosip.j_reg; jr != NULL; jr = jr->next) { + if (jr->len > 0) { + if (sendto(udp_socket, (const void *) buf, 4, 0, + (struct sockaddr *) &(jr->addr), jr->len) > 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: Keep Alive sent on UDP!\n")); + } + } + } + return OSIP_SUCCESS; } -static int -udp_tl_set_socket (int socket) +static int udp_tl_set_socket(int socket) { - udp_socket = socket; + udp_socket = socket; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -static int -udp_tl_masquerade_contact (const char *public_address, int port) +static int udp_tl_masquerade_contact(const char *public_address, int port) { - if (public_address == NULL || public_address[0] == '\0') - { - memset (udp_firewall_ip, '\0', sizeof (udp_firewall_ip)); - return OSIP_SUCCESS; - } - snprintf (udp_firewall_ip, sizeof (udp_firewall_ip), "%s", public_address); - if (port > 0) - { - snprintf (udp_firewall_port, sizeof (udp_firewall_port), "%i", port); - } - return OSIP_SUCCESS; + if (public_address == NULL || public_address[0] == '\0') { + memset(udp_firewall_ip, '\0', sizeof(udp_firewall_ip)); + memset(udp_firewall_port, '\0', sizeof(udp_firewall_port)); + if (eXtl_udp.proto_port > 0) + snprintf(udp_firewall_port, sizeof(udp_firewall_port), "%i", + eXtl_udp.proto_port); + return OSIP_SUCCESS; + } + snprintf(udp_firewall_ip, sizeof(udp_firewall_ip), "%s", public_address); + if (port > 0) { + snprintf(udp_firewall_port, sizeof(udp_firewall_port), "%i", port); + } + return OSIP_SUCCESS; } static int -udp_tl_get_masquerade_contact (char *ip, int ip_size, char *port, int port_size) +udp_tl_get_masquerade_contact(char *ip, int ip_size, char *port, int port_size) { - memset (ip, 0, ip_size); - memset (port, 0, port_size); + memset(ip, 0, ip_size); + memset(port, 0, port_size); - if (udp_firewall_ip != '\0') - snprintf (ip, ip_size, "%s", udp_firewall_ip); + if (udp_firewall_ip[0] != '\0') + snprintf(ip, ip_size, "%s", udp_firewall_ip); - if (udp_firewall_port != '\0') - snprintf (port, port_size, "%s", udp_firewall_port); - return OSIP_SUCCESS; + if (udp_firewall_port[0] != '\0') + snprintf(port, port_size, "%s", udp_firewall_port); + return OSIP_SUCCESS; } struct eXtl_protocol eXtl_udp = { - 1, - 5060, - "UDP", - "0.0.0.0", - IPPROTO_UDP, - AF_INET, - 0, - 0, - - &udp_tl_init, - &udp_tl_free, - &udp_tl_open, - &udp_tl_set_fdset, - &udp_tl_read_message, - &udp_tl_send_message, - &udp_tl_keepalive, - &udp_tl_set_socket, - &udp_tl_masquerade_contact, - &udp_tl_get_masquerade_contact + 1, + 5060, + "UDP", + "0.0.0.0", + IPPROTO_UDP, + AF_INET, + 0, + 0, + + &udp_tl_init, + &udp_tl_free, + &udp_tl_open, + &udp_tl_set_fdset, + &udp_tl_read_message, + &udp_tl_send_message, + &udp_tl_keepalive, + &udp_tl_set_socket, + &udp_tl_masquerade_contact, + &udp_tl_get_masquerade_contact }; diff -Nru libexosip2-3.3.0/src/eXtransport.c libexosip2-3.6.0/src/eXtransport.c --- libexosip2-3.3.0/src/eXtransport.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/eXtransport.c 2010-01-06 14:57:57.000000000 +0000 @@ -27,139 +27,127 @@ extern eXosip_t eXosip; -char * -_eXosip_transport_protocol (osip_message_t * msg) +char *_eXosip_transport_protocol(osip_message_t * msg) { - osip_via_t *via; + osip_via_t *via; - via = (osip_via_t *) osip_list_get (&msg->vias, 0); - if (via == NULL || via->protocol == NULL) - return NULL; - return via->protocol; + via = (osip_via_t *) osip_list_get(&msg->vias, 0); + if (via == NULL || via->protocol == NULL) + return NULL; + return via->protocol; } -int -_eXosip_find_protocol (osip_message_t * msg) +int _eXosip_find_protocol(osip_message_t * msg) { - osip_via_t *via; + osip_via_t *via; - via = (osip_via_t *) osip_list_get (&msg->vias, 0); - if (via == NULL || via->protocol == NULL) - return -1; - else if (0 == osip_strcasecmp (via->protocol, "UDP")) - return IPPROTO_UDP; - else if (0 == osip_strcasecmp (via->protocol, "TCP")) - return IPPROTO_TCP; - return -1;; + via = (osip_via_t *) osip_list_get(&msg->vias, 0); + if (via == NULL || via->protocol == NULL) + return -1; + else if (0 == osip_strcasecmp(via->protocol, "UDP")) + return IPPROTO_UDP; + else if (0 == osip_strcasecmp(via->protocol, "TCP")) + return IPPROTO_TCP; + return -1;; } -int -eXosip_transport_set (osip_message_t * msg, const char *transport) +int eXosip_transport_set(osip_message_t * msg, const char *transport) { - osip_via_t *via; + osip_via_t *via; - via = (osip_via_t *) osip_list_get (&msg->vias, 0); - if (via == NULL || via->protocol == NULL) - return -1; - - if (0 == osip_strcasecmp (via->protocol, transport)) - return OSIP_SUCCESS; - - osip_free (via->protocol); - via->protocol = osip_strdup (transport); - return OSIP_SUCCESS; + via = (osip_via_t *) osip_list_get(&msg->vias, 0); + if (via == NULL || via->protocol == NULL) + return -1; + + if (0 == osip_strcasecmp(via->protocol, transport)) + return OSIP_SUCCESS; + + osip_free(via->protocol); + via->protocol = osip_strdup(transport); + return OSIP_SUCCESS; } #if 0 #ifndef MINISIZE int -_eXosip_recvfrom (int s, char *buf, int len, unsigned int flags, - struct sockaddr *from, socklen_t * fromlen) +_eXosip_recvfrom(int s, char *buf, int len, unsigned int flags, + struct sockaddr *from, socklen_t * fromlen) { - int message_size = 0; - int length_done = 0; - int real_size = 0; - int i; - int extra_data_discarded; - - if (!eXosip.http_port) - { - return recvfrom (s, buf, len, flags, from, fromlen); - } - - /* we get the size of the HTTP data */ - i = recv (eXosip.net_interfaces[0].net_socket, (char *) &(message_size), 4, 0); - - real_size = message_size; - if (message_size < 0) - { - return -1; /* Connection error? */ - } - if (message_size == 0) - { - buf[0] = '\0'; - return OSIP_SUCCESS; - } - if (message_size > len - 1) - message_size = len - 1; - - length_done = 0; - - i = recv (eXosip.net_interfaces[0].net_socket, buf, message_size, 0); - length_done = i; - - if (length_done == real_size) - { - return length_done; - } - - if (length_done < message_size) - { - /* continue reading up to message_size */ - while (length_done < message_size) - { - i = - recv (eXosip.net_interfaces[0].net_socket, buf + length_done, - message_size - length_done, 0); - length_done = length_done + i; - } - } - - extra_data_discarded = length_done; - while (extra_data_discarded < real_size) - { - char buf2[2048]; - - /* We have to discard the end of data... up to the next message */ - i = recv (eXosip.net_interfaces[0].net_socket, buf2, 2048, 0); - extra_data_discarded = extra_data_discarded + i; - } - return length_done; + int message_size = 0; + int length_done = 0; + int real_size = 0; + int i; + int extra_data_discarded; + + if (!eXosip.http_port) { + return recvfrom(s, buf, len, flags, from, fromlen); + } + + /* we get the size of the HTTP data */ + i = recv(eXosip.net_interfaces[0].net_socket, (char *) &(message_size), 4, 0); + + real_size = message_size; + if (message_size < 0) { + return -1; /* Connection error? */ + } + if (message_size == 0) { + buf[0] = '\0'; + return OSIP_SUCCESS; + } + if (message_size > len - 1) + message_size = len - 1; + + length_done = 0; + + i = recv(eXosip.net_interfaces[0].net_socket, buf, message_size, 0); + length_done = i; + + if (length_done == real_size) { + return length_done; + } + + if (length_done < message_size) { + /* continue reading up to message_size */ + while (length_done < message_size) { + i = recv(eXosip.net_interfaces[0].net_socket, buf + length_done, + message_size - length_done, 0); + length_done = length_done + i; + } + } + + extra_data_discarded = length_done; + while (extra_data_discarded < real_size) { + char buf2[2048]; + + /* We have to discard the end of data... up to the next message */ + i = recv(eXosip.net_interfaces[0].net_socket, buf2, 2048, 0); + extra_data_discarded = extra_data_discarded + i; + } + return length_done; } int -_eXosip_sendto (int s, const void *buf, size_t len, int flags, - const struct sockaddr *to, socklen_t tolen) +_eXosip_sendto(int s, const void *buf, size_t len, int flags, + const struct sockaddr *to, socklen_t tolen) { - int i; - char buf2[10000]; + int i; + char buf2[10000]; - if (!eXosip.http_port) - { - i = sendto (s, buf, len, flags, to, tolen); - return i; - } - - memset (buf2, '\0', sizeof (buf2)); - memcpy (buf2, &len, sizeof (int)); - memcpy (buf2 + sizeof (int), buf, len); - - i = send (s, (char *) buf2, len + sizeof (int), 0); /* use TCP connection to proxy */ - if (i > 0) - i = i - sizeof (int); + if (!eXosip.http_port) { + i = sendto(s, buf, len, flags, to, tolen); + return i; + } + + memset(buf2, '\0', sizeof(buf2)); + memcpy(buf2, &len, sizeof(int)); + memcpy(buf2 + sizeof(int), buf, len); + + i = send(s, (char *) buf2, len + sizeof(int), 0); /* use TCP connection to proxy */ + if (i > 0) + i = i - sizeof(int); - return i; + return i; } #endif diff -Nru libexosip2-3.3.0/src/eXtransport.h libexosip2-3.6.0/src/eXtransport.h --- libexosip2-3.3.0/src/eXtransport.h 2009-01-27 22:03:59.000000000 +0000 +++ libexosip2-3.6.0/src/eXtransport.h 2011-10-04 07:56:59.000000000 +0000 @@ -35,30 +35,29 @@ # include #endif -struct eXtl_protocol -{ - int enabled; - - int proto_port; - char proto_name[10]; - char proto_ifs[20]; - int proto_num; - int proto_family; - int proto_secure; - int proto_reliable; - - int (*tl_init) (void); - int (*tl_free) (void); - int (*tl_open) (void); - int (*tl_set_fdset) (fd_set * osip_fdset, int *fd_max); - int (*tl_read_message) (fd_set * osip_fdset); - int (*tl_send_message) (osip_transaction_t * tr, osip_message_t * sip, - char *host, int port, int out_socket); - int (*tl_keepalive) (void); - int (*tl_set_socket) (int socket); - int (*tl_masquerade_contact) (const char *ip, int port); - int (*tl_get_masquerade_contact) (char *ip, int ip_size, char *port, - int port_size); +struct eXtl_protocol { + int enabled; + + int proto_port; + char proto_name[10]; + char proto_ifs[20]; + int proto_num; + int proto_family; + int proto_secure; + int proto_reliable; + + int (*tl_init) (void); + int (*tl_free) (void); + int (*tl_open) (void); + int (*tl_set_fdset) (fd_set * osip_fdset, fd_set * osip_wrset, int *fd_max); + int (*tl_read_message) (fd_set * osip_fdset, fd_set * osip_wrset); + int (*tl_send_message) (osip_transaction_t * tr, osip_message_t * sip, + char *host, int port, int out_socket); + int (*tl_keepalive) (void); + int (*tl_set_socket) (int socket); + int (*tl_masquerade_contact) (const char *ip, int port); + int (*tl_get_masquerade_contact) (char *ip, int ip_size, char *port, + int port_size); }; extern struct eXtl_protocol eXtl_udp; diff -Nru libexosip2-3.3.0/src/eXutils.c libexosip2-3.6.0/src/eXutils.c --- libexosip2-3.3.0/src/eXutils.c 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/src/eXutils.c 2011-07-14 11:23:01.000000000 +0000 @@ -37,10 +37,13 @@ #include #endif -#ifdef HAVE_RESOLV8_COMPAT_H +#ifdef HAVE_NAMESER8_COMPAT_H #include #include #elif defined(HAVE_RESOLV_H) || defined(OpenBSD) || defined(FreeBSD) || defined(NetBSD) +#ifdef HAVE_ARPA_NAMESER_COMPAT_H +#include +#endif #include #endif @@ -60,83 +63,78 @@ #if defined(USE_GETHOSTBYNAME) -void -eXosip_freeaddrinfo (struct addrinfo *ai) +void eXosip_freeaddrinfo(struct addrinfo *ai) { - struct addrinfo *next; - - while (ai) - { - next = ai->ai_next; - free (ai); - ai = next; - } -} + struct addrinfo *next; -struct namebuf -{ - struct hostent hostentry; - char *h_addr_list[2]; - struct in_addr addrentry; - char h_name[16]; /* 123.123.123.123 = 15 letters is maximum */ + while (ai) { + next = ai->ai_next; + free(ai); + ai = next; + } +} + +struct namebuf { + struct hostent hostentry; + char *h_addr_list[2]; + struct in_addr addrentry; + char h_name[16]; /* 123.123.123.123 = 15 letters is maximum */ }; -static struct addrinfo * -osip_he2ai (struct hostent *he, int port, int protocol) +static struct addrinfo *osip_he2ai(struct hostent *he, int port, int protocol) { - struct addrinfo *ai; + struct addrinfo *ai; - struct addrinfo *prevai = NULL; + struct addrinfo *prevai = NULL; - struct addrinfo *firstai = NULL; + struct addrinfo *firstai = NULL; - struct sockaddr_in *addr; + struct sockaddr_in *addr; - int i; + int i; - struct in_addr *curr; + struct in_addr *curr; - if (!he) - /* no input == no output! */ - return NULL; + if (!he) + /* no input == no output! */ + return NULL; - for (i = 0; (curr = (struct in_addr *) he->h_addr_list[i]); i++) - { + for (i = 0; (curr = (struct in_addr *) he->h_addr_list[i]); i++) { - ai = calloc (1, sizeof (struct addrinfo) + sizeof (struct sockaddr_in)); + ai = calloc(1, sizeof(struct addrinfo) + sizeof(struct sockaddr_in)); - if (!ai) - break; + if (!ai) + break; - if (!firstai) - /* store the pointer we want to return from this function */ - firstai = ai; + if (!firstai) + /* store the pointer we want to return from this function */ + firstai = ai; - if (prevai) - /* make the previous entry point to this */ - prevai->ai_next = ai; + if (prevai) + /* make the previous entry point to this */ + prevai->ai_next = ai; - ai->ai_family = AF_INET; /* we only support this */ - if (protocol == IPPROTO_UDP) - ai->ai_socktype = SOCK_DGRAM; - else - ai->ai_socktype = SOCK_STREAM; - ai->ai_addrlen = sizeof (struct sockaddr_in); - /* make the ai_addr point to the address immediately following this struct - and use that area to store the address */ - ai->ai_addr = (struct sockaddr *) ((char *) ai + sizeof (struct addrinfo)); + ai->ai_family = AF_INET; /* we only support this */ + if (protocol == IPPROTO_UDP) + ai->ai_socktype = SOCK_DGRAM; + else + ai->ai_socktype = SOCK_STREAM; + ai->ai_addrlen = sizeof(struct sockaddr_in); + /* make the ai_addr point to the address immediately following this struct + and use that area to store the address */ + ai->ai_addr = (struct sockaddr *) ((char *) ai + sizeof(struct addrinfo)); - /* leave the rest of the struct filled with zero */ + /* leave the rest of the struct filled with zero */ - addr = (struct sockaddr_in *) ai->ai_addr; /* storage area for this info */ + addr = (struct sockaddr_in *) ai->ai_addr; /* storage area for this info */ - memcpy ((char *) &(addr->sin_addr), curr, sizeof (struct in_addr)); - addr->sin_family = he->h_addrtype; - addr->sin_port = htons ((unsigned short) port); + memcpy((char *) &(addr->sin_addr), curr, sizeof(struct in_addr)); + addr->sin_family = he->h_addrtype; + addr->sin_port = htons((unsigned short) port); - prevai = ai; - } - return firstai; + prevai = ai; + } + return firstai; } /* @@ -148,53 +146,47 @@ * The input parameters ARE NOT checked for validity but they are expected * to have been checked already when this is called. */ -static struct addrinfo * -osip_ip2addr (in_addr_t num, const char *hostname, int port, int protocol) -{ - struct addrinfo *ai; - - struct hostent *h; - - struct in_addr *addrentry; - - struct namebuf buffer; - - struct namebuf *buf = &buffer; - - h = &buf->hostentry; - h->h_addr_list = &buf->h_addr_list[0]; - addrentry = &buf->addrentry; - addrentry->s_addr = num; - h->h_addr_list[0] = (char *) addrentry; - h->h_addr_list[1] = NULL; - h->h_addrtype = AF_INET; - h->h_length = sizeof (*addrentry); - h->h_name = &buf->h_name[0]; - h->h_aliases = NULL; - - /* Now store the dotted version of the address */ - snprintf ((char *) h->h_name, 16, "%s", hostname); - - ai = osip_he2ai (h, port, protocol); - return ai; -} - -static int -eXosip_inet_pton (int family, const char *src, void *dst) +static struct addrinfo *osip_ip2addr(in_addr_t num, const char *hostname, int port, + int protocol) { - if (strchr (src, ':')) /* possible IPv6 address */ - return OSIP_UNDEFINED_ERROR; /* (inet_pton(AF_INET6, src, dst)); */ - else if (strchr (src, '.')) /* possible IPv4 address */ - { - struct in_addr *tmp = dst; - - tmp->s_addr = inet_addr (src); /* already in N. byte order */ - if (tmp->s_addr == INADDR_NONE) - return 0; - - return 1; /* (inet_pton(AF_INET, src, dst)); */ - } else /* Impossibly a valid ip address */ - return INADDR_NONE; + struct addrinfo *ai; + struct hostent *h; + struct in_addr *addrentry; + struct namebuf buffer; + struct namebuf *buf = &buffer; + + h = &buf->hostentry; + h->h_addr_list = &buf->h_addr_list[0]; + addrentry = &buf->addrentry; + addrentry->s_addr = num; + h->h_addr_list[0] = (char *) addrentry; + h->h_addr_list[1] = NULL; + h->h_addrtype = AF_INET; + h->h_length = sizeof(*addrentry); + h->h_name = &buf->h_name[0]; + h->h_aliases = NULL; + + /* Now store the dotted version of the address */ + snprintf((char *) h->h_name, 16, "%s", hostname); + + ai = osip_he2ai(h, port, protocol); + return ai; +} + +static int eXosip_inet_pton(int family, const char *src, void *dst) +{ + if (strchr(src, ':')) /* possible IPv6 address */ + return OSIP_UNDEFINED_ERROR; /* (inet_pton(AF_INET6, src, dst)); */ + else if (strchr(src, '.')) { /* possible IPv4 address */ + struct in_addr *tmp = dst; + + tmp->s_addr = inet_addr(src); /* already in N. byte order */ + if (tmp->s_addr == INADDR_NONE) + return 0; + + return 1; /* (inet_pton(AF_INET, src, dst)); */ + } else /* Impossibly a valid ip address */ + return INADDR_NONE; } /* @@ -214,198 +206,191 @@ * */ int -eXosip_get_addrinfo (struct addrinfo **addrinfo, - const char *hostname, int port, int protocol) +eXosip_get_addrinfo(struct addrinfo **addrinfo, + const char *hostname, int port, int protocol) { - struct hostent *h = NULL; + struct hostent *h = NULL; - in_addr_t in; + in_addr_t in; - struct hostent *buf = NULL; + struct hostent *buf = NULL; - char portbuf[10]; + char portbuf[10]; - *addrinfo = NULL; /* default return */ + *addrinfo = NULL; /* default return */ - if (port < 0) /* -1 for SRV record */ - return OSIP_BADPARAMETER; + if (port < 0) /* -1 for SRV record */ + return OSIP_BADPARAMETER; - snprintf (portbuf, sizeof (portbuf), "%i", port); + snprintf(portbuf, sizeof(portbuf), "%i", port); - if (1 == eXosip_inet_pton (AF_INET, hostname, &in)) - /* This is a dotted IP address 123.123.123.123-style */ - { - *addrinfo = osip_ip2addr (in, hostname, port, protocol); - return OSIP_SUCCESS; - } + if (1 == eXosip_inet_pton(AF_INET, hostname, &in)) + /* This is a dotted IP address 123.123.123.123-style */ + { + *addrinfo = osip_ip2addr(in, hostname, port, protocol); + return OSIP_SUCCESS; + } #if defined(HAVE_GETHOSTBYNAME_R) - /* - * gethostbyname_r() is the preferred resolve function for many platforms. - * Since there are three different versions of it, the following code is - * somewhat #ifdef-ridden. - */ - else - { - int h_errnop; - - int res = ERANGE; - - buf = (struct hostent *) calloc (CURL_HOSTENT_SIZE, 1); - if (!buf) - return NULL; /* major failure */ - /* - * The clearing of the buffer is a workaround for a gethostbyname_r bug in - * qnx nto and it is also _required_ for some of these functions on some - * platforms. - */ + /* + * gethostbyname_r() is the preferred resolve function for many platforms. + * Since there are three different versions of it, the following code is + * somewhat #ifdef-ridden. + */ + else { + int h_errnop; + + int res = ERANGE; + + buf = (struct hostent *) calloc(CURL_HOSTENT_SIZE, 1); + if (!buf) + return NULL; /* major failure */ + /* + * The clearing of the buffer is a workaround for a gethostbyname_r bug in + * qnx nto and it is also _required_ for some of these functions on some + * platforms. + */ #ifdef HAVE_GETHOSTBYNAME_R_5 - /* Solaris, IRIX and more */ - (void) res; /* prevent compiler warning */ - h = gethostbyname_r (hostname, - (struct hostent *) buf, - (char *) buf + sizeof (struct hostent), - CURL_HOSTENT_SIZE - sizeof (struct hostent), &h_errnop); - - /* If the buffer is too small, it returns NULL and sets errno to - * ERANGE. The errno is thread safe if this is compiled with - * -D_REENTRANT as then the 'errno' variable is a macro defined to get - * used properly for threads. - */ - - if (h) - { - ; - } else -#endif /* HAVE_GETHOSTBYNAME_R_5 */ + /* Solaris, IRIX and more */ + (void) res; /* prevent compiler warning */ + h = gethostbyname_r(hostname, + (struct hostent *) buf, + (char *) buf + sizeof(struct hostent), + CURL_HOSTENT_SIZE - sizeof(struct hostent), &h_errnop); + + /* If the buffer is too small, it returns NULL and sets errno to + * ERANGE. The errno is thread safe if this is compiled with + * -D_REENTRANT as then the 'errno' variable is a macro defined to get + * used properly for threads. + */ + + if (h) { + ; + } else +#endif /* HAVE_GETHOSTBYNAME_R_5 */ #ifdef HAVE_GETHOSTBYNAME_R_6 - /* Linux */ + /* Linux */ - res = gethostbyname_r (hostname, (struct hostent *) buf, (char *) buf + sizeof (struct hostent), CURL_HOSTENT_SIZE - sizeof (struct hostent), &h, /* DIFFERENCE */ - &h_errnop); - /* Redhat 8, using glibc 2.2.93 changed the behavior. Now all of a - * sudden this function returns EAGAIN if the given buffer size is too - * small. Previous versions are known to return ERANGE for the same - * problem. - * - * This wouldn't be such a big problem if older versions wouldn't - * sometimes return EAGAIN on a common failure case. Alas, we can't - * assume that EAGAIN *or* ERANGE means ERANGE for any given version of - * glibc. - * - * For now, we do that and thus we may call the function repeatedly and - * fail for older glibc versions that return EAGAIN, until we run out of - * buffer size (step_size grows beyond CURL_HOSTENT_SIZE). - * - * If anyone has a better fix, please tell us! - * - * ------------------------------------------------------------------- - * - * On October 23rd 2003, Dan C dug up more details on the mysteries of - * gethostbyname_r() in glibc: - * - * In glibc 2.2.5 the interface is different (this has also been - * discovered in glibc 2.1.1-6 as shipped by Redhat 6). What I can't - * explain, is that tests performed on glibc 2.2.4-34 and 2.2.4-32 - * (shipped/upgraded by Redhat 7.2) don't show this behavior! - * - * In this "buggy" version, the return code is -1 on error and 'errno' - * is set to the ERANGE or EAGAIN code. Note that 'errno' is not a - * thread-safe variable. - */ + res = gethostbyname_r(hostname, (struct hostent *) buf, (char *) buf + sizeof(struct hostent), CURL_HOSTENT_SIZE - sizeof(struct hostent), &h, /* DIFFERENCE */ + &h_errnop); + /* Redhat 8, using glibc 2.2.93 changed the behavior. Now all of a + * sudden this function returns EAGAIN if the given buffer size is too + * small. Previous versions are known to return ERANGE for the same + * problem. + * + * This wouldn't be such a big problem if older versions wouldn't + * sometimes return EAGAIN on a common failure case. Alas, we can't + * assume that EAGAIN *or* ERANGE means ERANGE for any given version of + * glibc. + * + * For now, we do that and thus we may call the function repeatedly and + * fail for older glibc versions that return EAGAIN, until we run out of + * buffer size (step_size grows beyond CURL_HOSTENT_SIZE). + * + * If anyone has a better fix, please tell us! + * + * ------------------------------------------------------------------- + * + * On October 23rd 2003, Dan C dug up more details on the mysteries of + * gethostbyname_r() in glibc: + * + * In glibc 2.2.5 the interface is different (this has also been + * discovered in glibc 2.1.1-6 as shipped by Redhat 6). What I can't + * explain, is that tests performed on glibc 2.2.4-34 and 2.2.4-32 + * (shipped/upgraded by Redhat 7.2) don't show this behavior! + * + * In this "buggy" version, the return code is -1 on error and 'errno' + * is set to the ERANGE or EAGAIN code. Note that 'errno' is not a + * thread-safe variable. + */ - if (!h) /* failure */ -#endif /* HAVE_GETHOSTBYNAME_R_6 */ + if (!h) /* failure */ +#endif /* HAVE_GETHOSTBYNAME_R_6 */ #ifdef HAVE_GETHOSTBYNAME_R_3 - /* AIX, Digital Unix/Tru64, HPUX 10, more? */ + /* AIX, Digital Unix/Tru64, HPUX 10, more? */ - /* For AIX 4.3 or later, we don't use gethostbyname_r() at all, because of - * the plain fact that it does not return unique full buffers on each - * call, but instead several of the pointers in the hostent structs will - * point to the same actual data! This have the unfortunate down-side that - * our caching system breaks down horribly. Luckily for us though, AIX 4.3 - * and more recent versions have a "completely thread-safe"[*] libc where - * all the data is stored in thread-specific memory areas making calls to - * the plain old gethostbyname() work fine even for multi-threaded - * programs. - * - * This AIX 4.3 or later detection is all made in the configure script. - * - * Troels Walsted Hansen helped us work this out on March 3rd, 2003. - * - * [*] = much later we've found out that it isn't at all "completely - * thread-safe", but at least the gethostbyname() function is. - */ - - if (CURL_HOSTENT_SIZE >= - (sizeof (struct hostent) + sizeof (struct hostent_data))) - { - - /* August 22nd, 2000: Albert Chin-A-Young brought an updated version - * that should work! September 20: Richard Prescott worked on the buffer - * size dilemma. - */ - - res = gethostbyname_r (hostname, - (struct hostent *) buf, - (struct hostent_data *) ((char *) buf + - sizeof (struct - hostent))); - h_errnop = errno; /* we don't deal with this, but set it anyway */ - } else - res = -1; /* failure, too smallish buffer size */ - - if (!res) - { /* success */ - - h = buf; /* result expected in h */ - - /* This is the worst kind of the different gethostbyname_r() interfaces. - * Since we don't know how big buffer this particular lookup required, - * we can't realloc down the huge alloc without doing closer analysis of - * the returned data. Thus, we always use CURL_HOSTENT_SIZE for every - * name lookup. Fixing this would require an extra malloc() and then - * calling struct addrinfo_copy() that subsequent realloc()s down the new - * memory area to the actually used amount. - */ - } else -#endif /* HAVE_GETHOSTBYNAME_R_3 */ - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "gethostbyname failure. %s:%s (%s)\n", hostname, port)); - h = NULL; /* set return code to NULL */ - free (buf); - } -#else /* HAVE_GETHOSTBYNAME_R */ - /* - * Here is code for platforms that don't have gethostbyname_r() or for - * which the gethostbyname() is the preferred() function. - */ - else - { - h = NULL; + /* For AIX 4.3 or later, we don't use gethostbyname_r() at all, because of + * the plain fact that it does not return unique full buffers on each + * call, but instead several of the pointers in the hostent structs will + * point to the same actual data! This have the unfortunate down-side that + * our caching system breaks down horribly. Luckily for us though, AIX 4.3 + * and more recent versions have a "completely thread-safe"[*] libc where + * all the data is stored in thread-specific memory areas making calls to + * the plain old gethostbyname() work fine even for multi-threaded + * programs. + * + * This AIX 4.3 or later detection is all made in the configure script. + * + * Troels Walsted Hansen helped us work this out on March 3rd, 2003. + * + * [*] = much later we've found out that it isn't at all "completely + * thread-safe", but at least the gethostbyname() function is. + */ + + if (CURL_HOSTENT_SIZE >= + (sizeof(struct hostent) + sizeof(struct hostent_data))) { + + /* August 22nd, 2000: Albert Chin-A-Young brought an updated version + * that should work! September 20: Richard Prescott worked on the buffer + * size dilemma. + */ + + res = gethostbyname_r(hostname, + (struct hostent *) buf, + (struct hostent_data *) ((char *) buf + + sizeof(struct + hostent))); + h_errnop = errno; /* we don't deal with this, but set it anyway */ + } else + res = -1; /* failure, too smallish buffer size */ + + if (!res) { /* success */ + + h = buf; /* result expected in h */ + + /* This is the worst kind of the different gethostbyname_r() interfaces. + * Since we don't know how big buffer this particular lookup required, + * we can't realloc down the huge alloc without doing closer analysis of + * the returned data. Thus, we always use CURL_HOSTENT_SIZE for every + * name lookup. Fixing this would require an extra malloc() and then + * calling struct addrinfo_copy() that subsequent realloc()s down the new + * memory area to the actually used amount. + */ + } else +#endif /* HAVE_GETHOSTBYNAME_R_3 */ + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "gethostbyname failure. %s:%s (%s)\n", hostname, port)); + h = NULL; /* set return code to NULL */ + free(buf); + } +#else /* HAVE_GETHOSTBYNAME_R */ + /* + * Here is code for platforms that don't have gethostbyname_r() or for + * which the gethostbyname() is the preferred() function. + */ + else { + h = NULL; #if !defined(__arc__) - h = gethostbyname (hostname); + h = gethostbyname(hostname); #endif - if (!h) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "gethostbyname failure. %s:%s (%s)\n", hostname, port)); - } -#endif /*HAVE_GETHOSTBYNAME_R */ - } - - if (h) - { - *addrinfo = osip_he2ai (h, port, protocol); - - if (buf) /* used a *_r() function */ - free (buf); - } + if (!h) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "gethostbyname failure. %s:%s (%s)\n", hostname, port)); + } +#endif /*HAVE_GETHOSTBYNAME_R */ + } + + if (h) { + *addrinfo = osip_he2ai(h, port, protocol); + + if (buf) /* used a *_r() function */ + free(buf); + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } #endif @@ -417,138 +402,125 @@ #include int -eXosip_dns_get_local_fqdn (char **servername, char **serverip, - char **netmask, unsigned int WIN32_interface) -{ - unsigned int pos; - - *servername = NULL; /* no name on win32? */ - *serverip = NULL; - *netmask = NULL; - - /* First, try to get the interface where we should listen */ - { - DWORD size_of_iptable = 0; - - PMIB_IPADDRTABLE ipt; - - PMIB_IFROW ifrow; - - if (GetIpAddrTable (NULL, &size_of_iptable, TRUE) == ERROR_INSUFFICIENT_BUFFER) - { - ifrow = (PMIB_IFROW) _alloca (sizeof (MIB_IFROW)); - ipt = (PMIB_IPADDRTABLE) _alloca (size_of_iptable); - if (ifrow == NULL || ipt == NULL) - { - /* not very usefull to continue */ - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO4, NULL, - "ERROR alloca failed\r\n")); - return OSIP_NOMEM; - } - - if (!GetIpAddrTable (ipt, &size_of_iptable, TRUE)) - { - /* look for the best public interface */ - - for (pos = 0; pos < ipt->dwNumEntries && *netmask == NULL; ++pos) - { - /* index is */ - struct in_addr addr; - - struct in_addr mask; - - ifrow->dwIndex = ipt->table[pos].dwIndex; - if (GetIfEntry (ifrow) == NO_ERROR) - { - switch (ifrow->dwType) - { - case MIB_IF_TYPE_LOOPBACK: - /* break; */ - case MIB_IF_TYPE_ETHERNET: - default: - addr.s_addr = ipt->table[pos].dwAddr; - mask.s_addr = ipt->table[pos].dwMask; - if (ipt->table[pos].dwIndex == WIN32_interface) - { - *servername = NULL; /* no name on win32? */ - *serverip = osip_strdup (inet_ntoa (addr)); - *netmask = osip_strdup (inet_ntoa (mask)); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO4, NULL, - "Interface ethernet: %s/%s\r\n", - *serverip, *netmask)); - break; - } - } - } - } - } - } - } - - if (*serverip == NULL || *netmask == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_WARNING, NULL, - "ERROR No network interface found\r\n")); - return OSIP_NO_NETWORK; - } - - return OSIP_SUCCESS; -} - -int -eXosip_guess_ip_for_via (int family, char *address, int size) +eXosip_dns_get_local_fqdn(char **servername, char **serverip, + char **netmask, unsigned int WIN32_interface) { - SOCKET sock; - - SOCKADDR_STORAGE local_addr; + unsigned int pos; - int local_addr_len; + *servername = NULL; /* no name on win32? */ + *serverip = NULL; + *netmask = NULL; + + /* First, try to get the interface where we should listen */ + { + DWORD size_of_iptable = 0; + + PMIB_IPADDRTABLE ipt; + + PMIB_IFROW ifrow; + + if (GetIpAddrTable(NULL, &size_of_iptable, TRUE) == + ERROR_INSUFFICIENT_BUFFER) { + ifrow = (PMIB_IFROW) _alloca(sizeof(MIB_IFROW)); + ipt = (PMIB_IPADDRTABLE) _alloca(size_of_iptable); + if (ifrow == NULL || ipt == NULL) { + /* not very usefull to continue */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO4, NULL, + "ERROR alloca failed\r\n")); + return OSIP_NOMEM; + } + + if (!GetIpAddrTable(ipt, &size_of_iptable, TRUE)) { + /* look for the best public interface */ + + for (pos = 0; pos < ipt->dwNumEntries && *netmask == NULL; ++pos) { + /* index is */ + struct in_addr addr; + + struct in_addr mask; + + ifrow->dwIndex = ipt->table[pos].dwIndex; + if (GetIfEntry(ifrow) == NO_ERROR) { + switch (ifrow->dwType) { + case MIB_IF_TYPE_LOOPBACK: + /* break; */ + case MIB_IF_TYPE_ETHERNET: + default: + addr.s_addr = ipt->table[pos].dwAddr; + mask.s_addr = ipt->table[pos].dwMask; + if (ipt->table[pos].dwIndex == WIN32_interface) { + *servername = NULL; /* no name on win32? */ + *serverip = osip_strdup(inet_ntoa(addr)); + *netmask = osip_strdup(inet_ntoa(mask)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO4, NULL, + "Interface ethernet: %s/%s\r\n", + *serverip, *netmask)); + break; + } + } + } + } + } + } + } + + if (*serverip == NULL || *netmask == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_WARNING, NULL, + "ERROR No network interface found\r\n")); + return OSIP_NO_NETWORK; + } + + return OSIP_SUCCESS; +} + +int eXosip_guess_ip_for_via(int family, char *address, int size) +{ + SOCKET sock; + + SOCKADDR_STORAGE local_addr; + + int local_addr_len; + + struct addrinfo *addrf=NULL; + + address[0] = '\0'; + sock = socket(family, SOCK_DGRAM, 0); + + if (family == AF_INET) { + eXosip_get_addrinfo(&addrf, eXosip.ipv4_for_gateway, 0, IPPROTO_UDP); + } else if (family == AF_INET6) { + eXosip_get_addrinfo(&addrf, eXosip.ipv6_for_gateway, 0, IPPROTO_UDP); + } + + if (addrf == NULL) { + closesocket(sock); + snprintf(address, size, (family == AF_INET) ? "127.0.0.1" : "::1"); + return OSIP_NO_NETWORK; + } + + if (WSAIoctl + (sock, SIO_ROUTING_INTERFACE_QUERY, addrf->ai_addr, addrf->ai_addrlen, + &local_addr, sizeof(local_addr), &local_addr_len, NULL, NULL) != 0) { + closesocket(sock); + eXosip_freeaddrinfo(addrf); + snprintf(address, size, (family == AF_INET) ? "127.0.0.1" : "::1"); + return OSIP_NO_NETWORK; + } + + closesocket(sock); + eXosip_freeaddrinfo(addrf); + + if (getnameinfo((const struct sockaddr *) &local_addr, + local_addr_len, address, size, NULL, 0, NI_NUMERICHOST)) { + snprintf(address, size, (family == AF_INET) ? "127.0.0.1" : "::1"); + return OSIP_NO_NETWORK; + } - struct addrinfo *addrf; - - address[0] = '\0'; - sock = socket (family, SOCK_DGRAM, 0); - - if (family == AF_INET) - { - getaddrinfo (eXosip.ipv4_for_gateway, NULL, NULL, &addrf); - } else if (family == AF_INET6) - { - getaddrinfo (eXosip.ipv6_for_gateway, NULL, NULL, &addrf); - } - - if (addrf == NULL) - { - closesocket (sock); - snprintf (address, size, (family == AF_INET) ? "127.0.0.1" : "::1"); - return OSIP_NO_NETWORK; - } - - if (WSAIoctl - (sock, SIO_ROUTING_INTERFACE_QUERY, addrf->ai_addr, addrf->ai_addrlen, - &local_addr, sizeof (local_addr), &local_addr_len, NULL, NULL) != 0) - { - closesocket (sock); - freeaddrinfo (addrf); - snprintf (address, size, (family == AF_INET) ? "127.0.0.1" : "::1"); - return OSIP_NO_NETWORK; - } - - closesocket (sock); - freeaddrinfo (addrf); - - if (getnameinfo ((const struct sockaddr *) &local_addr, - local_addr_len, address, size, NULL, 0, NI_NUMERICHOST)) - { - snprintf (address, size, (family == AF_INET) ? "127.0.0.1" : "::1"); - return OSIP_NO_NETWORK; - } - - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -#else /* sun, *BSD, linux, and other? */ +#else /* sun, *BSD, linux, and other? */ #include @@ -564,769 +536,2457 @@ #include -static int _eXosip_default_gateway_ipv4 (char *address, int size); +static int _eXosip_default_gateway_ipv4(char *address, int size); -static int _eXosip_default_gateway_ipv6 (char *address, int size); +static int _eXosip_default_gateway_ipv6(char *address, int size); #ifdef HAVE_GETIFADDRS #include static int -_eXosip_default_gateway_with_getifaddrs (int type, char *address, int size) +_eXosip_default_gateway_with_getifaddrs(int type, char *address, int size) { - struct ifaddrs *ifp; + struct ifaddrs *ifp; - struct ifaddrs *ifpstart; + struct ifaddrs *ifpstart; - int ret = -1; + int ret = -1; - if (getifaddrs (&ifpstart) < 0) - { - return OSIP_NO_NETWORK; - } - - for (ifp = ifpstart; ifp != NULL; ifp = ifp->ifa_next) - { - if (ifp->ifa_addr && ifp->ifa_addr->sa_family == type - && (ifp->ifa_flags & IFF_RUNNING) && !(ifp->ifa_flags & IFF_LOOPBACK)) - { - getnameinfo (ifp->ifa_addr, - (type == AF_INET6) ? - sizeof (struct sockaddr_in6) : sizeof (struct sockaddr_in), - address, size, NULL, 0, NI_NUMERICHOST); - if (strchr (address, '%') == NULL) - { /*avoid ipv6 link-local addresses */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "_eXosip_default_gateway_with_getifaddrs(): found %s\n", - address)); - ret = 0; - break; - } - } - } - freeifaddrs (ifpstart); - return ret; + if (getifaddrs(&ifpstart) < 0) { + return OSIP_NO_NETWORK; + } + + for (ifp = ifpstart; ifp != NULL; ifp = ifp->ifa_next) { + if (ifp->ifa_addr && ifp->ifa_addr->sa_family == type + && (ifp->ifa_flags & IFF_RUNNING) && !(ifp->ifa_flags & IFF_LOOPBACK)) + { + getnameinfo(ifp->ifa_addr, + (type == AF_INET6) ? + sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in), + address, size, NULL, 0, NI_NUMERICHOST); + if (strchr(address, '%') == NULL) { /*avoid ipv6 link-local addresses */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "_eXosip_default_gateway_with_getifaddrs(): found %s\n", + address)); + ret = 0; + break; + } + } + } + freeifaddrs(ifpstart); + return ret; } #endif -int -eXosip_guess_ip_for_via (int family, char *address, int size) -{ - int err; - - if (family == AF_INET6) - { - err = _eXosip_default_gateway_ipv6 (address, size); - } else - { - err = _eXosip_default_gateway_ipv4 (address, size); - } +int eXosip_guess_ip_for_via(int family, char *address, int size) +{ + int err; + + if (family == AF_INET6) { + err = _eXosip_default_gateway_ipv6(address, size); + } else { + err = _eXosip_default_gateway_ipv4(address, size); + } #ifdef HAVE_GETIFADDRS - if (err < 0) - err = _eXosip_default_gateway_with_getifaddrs (family, address, size); + if (err < 0) + err = _eXosip_default_gateway_with_getifaddrs(family, address, size); #endif - return err; + return err; } /* This is a portable way to find the default gateway. * The ip of the default interface is returned. */ -static int -_eXosip_default_gateway_ipv4 (char *address, int size) +static int _eXosip_default_gateway_ipv4(char *address, int size) { #ifdef __APPLE_CC__ - int len; + int len; #else - unsigned int len; + unsigned int len; #endif - int sock_rt, on = 1; + int sock_rt, on = 1; - struct sockaddr_in iface_out; + struct sockaddr_in iface_out; - struct sockaddr_in remote; + struct sockaddr_in remote; - memset (&remote, 0, sizeof (struct sockaddr_in)); - - remote.sin_family = AF_INET; - remote.sin_addr.s_addr = inet_addr (eXosip.ipv4_for_gateway); - remote.sin_port = htons (11111); - - memset (&iface_out, 0, sizeof (iface_out)); - sock_rt = socket (AF_INET, SOCK_DGRAM, 0); - - if (setsockopt (sock_rt, SOL_SOCKET, SO_BROADCAST, &on, sizeof (on)) == -1) - { - perror ("DEBUG: [get_output_if] setsockopt(SOL_SOCKET, SO_BROADCAST"); - close (sock_rt); - snprintf (address, size, "127.0.0.1"); - return OSIP_NO_NETWORK; - } - - if (connect - (sock_rt, (struct sockaddr *) &remote, sizeof (struct sockaddr_in)) == -1) - { - perror ("DEBUG: [get_output_if] connect"); - close (sock_rt); - snprintf (address, size, "127.0.0.1"); - return OSIP_NO_NETWORK; - } - - len = sizeof (iface_out); - if (getsockname (sock_rt, (struct sockaddr *) &iface_out, &len) == -1) - { - perror ("DEBUG: [get_output_if] getsockname"); - close (sock_rt); - snprintf (address, size, "127.0.0.1"); - return OSIP_NO_NETWORK; - } - - close (sock_rt); - if (iface_out.sin_addr.s_addr == 0) - { /* what is this case?? */ - snprintf (address, size, "127.0.0.1"); - return OSIP_NO_NETWORK; - } - osip_strncpy (address, inet_ntoa (iface_out.sin_addr), size - 1); - return OSIP_SUCCESS; + memset(&remote, 0, sizeof(struct sockaddr_in)); + + remote.sin_family = AF_INET; + remote.sin_addr.s_addr = inet_addr(eXosip.ipv4_for_gateway); + remote.sin_port = htons(11111); + + memset(&iface_out, 0, sizeof(iface_out)); + sock_rt = socket(AF_INET, SOCK_DGRAM, 0); + + if (setsockopt(sock_rt, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on)) == -1) { + perror("DEBUG: [get_output_if] setsockopt(SOL_SOCKET, SO_BROADCAST"); + close(sock_rt); + snprintf(address, size, "127.0.0.1"); + return OSIP_NO_NETWORK; + } + + if (connect + (sock_rt, (struct sockaddr *) &remote, sizeof(struct sockaddr_in)) == -1) { + perror("DEBUG: [get_output_if] connect"); + close(sock_rt); + snprintf(address, size, "127.0.0.1"); + return OSIP_NO_NETWORK; + } + + len = sizeof(iface_out); + if (getsockname(sock_rt, (struct sockaddr *) &iface_out, &len) == -1) { + perror("DEBUG: [get_output_if] getsockname"); + close(sock_rt); + snprintf(address, size, "127.0.0.1"); + return OSIP_NO_NETWORK; + } + + close(sock_rt); + if (iface_out.sin_addr.s_addr == 0) { /* what is this case?? */ + snprintf(address, size, "127.0.0.1"); + return OSIP_NO_NETWORK; + } + osip_strncpy(address, inet_ntoa(iface_out.sin_addr), size - 1); + return OSIP_SUCCESS; } /* This is a portable way to find the default gateway. * The ip of the default interface is returned. */ -static int -_eXosip_default_gateway_ipv6 (char *address, int size) +static int _eXosip_default_gateway_ipv6(char *address, int size) { #ifdef __APPLE_CC__ - int len; + int len; #else - unsigned int len; + unsigned int len; #endif - int sock_rt, on = 1; + int sock_rt, on = 1; + + struct sockaddr_in6 iface_out; + + struct sockaddr_in6 remote; + + memset(&remote, 0, sizeof(struct sockaddr_in6)); + + remote.sin6_family = AF_INET6; + inet_pton(AF_INET6, eXosip.ipv6_for_gateway, &remote.sin6_addr); + remote.sin6_port = htons(11111); - struct sockaddr_in6 iface_out; + memset(&iface_out, 0, sizeof(iface_out)); + sock_rt = socket(AF_INET6, SOCK_DGRAM, 0); + /*default to ipv6 local loopback in case something goes wrong: */ + snprintf(address, size, "::1"); + if (setsockopt(sock_rt, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on)) == -1) { + perror("DEBUG: [get_output_if] setsockopt(SOL_SOCKET, SO_BROADCAST"); + close(sock_rt); + return OSIP_NO_NETWORK; + } - struct sockaddr_in6 remote; + if (connect + (sock_rt, (struct sockaddr *) &remote, sizeof(struct sockaddr_in6)) == -1) + { + perror("DEBUG: [get_output_if] connect"); + close(sock_rt); + return OSIP_NO_NETWORK; + } - memset (&remote, 0, sizeof (struct sockaddr_in6)); - - remote.sin6_family = AF_INET6; - inet_pton (AF_INET6, eXosip.ipv6_for_gateway, &remote.sin6_addr); - remote.sin6_port = htons (11111); - - memset (&iface_out, 0, sizeof (iface_out)); - sock_rt = socket (AF_INET6, SOCK_DGRAM, 0); - /*default to ipv6 local loopback in case something goes wrong: */ - strncpy (address, "::1", size); - if (setsockopt (sock_rt, SOL_SOCKET, SO_BROADCAST, &on, sizeof (on)) == -1) - { - perror ("DEBUG: [get_output_if] setsockopt(SOL_SOCKET, SO_BROADCAST"); - close (sock_rt); - return OSIP_NO_NETWORK; - } - - if (connect - (sock_rt, (struct sockaddr *) &remote, sizeof (struct sockaddr_in6)) == -1) - { - perror ("DEBUG: [get_output_if] connect"); - close (sock_rt); - return OSIP_NO_NETWORK; - } - - len = sizeof (iface_out); - if (getsockname (sock_rt, (struct sockaddr *) &iface_out, &len) == -1) - { - perror ("DEBUG: [get_output_if] getsockname"); - close (sock_rt); - return OSIP_NO_NETWORK; - } - close (sock_rt); - - if (iface_out.sin6_addr.s6_addr == 0) - { /* what is this case?? */ - return OSIP_NO_NETWORK; - } - inet_ntop (AF_INET6, (const void *) &iface_out.sin6_addr, address, size - 1); - return OSIP_SUCCESS; -} - -#endif - -char * -strdup_printf (const char *fmt, ...) -{ - /* Guess we need no more than 100 bytes. */ - int n, size = 100; - - char *p; - - va_list ap; - - if ((p = osip_malloc (size)) == NULL) - return NULL; - while (1) - { - /* Try to print in the allocated space. */ - va_start (ap, fmt); + len = sizeof(iface_out); + if (getsockname(sock_rt, (struct sockaddr *) &iface_out, &len) == -1) { + perror("DEBUG: [get_output_if] getsockname"); + close(sock_rt); + return OSIP_NO_NETWORK; + } + close(sock_rt); + + if (iface_out.sin6_addr.s6_addr == 0) { /* what is this case?? */ + return OSIP_NO_NETWORK; + } + inet_ntop(AF_INET6, (const void *) &iface_out.sin6_addr, address, size - 1); + return OSIP_SUCCESS; +} + +#endif + +char *strdup_printf(const char *fmt, ...) +{ + /* Guess we need no more than 100 bytes. */ + int n, size = 100; + + char *p; + + va_list ap; + + if ((p = osip_malloc(size)) == NULL) + return NULL; + while (1) { + /* Try to print in the allocated space. */ + va_start(ap, fmt); #ifdef WIN32 - n = _vsnprintf (p, size, fmt, ap); + n = _vsnprintf(p, size, fmt, ap); #else - n = vsnprintf (p, size, fmt, ap); + n = vsnprintf(p, size, fmt, ap); #endif - va_end (ap); - /* If that worked, return the string. */ - if (n > -1 && n < size) - return p; - /* Else try again with more space. */ - if (n > -1) /* glibc 2.1 */ - size = n + 1; /* precisely what is needed */ - else /* glibc 2.0 */ - size *= 2; /* twice the old size */ - if ((p = realloc (p, size)) == NULL) - return NULL; - } + va_end(ap); + /* If that worked, return the string. */ + if (n > -1 && n < size) + return p; + /* Else try again with more space. */ + if (n > -1) /* glibc 2.1 */ + size = n + 1; /* precisely what is needed */ + else /* glibc 2.0 */ + size *= 2; /* twice the old size */ + if ((p = osip_realloc(p, size)) == NULL) + return NULL; + } } #if !defined(USE_GETHOSTBYNAME) int -eXosip_get_addrinfo (struct addrinfo **addrinfo, const char *hostname, - int service, int protocol) +eXosip_get_addrinfo(struct addrinfo **addrinfo, const char *hostname, + int service, int protocol) { - struct addrinfo hints; + struct addrinfo hints; + char portbuf[10]; + int error; + int i; + + if (hostname == NULL) + return OSIP_BADPARAMETER; + + if (service == -1) /* -1 for SRV record */ + { + /* obsolete code: make an SRV record? */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip_get_addrinfo: obsolete code?\n")); + return -1; + } + + for (i = 0; i < MAX_EXOSIP_DNS_ENTRY; i++) { + if (eXosip.dns_entries[i].host[0] != '\0' + && 0 == osip_strcasecmp(eXosip.dns_entries[i].host, hostname)) { + /* update entry */ + if (eXosip.dns_entries[i].ip[0] != '\0') { + hostname = eXosip.dns_entries[i].ip; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip option set: dns cache used:%s -> %s\n", + eXosip.dns_entries[i].host, + eXosip.dns_entries[i].ip)); + } + } + } + + snprintf(portbuf, sizeof(portbuf), "%i", service); + + memset(&hints, 0, sizeof(hints)); + + hints.ai_flags = 0; + + if (ipv6_enable) + hints.ai_family = PF_INET6; + else + hints.ai_family = PF_INET; /* ipv4 only support */ + + if (protocol == IPPROTO_UDP) + hints.ai_socktype = SOCK_DGRAM; + else + hints.ai_socktype = SOCK_STREAM; + + hints.ai_protocol = protocol; /* IPPROTO_UDP or IPPROTO_TCP */ + error = getaddrinfo(hostname, portbuf, &hints, addrinfo); + if (osip_strcasecmp(hostname, "0.0.0.0")!=0) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "DNS resolution with %s:%i\n", hostname, service)); + } + + if (error || *addrinfo == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "getaddrinfo failure. %s:%s (%d)\n", hostname, portbuf, + error)); + return OSIP_UNKNOWN_HOST; + } else { + struct addrinfo *elem; + + char tmp[INET6_ADDRSTRLEN]; + + char porttmp[10]; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "getaddrinfo returned the following addresses:\n")); + for (elem = *addrinfo; elem != NULL; elem = elem->ai_next) { + getnameinfo(elem->ai_addr, elem->ai_addrlen, tmp, sizeof(tmp), porttmp, + sizeof(porttmp), NI_NUMERICHOST | NI_NUMERICSERV); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, "%s port %s\n", tmp, + porttmp)); + } + } + + return OSIP_SUCCESS; +} +#endif + +static void osip_srv_record_sort(struct osip_srv_record *rec, int n) +{ + int i; + int permuts; + struct osip_srv_entry swap; + do { + struct osip_srv_entry *s1, *s2; + permuts = 0; + for (i = 0; i < n - 1; ++i) { + s1 = &rec->srventry[i]; + s2 = &rec->srventry[i + 1]; + if (s1->priority > s2->priority) { + memcpy(&swap, s1, sizeof(swap)); + memcpy(s1, s2, sizeof(swap)); + memcpy(s2, &swap, sizeof(swap)); + permuts++; + } + } + } while (permuts != 0); +} - int error; - char portbuf[10]; +int +_eXosip_srv_lookup(osip_message_t * sip, osip_naptr_t **naptr_record) +{ + int use_srv = 1; + + int port; - if (hostname == NULL) - return OSIP_BADPARAMETER; - - if (service != -1) /* -1 for SRV record */ - { - int i; - - for (i = 0; i < MAX_EXOSIP_DNS_ENTRY; i++) - { - if (eXosip.dns_entries[i].host[0] != '\0' - && 0 == osip_strcasecmp (eXosip.dns_entries[i].host, hostname)) - { - /* update entry */ - if (eXosip.dns_entries[i].ip[0] != '\0') - { - hostname = eXosip.dns_entries[i].ip; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip option set: dns cache used:%s -> %s\n", - eXosip.dns_entries[i].host, - eXosip.dns_entries[i].ip)); - } - } - } - } - - if (service != -1) /* -1 for SRV record */ - snprintf (portbuf, sizeof (portbuf), "%i", service); - - memset (&hints, 0, sizeof (hints)); - - hints.ai_flags = 0; - - if (ipv6_enable) - hints.ai_family = PF_INET6; - else - hints.ai_family = PF_INET; /* ipv4 only support */ - - if (protocol == IPPROTO_UDP) - hints.ai_socktype = SOCK_DGRAM; - else - hints.ai_socktype = SOCK_STREAM; - - hints.ai_protocol = protocol; /* IPPROTO_UDP or IPPROTO_TCP */ - if (service == -1) /* -1 for SRV record */ - { - error = getaddrinfo (hostname, "sip", &hints, addrinfo); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "SRV resolution with udp-sip-%s\n", hostname)); - } else - { - error = getaddrinfo (hostname, portbuf, &hints, addrinfo); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "DNS resolution with %s:%i\n", hostname, service)); - } - if (error || *addrinfo == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "getaddrinfo failure. %s:%s (%d)\n", hostname, portbuf, error)); - return OSIP_UNKNOWN_HOST; - } else - { - struct addrinfo *elem; - - char tmp[INET6_ADDRSTRLEN]; - - char porttmp[10]; - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "getaddrinfo returned the following addresses:\n")); - for (elem = *addrinfo; elem != NULL; elem = elem->ai_next) - { - getnameinfo (elem->ai_addr, elem->ai_addrlen, tmp, sizeof (tmp), porttmp, - sizeof (porttmp), NI_NUMERICHOST | NI_NUMERICSERV); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, "%s port %s\n", tmp, - porttmp)); - } - } + char *host; - return OSIP_SUCCESS; + osip_via_t *via; + + via = (osip_via_t *) osip_list_get(&sip->vias, 0); + if (via == NULL || via->protocol == NULL) + return OSIP_BADPARAMETER; + + if (MSG_IS_REQUEST(sip)) { + osip_route_t *route; + + if (sip->sip_method==NULL) + return OSIP_BADPARAMETER; + + osip_message_get_route(sip, 0, &route); + if (route != NULL) { + osip_uri_param_t *lr_param = NULL; + + osip_uri_uparam_get_byname(route->url, "lr", &lr_param); + if (lr_param == NULL) + route = NULL; + } + + if (route != NULL) { + port = 5060; + if (route->url->port != NULL) { + port = osip_atoi(route->url->port); + use_srv = 0; + } + host = route->url->host; + } else { + /* search for maddr parameter */ + osip_uri_param_t *maddr_param = NULL; + + osip_uri_uparam_get_byname(sip->req_uri, "maddr", &maddr_param); + host = NULL; + if (maddr_param != NULL && maddr_param->gvalue != NULL) + host = maddr_param->gvalue; + + port = 5060; + if (sip->req_uri->port != NULL) { + use_srv = 0; + port = osip_atoi(sip->req_uri->port); + } + + if (host == NULL) + host = sip->req_uri->host; + } + } else { + osip_generic_param_t *maddr; + + osip_generic_param_t *received; + + osip_generic_param_t *rport; + + osip_via_param_get_byname(via, "maddr", &maddr); + osip_via_param_get_byname(via, "received", &received); + osip_via_param_get_byname(via, "rport", &rport); + if (maddr != NULL) + host = maddr->gvalue; + else if (received != NULL) + host = received->gvalue; + else + host = via->host; + + if (via->port == NULL) + use_srv = 0; + if (rport == NULL || rport->gvalue == NULL) { + if (via->port != NULL) + port = osip_atoi(via->port); + else + port = 5060; + } else + port = osip_atoi(rport->gvalue); + } + + if (host == NULL) { + return OSIP_UNKNOWN_HOST; + } + + /* check if we have an IPv4 or IPv6 address */ + if (strchr(host, ':') || (INADDR_NONE != inet_addr(host))) { + return OSIP_UNDEFINED_ERROR; + } + + if (use_srv == 1) { + int keep_in_cache=MSG_IS_REGISTER(sip)?1:0; + + /* Section 16.6 Request Forwarding (4. Record-Route) + The URI placed in the Record-Route header field MUST resolve to + the element inserting it (or a suitable stand-in) when the + server location procedures of [4] are applied to it, so that + subsequent requests reach the same SIP element. + + Note: When the above doesn't appear to be true, check at least cache. */ + + osip_generic_param_t *tag = NULL; + + osip_to_get_tag(sip->to, &tag); + if (tag != NULL) /* check cache only */ + *naptr_record = eXosip_dnsutils_naptr(host, "sip", via->protocol, -1); + else + *naptr_record = eXosip_dnsutils_naptr(host, "sip", via->protocol, keep_in_cache); + + return OSIP_SUCCESS; + } + return OSIP_UNDEFINED_ERROR; +} + +int eXosip_dnsutils_rotate_srv(osip_srv_record_t *srv_record) +{ + int n; + if (srv_record->srventry[0].srv[0] == '\0') + return -1; + srv_record->index++; + if (srv_record->srventry[srv_record->index].srv[0] == '\0') + srv_record->index=0; + + for (n=1; n < 10 && srv_record->srventry[n].srv[0]!='\0';n++) + {} + return n-1; } -#endif #ifdef SRV_RECORD -static void osip_srv_record_sort(struct osip_srv_record *rec, int n){ - int i; - int permuts; - struct osip_srv_entry swap; - do{ - struct osip_srv_entry *s1,*s2; - permuts=0; - for(i=0;isrventry[i]; - s2=&rec->srventry[i+1]; - if (s1->priority>s2->priority){ - memcpy(&swap,s1,sizeof(swap)); - memcpy(s1,s2,sizeof(swap)); - memcpy(s2,&swap,sizeof(swap)); - permuts++; - } - } - }while(permuts!=0); -} +static osip_list_t *dnsutils_list=NULL; +#if defined(HAVE_CARES_H) -int -_eXosip_srv_lookup (osip_transaction_t * tr, osip_message_t * sip, - struct osip_srv_record *record) -{ - int use_srv = 1; +#ifdef HAVE_SYS_SOCKET_H +# include +#endif +#ifdef HAVE_NETINET_IN_H +# include +#endif +#ifdef HAVE_ARPA_INET_H +# include +#endif +#ifdef HAVE_NETDB_H +# include +#endif +#ifdef HAVE_ARPA_NAMESER_H +# include +#else +# include "nameser.h" +#endif +#ifdef HAVE_ARPA_NAMESER_COMPAT_H +# include +#endif - int port; +#ifndef HFIXEDSZ +#define HFIXEDSZ 12 +#endif +#ifndef QFIXEDSZ +#define QFIXEDSZ 4 +#endif +#ifndef RRFIXEDSZ +#define RRFIXEDSZ 10 +#endif - char *host; +#ifndef T_A +#define T_A 1 +#endif - osip_via_t *via; - - via = (osip_via_t *) osip_list_get (&sip->vias, 0); - if (via == NULL || via->protocol == NULL) - return OSIP_BADPARAMETER; - - if (MSG_IS_REQUEST (sip)) - { - osip_route_t *route; - - osip_message_get_route (sip, 0, &route); - if (route != NULL) - { - osip_uri_param_t *lr_param = NULL; - - osip_uri_uparam_get_byname (route->url, "lr", &lr_param); - if (lr_param == NULL) - route = NULL; - } - - if (route != NULL) - { - port = 5060; - if (route->url->port != NULL) - { - port = osip_atoi (route->url->port); - use_srv = 0; - } - host = route->url->host; - } else - { - /* search for maddr parameter */ - osip_uri_param_t *maddr_param = NULL; - - osip_uri_uparam_get_byname (sip->req_uri, "maddr", &maddr_param); - host = NULL; - if (maddr_param != NULL && maddr_param->gvalue != NULL) - host = maddr_param->gvalue; - - port = 5060; - if (sip->req_uri->port != NULL) - { - use_srv = 0; - port = osip_atoi (sip->req_uri->port); - } - - if (host == NULL) - host = sip->req_uri->host; - } - } else - { - osip_generic_param_t *maddr; - - osip_generic_param_t *received; - - osip_generic_param_t *rport; - - osip_via_param_get_byname (via, "maddr", &maddr); - osip_via_param_get_byname (via, "received", &received); - osip_via_param_get_byname (via, "rport", &rport); - if (maddr != NULL) - host = maddr->gvalue; - else if (received != NULL) - host = received->gvalue; - else - host = via->host; - - if (via->port == NULL) - use_srv = 0; - if (rport == NULL || rport->gvalue == NULL) - { - if (via->port != NULL) - port = osip_atoi (via->port); - else - port = 5060; - } else - port = osip_atoi (rport->gvalue); - } - - /* check if we have an IPv4 or IPv6 address */ - if (strchr (host, ':') || (INADDR_NONE != inet_addr (host))) - { - return OSIP_UNKNOWN_HOST; - } - - if (use_srv == 1) - { - int i; - - i = eXosip_get_srv_record (record, host, via->protocol); - return i; - } - return OSIP_SUCCESS; -} +#ifndef T_AAAA +#define T_AAAA 28 +#endif -#if defined(WIN32) && !defined(_WIN32_WCE) +#ifndef T_SRV +#define T_SRV 33 +#endif -int -_eX_dn_expand (unsigned char *msg, unsigned char *eomorig, unsigned char *comp_dn, - unsigned char *exp_dn, int length) -{ - unsigned char *cp; - unsigned char *dest; - unsigned char *eom; - int len = -1; - int len_copied = 0; - - dest = exp_dn; - cp = comp_dn; - eom = exp_dn + length; - - while (*cp != '\0') - { - int w = *cp; - int comp = w & 0xc0; - - cp++; - if (comp == 0) - { - if (dest != exp_dn) - { - if (dest >= eom) - return -1; - *dest = '.'; - dest++; - } - if (dest + w >= eom) - return -1; - len_copied++; - len_copied = len_copied + w; - w--; - for (; w >= 0; w--, cp++) - { - if ((*cp == '.') || (*cp == '\\')) - { - if (dest + w + 2 >= eom) - return -1; - *dest = '\\'; - dest++; - } - *dest = *cp; - dest++; - if (cp >= eomorig) - return -1; - } - } else if (comp == 0xc0) - { - if (len < 0) - len = cp - comp_dn + 1; - cp = msg + (((w & 0x3f) << 8) | (*cp & 0xff)); - if (cp < msg || cp >= eomorig) - return -1; - len_copied = len_copied + 2; - if (len_copied >= eomorig - msg) - return -1; - } else - return -1; - } - - *dest = '\0'; - - if (len < 0) - len = cp - comp_dn; - return len; -} +#ifndef T_NAPTR +#define T_NAPTR 35 +#endif -int -eXosip_get_naptr (char *domain, char *protocol, char *srv_record, int max_length) +#ifndef C_IN +#define C_IN 1 +#endif + +#ifdef HAVE_SYS_TIME_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include + +#ifdef _WIN32_WCE +#include "inet_ntop.h" +#elif WIN32 +#include "inet_ntop.h" +#endif + +#ifdef USE_WINSOCK +#define SOCKERRNO ((int)WSAGetLastError()) +#define SET_SOCKERRNO(x) (WSASetLastError((int)(x))) +#else +#define SOCKERRNO (errno) +#define SET_SOCKERRNO(x) (errno = (x)) +#endif + +static const unsigned char *skip_question(const unsigned char *aptr, + const unsigned char *abuf, + int alen) +{ + char *name; + int status; + long len; + + status = ares_expand_name(aptr, abuf, alen, &name, &len); + if (status != ARES_SUCCESS) + return NULL; + aptr += len; + + ares_free_string(name); + if (aptr + QFIXEDSZ > abuf + alen) + { + return NULL; + } + + aptr += QFIXEDSZ; + return aptr; +} + +static const unsigned char *save_A(osip_naptr_t *output_record, + const unsigned char *aptr, + const unsigned char *abuf, int alen) +{ + char rr_name[512]; + int type, dnsclass, ttl, dlen, status; + long len; + char addr[46]; + union { + unsigned char * as_uchar; + char * as_char; + } name; + + /* Parse the RR name. */ + status = ares_expand_name(aptr, abuf, alen, &name.as_char, &len); + if (status != ARES_SUCCESS) + return NULL; + aptr += len; + + if (aptr + RRFIXEDSZ > abuf + alen) + { + ares_free_string(name.as_char); + return NULL; + } + + type = DNS_RR_TYPE(aptr); + dnsclass = DNS_RR_CLASS(aptr); + ttl = DNS_RR_TTL(aptr); + dlen = DNS_RR_LEN(aptr); + aptr += RRFIXEDSZ; + if (aptr + dlen > abuf + alen) + { + ares_free_string(name.as_char); + return NULL; + } + + snprintf(rr_name, sizeof(rr_name), "%s", name.as_char); + ares_free_string(name.as_char); + + switch (type) + { + case T_A: + /* The RR data is a four-byte Internet address. */ + { + int n; + osip_srv_entry_t *srventry; + if (dlen != 4) + return NULL; + + inet_ntop(AF_INET,aptr,addr,sizeof(addr)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "save_A: A record %s -> %s\n", + rr_name, addr)); + + for (n=0;n<10;n++) + { + if (osip_strcasecmp(rr_name, output_record->sipudp_record.srventry[n].srv)==0) + { + srventry = &output_record->sipudp_record.srventry[n]; + snprintf(srventry->ipaddress, sizeof(srventry->ipaddress), "%s", addr); + } + if (osip_strcasecmp(rr_name, output_record->siptcp_record.srventry[n].srv)==0) + { + srventry = &output_record->siptcp_record.srventry[n]; + snprintf(srventry->ipaddress, sizeof(srventry->ipaddress), "%s", addr); + } + if (osip_strcasecmp(rr_name, output_record->siptls_record.srventry[n].srv)==0) + { + srventry = &output_record->siptls_record.srventry[n]; + snprintf(srventry->ipaddress, sizeof(srventry->ipaddress), "%s", addr); + } + if (osip_strcasecmp(rr_name, output_record->sipdtls_record.srventry[n].srv)==0) + { + srventry = &output_record->sipdtls_record.srventry[n]; + snprintf(srventry->ipaddress, sizeof(srventry->ipaddress), "%s", addr); + } + if (osip_strcasecmp(rr_name, output_record->sipsctp_record.srventry[n].srv)==0) + { + srventry = &output_record->sipsctp_record.srventry[n]; + snprintf(srventry->ipaddress, sizeof(srventry->ipaddress), "%s", addr); + } + } + } + + break; + + case T_AAAA: + /* The RR data is a 16-byte IPv6 address. */ + if (dlen != 16) + return NULL; + + inet_ntop(AF_INET6,aptr,addr,sizeof(addr)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "save_AAAA: A record %s -> %s\n", + rr_name, addr)); + break; + + default: + break; + } + + return aptr + dlen; +} + +static const unsigned char *save_SRV(osip_naptr_t *output_record, + const unsigned char *aptr, + const unsigned char *abuf, int alen) +{ + char rr_name[512]; + int type, dnsclass, ttl, dlen, status; + long len; + union { + unsigned char * as_uchar; + char * as_char; + } name; + + status = ares_expand_name(aptr, abuf, alen, &name.as_char, &len); + if (status != ARES_SUCCESS) + return NULL; + aptr += len; + + if (aptr + RRFIXEDSZ > abuf + alen) + { + ares_free_string(name.as_char); + return NULL; + } + + type = DNS_RR_TYPE(aptr); + dnsclass = DNS_RR_CLASS(aptr); + ttl = DNS_RR_TTL(aptr); + dlen = DNS_RR_LEN(aptr); + aptr += RRFIXEDSZ; + if (aptr + dlen > abuf + alen) + { + ares_free_string(name.as_char); + return NULL; + } + + snprintf(rr_name, sizeof(rr_name), "%s", name.as_char); + ares_free_string(name.as_char); + + switch (type) + { + case T_SRV: + /* The RR data is three two-byte numbers representing the + * priority, weight, and port, followed by a domain name. + */ + { + osip_srv_record_t *srvrecord=NULL; + osip_srv_entry_t *srventry=NULL; + int n; + + if (osip_strcasecmp(rr_name, output_record->sipudp_record.name)==0) + srvrecord = &output_record->sipudp_record; + else if (osip_strcasecmp(rr_name, output_record->siptcp_record.name)==0) + srvrecord = &output_record->siptcp_record; + else if (osip_strcasecmp(rr_name, output_record->siptls_record.name)==0) + srvrecord = &output_record->siptls_record; + else if (osip_strcasecmp(rr_name, output_record->sipdtls_record.name)==0) + srvrecord = &output_record->sipdtls_record; + else if (osip_strcasecmp(rr_name, output_record->sipsctp_record.name)==0) + srvrecord = &output_record->sipsctp_record; + else + break; + + n=0; + while (n<10 && srvrecord->srventry[n].srv[0]!='\0') + n++; + if (n==10) + break; /* skip... */ + srventry = &srvrecord->srventry[n]; + + srventry->priority = DNS__16BIT(aptr); + srventry->weight = DNS__16BIT(aptr + 2); + srventry->port = DNS__16BIT(aptr + 4); + + if (srventry->weight) + srventry->rweight = 1 + rand() % (10000 * srventry->weight); + else + srventry->rweight = 0; + + status = ares_expand_name(aptr + 6, abuf, alen, &name.as_char, &len); + if (status != ARES_SUCCESS) + return NULL; + snprintf(srventry->srv, sizeof(srventry->srv), "%s", name.as_char); + + srvrecord->srv_state=OSIP_SRV_STATE_COMPLETED; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "save_SRV: SRV record %s IN SRV -> %s:%i/%i/%i/%i\n", + rr_name, srventry->srv, srventry->port, srventry->priority, + srventry->weight, srventry->rweight)); + + osip_srv_record_sort(srvrecord, n+1); + ares_free_string(name.as_char); + } + break; + default: + break; + } + + return aptr + dlen; +} + +static const unsigned char *save_NAPTR(osip_naptr_t *output_record, + const unsigned char *aptr, + const unsigned char *abuf, int alen) +{ + char rr_name[512]; + const unsigned char *p; + int type, dnsclass, ttl, dlen, status; + long len; + union { + unsigned char * as_uchar; + char * as_char; + } name; + + status = ares_expand_name(aptr, abuf, alen, &name.as_char, &len); + if (status != ARES_SUCCESS) + return NULL; + aptr += len; + + if (aptr + RRFIXEDSZ > abuf + alen) + { + ares_free_string(name.as_char); + return NULL; + } + + type = DNS_RR_TYPE(aptr); + dnsclass = DNS_RR_CLASS(aptr); + ttl = DNS_RR_TTL(aptr); + dlen = DNS_RR_LEN(aptr); + aptr += RRFIXEDSZ; + if (aptr + dlen > abuf + alen) + { + ares_free_string(name.as_char); + return NULL; + } + + snprintf(rr_name, sizeof(rr_name), "%s", name.as_char); + ares_free_string(name.as_char); + + switch (type) + { + case T_NAPTR: + { + osip_srv_record_t srvrecord; + memset(&srvrecord, 0, sizeof(osip_srv_record_t)); + + srvrecord.order = DNS__16BIT(aptr); + srvrecord.preference = DNS__16BIT(aptr+2); + + p = aptr + 4; + status = ares_expand_string(p, abuf, alen, &name.as_uchar, &len); + if (status != ARES_SUCCESS) + return NULL; + ares_free_string(name.as_char); + p += len; + + status = ares_expand_string(p, abuf, alen, &name.as_uchar, &len); + if (status != ARES_SUCCESS) + return NULL; + snprintf(srvrecord.protocol, sizeof(srvrecord.protocol), "%s", name.as_char); + ares_free_string(name.as_char); + p += len; + + status = ares_expand_string(p, abuf, alen, &name.as_uchar, &len); + if (status != ARES_SUCCESS) + return NULL; + ares_free_string(name.as_char); + p += len; + + status = ares_expand_name(p, abuf, alen, &name.as_char, &len); + if (status != ARES_SUCCESS) + return NULL; + + snprintf(srvrecord.name, sizeof(srvrecord.name), "%s", name.as_char); + + srvrecord.srv_state = OSIP_SRV_STATE_UNKNOWN; + if (osip_strncasecmp(srvrecord.protocol, "SIP+D2U", 8) == 0) { /* udp */ + memcpy(&output_record->sipudp_record, &srvrecord, sizeof(osip_srv_record_t)); + } else if (osip_strncasecmp(srvrecord.protocol, "SIP+D2T", 8) == 0) { /* tcp */ + memcpy(&output_record->siptcp_record, &srvrecord, sizeof(osip_srv_record_t)); + } else if (osip_strncasecmp(srvrecord.protocol, "SIPS+D2T", 9) == 0) { /* tls */ + memcpy(&output_record->siptls_record, &srvrecord, sizeof(osip_srv_record_t)); + } else if (osip_strncasecmp(srvrecord.protocol, "SIPS+D2U", 9) == 0) { /* dtls-udp */ + memcpy(&output_record->sipdtls_record, &srvrecord, sizeof(osip_srv_record_t)); + } else if (osip_strncasecmp(srvrecord.protocol, "SIP+D2S", 8) == 0) { /* sctp */ + memcpy(&output_record->sipsctp_record, &srvrecord, sizeof(osip_srv_record_t)); + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "save_NAPTR: NAPTR %s ->%i/%i/%s\n", + rr_name, srvrecord.order, srvrecord.preference, srvrecord.name)); + + ares_free_string(name.as_char); + } + break; + + default: + break; + } + + return aptr + dlen; +} + +static const char *opcodes[] = { + "QUERY", "IQUERY", "STATUS", "(reserved)", "NOTIFY", + "(unknown)", "(unknown)", "(unknown)", "(unknown)", + "UPDATEA", "UPDATED", "UPDATEDA", "UPDATEM", "UPDATEMA", + "ZONEINIT", "ZONEREF" +}; + +static const char *rcodes[] = { + "NOERROR", "FORMERR", "SERVFAIL", "NXDOMAIN", "NOTIMP", "REFUSED", + "(unknown)", "(unknown)", "(unknown)", "(unknown)", "(unknown)", + "(unknown)", "(unknown)", "(unknown)", "(unknown)", "NOCHANGE" +}; + +static void _store_A(void *arg, int status, int timeouts, + unsigned char *abuf, int alen) { - char zone[1024]; + osip_naptr_t *output_record = (osip_naptr_t *)arg; - PDNS_RECORD answer, tmp; /* answer buffer from nameserver */ + int qr, aa, tc, rd, ra, opcode, rcode; /* , id; */ + unsigned int qdcount, ancount, nscount, arcount, i; + const unsigned char *aptr; + + (void) timeouts; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, "Checking for A records %s:\n", output_record->domain)); + + if (status != ARES_SUCCESS) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "DNS A: %s %s\n", output_record->domain, ares_strerror(status))); + if (!abuf) + return; + } + + if (alen < HFIXEDSZ) + return; + + /* id = DNS_HEADER_QID(abuf); */ + qr = DNS_HEADER_QR(abuf); + opcode = DNS_HEADER_OPCODE(abuf); + aa = DNS_HEADER_AA(abuf); + tc = DNS_HEADER_TC(abuf); + rd = DNS_HEADER_RD(abuf); + ra = DNS_HEADER_RA(abuf); + rcode = DNS_HEADER_RCODE(abuf); + qdcount = DNS_HEADER_QDCOUNT(abuf); + ancount = DNS_HEADER_ANCOUNT(abuf); + nscount = DNS_HEADER_NSCOUNT(abuf); + arcount = DNS_HEADER_ARCOUNT(abuf); + + /* the answer header. */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, "flags: %s%s%s%s%s %s/%s\n", + qr ? "qr " : "", aa ? "aa " : "", tc ? "tc " : "", rd ? "rd " : "", ra ? "ra " : "", + opcodes[opcode], rcodes[rcode])); + + /* the questions. */ + aptr = abuf + HFIXEDSZ; + for (i = 0; i < qdcount; i++) + { + aptr = skip_question(aptr, abuf, alen); + if (aptr == NULL) + return; + } + + /* the answers. */ + for (i = 0; i < ancount; i++) + { + aptr = save_A(output_record, aptr, abuf, alen); + if (aptr == NULL) + return; + } + + /* the NS records. */ + for (i = 0; i < nscount; i++) + { + aptr = save_A(output_record, aptr, abuf, alen); + if (aptr == NULL) + return; + } + + /* the additional records. */ + for (i = 0; i < arcount; i++) + { + aptr = save_A(output_record, aptr, abuf, alen); + if (aptr == NULL) + return; + } +} + +static void _store_srv(void *arg, int status, int timeouts, + unsigned char *abuf, int alen) +{ + osip_naptr_t *output_record = (osip_naptr_t *)arg; + + int qr, aa, tc, rd, ra, opcode, rcode; /* , id; */ + unsigned int qdcount, ancount, nscount, arcount, i; + const unsigned char *aptr; + + (void) timeouts; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, "Checking for SRV query %s:\n", output_record->domain)); + + if (status != ARES_SUCCESS) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "DNS SRV: %s %s\n", output_record->domain, ares_strerror(status))); + if (!abuf) + return; + } + + if (alen < HFIXEDSZ) + return; + + /* id = DNS_HEADER_QID(abuf); */ + qr = DNS_HEADER_QR(abuf); + opcode = DNS_HEADER_OPCODE(abuf); + aa = DNS_HEADER_AA(abuf); + tc = DNS_HEADER_TC(abuf); + rd = DNS_HEADER_RD(abuf); + ra = DNS_HEADER_RA(abuf); + rcode = DNS_HEADER_RCODE(abuf); + qdcount = DNS_HEADER_QDCOUNT(abuf); + ancount = DNS_HEADER_ANCOUNT(abuf); + nscount = DNS_HEADER_NSCOUNT(abuf); + arcount = DNS_HEADER_ARCOUNT(abuf); + + /* the answer header. */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, "flags: %s%s%s%s%s %s/%s\n", + qr ? "qr " : "", aa ? "aa " : "", tc ? "tc " : "", rd ? "rd " : "", ra ? "ra " : "", + opcodes[opcode], rcodes[rcode])); + + /* the questions. */ + aptr = abuf + HFIXEDSZ; + for (i = 0; i < qdcount; i++) + { + aptr = skip_question(aptr, abuf, alen); + if (aptr == NULL) + return; + } + + /* the answers. */ + for (i = 0; i < ancount; i++) + { + aptr = save_SRV(output_record, aptr, abuf, alen); + if (aptr == NULL) + return; + } + + /* the NS records. */ + for (i = 0; i < nscount; i++) + { + aptr = save_SRV(output_record, aptr, abuf, alen); + if (aptr == NULL) + return; + } + + /* the additional records. */ + for (i = 0; i < arcount; i++) + { + aptr = save_SRV(output_record, aptr, abuf, alen); + if (aptr == NULL) + return; + } +} + +static void _store_naptr(void *arg, int status, int timeouts, + unsigned char *abuf, int alen) +{ + osip_naptr_t *output_record = (osip_naptr_t *)arg; + + int qr, aa, tc, rd, ra, opcode, rcode; /* , id; */ + unsigned int qdcount, ancount, nscount, arcount, i; + const unsigned char *aptr; + + (void) timeouts; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, "Answer for NAPTR query %s:\n", output_record->domain)); + + if (status != ARES_SUCCESS) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "DNS NAPTR: %s %s\n", output_record->domain, ares_strerror(status))); + if (!abuf) + return; + } + + if (alen < HFIXEDSZ) + return; + + /* id = DNS_HEADER_QID(abuf); */ + qr = DNS_HEADER_QR(abuf); + opcode = DNS_HEADER_OPCODE(abuf); + aa = DNS_HEADER_AA(abuf); + tc = DNS_HEADER_TC(abuf); + rd = DNS_HEADER_RD(abuf); + ra = DNS_HEADER_RA(abuf); + rcode = DNS_HEADER_RCODE(abuf); + qdcount = DNS_HEADER_QDCOUNT(abuf); + ancount = DNS_HEADER_ANCOUNT(abuf); + nscount = DNS_HEADER_NSCOUNT(abuf); + arcount = DNS_HEADER_ARCOUNT(abuf); + + /* the answer header. */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, "flags: %s%s%s%s%s %s/%s\n", + qr ? "qr " : "", aa ? "aa " : "", tc ? "tc " : "", rd ? "rd " : "", ra ? "ra " : "", + opcodes[opcode], rcodes[rcode])); + + /* the questions. */ + aptr = abuf + HFIXEDSZ; + for (i = 0; i < qdcount; i++) + { + aptr = skip_question(aptr, abuf, alen); + if (aptr == NULL) + return; + } + + /* the answers. */ + for (i = 0; i < ancount; i++) + { + aptr = save_NAPTR(output_record, aptr, abuf, alen); + if (aptr == NULL) + return; + } + + /* the NS records. */ + for (i = 0; i < nscount; i++) + { + aptr = save_NAPTR(output_record, aptr, abuf, alen); + if (aptr == NULL) + return; + } + + /* the additional records. */ + for (i = 0; i < arcount; i++) + { + aptr = save_NAPTR(output_record, aptr, abuf, alen); + if (aptr == NULL) + return; + } +} + +static void _srv_callback(void *arg, int status, int timeouts, + unsigned char *abuf, int alen) +{ + _store_srv(arg, status, timeouts, abuf, alen); + _store_A(arg, status, timeouts, abuf, alen); +} + +static void _naptr_callback(void *arg, int status, int timeouts, + unsigned char *abuf, int alen) +{ + osip_naptr_t *output_record = (osip_naptr_t *)arg; + if (status != ARES_SUCCESS) + { + if (status==ARES_ENODATA) /* no NAPTR record for this domain */ + { + osip_srv_record_t srvrecord; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "_naptr_callback: %s %s\n", output_record->domain, ares_strerror(status))); + /* pre-set all SRV record to unsupported? */ + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + + output_record->sipudp_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + output_record->siptcp_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + output_record->siptls_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + output_record->sipdtls_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + output_record->sipsctp_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + + memset(&srvrecord, 0, sizeof(osip_srv_record_t)); + + srvrecord.order = 49; + srvrecord.preference = 49; + srvrecord.srv_state = OSIP_SRV_STATE_UNKNOWN; + + snprintf(srvrecord.protocol, sizeof(srvrecord.protocol), "%s", "SIP+D2U"); + snprintf(srvrecord.name, sizeof(srvrecord.name), "_sip._udp.%s", output_record->domain); + memcpy(&output_record->sipudp_record, &srvrecord, sizeof(osip_srv_record_t)); + + snprintf(srvrecord.protocol, sizeof(srvrecord.protocol), "%s", "SIP+D2T"); + snprintf(srvrecord.name, sizeof(srvrecord.name), "_sip._tcp.%s", output_record->domain); + memcpy(&output_record->siptcp_record, &srvrecord, sizeof(osip_srv_record_t)); + + snprintf(srvrecord.protocol, sizeof(srvrecord.protocol), "%s", "SIPS+D2T"); + snprintf(srvrecord.name, sizeof(srvrecord.name), "_sips._tcp.%s", output_record->domain); + memcpy(&output_record->siptls_record, &srvrecord, sizeof(osip_srv_record_t)); + + snprintf(srvrecord.protocol, sizeof(srvrecord.protocol), "%s", "SIPS+D2U"); + snprintf(srvrecord.name, sizeof(srvrecord.name), "_sips._udp.%s", output_record->domain); + memcpy(&output_record->sipdtls_record, &srvrecord, sizeof(osip_srv_record_t)); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "_naptr_callback: NO NAPTR DNS // SRV record created manually ->%i/%i/%s\n", + srvrecord.order, srvrecord.preference, srvrecord.name)); + + return; + } + } + + if (status != ARES_SUCCESS) + { + if (status==ARES_ENODATA) /* no NAPTR record for this domain */ + output_record->naptr_state=OSIP_NAPTR_STATE_NOTSUPPORTED; + else if (status==ARES_ENOTFOUND) /* domain does not exist */ + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + else if (status==ARES_ETIMEOUT) + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + else if (status==ARES_ESERVFAIL) + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + else if (status==ARES_ENOTIMP) + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + else if (status==ARES_EREFUSED) + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + else /* ... */ + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, "_naptr_callback: %s %s\n", output_record->domain, ares_strerror(status))); + /*if (!abuf) */ + return; + } + + /* pre-set all SRV record to unsupported? */ + output_record->sipudp_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + output_record->siptcp_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + output_record->siptls_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + output_record->sipdtls_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + output_record->sipsctp_record.srv_state = OSIP_SRV_STATE_NOTSUPPORTED; + + _store_naptr(arg, status, timeouts, abuf, alen); + _store_srv(arg, status, timeouts, abuf, alen); + _store_A(arg, status, timeouts, abuf, alen); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + + /* verify if we already have OSIP_NAPTR_STATE_SRVDONE automatically! */ + if (output_record->sipudp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptcp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipdtls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipsctp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; +} + +static int eXosip_dnsutils_srv_lookup(struct osip_naptr *output_record) +{ + ares_channel channel=NULL; + struct ares_options options; + int i; + + if (output_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + { + /* continue searching if channel exist */ + if (output_record->arg==NULL) + return OSIP_SUCCESS; + + channel = output_record->arg; + { + fd_set read_fds, write_fds; + struct timeval *tvp, tv; + int nfds; + int count; + FD_ZERO(&read_fds); + FD_ZERO(&write_fds); + nfds = ares_fds(channel, &read_fds, &write_fds); + if (nfds != 0) + { + tvp = ares_timeout(channel, NULL, &tv); + tvp->tv_sec=0; + tvp->tv_usec=0; + count = select(nfds, &read_fds, &write_fds, NULL, tvp); + if (count < 0 && SOCKERRNO != EINVAL) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_srv_lookup: select failed ('%s SRV')\n", output_record->domain)); + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + output_record->arg=NULL; + ares_destroy(channel); + return OSIP_UNDEFINED_ERROR; + } + ares_process(channel, &read_fds, &write_fds); + + FD_ZERO(&read_fds); + FD_ZERO(&write_fds); + nfds = ares_fds(channel, &read_fds, &write_fds); + } + + if (nfds == 0) + { + /* SRVs finished: we assume that one is enough */ + if (output_record->sipudp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptcp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipdtls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipsctp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else + { + if (output_record->sipudp_record.order == 49 && output_record->sipudp_record.preference == 49) + output_record->naptr_state=OSIP_NAPTR_STATE_NOTSUPPORTED; + else + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + } + + output_record->arg=NULL; + ares_destroy(channel); + return OSIP_SUCCESS; + } + } + + return OSIP_SUCCESS; + } + + if (output_record->naptr_state!=OSIP_NAPTR_STATE_NAPTRDONE) + return OSIP_SUCCESS; + + if (output_record->sipudp_record.name[0]=='\0' + &&output_record->siptcp_record.name[0]=='\0' + &&output_record->siptls_record.name[0]=='\0' + &&output_record->sipdtls_record.name[0]=='\0' + &&output_record->sipsctp_record.name[0]=='\0') + { + output_record->naptr_state=OSIP_NAPTR_STATE_NOTSUPPORTED; + if (output_record->arg!=NULL) + { + output_record->arg=NULL; + ares_destroy(channel); + } + return OSIP_SUCCESS; + } + + if (output_record->arg==NULL) + { + options.timeout = 3000; + options.tries = 1; + options.flags = ARES_FLAG_NOALIASES; + i = ares_init_options(&channel, &options, ARES_OPT_TIMEOUTMS|ARES_OPT_TRIES|ARES_OPT_FLAGS); + if (i != ARES_SUCCESS) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_srv_lookup: ares_init_options failed ('%s SRV')\n", output_record->domain)); + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + return OSIP_BADPARAMETER; + } + output_record->arg=channel; + } + else + { + channel=output_record->arg; + } + + output_record->naptr_state=OSIP_NAPTR_STATE_SRVINPROGRESS; + + if (output_record->sipudp_record.name[0]!='\0') + { + ares_query(channel, output_record->sipudp_record.name, C_IN, T_SRV, _srv_callback, (void *) output_record); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_srv_lookup: About to ask for '%s SRV'\n", output_record->sipudp_record.name)); + } + + if (output_record->siptcp_record.name[0]!='\0') + { + ares_query(channel, output_record->siptcp_record.name, C_IN, T_SRV, _srv_callback, (void *) output_record); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_srv_lookup: About to ask for '%s SRV'\n", output_record->siptcp_record.name)); + } + + if (output_record->siptls_record.name[0]!='\0') + { + ares_query(channel, output_record->siptls_record.name, C_IN, T_SRV, _srv_callback, (void *) output_record); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_srv_lookup: About to ask for '%s SRV'\n", output_record->siptls_record.name)); + } + + if (output_record->sipdtls_record.name[0]!='\0') + { + ares_query(channel, output_record->sipdtls_record.name, C_IN, T_SRV, _srv_callback, (void *) output_record); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_srv_lookup: About to ask for '%s SRV'\n", output_record->sipdtls_record.name)); + } + + { + fd_set read_fds, write_fds; + struct timeval *tvp, tv; + int nfds; + int count; + FD_ZERO(&read_fds); + FD_ZERO(&write_fds); + nfds = ares_fds(channel, &read_fds, &write_fds); + if (nfds != 0) + { + tvp = ares_timeout(channel, NULL, &tv); + tvp->tv_sec=0; + tvp->tv_usec=0; + count = select(nfds, &read_fds, &write_fds, NULL, tvp); + if (count < 0 && SOCKERRNO != EINVAL) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_srv_lookup: select failed ('%s SRV')\n", output_record->domain)); + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + output_record->arg=NULL; + ares_destroy(channel); + return OSIP_UNDEFINED_ERROR; + } + ares_process(channel, &read_fds, &write_fds); + + FD_ZERO(&read_fds); + FD_ZERO(&write_fds); + nfds = ares_fds(channel, &read_fds, &write_fds); + } + + if (nfds == 0) + { + /* SRVs finished: we assume that one is enough */ + if (output_record->sipudp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptcp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipdtls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipsctp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else { + if (output_record->sipudp_record.order == 49 && output_record->sipudp_record.preference == 49) + output_record->naptr_state=OSIP_NAPTR_STATE_NOTSUPPORTED; + else + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + } + output_record->arg=NULL; + ares_destroy(channel); + return OSIP_SUCCESS; + } + } + + return OSIP_SUCCESS; +} + +static int eXosip_dnsutils_naptr_lookup(osip_naptr_t *output_record, const char *domain) +{ + ares_channel channel=NULL; + struct ares_options options; + int i; + + if (output_record->arg!=NULL) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr_lookup: wrong code path ('%s NAPTR')\n", domain)); + return OSIP_UNDEFINED_ERROR; + } + + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + if (domain == NULL) + return OSIP_BADPARAMETER; + + if (strlen(domain)> 512) + return OSIP_BADPARAMETER; + + snprintf(output_record->domain, sizeof(output_record->domain), "%s", domain); + + options.timeout = 3000; + options.tries = 1; + options.flags = ARES_FLAG_NOALIASES; + i = ares_init_options(&channel, &options, ARES_OPT_TIMEOUTMS|ARES_OPT_TRIES|ARES_OPT_FLAGS); + if (i != ARES_SUCCESS) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr_lookup: ares_init_options failed ('%s NAPTR')\n", domain)); + return OSIP_BADPARAMETER; + } + output_record->arg=channel; + output_record->naptr_state=OSIP_NAPTR_STATE_INPROGRESS; + ares_query(channel, domain, C_IN, T_NAPTR, _naptr_callback, (void *) output_record); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr_lookup: About to ask for '%s NAPTR'\n", domain)); + + { + fd_set read_fds, write_fds; + struct timeval *tvp, tv; + int nfds; + int count; + FD_ZERO(&read_fds); + FD_ZERO(&write_fds); + nfds = ares_fds(channel, &read_fds, &write_fds); + if (nfds != 0) + { + tvp = ares_timeout(channel, NULL, &tv); + tvp->tv_sec=0; + tvp->tv_usec=0; + count = select(nfds, &read_fds, &write_fds, NULL, tvp); + if (count < 0 && SOCKERRNO != EINVAL) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr_lookup: select failed ('%s NAPTR')\n", domain)); + output_record->arg=NULL; + ares_destroy(channel); + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + return OSIP_UNDEFINED_ERROR; + } + ares_process(channel, &read_fds, &write_fds); + + FD_ZERO(&read_fds); + FD_ZERO(&write_fds); + nfds = ares_fds(channel, &read_fds, &write_fds); + } + if (nfds == 0) + { + if (output_record->naptr_state!=OSIP_NAPTR_STATE_NAPTRDONE) + { + /* don't need channel any more */ + ares_destroy(channel); + output_record->arg=NULL; + } + return OSIP_SUCCESS; + } + } + + return OSIP_SUCCESS; +} + +struct osip_naptr *eXosip_dnsutils_naptr(const char *domain, const char *protocol, const char *transport, int keep_in_cache) +{ + struct osip_naptr *naptr_record; + int pos; + int i; +#if defined(WIN32) && !defined(_WIN32_WCE) + DNS_STATUS err; + DWORD buf_length=0; + IP4_ARRAY *dns_servers; +#endif + int not_in_list=0; + + if (eXosip.dns_capabilities<=0) + return NULL; + + if (dnsutils_list==NULL) + { + dnsutils_list = (osip_list_t*) osip_malloc(sizeof(osip_list_t)); + osip_list_init(dnsutils_list); + + i = ares_library_init(ARES_LIB_INIT_ALL); + if (i != ARES_SUCCESS) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr: ares cannot be initialized\n")); + return NULL; + } + } + + if (keep_in_cache<0) { + naptr_record=NULL; + pos = 0; + while (!osip_list_eol(dnsutils_list, pos)) { + naptr_record = (osip_naptr_t *) osip_list_get(dnsutils_list, pos); + if (osip_strcasecmp(domain, naptr_record->domain)==0) + { + if (naptr_record->naptr_state == OSIP_NAPTR_STATE_RETRYLATER) + break; + if (naptr_record->naptr_state == OSIP_NAPTR_STATE_NOTSUPPORTED) + break; + + return naptr_record; + } + + naptr_record=NULL; + pos++; + if (pos==10) + break; + } + return NULL; + } - int n; +#if defined(WIN32) && !defined(_WIN32_WCE) + err = DnsQueryConfig(DnsConfigDnsServerList, 0, NULL, NULL, NULL, &buf_length); + if (err == DNS_ERROR_NO_DNS_SERVERS) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr: no DNS server configured\n")); + return NULL; + } + + if(err != ERROR_MORE_DATA && err!=0) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr: error with DnsQueryConfig / DnsConfigDnsServerList\n")); + return NULL; + } + + dns_servers = osip_malloc(buf_length); + err = DnsQueryConfig(DnsConfigDnsServerList, 0, NULL, NULL, dns_servers, &buf_length); + if(err!=0) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr: error with DnsQueryConfig / DnsConfigDnsServerList\n")); + osip_free(dns_servers); + return NULL; + } + + if (dns_servers->AddrCount == 0) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr: no DNS server configured\n")); + osip_free(dns_servers); + return NULL; + } + + for(i=0; (DWORD)iAddrCount; i++) + { + char ipaddress[512]; + DWORD val = dns_servers->AddrArray[i]; + snprintf(ipaddress, sizeof(ipaddress), "%d.%d.%d.%d", + (val >> 0) & 0x000000FF, + (val >> 8) & 0x000000FF, + (val >> 16) & 0x000000FF, + (val >> 24) & 0x000000FF); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr: DNS server (%i): %s\n", + i, ipaddress)); + } + osip_free(dns_servers); +#endif + + naptr_record=NULL; + pos = 0; + while (!osip_list_eol(dnsutils_list, pos)) { + naptr_record = (osip_naptr_t *) osip_list_get(dnsutils_list, pos); + + /* process all */ + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + naptr_record=NULL; + pos++; + if (pos==10) + break; + } + + if (domain==NULL) + return NULL; + + naptr_record=NULL; + pos = 0; + while (!osip_list_eol(dnsutils_list, pos)) { + naptr_record = (osip_naptr_t *) osip_list_get(dnsutils_list, pos); + if (osip_strcasecmp(domain, naptr_record->domain)==0) + { + if (naptr_record->naptr_state == OSIP_NAPTR_STATE_RETRYLATER) + break; + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + return naptr_record; + } + + naptr_record=NULL; + pos++; + if (pos==10) + break; + } + + if (pos==10 && keep_in_cache>0) + { + /* no NAPTR found within the last 10 NAPTR : refuse to keep in cache... */ + /* If we were adding unlimited NAPTR record into the cache, the program + would infinitly increase memory usage. If you reach there, then you + most probably don't use the API correctly: Only NAPTR related to + registration will end up in the cache. So in theory, 10 NAPTR will be + cached for 10 accounts, which seems enough for a softphone. Then all + SIP message should go through the same proxy by using a pre-route set. + Correctly using the API will definitly send out-of-dialog SIP message + to the same proxy as the REGISTER. If you have issue with in-dialog + Request or Response and NAPTR, that means your proxy is not following + guidelines from the rfc3261 and rfc3263 where proxy should specify + port numbers when they want you to resolve the host as a A record + -and then avoid NAPTR-. + */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr: Time will tell how much you go there (%s) - it's wrong code path, fix it\n", + domain)); + + keep_in_cache=0; + + naptr_record = (osip_naptr_t*) osip_malloc(sizeof(osip_naptr_t)); + memset(naptr_record, 0, sizeof(osip_naptr_t)); + naptr_record->keep_in_cache=keep_in_cache; + } + else if (naptr_record==NULL) + { + naptr_record = (osip_naptr_t*) osip_malloc(sizeof(osip_naptr_t)); + memset(naptr_record, 0, sizeof(osip_naptr_t)); + naptr_record->keep_in_cache=keep_in_cache; + not_in_list=1; + } + else + { + /* it was found, so it WAS in cache before, but we were in "retry" state */ + memset(naptr_record, 0, sizeof(osip_naptr_t)); + naptr_record->keep_in_cache=1; + } + i = eXosip_dnsutils_naptr_lookup(naptr_record, domain); + if (i < 0) + { + if (keep_in_cache<=0) { + return naptr_record; + } + if (not_in_list==1) { + osip_list_add(dnsutils_list, naptr_record, -1); + } + return naptr_record; + } + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + if (keep_in_cache<=0) { + return naptr_record; + } + if (not_in_list==1) + osip_list_add(dnsutils_list, naptr_record, -1); + return naptr_record; +} + +int eXosip_dnsutils_dns_process(osip_naptr_t *naptr_record, int force) +{ + ares_channel channel=NULL; + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + if (naptr_record->arg!=NULL) + channel = naptr_record->arg; + + if (channel==NULL) + return OSIP_SUCCESS; + + /* in "keep_in_cache" use-case (REGISTER), we delayed completion. */ + for (;;){ + fd_set read_fds, write_fds; + struct timeval *tvp, tv; + int nfds; + int count; + FD_ZERO(&read_fds); + FD_ZERO(&write_fds); + nfds = ares_fds(channel, &read_fds, &write_fds); + if (nfds != 0) + { + tvp = ares_timeout(channel, NULL, &tv); + tvp->tv_sec=0; + tvp->tv_usec=0; + count = select(nfds, &read_fds, &write_fds, NULL, tvp); + if (count < 0 && SOCKERRNO != EINVAL) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_dns_process: select failed ('%s')\n", naptr_record->domain)); + ares_destroy(channel); + naptr_record->arg=NULL; + return OSIP_UNDEFINED_ERROR; + } + ares_process(channel, &read_fds, &write_fds); + + FD_ZERO(&read_fds); + FD_ZERO(&write_fds); + nfds = ares_fds(channel, &read_fds, &write_fds); + } + if (nfds == 0) + { + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE) { + /* missing all SRV */ + eXosip_dnsutils_srv_lookup(naptr_record); + } + else if (naptr_record->naptr_state==OSIP_NAPTR_STATE_INPROGRESS) { + if (naptr_record->sipudp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + naptr_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (naptr_record->siptcp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + naptr_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (naptr_record->siptls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + naptr_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (naptr_record->sipdtls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + naptr_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (naptr_record->sipsctp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + naptr_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else + naptr_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + /* no need any more */ + naptr_record->arg=NULL; + ares_destroy(channel); + return OSIP_SUCCESS; + } + else { + /* no need any more */ + naptr_record->arg=NULL; + ares_destroy(channel); + return OSIP_SUCCESS; + } + } + if (force<=0) + break; + } + return OSIP_SUCCESS; +} + +void _eXosip_dnsutils_release(osip_naptr_t *naptr_record) +{ + ares_channel channel; + if (naptr_record==NULL) + return; + if (naptr_record->keep_in_cache>0) + return; + if (naptr_record->arg!=NULL) + { + channel = naptr_record->arg; + ares_destroy(channel); + naptr_record->arg=NULL; + } + osip_free(naptr_record); +} + +#elif defined(WIN32) && !defined(_WIN32_WCE) + +int _eXosip_dnsutils_srv_lookup(struct osip_srv_record *output_srv) +{ + PDNS_RECORD answer, tmp; /* answer buffer from nameserver */ + int n; + + if (output_srv->name[0]=='\0') + { + return OSIP_SUCCESS; + } + + if (output_srv->srventry[0].srv[0]!='\0') + { + /* if we received the SRV inside the NAPTR answer, are we sure we received + all SRV entries? */ + return OSIP_SUCCESS; + } + + if (DnsQuery(output_srv->name, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &answer, NULL) != 0) { + return OSIP_UNKNOWN_HOST; + } + + n = 0; + for (tmp = answer; tmp != NULL; tmp = tmp->pNext) { + struct osip_srv_entry *srventry; + + DNS_SRV_DATA *data; + + if (tmp->wType != DNS_TYPE_SRV) + continue; + srventry = &output_srv->srventry[n]; + data = &tmp->Data.SRV; + snprintf(srventry->srv, sizeof(srventry->srv), "%s", data->pNameTarget); + + srventry->priority = data->wPriority; + srventry->weight = data->wWeight; + if (srventry->weight) + srventry->rweight = 1 + rand() % (10000 * srventry->weight); + else + srventry->rweight = 0; + srventry->port = data->wPort; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "SRV record %s IN SRV -> %s:%i/%i/%i/%i\n", + output_srv->name, srventry->srv, srventry->port, srventry->priority, + srventry->weight, srventry->rweight)); + + output_srv->srv_state=OSIP_SRV_STATE_COMPLETED; + + n++; + if (n == 10) + break; + } + + DnsRecordListFree(answer, DnsFreeRecordList); + + if (n == 0) + return OSIP_UNKNOWN_HOST; + osip_srv_record_sort(output_srv, n); + return OSIP_SUCCESS; +} + +int eXosip_dnsutils_srv_lookup(struct osip_naptr *output_record) +{ + if (output_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + return OSIP_SUCCESS; + + output_record->sipudp_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + output_record->siptcp_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + output_record->siptls_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + output_record->sipdtls_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + output_record->sipsctp_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + + _eXosip_dnsutils_srv_lookup(&output_record->sipudp_record); + _eXosip_dnsutils_srv_lookup(&output_record->siptcp_record); + _eXosip_dnsutils_srv_lookup(&output_record->siptls_record); + _eXosip_dnsutils_srv_lookup(&output_record->sipdtls_record); + /* _eXosip_dnsutils_srv_lookup(&output_record->sipsctp_record); */ + + if (output_record->sipudp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptcp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipdtls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipsctp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; - char tr[100]; - - memset (srv_record, 0, max_length); - if (domain == NULL || protocol == NULL) - return OSIP_BADPARAMETER; - - if (strlen (domain) + strlen (protocol) > 1000) - return OSIP_BADPARAMETER; - - if (strlen (protocol) >= 100) - return OSIP_BADPARAMETER; - snprintf (tr, 100, protocol); - osip_tolower (tr); - - snprintf (zone, 1024, "%s", domain); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "About to ask for '%s NAPTR'\n", zone)); - - if (DnsQuery (zone, DNS_TYPE_NAPTR, DNS_QUERY_STANDARD, NULL, &answer, NULL) != - 0) - { - return OSIP_UNKNOWN_HOST; - } - - n = 0; - for (tmp = answer; tmp != NULL; tmp = tmp->pNext) - { - char *buf = (char *) &tmp->Data; - - int len; - - typedef struct - { - unsigned short order; - unsigned short pref; - char flag[256]; - char service[1024]; - char regexp[1024]; - char replacement[1024]; - } osip_naptr_t; - - osip_naptr_t anaptr; - - if (tmp->wType != DNS_TYPE_NAPTR) - continue; - - memset (&anaptr, 0, sizeof (osip_naptr_t)); - - memcpy ((void *) &anaptr.order, buf, 2); - anaptr.order = ntohs (anaptr.order); /* ((unsigned short)buf[0] << 8) | ((unsigned short)buf[1]); */ - buf += sizeof (unsigned short); - memcpy ((void *) &anaptr.pref, buf, 2); - anaptr.pref = ntohs (anaptr.pref); /* ((unsigned short)buf[0] << 8) | ((unsigned short)buf[1]); */ - buf += sizeof (unsigned short); - - len = *buf; - if (len < 0 || len > 255) - break; - buf++; - strncpy (anaptr.flag, buf, len); - anaptr.flag[len] = '\0'; - buf += len; - - len = *buf; - if (len < 0 || len > 1023) - break; - buf++; - strncpy (anaptr.service, buf, len); - anaptr.service[len] = '\0'; - buf += len; - - len = *buf; - if (len < 0 || len > 1023) - break; - buf++; - strncpy (anaptr.regexp, buf, len); - anaptr.regexp[len] = '\0'; - buf += len; - - len = - _eX_dn_expand ((char *) &tmp->Data, - ((char *) &tmp->Data) + tmp->wDataLength, buf, - anaptr.replacement, 1024 - 1); - - if (len < 0) - break; - buf += len; - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "NAPTR %s ->%i/%i/%s/%s/%s/%s\n", - zone, anaptr.order, anaptr.pref, anaptr.flag, - anaptr.service, anaptr.regexp, anaptr.replacement)); - - if (osip_strncasecmp (tr, "udp", 4) == 0 - && osip_strncasecmp (anaptr.service, "SIP+D2U", 8) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - DnsRecordListFree (answer, DnsFreeRecordList); - return OSIP_SUCCESS; - } else if (osip_strncasecmp (tr, "tcp", 4) == 0 - && osip_strncasecmp (anaptr.service, "SIP+D2T", 8) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - DnsRecordListFree (answer, DnsFreeRecordList); - return OSIP_SUCCESS; - } else if (osip_strncasecmp (tr, "udp-tls", 8) == 0 - && osip_strncasecmp (anaptr.service, "SIPS+D2U", 9) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - DnsRecordListFree (answer, DnsFreeRecordList); - return OSIP_SUCCESS; - } else if (osip_strncasecmp (tr, "tls", 4) == 0 - && osip_strncasecmp (anaptr.service, "SIPS+D2T", 9) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - DnsRecordListFree (answer, DnsFreeRecordList); - return OSIP_SUCCESS; - } else if (osip_strncasecmp (tr, "sctp", 5) == 0 - && osip_strncasecmp (anaptr.service, "SIP+D2S", 8) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - DnsRecordListFree (answer, DnsFreeRecordList); - return OSIP_SUCCESS; - } - - n++; - } - - DnsRecordListFree (answer, DnsFreeRecordList); - - if (n == 0) - return OSIP_UNKNOWN_HOST; - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "protocol: %s is not supported by domain %s\n", protocol, domain)); - return OSIP_SUCCESS; + return 0; } - int -eXosip_get_srv_record (struct osip_srv_record *record, char *domain, - char *protocol) +_eX_dn_expand(unsigned char *msg, unsigned char *eomorig, unsigned char *comp_dn, + unsigned char *exp_dn, int length) { - char zone[1024]; - PDNS_RECORD answer, tmp; /* answer buffer from nameserver */ - int n; - char tr[100]; - - if (domain == NULL || protocol == NULL) - return OSIP_BADPARAMETER; - - memset (record, 0, sizeof (struct osip_srv_record)); - if (strlen (domain) + strlen (protocol) > 1000) - return OSIP_BADPARAMETER; - - if (strlen (protocol) >= 100) - return OSIP_BADPARAMETER; - snprintf (tr, 100, protocol); - osip_tolower (tr); - if (eXosip.use_naptr) - n = eXosip_get_naptr (domain, protocol, zone, sizeof (zone) - 1); - else n = -1; - if (n==OSIP_SUCCESS && zone=='\0') - { - /* protocol is not listed in NAPTR answer: not supported */ - return OSIP_UNKNOWN_HOST; - } - - if (n != OSIP_SUCCESS) - { - snprintf (zone, sizeof (zone) - 1, "_sip._%s.%s", tr, domain); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "Using locally generated SRV record %s\n", zone)); - } - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "About to ask for '%s IN SRV'\n", zone)); - - if (DnsQuery (zone, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &answer, NULL) != 0) - { - return OSIP_UNKNOWN_HOST; - } - - n = 0; - for (tmp = answer; tmp != NULL; tmp = tmp->pNext) - { - struct osip_srv_entry *srventry; - - DNS_SRV_DATA *data; - - if (tmp->wType != DNS_TYPE_SRV) - continue; - srventry = &record->srventry[n]; - data = &tmp->Data.SRV; - snprintf (srventry->srv, sizeof (srventry->srv), "%s", data->pNameTarget); - - srventry->priority = data->wPriority; - srventry->weight = data->wWeight; - if (srventry->weight) - srventry->rweight = 1 + rand () % (10000 * srventry->weight); - else - srventry->rweight = 0; - srventry->port = data->wPort; - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "SRV record %s IN SRV -> %s:%i/%i/%i/%i\n", - zone, srventry->srv, srventry->port, srventry->priority, - srventry->weight, srventry->rweight)); - - n++; - if (n == 10) - break; - } - - DnsRecordListFree (answer, DnsFreeRecordList); - - if (n == 0) - return OSIP_UNKNOWN_HOST; - osip_srv_record_sort(record,n); - snprintf (record->name, sizeof (record->name), "%s", domain); - return OSIP_SUCCESS; + unsigned char *cp; + unsigned char *dest; + unsigned char *eom; + int len = -1; + int len_copied = 0; + + dest = exp_dn; + cp = comp_dn; + eom = exp_dn + length; + + while (*cp != '\0') { + int w = *cp; + int comp = w & 0xc0; + + cp++; + if (comp == 0) { + if (dest != exp_dn) { + if (dest >= eom) + return -1; + *dest = '.'; + dest++; + } + if (dest + w >= eom) + return -1; + len_copied++; + len_copied = len_copied + w; + w--; + for (; w >= 0; w--, cp++) { + if ((*cp == '.') || (*cp == '\\')) { + if (dest + w + 2 >= eom) + return -1; + *dest = '\\'; + dest++; + } + *dest = *cp; + dest++; + if (cp >= eomorig) + return -1; + } + } else if (comp == 0xc0) { + if (len < 0) + len = cp - comp_dn + 1; + cp = msg + (((w & 0x3f) << 8) | (*cp & 0xff)); + if (cp < msg || cp >= eomorig) + return -1; + len_copied = len_copied + 2; + if (len_copied >= eomorig - msg) + return -1; + } else + return -1; + } + + *dest = '\0'; + + if (len < 0) + len = cp - comp_dn; + return len; +} + +int eXosip_dnsutils_naptr_lookup(osip_naptr_t *output_record, const char *domain) +{ + PDNS_RECORD answer, tmp; /* answer buffer from nameserver */ + DNS_STATUS ret; + + if (domain == NULL) + return OSIP_BADPARAMETER; + + if (strlen(domain)> 512) + return OSIP_BADPARAMETER; + + snprintf(output_record->domain, sizeof(output_record->domain), "%s", domain); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr_lookup: About to ask for '%s NAPTR'\n", domain)); + + ret = DnsQuery(domain, DNS_TYPE_NAPTR, DNS_QUERY_STANDARD, NULL, &answer, NULL); + if (ret == DNS_ERROR_NO_DNS_SERVERS) + return OSIP_NO_NETWORK; + if (ret == ERROR_TIMEOUT) + return OSIP_TIMEOUT; + if (ret == DNS_INFO_NO_RECORDS) + return OSIP_UNKNOWN_HOST; + if (ret == DNS_ERROR_RCODE_SERVER_FAILURE) + return OSIP_NOTFOUND; /* no such domain? */ + + if (ret != 0) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr_lookup: DnsQuery Failed for %s NAPTR with %d\n", domain, ret)); + return OSIP_UNDEFINED_ERROR; + } + + for (tmp = answer; tmp != NULL; tmp = tmp->pNext) { + char *buf = (char *) &tmp->Data; + + int len; + OSVERSIONINFOEX ovi; + typedef struct { + unsigned short order; + unsigned short pref; + char flag[256]; + char service[1024]; + char regexp[1024]; + char replacement[1024]; + } osip_naptr_t; + + osip_naptr_t anaptr; + + if (tmp->wType != DNS_TYPE_NAPTR) + continue; + + memset(&anaptr, 0, sizeof(osip_naptr_t)); + memset(&ovi, 0, sizeof(ovi)); + ovi.dwOSVersionInfoSize = sizeof(ovi); + GetVersionEx((LPOSVERSIONINFO) & ovi); + + /* Minimum: client: Windows 2000 Professional */ + /* Minimum: server: Windows 2000 Server */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr_lookup: check OS support for NAPTR: %i %i %i\n", + ovi.dwMajorVersion, ovi.dwMinorVersion, ovi.dwBuildNumber)); + if (ovi.dwMajorVersion > 5) { + +#if (_WIN32_WINNT >= 0x0600) + /* RUN only on Vista? */ + /* compile starting from SDK 6.0A? even on XP... */ + anaptr.order = tmp->Data.NAPTR.wOrder; + anaptr.pref = tmp->Data.NAPTR.wPreference; + strncpy(anaptr.flag, tmp->Data.NAPTR.pFlags, sizeof(anaptr.flag) - 1); + strncpy(anaptr.service, tmp->Data.NAPTR.pService, + sizeof(anaptr.service) - 1); + strncpy(anaptr.regexp, tmp->Data.NAPTR.pRegularExpression, + sizeof(anaptr.regexp) - 1); + strncpy(anaptr.replacement, tmp->Data.NAPTR.pReplacement, + sizeof(anaptr.replacement) - 1); + +#endif + } + + else { + memcpy((void *) &anaptr.order, buf, 2); + anaptr.order = ntohs(anaptr.order); /* ((unsigned short)buf[0] << 8) | ((unsigned short)buf[1]); */ + buf += sizeof(unsigned short); + memcpy((void *) &anaptr.pref, buf, 2); + anaptr.pref = ntohs(anaptr.pref); /* ((unsigned short)buf[0] << 8) | ((unsigned short)buf[1]); */ + buf += sizeof(unsigned short); + + len = *buf; + if (len < 0 || len > 255) + break; + buf++; + strncpy(anaptr.flag, buf, len); + anaptr.flag[len] = '\0'; + buf += len; + + len = *buf; + if (len < 0 || len > 1023) + break; + buf++; + strncpy(anaptr.service, buf, len); + anaptr.service[len] = '\0'; + buf += len; + + len = *buf; + if (len < 0 || len > 1023) + break; + buf++; + strncpy(anaptr.regexp, buf, len); + anaptr.regexp[len] = '\0'; + buf += len; + + len = + _eX_dn_expand((char *) &tmp->Data, + ((char *) &tmp->Data) + tmp->wDataLength, buf, + anaptr.replacement, 1024 - 1); + + if (len < 0) + break; + buf += len; + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr_lookup: NAPTR %s ->%i/%i/%s/%s/%s/%s\n", + domain, anaptr.order, anaptr.pref, anaptr.flag, + anaptr.service, anaptr.regexp, anaptr.replacement)); + + if (osip_strncasecmp(anaptr.service, "SIP+D2U", 8) == 0) { /* udp */ + snprintf(output_record->sipudp_record.name, sizeof(output_record->sipudp_record.name), + "%s", anaptr.replacement); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + } else if (osip_strncasecmp(anaptr.service, "SIP+D2T", 8) == 0) { /* tcp */ + snprintf(output_record->siptcp_record.name, sizeof(output_record->siptcp_record.name), + "%s", anaptr.replacement); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + } else if (osip_strncasecmp(anaptr.service, "SIPS+D2T", 9) == 0) { /* tls */ + snprintf(output_record->siptls_record.name, sizeof(output_record->siptls_record.name), + "%s", anaptr.replacement); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + } else if (osip_strncasecmp(anaptr.service, "SIPS+D2U", 9) == 0) { /* dtls-udp */ + snprintf(output_record->sipdtls_record.name, sizeof(output_record->sipdtls_record.name), + "%s", anaptr.replacement); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + } else if (osip_strncasecmp(anaptr.service, "SIP+D2S", 8) == 0) { /* sctp */ + snprintf(output_record->sipsctp_record.name, sizeof(output_record->sipsctp_record.name), + "%s", anaptr.replacement); + } + } + + for (tmp = answer; tmp != NULL; tmp = tmp->pNext) { + struct osip_srv_entry *srventry; + struct osip_srv_record *srvrecord; + DNS_SRV_DATA *data; + int n; + + if (tmp->wType != DNS_TYPE_SRV) + continue; + + if (osip_strcasecmp(tmp->pName, output_record->sipudp_record.name)==0) + srvrecord = &output_record->sipudp_record; + else if (osip_strcasecmp(tmp->pName, output_record->siptcp_record.name)==0) + srvrecord = &output_record->siptcp_record; + else if (osip_strcasecmp(tmp->pName, output_record->siptls_record.name)==0) + srvrecord = &output_record->siptls_record; + else if (osip_strcasecmp(tmp->pName, output_record->sipdtls_record.name)==0) + srvrecord = &output_record->sipdtls_record; + else if (osip_strcasecmp(tmp->pName, output_record->sipsctp_record.name)==0) + srvrecord = &output_record->sipsctp_record; + else + continue; + + n=0; + while (n<10 && srvrecord->srventry[n].srv[0]!='\0') + n++; + if (n==10) + continue; /* skip... */ + srventry = &srvrecord->srventry[n]; + + data = &tmp->Data.SRV; + snprintf(srventry->srv, sizeof(srventry->srv), "%s", data->pNameTarget); + + srventry->priority = data->wPriority; + srventry->weight = data->wWeight; + if (srventry->weight) + srventry->rweight = 1 + rand() % (10000 * srventry->weight); + else + srventry->rweight = 0; + srventry->port = data->wPort; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "SRV record %s IN SRV -> %s:%i/%i/%i/%i\n", + tmp->pName, srventry->srv, srventry->port, srventry->priority, + srventry->weight, srventry->rweight)); + osip_srv_record_sort(srvrecord, n+1); + + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + } + + for (tmp = answer; tmp != NULL; tmp = tmp->pNext) { + struct osip_srv_entry *srventry; + DNS_A_DATA *data; + DWORD val; + int n; + if (tmp->wType != DNS_TYPE_A) + continue; + + data = &tmp->Data.A; + + val = data->IpAddress; + + /* update all SRV bound to this A record. */ + for (n=0;n<10;n++) + { + if (osip_strcasecmp(tmp->pName, output_record->sipudp_record.srventry[n].srv)==0) + srventry = &output_record->sipudp_record.srventry[n]; + else if (osip_strcasecmp(tmp->pName, output_record->siptcp_record.srventry[n].srv)==0) + srventry = &output_record->siptcp_record.srventry[n]; + else if (osip_strcasecmp(tmp->pName, output_record->siptls_record.srventry[n].srv)==0) + srventry = &output_record->siptls_record.srventry[n]; + else if (osip_strcasecmp(tmp->pName, output_record->sipdtls_record.srventry[n].srv)==0) + srventry = &output_record->sipdtls_record.srventry[n]; + else if (osip_strcasecmp(tmp->pName, output_record->sipsctp_record.srventry[n].srv)==0) + srventry = &output_record->sipsctp_record.srventry[n]; + else + continue; + snprintf(srventry->ipaddress, sizeof(srventry->ipaddress), "%d.%d.%d.%d", + (val >> 0) & 0x000000FF, (val >> 8) & 0x000000FF, + (val >> 16) & 0x000000FF, (val >> 24) & 0x000000FF); + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "A record %s -> %d.%d.%d.%d\n", + tmp->pName, (val >> 0) & 0x000000FF, (val >> 8) & 0x000000FF, + (val >> 16) & 0x000000FF, (val >> 24) & 0x000000FF)); + + } + + DnsRecordListFree(answer, DnsFreeRecordList); + + return OSIP_SUCCESS; +} + +struct osip_naptr *eXosip_dnsutils_naptr(const char *domain, const char *protocol, const char *transport, int keep_in_cache) +{ + struct osip_naptr *naptr_record; + int pos; + int i; + DNS_STATUS err; + DWORD buf_length=0; + IP4_ARRAY *dns_servers; + int not_in_list=0; + + if (dnsutils_list==NULL) + { + dnsutils_list = (osip_list_t*) osip_malloc(sizeof(osip_list_t)); + osip_list_init(dnsutils_list); + } + + if (keep_in_cache<0) { + naptr_record=NULL; + pos = 0; + while (!osip_list_eol(dnsutils_list, pos)) { + naptr_record = (osip_naptr_t *) osip_list_get(dnsutils_list, pos); + if (osip_strcasecmp(domain, naptr_record->domain)==0) + { + if (naptr_record->naptr_state == OSIP_NAPTR_STATE_RETRYLATER) + break; + if (naptr_record->naptr_state == OSIP_NAPTR_STATE_NOTSUPPORTED) + break; + + return naptr_record; + } + + naptr_record=NULL; + pos++; + if (pos==10) + break; + } + return NULL; + } + + err = DnsQueryConfig(DnsConfigDnsServerList, 0, NULL, NULL, NULL, &buf_length); + if (err == DNS_ERROR_NO_DNS_SERVERS) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr: no DNS server configured\n")); + return NULL; + } + + if(err != ERROR_MORE_DATA && err!=0) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr: error with DnsQueryConfig / DnsConfigDnsServerList\n")); + return NULL; + } + + dns_servers = osip_malloc(buf_length); + err = DnsQueryConfig(DnsConfigDnsServerList, 0, NULL, NULL, dns_servers, &buf_length); + if(err!=0) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr: error with DnsQueryConfig / DnsConfigDnsServerList\n")); + osip_free(dns_servers); + return NULL; + } + + if (dns_servers->AddrCount == 0) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr: no DNS server configured\n")); + osip_free(dns_servers); + return NULL; + } + + for(i=0; (DWORD)iAddrCount; i++) + { + char ipaddress[512]; + DWORD val = dns_servers->AddrArray[i]; + snprintf(ipaddress, sizeof(ipaddress), "%d.%d.%d.%d", + (val >> 0) & 0x000000FF, + (val >> 8) & 0x000000FF, + (val >> 16) & 0x000000FF, + (val >> 24) & 0x000000FF); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr: DNS server (%i): %s\n", + i, ipaddress)); + } + + + naptr_record=NULL; + pos = 0; + while (!osip_list_eol(dnsutils_list, pos)) { + naptr_record = (osip_naptr_t *) osip_list_get(dnsutils_list, pos); + + /* process all */ + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + naptr_record=NULL; + pos++; + if (pos==10) + break; + } + + if (domain==NULL) + return NULL; + + naptr_record=NULL; + pos = 0; + while (!osip_list_eol(dnsutils_list, pos)) { + naptr_record = (osip_naptr_t *) osip_list_get(dnsutils_list, pos); + if (osip_strcasecmp(domain, naptr_record->domain)==0) + { + if (naptr_record->naptr_state == OSIP_NAPTR_STATE_RETRYLATER) + break; + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + return naptr_record; + } + + naptr_record=NULL; + pos++; + if (pos==10) + break; + } + + if (pos==10 && keep_in_cache>0) + { + /* no NAPTR found within the last 10 NAPTR : refuse to keep in cache... */ + /* If we were adding unlimited NAPTR record into the cache, the program + would infinitly increase memory usage. If you reach there, then you + most probably don't use the API correctly: Only NAPTR related to + registration will end up in the cache. So in theory, 10 NAPTR will be + cached for 10 accounts, which seems enough for a softphone. Then all + SIP message should go through the same proxy by using a pre-route set. + Correctly using the API will definitly send out-of-dialog SIP message + to the same proxy as the REGISTER. If you have issue with in-dialog + Request or Response and NAPTR, that means your proxy is not following + guidelines from the rfc3261 and rfc3263 where proxy should specify + port numbers when they want you to resolve the host as a A record + -and then avoid NAPTR-. + */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr: Time will tell how much you go there (%s) - it's wrong code path, fix it\n", + domain)); + + keep_in_cache=0; + + naptr_record = (osip_naptr_t*) osip_malloc(sizeof(osip_naptr_t)); + memset(naptr_record, 0, sizeof(osip_naptr_t)); + naptr_record->keep_in_cache=keep_in_cache; + } + else if (naptr_record==NULL) + { + naptr_record = (osip_naptr_t*) osip_malloc(sizeof(osip_naptr_t)); + memset(naptr_record, 0, sizeof(osip_naptr_t)); + naptr_record->keep_in_cache=keep_in_cache; + not_in_list=1; + } + else + { + /* it was found, so it WAS in cache before, but we were in "retry" state */ + memset(naptr_record, 0, sizeof(osip_naptr_t)); + naptr_record->keep_in_cache=1; + } + + i = eXosip_dnsutils_naptr_lookup(naptr_record, domain); + if (i < 0) + { + if (keep_in_cache<=0) { + return naptr_record; + } + if (not_in_list==1) { + osip_list_add(dnsutils_list, naptr_record, -1); + } + return naptr_record; + } + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + if (keep_in_cache<=0) { + return naptr_record; + } + if (not_in_list==1) + osip_list_add(dnsutils_list, naptr_record, -1); + return naptr_record; +} + +int eXosip_dnsutils_dns_process(osip_naptr_t *naptr_record, int force) +{ + return OSIP_SUCCESS; +} + +void _eXosip_dnsutils_release(osip_naptr_t *naptr_record) +{ + if (naptr_record==NULL) + return; + if (naptr_record->keep_in_cache>0) + return; + osip_free(naptr_record); } -#elif defined(__linux) +#elif defined(__linux) || defined(__APPLE_CC__) /* the biggest packet we'll send and receive */ #if PACKETSZ > 1024 @@ -1336,12 +2996,10 @@ #endif /* and what we send and receive */ -typedef union -{ - HEADER hdr; - u_char buf[MAXPACKET]; -} -querybuf; +typedef union { + HEADER hdr; + u_char buf[MAXPACKET]; +} querybuf; #ifndef T_SRV #define T_SRV 33 @@ -1351,440 +3009,637 @@ #define T_NAPTR 35 #endif -int -eXosip_get_naptr (char *domain, char *protocol, char *srv_record, int max_length) +static int _eXosip_dnsutils_srv_lookup(struct osip_srv_record *output_srv) { - querybuf answer; /* answer buffer from nameserver */ - int n; - char zone[1024]; - int ancount, qdcount; /* answer count and query count */ - HEADER *hp; /* answer buffer header */ - char hostbuf[256]; - unsigned char *msg, *eom, *cp; /* answer buffer positions */ - int dlen, type, aclass; - long ttl; - int answerno; - char tr[100]; - - memset (srv_record, 0, max_length); - if (domain == NULL || protocol == NULL) - return OSIP_BADPARAMETER; - - if (strlen (domain) + strlen (protocol) > 1000) - return OSIP_BADPARAMETER; - - if (strlen (protocol) >= 100) - return OSIP_BADPARAMETER; - snprintf (tr, 100, "%s", protocol); - osip_tolower (tr); - - snprintf (zone, 1024, "%s", domain); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "About to ask for '%s IN NAPTR\n", zone)); - - n = res_query (zone, C_IN, T_NAPTR, (unsigned char *) &answer, sizeof (answer)); - - if (n < (int) sizeof (HEADER)) - { - return OSIP_UNKNOWN_HOST; - } - - /* browse message and search for DNS answers part */ - hp = (HEADER *) & answer; - qdcount = ntohs (hp->qdcount); - ancount = ntohs (hp->ancount); - - msg = (unsigned char *) (&answer); - eom = (unsigned char *) (&answer) + n; - cp = (unsigned char *) (&answer) + sizeof (HEADER); - - while (qdcount-- > 0 && cp < eom) - { - n = dn_expand (msg, eom, cp, (char *) hostbuf, 256); - if (n < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Invalid SRV record answer for '%s': bad format\n", zone)); - return OSIP_UNDEFINED_ERROR; - } - cp += n + QFIXEDSZ; - } - - - /* browse DNS answers */ - answerno = 0; - - /* loop through the answer buffer and extract SRV records */ - while (ancount-- > 0 && cp < eom) - { - int len; - - typedef struct - { - unsigned short order; - unsigned short pref; - char flag[256]; - char service[1024]; - char regexp[1024]; - char replacement[1024]; - } osip_naptr_t; - - osip_naptr_t anaptr; - - n = dn_expand (msg, eom, cp, (char *) hostbuf, 256); - if (n < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Invalid NAPTR answer for '%s': bad format\n", zone)); - return OSIP_UNDEFINED_ERROR; - } + querybuf answer; /* answer buffer from nameserver */ + int n; + int ancount, qdcount; /* answer count and query count */ + HEADER *hp; /* answer buffer header */ + char hostbuf[256]; + unsigned char *msg, *eom, *cp; /* answer buffer positions */ + int dlen, type, aclass, pref, weight, port; + long ttl; + int answerno; + + if (output_srv->name[0]=='\0') + { + return OSIP_SUCCESS; + } + + if (output_srv->srventry[0].srv[0]!='\0') + { + /* if we received the SRV inside the NAPTR answer, are we sure we received + all SRV entries? */ + return OSIP_SUCCESS; + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "About to ask for '%s IN SRV'\n", output_srv->name)); + + n = res_query(output_srv->name, C_IN, T_SRV, (unsigned char *) &answer, sizeof(answer)); + + if (n < (int) sizeof(HEADER)) { + return OSIP_UNKNOWN_HOST; + } + + /* browse message and search for DNS answers part */ + hp = (HEADER *) & answer; + qdcount = ntohs(hp->qdcount); + ancount = ntohs(hp->ancount); + + msg = (unsigned char *) (&answer); + eom = (unsigned char *) (&answer) + n; + cp = (unsigned char *) (&answer) + sizeof(HEADER); + + while (qdcount-- > 0 && cp < eom) { + n = dn_expand(msg, eom, cp, (char *) hostbuf, 256); + if (n < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Invalid SRV record answer for '%s': bad format\n", output_srv->name)); + return OSIP_UNDEFINED_ERROR; + } + cp += n + QFIXEDSZ; + } + + + /* browse DNS answers */ + answerno = 0; + + /* loop through the answer buffer and extract SRV records */ + while (ancount-- > 0 && cp < eom) { + struct osip_srv_entry *srventry; + + n = dn_expand(msg, eom, cp, (char *) hostbuf, 256); + if (n < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Invalid SRV record answer for '%s': bad format\n", output_srv->name)); + return OSIP_UNDEFINED_ERROR; + } + + cp += n; - cp += n; #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - type = _get_short (cp); - cp += sizeof (u_short); + type = _get_short(cp); + cp += sizeof(u_short); #elif defined(__APPLE_CC__) - GETSHORT (type, cp); + GETSHORT(type, cp); #else - NS_GET16 (type, cp); + NS_GET16(type, cp); #endif #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - aclass = _get_short (cp); - cp += sizeof (u_short); + aclass = _get_short(cp); + cp += sizeof(u_short); #elif defined(__APPLE_CC__) - GETSHORT (aclass, cp); + GETSHORT(aclass, cp); #else - NS_GET16 (aclass, cp); + NS_GET16(aclass, cp); #endif #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - ttl = _get_long (cp); - cp += sizeof (u_long); + ttl = _get_long(cp); + cp += sizeof(u_long); #elif defined(__APPLE_CC__) - GETLONG (ttl, cp); + GETLONG(ttl, cp); #else - NS_GET32 (ttl, cp); + NS_GET32(ttl, cp); #endif #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - dlen = _get_short (cp); - cp += sizeof (u_short); + dlen = _get_short(cp); + cp += sizeof(u_short); #elif defined(__APPLE_CC__) - GETSHORT (dlen, cp); + GETSHORT(dlen, cp); #else - NS_GET16 (dlen, cp); + NS_GET16(dlen, cp); #endif - if (type != T_NAPTR) - { - cp += dlen; - continue; - } - - memset (&anaptr, 0, sizeof (osip_naptr_t)); - - memcpy ((void *) &anaptr.order, cp, 2); - anaptr.order = ntohs (anaptr.order); /*((unsigned short)cp[0] << 8) | ((unsigned short)cp[1]); */ - cp += sizeof (unsigned short); - memcpy ((void *) &anaptr.pref, cp, 2); - anaptr.pref = ntohs (anaptr.pref); /* ((unsigned short)cp[0] << 8) | ((unsigned short)cp[1]); */ - cp += sizeof (unsigned short); - - len = *cp; - cp++; - strncpy (anaptr.flag, (char *) cp, len); - anaptr.flag[len] = '\0'; - cp += len; - - len = *cp; - cp++; - strncpy (anaptr.service, (char *) cp, len); - anaptr.service[len] = '\0'; - cp += len; - - len = *cp; - cp++; - strncpy (anaptr.regexp, (char *) cp, len); - anaptr.regexp[len] = '\0'; - cp += len; - - n = dn_expand (msg, eom, cp, anaptr.replacement, 1024 - 1); - - if (n < 0) - break; - cp += n; - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "NAPTR %s ->%i/%i/%s/%s/%s/%s\n", - zone, anaptr.order, anaptr.pref, anaptr.flag, - anaptr.service, anaptr.regexp, anaptr.replacement)); - - if (osip_strncasecmp (tr, "udp", 4) == 0 - && osip_strncasecmp (anaptr.service, "SIP+D2U", 8) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - return OSIP_SUCCESS; - } else if (osip_strncasecmp (tr, "tcp", 4) == 0 - && osip_strncasecmp (anaptr.service, "SIP+D2T", 8) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - return OSIP_SUCCESS; - } else if (osip_strncasecmp (tr, "udp-tls", 8) == 0 - && osip_strncasecmp (anaptr.service, "SIPS+D2U", 9) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - return OSIP_SUCCESS; - } else if (osip_strncasecmp (tr, "tls", 4) == 0 - && osip_strncasecmp (anaptr.service, "SIPS+D2T", 9) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - return OSIP_SUCCESS; - } else if (osip_strncasecmp (tr, "sctp", 5) == 0 - && osip_strncasecmp (anaptr.service, "SIP+D2S", 8) == 0) - { - snprintf (srv_record, max_length, "%s", anaptr.replacement); - return OSIP_SUCCESS; - } - - answerno++; - } - - if (answerno == 0) - return OSIP_UNKNOWN_HOST; - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "protocol: %s is not supported by domain %s\n", protocol, domain)); - return OSIP_SUCCESS; -} - -int -eXosip_get_srv_record (struct osip_srv_record *record, char *domain, - char *protocol) -{ - querybuf answer; /* answer buffer from nameserver */ - int n; - char zone[1024]; - int ancount, qdcount; /* answer count and query count */ - HEADER *hp; /* answer buffer header */ - char hostbuf[256]; - unsigned char *msg, *eom, *cp; /* answer buffer positions */ - int dlen, type, aclass, pref, weight, port; - long ttl; - int answerno; - char tr[100]; - - if (domain == NULL || protocol == NULL) - return OSIP_BADPARAMETER; - - memset (record, 0, sizeof (struct osip_srv_record)); - if (strlen (domain) + strlen (protocol) > 1000) - return OSIP_BADPARAMETER; - - if (strlen (protocol) >= 100) - return OSIP_BADPARAMETER; - snprintf (tr, 100, "%s", protocol); - osip_tolower (tr); - if (eXosip.use_naptr) - n = eXosip_get_naptr (domain, protocol, zone, sizeof (zone) - 1); - else n=-1; - if (n==OSIP_SUCCESS && zone=='\0') - { - /* protocol is not listed in NAPTR answer: not supported */ - return OSIP_UNKNOWN_HOST; - } - if (n != OSIP_SUCCESS) - { - snprintf (zone, sizeof (zone) - 1, "_sip._%s.%s", tr, domain); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "Using locally generated SRV record %s\n", zone)); - } - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "About to ask for '%s IN SRV'\n", zone)); - - n = res_query (zone, C_IN, T_SRV, (unsigned char *) &answer, sizeof (answer)); - - if (n < (int) sizeof (HEADER)) - { - return OSIP_UNKNOWN_HOST; - } - - /* browse message and search for DNS answers part */ - hp = (HEADER *) & answer; - qdcount = ntohs (hp->qdcount); - ancount = ntohs (hp->ancount); - - msg = (unsigned char *) (&answer); - eom = (unsigned char *) (&answer) + n; - cp = (unsigned char *) (&answer) + sizeof (HEADER); - - while (qdcount-- > 0 && cp < eom) - { - n = dn_expand (msg, eom, cp, (char *) hostbuf, 256); - if (n < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Invalid SRV record answer for '%s': bad format\n", zone)); - return OSIP_UNDEFINED_ERROR; - } - cp += n + QFIXEDSZ; - } - - - /* browse DNS answers */ - answerno = 0; - - /* loop through the answer buffer and extract SRV records */ - while (ancount-- > 0 && cp < eom) - { - struct osip_srv_entry *srventry; - - n = dn_expand (msg, eom, cp, (char *) hostbuf, 256); - if (n < 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Invalid SRV record answer for '%s': bad format\n", zone)); - return OSIP_UNDEFINED_ERROR; - } - - cp += n; - - + if (type != T_SRV) { + cp += dlen; + continue; + } #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - type = _get_short (cp); - cp += sizeof (u_short); + pref = _get_short(cp); + cp += sizeof(u_short); #elif defined(__APPLE_CC__) - GETSHORT (type, cp); + GETSHORT(pref, cp); #else - NS_GET16 (type, cp); + NS_GET16(pref, cp); #endif #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - aclass = _get_short (cp); - cp += sizeof (u_short); + weight = _get_short(cp); + cp += sizeof(u_short); #elif defined(__APPLE_CC__) - GETSHORT (aclass, cp); + GETSHORT(weight, cp); #else - NS_GET16 (aclass, cp); + NS_GET16(weight, cp); #endif #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - ttl = _get_long (cp); - cp += sizeof (u_long); + port = _get_short(cp); + cp += sizeof(u_short); #elif defined(__APPLE_CC__) - GETLONG (ttl, cp); + GETSHORT(port, cp); #else - NS_GET32 (ttl, cp); + NS_GET16(port, cp); #endif + n = dn_expand(msg, eom, cp, (char *) hostbuf, 256); + if (n < 0) + break; + cp += n; + + srventry = &output_srv->srventry[answerno]; + snprintf(srventry->srv, sizeof(srventry->srv), "%s", hostbuf); + + srventry->priority = pref; + srventry->weight = weight; + if (weight) + srventry->rweight = 1 + random() % (10000 * srventry->weight); + else + srventry->rweight = 0; + srventry->port = port; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "SRV record %s IN SRV -> %s:%i/%i/%i/%i\n", + output_srv->name, srventry->srv, srventry->port, srventry->priority, + srventry->weight, srventry->rweight)); + + output_srv->srv_state=OSIP_SRV_STATE_COMPLETED; + + answerno++; + if (answerno == 10) + break; + } + + if (answerno == 0) + return OSIP_UNKNOWN_HOST; + + osip_srv_record_sort(output_srv, answerno); + return OSIP_SUCCESS; +} + +static int eXosip_dnsutils_srv_lookup(struct osip_naptr *output_record) +{ + if (output_record->naptr_state==OSIP_NAPTR_STATE_SRVDONE) + return OSIP_SUCCESS; + + output_record->sipudp_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + output_record->siptcp_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + output_record->siptls_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + output_record->sipdtls_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + output_record->sipsctp_record.srv_state=OSIP_SRV_STATE_NOTSUPPORTED; + + _eXosip_dnsutils_srv_lookup(&output_record->sipudp_record); + _eXosip_dnsutils_srv_lookup(&output_record->siptcp_record); + _eXosip_dnsutils_srv_lookup(&output_record->siptls_record); + _eXosip_dnsutils_srv_lookup(&output_record->sipdtls_record); + /* _eXosip_dnsutils_srv_lookup(&output_record->sipsctp_record); */ + + if (output_record->sipudp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptcp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->siptls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipdtls_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else if (output_record->sipsctp_record.srv_state == OSIP_SRV_STATE_COMPLETED) + output_record->naptr_state=OSIP_NAPTR_STATE_SRVDONE; + else + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + + return 0; +} + +static int eXosip_dnsutils_naptr_lookup(osip_naptr_t *output_record, const char *domain) +{ + querybuf answer; /* answer buffer from nameserver */ + int n; + int ancount, qdcount; /* answer count and query count */ + int nscount, arcount; /* ns count and ar count */ + HEADER *hp; /* answer buffer header */ + char hostbuf[256]; + unsigned char *msg, *eom, *cp; /* answer buffer positions */ + int dlen, type, aclass; + long ttl; + int answerno; + + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + if (domain == NULL) + return OSIP_BADPARAMETER; + + if (strlen(domain)> 512) + return OSIP_BADPARAMETER; + + snprintf(output_record->domain, sizeof(output_record->domain), "%s", domain); + + output_record->naptr_state=OSIP_NAPTR_STATE_INPROGRESS; + + n = res_query(domain, C_IN, T_NAPTR, (unsigned char *) &answer, sizeof(answer)); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr_lookup: About to ask for '%s NAPTR'\n", domain)); + + if (n < (int) sizeof(HEADER)) { + int hstatus = h_errno; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip_dnsutils_naptr_lookup: res_query failed ('%s NAPTR')\n", domain)); + if (hstatus==NO_DATA) + output_record->naptr_state=OSIP_NAPTR_STATE_NOTSUPPORTED; + else if (hstatus==HOST_NOT_FOUND) + output_record->naptr_state=OSIP_NAPTR_STATE_NOTSUPPORTED; + else + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + return OSIP_UNDEFINED_ERROR; + } + + /* browse message and search for DNS answers part */ + hp = (HEADER *) & answer; + qdcount = ntohs(hp->qdcount); + ancount = ntohs(hp->ancount); + nscount = ntohs(hp->ancount); + arcount = ntohs(hp->arcount); + + msg = (unsigned char *) (&answer); + eom = (unsigned char *) (&answer) + n; + cp = (unsigned char *) (&answer) + sizeof(HEADER); + + while (qdcount-- > 0 && cp < eom) { + n = dn_expand(msg, eom, cp, (char *) hostbuf, 256); + if (n < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Invalid SRV record answer for '%s': bad format\n", domain)); + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + return OSIP_UNDEFINED_ERROR; + } + cp += n + QFIXEDSZ; + } + + + /* browse DNS answers */ + answerno = 0; + + /* loop through the answer buffer and extract SRV records */ + while (ancount-- > 0 && cp < eom) { + int len; + + typedef struct { + unsigned short order; + unsigned short pref; + char flag[256]; + char service[1024]; + char regexp[1024]; + char replacement[1024]; + } osip_naptr_t; + + osip_naptr_t anaptr; + + n = dn_expand(msg, eom, cp, (char *) hostbuf, 256); + if (n < 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Invalid NAPTR answer for '%s': bad format\n", domain)); + output_record->naptr_state=OSIP_NAPTR_STATE_RETRYLATER; + return OSIP_UNDEFINED_ERROR; + } + + cp += n; + #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - dlen = _get_short (cp); - cp += sizeof (u_short); + type = _get_short(cp); + cp += sizeof(u_short); #elif defined(__APPLE_CC__) - GETSHORT (dlen, cp); + GETSHORT(type, cp); #else - NS_GET16 (dlen, cp); + NS_GET16(type, cp); #endif - if (type != T_SRV) - { - cp += dlen; - continue; - } #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - pref = _get_short (cp); - cp += sizeof (u_short); + aclass = _get_short(cp); + cp += sizeof(u_short); #elif defined(__APPLE_CC__) - GETSHORT (pref, cp); + GETSHORT(aclass, cp); #else - NS_GET16 (pref, cp); + NS_GET16(aclass, cp); #endif #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - weight = _get_short (cp); - cp += sizeof (u_short); + ttl = _get_long(cp); + cp += sizeof(u_long); #elif defined(__APPLE_CC__) - GETSHORT (weight, cp); + GETLONG(ttl, cp); #else - NS_GET16 (weight, cp); + NS_GET32(ttl, cp); #endif #if defined(__NetBSD__) || defined(__OpenBSD__) ||\ defined(OLD_NAMESER) || defined(__FreeBSD__) - port = _get_short (cp); - cp += sizeof (u_short); + dlen = _get_short(cp); + cp += sizeof(u_short); #elif defined(__APPLE_CC__) - GETSHORT (port, cp); + GETSHORT(dlen, cp); #else - NS_GET16 (port, cp); + NS_GET16(dlen, cp); #endif - n = dn_expand (msg, eom, cp, (char *) hostbuf, 256); - if (n < 0) - break; - cp += n; - - srventry = &record->srventry[answerno]; - snprintf (srventry->srv, sizeof (srventry->srv), "%s", hostbuf); - - srventry->priority = pref; - srventry->weight = weight; - if (weight) - srventry->rweight = 1 + random () % (10000 * srventry->weight); - else - srventry->rweight = 0; - srventry->port = port; - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "SRV record %s IN SRV -> %s:%i/%i/%i/%i\n", - zone, srventry->srv, srventry->port, srventry->priority, - srventry->weight, srventry->rweight)); - - answerno++; - if (answerno == 10) - break; - } - - if (answerno == 0) - return OSIP_UNKNOWN_HOST; - osip_srv_record_sort(record,answerno); - snprintf (record->name, sizeof (record->name), "%s", domain); - return OSIP_SUCCESS; + if (type != T_NAPTR) { + cp += dlen; + continue; + } + + memset(&anaptr, 0, sizeof(osip_naptr_t)); + + memcpy((void *) &anaptr.order, cp, 2); + anaptr.order = ntohs(anaptr.order); /*((unsigned short)cp[0] << 8) | ((unsigned short)cp[1]); */ + cp += sizeof(unsigned short); + memcpy((void *) &anaptr.pref, cp, 2); + anaptr.pref = ntohs(anaptr.pref); /* ((unsigned short)cp[0] << 8) | ((unsigned short)cp[1]); */ + cp += sizeof(unsigned short); + + len = *cp; + cp++; + strncpy(anaptr.flag, (char *) cp, len); + anaptr.flag[len] = '\0'; + cp += len; + + len = *cp; + cp++; + strncpy(anaptr.service, (char *) cp, len); + anaptr.service[len] = '\0'; + cp += len; + + len = *cp; + cp++; + strncpy(anaptr.regexp, (char *) cp, len); + anaptr.regexp[len] = '\0'; + cp += len; + + n = dn_expand(msg, eom, cp, anaptr.replacement, 1024 - 1); + + if (n < 0) + break; + cp += n; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "NAPTR %s ->%i/%i/%s/%s/%s/%s\n", + domain, anaptr.order, anaptr.pref, anaptr.flag, + anaptr.service, anaptr.regexp, anaptr.replacement)); + + if (osip_strncasecmp(anaptr.service, "SIP+D2U", 8) == 0) { + snprintf(output_record->sipudp_record.name, sizeof(output_record->sipudp_record.name), + "%s", anaptr.replacement); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + } else if (osip_strncasecmp(anaptr.service, "SIP+D2T", 8) == 0) { + snprintf(output_record->siptcp_record.name, sizeof(output_record->siptcp_record.name), + "%s", anaptr.replacement); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + } else if (osip_strncasecmp(anaptr.service, "SIPS+D2U", 9) == 0) { + snprintf(output_record->sipdtls_record.name, sizeof(output_record->sipdtls_record.name), + "%s", anaptr.replacement); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + } else if (osip_strncasecmp(anaptr.service, "SIPS+D2T", 9) == 0) { + snprintf(output_record->siptls_record.name, sizeof(output_record->siptls_record.name), + "%s", anaptr.replacement); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + } else if (osip_strncasecmp(anaptr.service, "SIP+D2S", 8) == 0) { + snprintf(output_record->sipsctp_record.name, sizeof(output_record->sipsctp_record.name), + "%s", anaptr.replacement); + output_record->naptr_state=OSIP_NAPTR_STATE_NAPTRDONE; + } + + answerno++; + } + + if (answerno == 0) + { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "No NAPTR for SIP for domain %s\n", domain)); + output_record->naptr_state=OSIP_NAPTR_STATE_NOTSUPPORTED; + return OSIP_SUCCESS; + } + + if (output_record->naptr_state!=OSIP_NAPTR_STATE_NAPTRDONE) + output_record->naptr_state=OSIP_NAPTR_STATE_NOTSUPPORTED; + + return OSIP_SUCCESS; +} + +struct osip_naptr *eXosip_dnsutils_naptr(const char *domain, const char *protocol, const char *transport, int keep_in_cache) +{ + struct osip_naptr *naptr_record; + int pos; + int i; + int not_in_list=0; + + if (dnsutils_list==NULL) + { + dnsutils_list = (osip_list_t*) osip_malloc(sizeof(osip_list_t)); + osip_list_init(dnsutils_list); + } + + if (keep_in_cache<0) { + naptr_record=NULL; + pos = 0; + while (!osip_list_eol(dnsutils_list, pos)) { + naptr_record = (osip_naptr_t *) osip_list_get(dnsutils_list, pos); + if (osip_strcasecmp(domain, naptr_record->domain)==0) + { + if (naptr_record->naptr_state == OSIP_NAPTR_STATE_RETRYLATER) + break; + if (naptr_record->naptr_state == OSIP_NAPTR_STATE_NOTSUPPORTED) + break; + + return naptr_record; + } + + naptr_record=NULL; + pos++; + if (pos==10) + break; + } + return NULL; + } + + naptr_record=NULL; + pos = 0; + while (!osip_list_eol(dnsutils_list, pos)) { + naptr_record = (osip_naptr_t *) osip_list_get(dnsutils_list, pos); + + /* process all */ + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + naptr_record=NULL; + pos++; + if (pos==10) + break; + } + + if (domain==NULL) + return NULL; + + naptr_record=NULL; + pos = 0; + while (!osip_list_eol(dnsutils_list, pos)) { + naptr_record = (osip_naptr_t *) osip_list_get(dnsutils_list, pos); + if (osip_strcasecmp(domain, naptr_record->domain)==0) + { + if (naptr_record->naptr_state == OSIP_NAPTR_STATE_RETRYLATER) + break; + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + return naptr_record; + } + + naptr_record=NULL; + pos++; + if (pos==10) + break; + } + + if (pos==10 && keep_in_cache>0) + { + /* no NAPTR found within the last 10 NAPTR : refuse to keep in cache... */ + /* If we were adding unlimited NAPTR record into the cache, the program + would infinitly increase memory usage. If you reach there, then you + most probably don't use the API correctly: Only NAPTR related to + registration will end up in the cache. So in theory, 10 NAPTR will be + cached for 10 accounts, which seems enough for a softphone. Then all + SIP message should go through the same proxy by using a pre-route set. + Correctly using the API will definitly send out-of-dialog SIP message + to the same proxy as the REGISTER. If you have issue with in-dialog + Request or Response and NAPTR, that means your proxy is not following + guidelines from the rfc3261 and rfc3263 where proxy should specify + port numbers when they want you to resolve the host as a A record + -and then avoid NAPTR-. + */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip_dnsutils_naptr: Time will tell how much you go there (%s) - it's wrong code path, fix it\n", + domain)); + + keep_in_cache=0; + + naptr_record = (osip_naptr_t*) osip_malloc(sizeof(osip_naptr_t)); + memset(naptr_record, 0, sizeof(osip_naptr_t)); + naptr_record->keep_in_cache=keep_in_cache; + } + else if (naptr_record==NULL) + { + naptr_record = (osip_naptr_t*) osip_malloc(sizeof(osip_naptr_t)); + memset(naptr_record, 0, sizeof(osip_naptr_t)); + naptr_record->keep_in_cache=keep_in_cache; + not_in_list=1; + } + else + { + /* it was found, so it WAS in cache before, but we were in "retry" state */ + memset(naptr_record, 0, sizeof(osip_naptr_t)); + naptr_record->keep_in_cache=1; + } + + i = eXosip_dnsutils_naptr_lookup(naptr_record, domain); + if (i < 0) + { + if (keep_in_cache<=0) { + return naptr_record; + } + if (not_in_list==1) { + osip_list_add(dnsutils_list, naptr_record, -1); + } + return naptr_record; + } + + if (naptr_record->naptr_state==OSIP_NAPTR_STATE_NAPTRDONE + ||naptr_record->naptr_state==OSIP_NAPTR_STATE_SRVINPROGRESS) + eXosip_dnsutils_srv_lookup(naptr_record); + + if (keep_in_cache<=0) { + return naptr_record; + } + if (not_in_list==1) + osip_list_add(dnsutils_list, naptr_record, -1); + return naptr_record; +} + +int eXosip_dnsutils_dns_process(osip_naptr_t *naptr_record, int force) +{ + return OSIP_SUCCESS; +} + +void _eXosip_dnsutils_release(osip_naptr_t *naptr_record) +{ + if (naptr_record==NULL) + return; + if (naptr_record->keep_in_cache>0) + return; + osip_free(naptr_record); } - #else -int -eXosip_get_srv_record (struct osip_srv_record *record, char *domain, - char *protocol) +struct osip_naptr *eXosip_dnsutils_naptr(const char *domain, const char *protocol, const char *transport, int keep_in_cache) +{ + return NULL; +} + +int eXosip_dnsutils_dns_process(osip_naptr_t *naptr_record, int force) +{ + return OSIP_UNDEFINED_ERROR; +} + +void _eXosip_dnsutils_release(osip_naptr_t *naptr_record) { - return OSIP_UNDEFINED_ERROR; + return; } #endif +#else + +struct osip_naptr *eXosip_dnsutils_naptr(const char *domain, const char *protocol, const char *transport, int keep_in_cache) +{ + return NULL; +} + +int eXosip_dnsutils_dns_process(osip_naptr_t *naptr_record, int force) +{ + return OSIP_UNDEFINED_ERROR; +} + +void _eXosip_dnsutils_release(osip_naptr_t *naptr_record) +{ + return; +} + #endif + + + + diff -Nru libexosip2-3.3.0/src/inet_ntop.c libexosip2-3.6.0/src/inet_ntop.c --- libexosip2-3.3.0/src/inet_ntop.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/inet_ntop.c 2011-09-27 23:56:28.000000000 +0000 @@ -69,7 +69,7 @@ #define INT16SZ 2 #ifndef AF_INET6 -#define AF_INET6 AF_MAX+1 /* just to let this compile */ +#define AF_INET6 AF_MAX+1 /* just to let this compile */ #endif /* @@ -77,8 +77,8 @@ * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static const char *_inet_ntop4 (const u_char * src, char *dst, size_t size); -static const char *_inet_ntop6 (const u_char * src, char *dst, size_t size); +static const char *_inet_ntop4(const u_char * src, char *dst, size_t size); +static const char *_inet_ntop6(const u_char * src, char *dst, size_t size); /* char * * inet_ntop(af, src, dst, size) @@ -88,26 +88,24 @@ * author: * Paul Vixie, 1996. */ -const char * -_inet_ntop (af, src, dst, size) - int af; - const void *src; - char *dst; - size_t size; +const char *_inet_ntop(af, src, dst, size) +int af; +const void *src; +char *dst; +size_t size; { - switch (af) - { - case AF_INET: - return (_inet_ntop4 (src, dst, size)); - case AF_INET6: - return (_inet_ntop6 (src, dst, size)); - default: + switch (af) { + case AF_INET: + return (_inet_ntop4(src, dst, size)); + case AF_INET6: + return (_inet_ntop6(src, dst, size)); + default: #ifndef _WIN32_WCE - errno = EAFNOSUPPORT; + errno = WSAEAFNOSUPPORT; #endif - return (NULL); - } - /* NOTREACHED */ + return (NULL); + } + /* NOTREACHED */ } /* const char * @@ -121,25 +119,23 @@ * author: * Paul Vixie, 1996. */ -static const char * -_inet_ntop4 (src, dst, size) - const u_char *src; - char *dst; - size_t size; +static const char *_inet_ntop4(src, dst, size) +const u_char *src; +char *dst; +size_t size; { - static const char fmt[] = "%u.%u.%u.%u"; - char tmp[sizeof "255.255.255.255"]; + static const char fmt[] = "%u.%u.%u.%u"; + char tmp[sizeof "255.255.255.255"]; - sprintf (tmp, fmt, src[0], src[1], src[2], src[3]); - if ((size_t) strlen (tmp) > size) - { + sprintf(tmp, fmt, src[0], src[1], src[2], src[3]); + if ((size_t) strlen(tmp) >= size) { #ifndef _WIN32_WCE - errno = ENOSPC; + errno = ENOSPC; #endif - return (NULL); - } - strcpy (dst, tmp); - return (dst); + return (NULL); + } + strcpy(dst, tmp); + return (dst); } /* const char * @@ -148,108 +144,97 @@ * author: * Paul Vixie, 1996. */ -static const char * -_inet_ntop6 (src, dst, size) - const u_char *src; - char *dst; - size_t size; +static const char *_inet_ntop6(src, dst, size) +const u_char *src; +char *dst; +size_t size; { - /* - * Note that int32_t and int16_t need only be "at least" large enough - * to contain a value of the specified size. On some systems, like - * Crays, there is no such thing as an integer variable with 16 bits. - * Keep this in mind if you think this function should have been coded - * to use pointer overlays. All the world's not a VAX. - */ - char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; - struct - { - int base, len; - } best, cur; - uint32_t words[IN6ADDRSZ / INT16SZ]; - int i; - - /* - * Preprocess: - * Copy the input (bytewise) array into a wordwise array. - * Find the longest run of 0x00's in src[] for :: shorthanding. - */ - memset (words, 0, sizeof words); - for (i = 0; i < IN6ADDRSZ; i++) - words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); - best.base = -1; - cur.base = -1; - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) - { - if (words[i] == 0) - { - if (cur.base == -1) - cur.base = i, cur.len = 1; - else - cur.len++; - } else - { - if (cur.base != -1) - { - if (best.base == -1 || cur.len > best.len) - best = cur; - cur.base = -1; - } - } - } - if (cur.base != -1) - { - if (best.base == -1 || cur.len > best.len) - best = cur; - } - if (best.base != -1 && best.len < 2) - best.base = -1; - - /* - * Format the result. - */ - tp = tmp; - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) - { - /* Are we inside the best run of 0x00's? */ - if (best.base != -1 && i >= best.base && i < (best.base + best.len)) - { - if (i == best.base) - *tp++ = ':'; - continue; - } - /* Are we following an initial run of 0x00s or any real hex? */ - if (i != 0) - *tp++ = ':'; - /* Is this address an encapsulated IPv4? */ - if (i == 6 && best.base == 0 && - (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) - { - if (!_inet_ntop4 (src + 12, tp, sizeof tmp - (tp - tmp))) - return (NULL); - tp += strlen (tp); - break; - } - sprintf (tp, "%x", words[i]); - tp += strlen (tp); - } - /* Was it a trailing run of 0x00's? */ - if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) - *tp++ = ':'; - *tp++ = '\0'; - - /* - * Check for overflow, copy, and we're done. - */ - if ((size_t) (tp - tmp) > size) - { + /* + * Note that int32_t and int16_t need only be "at least" large enough + * to contain a value of the specified size. On some systems, like + * Crays, there is no such thing as an integer variable with 16 bits. + * Keep this in mind if you think this function should have been coded + * to use pointer overlays. All the world's not a VAX. + */ + char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; + struct { + int base, len; + } best, cur; + uint32_t words[IN6ADDRSZ / INT16SZ]; + int i; + + /* + * Preprocess: + * Copy the input (bytewise) array into a wordwise array. + * Find the longest run of 0x00's in src[] for :: shorthanding. + */ + memset(words, 0, sizeof words); + for (i = 0; i < IN6ADDRSZ; i++) + words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); + best.base = -1; best.len = 0; + cur.base = -1; cur.len = 0; + for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { + if (words[i] == 0) { + if (cur.base == -1) + cur.base = i, cur.len = 1; + else + cur.len++; + } else { + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + cur.base = -1; + } + } + } + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + } + if (best.base != -1 && best.len < 2) + best.base = -1; + + /* + * Format the result. + */ + tp = tmp; + for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { + /* Are we inside the best run of 0x00's? */ + if (best.base != -1 && i >= best.base && i < (best.base + best.len)) { + if (i == best.base) + *tp++ = ':'; + continue; + } + /* Are we following an initial run of 0x00s or any real hex? */ + if (i != 0) + *tp++ = ':'; + /* Is this address an encapsulated IPv4? */ + if (i == 6 && best.base == 0 && + (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { + if (!_inet_ntop4(src + 12, tp, sizeof tmp - (tp - tmp))) + return (NULL); + tp += strlen(tp); + break; + } + sprintf(tp, "%x", words[i]); + tp += strlen(tp); + } + /* Was it a trailing run of 0x00's? */ + if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) + *tp++ = ':'; + *tp++ = '\0'; + + /* + * Check for overflow, copy, and we're done. + */ + if ((size_t) (tp - tmp) > size) { #if !defined (_WIN32_WCE) - errno = ENOSPC; + errno = ENOSPC; #endif - return (NULL); - } - strcpy (dst, tmp); - return (dst); + return (NULL); + } + strcpy(dst, tmp); + return (dst); } #endif diff -Nru libexosip2-3.3.0/src/inet_ntop.h libexosip2-3.6.0/src/inet_ntop.h --- libexosip2-3.3.0/src/inet_ntop.h 2008-10-26 15:08:15.000000000 +0000 +++ libexosip2-3.6.0/src/inet_ntop.h 2011-02-03 14:05:21.000000000 +0000 @@ -20,21 +20,14 @@ #if defined(WIN32) #if defined(__cplusplus) -extern "C" -{ -#endif - -#ifndef EAFNOSUPPORT -#define EAFNOSUPPORT WSAEAFNOSUPPORT +extern "C" { #endif - - const char *_inet_ntop (int af, const void *src, char *dst, size_t size); + const char *_inet_ntop(int af, const void *src, char *dst, size_t size); #define inet_ntop _inet_ntop #if defined(__cplusplus) } #endif - -#endif /* WIN32 */ +#endif /* WIN32 */ diff -Nru libexosip2-3.3.0/src/jauth.c libexosip2-3.6.0/src/jauth.c --- libexosip2-3.3.0/src/jauth.c 2012-07-13 13:38:15.000000000 +0000 +++ libexosip2-3.6.0/src/jauth.c 2011-10-04 07:56:59.000000000 +0000 @@ -82,1150 +82,1088 @@ extern eXosip_t eXosip; /* Private functions */ -void CvtHex (IN HASH Bin, OUT HASHHEX Hex); -static void DigestCalcHA1 (IN const char *pszAlg, IN const char *pszUserName, - IN const char *pszRealm, - IN const char *pszPassword, - IN const char *pszNonce, IN const char *pszCNonce, - OUT HASHHEX SessionKey); -static void DigestCalcResponse (IN HASHHEX HA1, IN const char *pszNonce, - IN const char *pszNonceCount, - IN const char *pszCNonce, - IN const char *pszQop, - IN int Aka, - IN const char *pszMethod, - IN const char *pszDigestUri, - IN HASHHEX HEntity, OUT HASHHEX Response); -static void DigestCalcResponseAka (IN const char *pszPassword, - IN const char *pszNonce, - IN const char *pszCNonce, - IN const char *pszQop, - IN const char *pszMethod, - IN const char *pszDigestUri, - IN int version, OUT HASHHEX Response); +void CvtHex(IN HASH Bin, OUT HASHHEX Hex); +static void DigestCalcHA1(IN const char *pszAlg, IN const char *pszUserName, + IN const char *pszRealm, + IN const char *pszPassword, + IN const char *pszNonce, IN const char *pszCNonce, + OUT HASHHEX SessionKey); +static void DigestCalcResponse(IN HASHHEX HA1, IN const char *pszNonce, + IN const char *pszNonceCount, + IN const char *pszCNonce, + IN const char *pszQop, + IN int Aka, + IN const char *pszMethod, + IN const char *pszDigestUri, + IN HASHHEX HEntity, OUT HASHHEX Response); +static void DigestCalcResponseAka(IN const char *pszPassword, + IN const char *pszNonce, + IN const char *pszCNonce, + IN const char *pszQop, + IN const char *pszMethod, + IN const char *pszDigestUri, + IN int version, OUT HASHHEX Response); -void -CvtHex (IN HASH Bin, OUT HASHHEX Hex) +void CvtHex(IN HASH Bin, OUT HASHHEX Hex) { - unsigned short i; - unsigned char j; + unsigned short i; + unsigned char j; - for (i = 0; i < HASHLEN; i++) - { - j = (Bin[i] >> 4) & 0xf; - if (j <= 9) - Hex[i * 2] = (j + '0'); - else - Hex[i * 2] = (j + 'a' - 10); - j = Bin[i] & 0xf; - if (j <= 9) - Hex[i * 2 + 1] = (j + '0'); - else - Hex[i * 2 + 1] = (j + 'a' - 10); - }; - Hex[HASHHEXLEN] = '\0'; + for (i = 0; i < HASHLEN; i++) { + j = (Bin[i] >> 4) & 0xf; + if (j <= 9) + Hex[i * 2] = (j + '0'); + else + Hex[i * 2] = (j + 'a' - 10); + j = Bin[i] & 0xf; + if (j <= 9) + Hex[i * 2 + 1] = (j + '0'); + else + Hex[i * 2 + 1] = (j + 'a' - 10); + }; + Hex[HASHHEXLEN] = '\0'; } /* calculate H(A1) as per spec */ static void -DigestCalcHA1 (IN const char *pszAlg, - IN const char *pszUserName, - IN const char *pszRealm, - IN const char *pszPassword, - IN const char *pszNonce, - IN const char *pszCNonce, OUT HASHHEX SessionKey) +DigestCalcHA1(IN const char *pszAlg, + IN const char *pszUserName, + IN const char *pszRealm, + IN const char *pszPassword, + IN const char *pszNonce, + IN const char *pszCNonce, OUT HASHHEX SessionKey) { - osip_MD5_CTX Md5Ctx; - HASH HA1; + osip_MD5_CTX Md5Ctx; + HASH HA1; - osip_MD5Init (&Md5Ctx); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszUserName, strlen (pszUserName)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszRealm, strlen (pszRealm)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszPassword, strlen (pszPassword)); - osip_MD5Final ((unsigned char *) HA1, &Md5Ctx); - if ((pszAlg != NULL) && osip_strcasecmp (pszAlg, "md5-sess") == 0) - { - osip_MD5Init (&Md5Ctx); - osip_MD5Update (&Md5Ctx, (unsigned char *) HA1, HASHLEN); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszNonce, strlen (pszNonce)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszCNonce, strlen (pszCNonce)); - osip_MD5Final ((unsigned char *) HA1, &Md5Ctx); - } - CvtHex (HA1, SessionKey); + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszUserName, strlen(pszUserName)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszRealm, strlen(pszRealm)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszPassword, strlen(pszPassword)); + osip_MD5Final((unsigned char *) HA1, &Md5Ctx); + if ((pszAlg != NULL) && osip_strcasecmp(pszAlg, "md5-sess") == 0) { + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, (unsigned char *) HA1, HASHLEN); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszNonce, strlen(pszNonce)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszCNonce, strlen(pszCNonce)); + osip_MD5Final((unsigned char *) HA1, &Md5Ctx); + } + CvtHex(HA1, SessionKey); } /* calculate request-digest/response-digest as per HTTP Digest spec */ -static void -DigestCalcResponse (IN HASHHEX HA1, /* H(A1) */ - IN const char *pszNonce, /* nonce from server */ - IN const char *pszNonceCount, /* 8 hex digits */ - IN const char *pszCNonce, /* client nonce */ - IN const char *pszQop, /* qop-value: "", "auth", "auth-int" */ - IN int Aka, /* Calculating AKAv1-MD5 response */ - IN const char *pszMethod, /* method from the request */ - IN const char *pszDigestUri, /* requested URL */ - IN HASHHEX HEntity, /* H(entity body) if qop="auth-int" */ - OUT HASHHEX Response - /* request-digest or response-digest */ ) +static void DigestCalcResponse(IN HASHHEX HA1, /* H(A1) */ + IN const char *pszNonce, /* nonce from server */ + IN const char *pszNonceCount, /* 8 hex digits */ + IN const char *pszCNonce, /* client nonce */ + IN const char *pszQop, /* qop-value: "", "auth", "auth-int" */ + IN int Aka, /* Calculating AKAv1-MD5 response */ + IN const char *pszMethod, /* method from the request */ + IN const char *pszDigestUri, /* requested URL */ + IN HASHHEX HEntity, /* H(entity body) if qop="auth-int" */ + OUT HASHHEX Response + /* request-digest or response-digest */ ) { - osip_MD5_CTX Md5Ctx; - HASH HA2; - HASH RespHash; - HASHHEX HA2Hex; - - /* calculate H(A2) */ - osip_MD5Init (&Md5Ctx); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszMethod, strlen (pszMethod)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszDigestUri, strlen (pszDigestUri)); - - if (pszQop == NULL) - { - goto auth_withoutqop; - } else if (0 == osip_strcasecmp (pszQop, "auth-int")) - { - goto auth_withauth_int; - } else if (0 == osip_strcasecmp (pszQop, "auth")) - { - goto auth_withauth; - } - -auth_withoutqop: - osip_MD5Final ((unsigned char *) HA2, &Md5Ctx); - CvtHex (HA2, HA2Hex); - - /* calculate response */ - osip_MD5Init (&Md5Ctx); - osip_MD5Update (&Md5Ctx, (unsigned char *) HA1, HASHHEXLEN); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszNonce, strlen (pszNonce)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - - goto end; - -auth_withauth_int: - - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) HEntity, HASHHEXLEN); - -auth_withauth: - osip_MD5Final ((unsigned char *) HA2, &Md5Ctx); - CvtHex (HA2, HA2Hex); - - /* calculate response */ - osip_MD5Init (&Md5Ctx); - osip_MD5Update (&Md5Ctx, (unsigned char *) HA1, HASHHEXLEN); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszNonce, strlen (pszNonce)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - if (Aka == 0) - { - osip_MD5Update (&Md5Ctx, (unsigned char *) pszNonceCount, - strlen (pszNonceCount)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszCNonce, strlen (pszCNonce)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) pszQop, strlen (pszQop)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - } -end: - osip_MD5Update (&Md5Ctx, (unsigned char *) HA2Hex, HASHHEXLEN); - osip_MD5Final ((unsigned char *) RespHash, &Md5Ctx); - CvtHex (RespHash, Response); + osip_MD5_CTX Md5Ctx; + HASH HA2; + HASH RespHash; + HASHHEX HA2Hex; + + /* calculate H(A2) */ + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszMethod, strlen(pszMethod)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszDigestUri, strlen(pszDigestUri)); + + if (pszQop == NULL) { + goto auth_withoutqop; + } else if (0 == osip_strcasecmp(pszQop, "auth-int")) { + goto auth_withauth_int; + } else if (0 == osip_strcasecmp(pszQop, "auth")) { + goto auth_withauth; + } + + auth_withoutqop: + osip_MD5Final((unsigned char *) HA2, &Md5Ctx); + CvtHex(HA2, HA2Hex); + + /* calculate response */ + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, (unsigned char *) HA1, HASHHEXLEN); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszNonce, strlen(pszNonce)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + + goto end; + + auth_withauth_int: + + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) HEntity, HASHHEXLEN); + + auth_withauth: + osip_MD5Final((unsigned char *) HA2, &Md5Ctx); + CvtHex(HA2, HA2Hex); + + /* calculate response */ + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, (unsigned char *) HA1, HASHHEXLEN); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszNonce, strlen(pszNonce)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + if (Aka == 0) { + osip_MD5Update(&Md5Ctx, (unsigned char *) pszNonceCount, + strlen(pszNonceCount)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszCNonce, strlen(pszCNonce)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) pszQop, strlen(pszQop)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + } + end: + osip_MD5Update(&Md5Ctx, (unsigned char *) HA2Hex, HASHHEXLEN); + osip_MD5Final((unsigned char *) RespHash, &Md5Ctx); + CvtHex(RespHash, Response); } /*" ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";*/ -static int -base64_val (char x) +static int base64_val(char x) { - switch (x) - { - case '=': - return -1; - case 'A': - return OSIP_SUCCESS; - case 'B': - return 1; - case 'C': - return 2; - case 'D': - return 3; - case 'E': - return 4; - case 'F': - return 5; - case 'G': - return 6; - case 'H': - return 7; - case 'I': - return 8; - case 'J': - return 9; - case 'K': - return 10; - case 'L': - return 11; - case 'M': - return 12; - case 'N': - return 13; - case 'O': - return 14; - case 'P': - return 15; - case 'Q': - return 16; - case 'R': - return 17; - case 'S': - return 18; - case 'T': - return 19; - case 'U': - return 20; - case 'V': - return 21; - case 'W': - return 22; - case 'X': - return 23; - case 'Y': - return 24; - case 'Z': - return 25; - case 'a': - return 26; - case 'b': - return 27; - case 'c': - return 28; - case 'd': - return 29; - case 'e': - return 30; - case 'f': - return 31; - case 'g': - return 32; - case 'h': - return 33; - case 'i': - return 34; - case 'j': - return 35; - case 'k': - return 36; - case 'l': - return 37; - case 'm': - return 38; - case 'n': - return 39; - case 'o': - return 40; - case 'p': - return 41; - case 'q': - return 42; - case 'r': - return 43; - case 's': - return 44; - case 't': - return 45; - case 'u': - return 46; - case 'v': - return 47; - case 'w': - return 48; - case 'x': - return 49; - case 'y': - return 50; - case 'z': - return 51; - case '0': - return 52; - case '1': - return 53; - case '2': - return 54; - case '3': - return 55; - case '4': - return 56; - case '5': - return 57; - case '6': - return 58; - case '7': - return 59; - case '8': - return 60; - case '9': - return 61; - case '+': - return 62; - case '/': - return 63; - } - return OSIP_SUCCESS; + switch (x) { + case '=': + return -1; + case 'A': + return OSIP_SUCCESS; + case 'B': + return 1; + case 'C': + return 2; + case 'D': + return 3; + case 'E': + return 4; + case 'F': + return 5; + case 'G': + return 6; + case 'H': + return 7; + case 'I': + return 8; + case 'J': + return 9; + case 'K': + return 10; + case 'L': + return 11; + case 'M': + return 12; + case 'N': + return 13; + case 'O': + return 14; + case 'P': + return 15; + case 'Q': + return 16; + case 'R': + return 17; + case 'S': + return 18; + case 'T': + return 19; + case 'U': + return 20; + case 'V': + return 21; + case 'W': + return 22; + case 'X': + return 23; + case 'Y': + return 24; + case 'Z': + return 25; + case 'a': + return 26; + case 'b': + return 27; + case 'c': + return 28; + case 'd': + return 29; + case 'e': + return 30; + case 'f': + return 31; + case 'g': + return 32; + case 'h': + return 33; + case 'i': + return 34; + case 'j': + return 35; + case 'k': + return 36; + case 'l': + return 37; + case 'm': + return 38; + case 'n': + return 39; + case 'o': + return 40; + case 'p': + return 41; + case 'q': + return 42; + case 'r': + return 43; + case 's': + return 44; + case 't': + return 45; + case 'u': + return 46; + case 'v': + return 47; + case 'w': + return 48; + case 'x': + return 49; + case 'y': + return 50; + case 'z': + return 51; + case '0': + return 52; + case '1': + return 53; + case '2': + return 54; + case '3': + return 55; + case '4': + return 56; + case '5': + return 57; + case '6': + return 58; + case '7': + return 59; + case '8': + return 60; + case '9': + return 61; + case '+': + return 62; + case '/': + return 63; + } + return OSIP_SUCCESS; } -static char * -base64_decode_string (const char *buf, unsigned int len, int *newlen) +static char *base64_decode_string(const char *buf, unsigned int len, int *newlen) { - int i, j, x1, x2, x3, x4; - char *out; - out = (char *) osip_malloc ((len * 3 / 4) + 8); - if (out == NULL) - return NULL; - for (i = 0, j = 0; i + 3 < len; i += 4) - { - x1 = base64_val (buf[i]); - x2 = base64_val (buf[i + 1]); - x3 = base64_val (buf[i + 2]); - x4 = base64_val (buf[i + 3]); - out[j++] = (x1 << 2) | ((x2 & 0x30) >> 4); - out[j++] = ((x2 & 0x0F) << 4) | ((x3 & 0x3C) >> 2); - out[j++] = ((x3 & 0x03) << 6) | (x4 & 0x3F); - } - if (i < len) - { - x1 = base64_val (buf[i]); - if (i + 1 < len) - x2 = base64_val (buf[i + 1]); - else - x2 = -1; - if (i + 2 < len) - x3 = base64_val (buf[i + 2]); - else - x3 = -1; - if (i + 3 < len) - x4 = base64_val (buf[i + 3]); - else - x4 = -1; - if (x2 != -1) - { - out[j++] = (x1 << 2) | ((x2 & 0x30) >> 4); - if (x3 == -1) - { - out[j++] = ((x2 & 0x0F) << 4) | ((x3 & 0x3C) >> 2); - if (x4 == -1) - { - out[j++] = ((x3 & 0x03) << 6) | (x4 & 0x3F); - } - } - } - - } - - out[j++] = 0; - *newlen = j; - return out; + unsigned int i, j; + int x1, x2, x3, x4; + char *out; + out = (char *) osip_malloc((len * 3 / 4) + 8); + if (out == NULL) + return NULL; + for (i = 0, j = 0; i + 3 < len; i += 4) { + x1 = base64_val(buf[i]); + x2 = base64_val(buf[i + 1]); + x3 = base64_val(buf[i + 2]); + x4 = base64_val(buf[i + 3]); + out[j++] = (x1 << 2) | ((x2 & 0x30) >> 4); + out[j++] = ((x2 & 0x0F) << 4) | ((x3 & 0x3C) >> 2); + out[j++] = ((x3 & 0x03) << 6) | (x4 & 0x3F); + } + if (i < len) { + x1 = base64_val(buf[i]); + if (i + 1 < len) + x2 = base64_val(buf[i + 1]); + else + x2 = -1; + if (i + 2 < len) + x3 = base64_val(buf[i + 2]); + else + x3 = -1; + if (i + 3 < len) + x4 = base64_val(buf[i + 3]); + else + x4 = -1; + if (x2 != -1) { + out[j++] = (x1 << 2) | ((x2 & 0x30) >> 4); + if (x3 == -1) { + out[j++] = ((x2 & 0x0F) << 4) | ((x3 & 0x3C) >> 2); + if (x4 == -1) { + out[j++] = ((x3 & 0x03) << 6) | (x4 & 0x3F); + } + } + } + + } + + out[j++] = 0; + *newlen = j; + return out; } char base64[64] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static char * -base64_encode_string (const char *buf, unsigned int len, int *newlen) + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +static char *base64_encode_string(const char *buf, unsigned int len, int *newlen) { - int i, k; - int triplets, rest; - char *out, *ptr; - - triplets = len / 3; - rest = len % 3; - out = (char *) osip_malloc ((triplets * 4) + 8); - if (out == NULL) - return NULL; - - ptr = out; - for (i = 0; i < triplets * 3; i += 3) - { - k = (((unsigned char) buf[i]) & 0xFC) >> 2; - *ptr = base64[k]; - ptr++; - - k = (((unsigned char) buf[i]) & 0x03) << 4; - k |= (((unsigned char) buf[i + 1]) & 0xF0) >> 4; - *ptr = base64[k]; - ptr++; - - k = (((unsigned char) buf[i + 1]) & 0x0F) << 2; - k |= (((unsigned char) buf[i + 2]) & 0xC0) >> 6; - *ptr = base64[k]; - ptr++; - - k = (((unsigned char) buf[i + 2]) & 0x3F); - *ptr = base64[k]; - ptr++; - } - i = triplets * 3; - switch (rest) - { - case 0: - break; - case 1: - k = (((unsigned char) buf[i]) & 0xFC) >> 2; - *ptr = base64[k]; - ptr++; - - k = (((unsigned char) buf[i]) & 0x03) << 4; - *ptr = base64[k]; - ptr++; - - *ptr = '='; - ptr++; - - *ptr = '='; - ptr++; - break; - case 2: - k = (((unsigned char) buf[i]) & 0xFC) >> 2; - *ptr = base64[k]; - ptr++; - - k = (((unsigned char) buf[i]) & 0x03) << 4; - k |= (((unsigned char) buf[i + 1]) & 0xF0) >> 4; - *ptr = base64[k]; - ptr++; - - k = (((unsigned char) buf[i + 1]) & 0x0F) << 2; - *ptr = base64[k]; - ptr++; - - *ptr = '='; - ptr++; - break; - } + int i, k; + int triplets, rest; + char *out, *ptr; + + triplets = len / 3; + rest = len % 3; + out = (char *) osip_malloc((triplets * 4) + 8); + if (out == NULL) + return NULL; + + ptr = out; + for (i = 0; i < triplets * 3; i += 3) { + k = (((unsigned char) buf[i]) & 0xFC) >> 2; + *ptr = base64[k]; + ptr++; + + k = (((unsigned char) buf[i]) & 0x03) << 4; + k |= (((unsigned char) buf[i + 1]) & 0xF0) >> 4; + *ptr = base64[k]; + ptr++; + + k = (((unsigned char) buf[i + 1]) & 0x0F) << 2; + k |= (((unsigned char) buf[i + 2]) & 0xC0) >> 6; + *ptr = base64[k]; + ptr++; + + k = (((unsigned char) buf[i + 2]) & 0x3F); + *ptr = base64[k]; + ptr++; + } + i = triplets * 3; + switch (rest) { + case 0: + break; + case 1: + k = (((unsigned char) buf[i]) & 0xFC) >> 2; + *ptr = base64[k]; + ptr++; + + k = (((unsigned char) buf[i]) & 0x03) << 4; + *ptr = base64[k]; + ptr++; + + *ptr = '='; + ptr++; + + *ptr = '='; + ptr++; + break; + case 2: + k = (((unsigned char) buf[i]) & 0xFC) >> 2; + *ptr = base64[k]; + ptr++; + + k = (((unsigned char) buf[i]) & 0x03) << 4; + k |= (((unsigned char) buf[i + 1]) & 0xF0) >> 4; + *ptr = base64[k]; + ptr++; + + k = (((unsigned char) buf[i + 1]) & 0x0F) << 2; + *ptr = base64[k]; + ptr++; + + *ptr = '='; + ptr++; + break; + } - *newlen = ptr - out; - return out; + *newlen = ptr - out; + return out; } char hexa[16] = "0123456789abcdef"; /* calculate AKA request-digest/response-digest as per HTTP Digest spec */ -void -DigestCalcResponseAka (IN const char *pszPassword, IN const char *pszNonce, /* nonce from server */ - IN const char *pszCNonce, /* client nonce */ - IN const char *pszQop, /* qop-value: "", "auth", "auth-int" */ - IN const char *pszMethod, /* method from the request */ - IN const char *pszDigestUri, /* requested URL */ - IN int version, /* AKA version */ - OUT RESHEXAKA2 resp_hex - /* request-digest or response-digest */ ) +void DigestCalcResponseAka(IN const char *pszPassword, IN const char *pszNonce, /* nonce from server */ + IN const char *pszCNonce, /* client nonce */ + IN const char *pszQop, /* qop-value: "", "auth", "auth-int" */ + IN const char *pszMethod, /* method from the request */ + IN const char *pszDigestUri, /* requested URL */ + IN int version, /* AKA version */ + OUT RESHEXAKA2 resp_hex + /* request-digest or response-digest */ ) { - char tmp[MAX_HEADER_LEN]; - /* static unsigned int mync = 1; */ - /* int has_opaque = 0; */ - char *nonce64, *nonce; - int noncelen; - RAND rnd; - MAC mac, xmac; - SQN sqn_he; - K k; - RES res; - CK ck; - IK ik; - AK ak; - int i, j; - - - /* Compute the AKA response */ - resp_hex[0] = 0; - sprintf (tmp, "%s", pszNonce); - nonce64 = tmp; - nonce = base64_decode_string (nonce64, strlen (tmp), &noncelen); - if (nonce == NULL) - return; - - if (noncelen < RANDLEN + AUTNLEN) - { - /* Nonce is too short */ - goto done; - } - memcpy (rnd, nonce, RANDLEN); - /* memcpy(autn,nonce+RANDLEN,AUTNLEN); */ - memcpy (sqn_he, nonce + RANDLEN, SQNLEN); - memcpy (mac, nonce + RANDLEN + SQNLEN + AMFLEN, MACLEN); - - osip_free (nonce); - - j = strlen (pszPassword); - memcpy (k, pszPassword, j); - memset (k + j, 0, KLEN - j); - - /* compute XMAC */ - f1 (k, rnd, sqn_he, amf, xmac); - if (memcmp (mac, xmac, MACLEN) != 0) - { - /* - createAuthHeaderAKAv1MD5 : MAC != eXpectedMAC - -> Server might not know the secret (man-in-the-middle attack?) - return OSIP_SUCCESS; - */ - } - - /* compute the response and keys */ - f2345 (k, rnd, res, ck, ik, ak); - /* no check for sqn is performed, so no AUTS synchronization performed */ - - /* Format data for output in the SIP message */ - for (i = 0; i < RESLEN; i++) - { - resp_hex[2 * i] = hexa[(res[i] & 0xF0) >> 4]; - resp_hex[2 * i + 1] = hexa[res[i] & 0x0F]; - } - resp_hex[RESHEXLEN - 1] = 0; - -done: - switch (version) - { - case 1: - /* AKA v1 */ - /* Nothing to do */ - break; - case 2: - /* AKA v2 */ - resp_hex[RESHEXLEN + IKLEN * 2 + CKLEN * 2 - 1] = 0; - for (i = 0; i < IKLEN; i++) - { - resp_hex[RESLEN * 2 + 2 * i] = hexa[(ik[i] & 0xF0) >> 4]; - resp_hex[RESLEN * 2 + 2 * i + 1] = hexa[ik[i] & 0x0F]; - } - for (i = 0; i < CKLEN; i++) - { - resp_hex[RESLEN * 2 + IKLEN * 2 + 2 * i] = hexa[(ck[i] & 0xF0) >> 4]; - resp_hex[RESLEN * 2 + IKLEN * 2 + 2 * i + 1] = hexa[ck[i] & 0x0F]; - } - break; - } + char tmp[MAX_HEADER_LEN]; + /* static unsigned int mync = 1; */ + /* int has_opaque = 0; */ + char *nonce64, *nonce; + int noncelen; + RAND rnd; + MAC mac, xmac; + SQN sqn_he; + K k; + RES res; + CK ck; + IK ik; + AK ak; + int i, j; + + + /* Compute the AKA response */ + resp_hex[0] = 0; + snprintf(tmp, MAX_HEADER_LEN-1, "%s", pszNonce); + tmp[MAX_HEADER_LEN-1] = 0; + nonce64 = tmp; + nonce = base64_decode_string(nonce64, strlen(tmp), &noncelen); + if (nonce == NULL) + return; + + if (noncelen < RANDLEN + AUTNLEN) { + /* Nonce is too short */ + osip_free(nonce); + goto done; + } + memcpy(rnd, nonce, RANDLEN); + /* memcpy(autn,nonce+RANDLEN,AUTNLEN); */ + memcpy(sqn_he, nonce + RANDLEN, SQNLEN); + memcpy(mac, nonce + RANDLEN + SQNLEN + AMFLEN, MACLEN); + + osip_free(nonce); + + j = strlen(pszPassword); + memcpy(k, pszPassword, j); + memset(k + j, 0, KLEN - j); + + /* compute XMAC */ + f1(k, rnd, sqn_he, amf, xmac); + if (memcmp(mac, xmac, MACLEN) != 0) { + /* + createAuthHeaderAKAv1MD5 : MAC != eXpectedMAC + -> Server might not know the secret (man-in-the-middle attack?) + return OSIP_SUCCESS; + */ + } + + /* compute the response and keys */ + f2345(k, rnd, res, ck, ik, ak); + /* no check for sqn is performed, so no AUTS synchronization performed */ + + /* Format data for output in the SIP message */ + for (i = 0; i < RESLEN; i++) { + resp_hex[2 * i] = hexa[(res[i] & 0xF0) >> 4]; + resp_hex[2 * i + 1] = hexa[res[i] & 0x0F]; + } + resp_hex[RESHEXLEN - 1] = 0; + + done: + switch (version) { + case 1: + /* AKA v1 */ + /* Nothing to do */ + break; + case 2: + /* AKA v2 */ + resp_hex[RESHEXLEN + IKLEN * 2 + CKLEN * 2 - 1] = 0; + for (i = 0; i < IKLEN; i++) { + resp_hex[RESLEN * 2 + 2 * i] = hexa[(ik[i] & 0xF0) >> 4]; + resp_hex[RESLEN * 2 + 2 * i + 1] = hexa[ik[i] & 0x0F]; + } + for (i = 0; i < CKLEN; i++) { + resp_hex[RESLEN * 2 + IKLEN * 2 + 2 * i] = hexa[(ck[i] & 0xF0) >> 4]; + resp_hex[RESLEN * 2 + IKLEN * 2 + 2 * i + 1] = hexa[ck[i] & 0x0F]; + } + break; + } } int -__eXosip_create_authorization_header (osip_www_authenticate_t * wa, - const char *rquri, const char *username, - const char *passwd, const char *ha1, - osip_authorization_t ** auth, - const char *method, - const char *pCNonce, int iNonceCount) +__eXosip_create_authorization_header(osip_www_authenticate_t * wa, + const char *rquri, const char *username, + const char *passwd, const char *ha1, + osip_authorization_t ** auth, + const char *method, + const char *pCNonce, int iNonceCount) { - osip_authorization_t *aut; + osip_authorization_t *aut; - char *qop = NULL; - char *Alg = "MD5"; - int version = 0; - int i; - - /* make some test */ - if (passwd == NULL) - return OSIP_BADPARAMETER; - if (wa == NULL) - return OSIP_BADPARAMETER; - - if (wa->auth_type == NULL || (wa->nonce == NULL)) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "www_authenticate header is not acceptable.\n")); - return OSIP_SYNTAXERROR; - } - - if (wa->realm == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "www_authenticate header contains an empty realm: contact your admin!\n")); - } - - if (0 != osip_strcasecmp ("Digest", wa->auth_type)) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Authentication method not supported. (Digest only).\n")); - return OSIP_UNDEFINED_ERROR; - } - /* "MD5" is invalid, but some servers use it. */ - if (wa->algorithm != NULL) - { - if (0 == osip_strcasecmp ("MD5", wa->algorithm) - || 0 == osip_strcasecmp ("\"MD5\"", wa->algorithm)) - { - } else if (0 == osip_strcasecmp ("AKAv1-MD5", wa->algorithm) - || 0 == osip_strcasecmp ("\"AKAv1-MD5\"", wa->algorithm)) - { - Alg = "AKAv1-MD5"; - } else if (0 == osip_strcasecmp ("AKAv2-MD5", wa->algorithm) - || 0 == osip_strcasecmp ("\"AKAv2-MD5\"", wa->algorithm)) - { - Alg = "AKAv2-MD5"; - } else - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Authentication method not supported. (MD5, AKAv1-MD5, AKAv2-MD5)\n")); - return OSIP_UNDEFINED_ERROR; - } - } - - i = osip_authorization_init (&aut); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "allocation with authorization_init failed.\n")); - return i; - } - - /* just copy some feilds from response to new request */ - osip_authorization_set_auth_type (aut, osip_strdup ("Digest")); - osip_authorization_set_realm (aut, - osip_strdup (osip_www_authenticate_get_realm - (wa))); - osip_authorization_set_nonce (aut, - osip_strdup (osip_www_authenticate_get_nonce - (wa))); - if (osip_www_authenticate_get_opaque (wa) != NULL) - osip_authorization_set_opaque (aut, - osip_strdup - (osip_www_authenticate_get_opaque (wa))); - /* copy the username field in new request */ - aut->username = osip_malloc (strlen (username) + 3); - if (aut->username == NULL) - { - osip_authorization_free (aut); - return OSIP_NOMEM; - } - sprintf (aut->username, "\"%s\"", username); - - { - char *tmp = osip_malloc (strlen (rquri) + 3); - if (tmp == NULL) - { - osip_authorization_free (aut); - return OSIP_NOMEM; - } - sprintf (tmp, "\"%s\"", rquri); - osip_authorization_set_uri (aut, tmp); - } - - osip_authorization_set_algorithm (aut, osip_strdup (Alg)); - - qop = osip_www_authenticate_get_qop_options (wa); - if (qop == NULL || qop[0] == '\0' || strlen (qop) < 4) - qop = NULL; - - - { - char *pszNonce = - osip_strdup_without_quote (osip_www_authenticate_get_nonce (wa)); - char *pszCNonce = NULL; - const char *pszUser = username; - char *pszRealm = NULL; - const char *pszPass = NULL; - char *szNonceCount = NULL; - const char *pszMethod = method; /* previous_answer->cseq->method; */ - char *pszQop = NULL; - const char *pszURI = rquri; - - HASHHEX HA1; - HASHHEX HA2 = ""; - HASHHEX Response; - RESHEXAKA2 Response2; - const char *pha1 = NULL; - - if (osip_authorization_get_realm (aut) == NULL) - { - pszRealm = osip_strdup (""); - } else - { - pszRealm = osip_strdup_without_quote (osip_authorization_get_realm (aut)); - } - - if (qop != NULL) - { - /* only accept qop="auth" */ - pszQop = osip_strdup ("auth"); - if (pszQop == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszRealm); - return OSIP_NOMEM; - } - - szNonceCount = osip_malloc (10); - if (szNonceCount == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszRealm); - osip_free (pszQop); - return OSIP_NOMEM; - } - snprintf (szNonceCount, 9, "%.8i", iNonceCount); - - pszCNonce = osip_strdup (pCNonce); - if (pszCNonce == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszRealm); - osip_free (pszQop); - osip_free (szNonceCount); - return OSIP_NOMEM; - } - - osip_authorization_set_message_qop (aut, osip_strdup ("auth")); - osip_authorization_set_nonce_count (aut, osip_strdup (szNonceCount)); - - { - char *tmp = osip_malloc (strlen (pszCNonce) + 3); - if (tmp == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszCNonce); - osip_free (pszRealm); - osip_free (pszQop); - osip_free (szNonceCount); - return OSIP_NOMEM; - } - sprintf (tmp, "\"%s\"", pszCNonce); - osip_authorization_set_cnonce (aut, tmp); - } - } - - pszPass = passwd; - - /* Depending on which algorithm the response will be calculated, MD5 or AKAv1-MD5 */ - if (0 == osip_strcasecmp (Alg, "MD5")) - { - if (ha1 && ha1[0]) - { - /* Depending on algorithm=md5 */ - pha1 = ha1; - } else - { - DigestCalcHA1 ("MD5", pszUser, pszRealm, pszPass, pszNonce, - pszCNonce, HA1); - pha1 = HA1; - } - - version = 0; - DigestCalcResponse ((char *) pha1, pszNonce, szNonceCount, pszCNonce, - pszQop, version, pszMethod, pszURI, HA2, Response); - } else - { - if (0 == osip_strcasecmp (Alg, "AKAv1-MD5")) - version = 1; - else - version = 2; - - DigestCalcResponseAka (pszPass, pszNonce, pszCNonce, - pszQop, pszMethod, pszURI, version, Response2); - if (ha1 && ha1[0]) - { - /* Depending on algorithm=md5 */ - pha1 = ha1; - } else - { - DigestCalcHA1 ("MD5", pszUser, pszRealm, Response2, pszNonce, - pszCNonce, HA1); - pha1 = HA1; - } - - DigestCalcResponse ((char *) pha1, pszNonce, szNonceCount, pszCNonce, - pszQop, version, pszMethod, pszURI, HA2, Response); - - } - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO4, NULL, - "Response in authorization |%s|\n", Response)); - { - char *resp = osip_malloc (35); - if (resp == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszCNonce); - osip_free (pszRealm); - osip_free (pszQop); - osip_free (szNonceCount); - return OSIP_NOMEM; - } - - sprintf (resp, "\"%s\"", Response); - osip_authorization_set_response (aut, resp); - } - osip_free (pszNonce); - osip_free (pszCNonce); - osip_free (pszRealm); - osip_free (pszQop); - osip_free (szNonceCount); - } + char *qop = NULL; + char *Alg = "MD5"; + int version = 0; + int i; + + /* make some test */ + if (passwd == NULL) + return OSIP_BADPARAMETER; + if (wa == NULL) + return OSIP_BADPARAMETER; + + if (wa->auth_type == NULL || (wa->nonce == NULL)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "www_authenticate header is not acceptable.\n")); + return OSIP_SYNTAXERROR; + } + + if (wa->realm == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "www_authenticate header contains an empty realm: contact your admin!\n")); + } + + if (0 != osip_strcasecmp("Digest", wa->auth_type)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Authentication method not supported. (Digest only).\n")); + return OSIP_UNDEFINED_ERROR; + } + /* "MD5" is invalid, but some servers use it. */ + if (wa->algorithm != NULL) { + if (0 == osip_strcasecmp("MD5", wa->algorithm) + || 0 == osip_strcasecmp("\"MD5\"", wa->algorithm)) { + } else if (0 == osip_strcasecmp("AKAv1-MD5", wa->algorithm) + || 0 == osip_strcasecmp("\"AKAv1-MD5\"", wa->algorithm)) { + Alg = "AKAv1-MD5"; + } else if (0 == osip_strcasecmp("AKAv2-MD5", wa->algorithm) + || 0 == osip_strcasecmp("\"AKAv2-MD5\"", wa->algorithm)) { + Alg = "AKAv2-MD5"; + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Authentication method not supported. (MD5, AKAv1-MD5, AKAv2-MD5)\n")); + return OSIP_UNDEFINED_ERROR; + } + } + + i = osip_authorization_init(&aut); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "allocation with authorization_init failed.\n")); + return i; + } + + /* just copy some feilds from response to new request */ + osip_authorization_set_auth_type(aut, osip_strdup("Digest")); + osip_authorization_set_realm(aut, + osip_strdup(osip_www_authenticate_get_realm(wa))); + if (aut->realm == NULL) { + aut->realm = (char *) osip_malloc(3); + aut->realm[0] = '"'; + aut->realm[1] = '"'; + aut->realm[2] = '\0'; + } + osip_authorization_set_nonce(aut, + osip_strdup(osip_www_authenticate_get_nonce(wa))); + if (osip_www_authenticate_get_opaque(wa) != NULL) + osip_authorization_set_opaque(aut, + osip_strdup + (osip_www_authenticate_get_opaque(wa))); + /* copy the username field in new request */ + aut->username = osip_malloc(strlen(username) + 3); + if (aut->username == NULL) { + osip_authorization_free(aut); + return OSIP_NOMEM; + } + sprintf(aut->username, "\"%s\"", username); + + { + char *tmp = osip_malloc(strlen(rquri) + 3); + if (tmp == NULL) { + osip_authorization_free(aut); + return OSIP_NOMEM; + } + sprintf(tmp, "\"%s\"", rquri); + osip_authorization_set_uri(aut, tmp); + } + + osip_authorization_set_algorithm(aut, osip_strdup(Alg)); + + qop = osip_www_authenticate_get_qop_options(wa); + if (qop == NULL || qop[0] == '\0' || strlen(qop) < 4) + qop = NULL; + + + { + char *pszNonce = + osip_strdup_without_quote(osip_www_authenticate_get_nonce(wa)); + char *pszCNonce = NULL; + const char *pszUser = username; + char *pszRealm = NULL; + const char *pszPass = NULL; + char *szNonceCount = NULL; + const char *pszMethod = method; /* previous_answer->cseq->method; */ + char *pszQop = NULL; + const char *pszURI = rquri; + + HASHHEX HA1; + HASHHEX HA2 = ""; + HASHHEX Response; + RESHEXAKA2 Response2; + const char *pha1 = NULL; + + if (osip_authorization_get_realm(aut) == NULL) { + pszRealm = osip_strdup(""); + } else { + pszRealm = + osip_strdup_without_quote(osip_authorization_get_realm(aut)); + } + + if (qop != NULL) { + /* only accept qop="auth" */ + pszQop = osip_strdup("auth"); + if (pszQop == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszRealm); + return OSIP_NOMEM; + } + + szNonceCount = osip_malloc(10); + if (szNonceCount == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszRealm); + osip_free(pszQop); + return OSIP_NOMEM; + } + snprintf(szNonceCount, 9, "%.8i", iNonceCount); + + pszCNonce = osip_strdup(pCNonce); + if (pszCNonce == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszRealm); + osip_free(pszQop); + osip_free(szNonceCount); + return OSIP_NOMEM; + } + + osip_authorization_set_message_qop(aut, osip_strdup("auth")); + osip_authorization_set_nonce_count(aut, osip_strdup(szNonceCount)); + + { + char *tmp = osip_malloc(strlen(pszCNonce) + 3); + if (tmp == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszCNonce); + osip_free(pszRealm); + osip_free(pszQop); + osip_free(szNonceCount); + return OSIP_NOMEM; + } + sprintf(tmp, "\"%s\"", pszCNonce); + osip_authorization_set_cnonce(aut, tmp); + } + } + + pszPass = passwd; + + /* Depending on which algorithm the response will be calculated, MD5 or AKAv1-MD5 */ + if (0 == osip_strcasecmp(Alg, "MD5")) { + if (ha1 && ha1[0]) { + /* Depending on algorithm=md5 */ + pha1 = ha1; + } else { + DigestCalcHA1("MD5", pszUser, pszRealm, pszPass, pszNonce, + pszCNonce, HA1); + pha1 = HA1; + } + + version = 0; + DigestCalcResponse((char *) pha1, pszNonce, szNonceCount, pszCNonce, + pszQop, version, pszMethod, pszURI, HA2, Response); + } else { + if (0 == osip_strcasecmp(Alg, "AKAv1-MD5")) + version = 1; + else + version = 2; + + DigestCalcResponseAka(pszPass, pszNonce, pszCNonce, + pszQop, pszMethod, pszURI, version, Response2); + if (ha1 && ha1[0]) { + /* Depending on algorithm=md5 */ + pha1 = ha1; + } else { + DigestCalcHA1("MD5", pszUser, pszRealm, Response2, pszNonce, + pszCNonce, HA1); + pha1 = HA1; + } + + DigestCalcResponse((char *) pha1, pszNonce, szNonceCount, pszCNonce, + pszQop, version, pszMethod, pszURI, HA2, Response); + + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO4, NULL, + "Response in authorization |%s|\n", Response)); + { + char *resp = osip_malloc(35); + if (resp == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszCNonce); + osip_free(pszRealm); + osip_free(pszQop); + osip_free(szNonceCount); + return OSIP_NOMEM; + } + + snprintf(resp, 35, "\"%s\"", Response); + resp[34] = 0; + osip_authorization_set_response(aut, resp); + } + osip_free(pszNonce); + osip_free(pszCNonce); + osip_free(pszRealm); + osip_free(pszQop); + osip_free(szNonceCount); + } - *auth = aut; - return OSIP_SUCCESS; + *auth = aut; + return OSIP_SUCCESS; } int -__eXosip_create_proxy_authorization_header (osip_proxy_authenticate_t * wa, - const char *rquri, - const char *username, - const char *passwd, - const char *ha1, - osip_proxy_authorization_t ** - auth, const char *method, - const char *pCNonce, int iNonceCount) +__eXosip_create_proxy_authorization_header(osip_proxy_authenticate_t * wa, + const char *rquri, + const char *username, + const char *passwd, + const char *ha1, + osip_proxy_authorization_t ** + auth, const char *method, + const char *pCNonce, int iNonceCount) { - osip_proxy_authorization_t *aut; + osip_proxy_authorization_t *aut; - char *qop = NULL; - char *Alg = "MD5"; - int version = 0; - int i; - - /* make some test */ - if (passwd == NULL) - return OSIP_BADPARAMETER; - if (wa == NULL) - return OSIP_BADPARAMETER; - - if (wa->auth_type == NULL || (wa->nonce == NULL)) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "www_authenticate header is not acceptable.\n")); - return OSIP_SYNTAXERROR; - } - - if (wa->realm == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "www_authenticate header contains an empty realm: contact your admin!\n")); - } - - if (0 != osip_strcasecmp ("Digest", wa->auth_type)) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Authentication method not supported. (Digest only).\n")); - return OSIP_UNDEFINED_ERROR; - } - - /* "MD5" is invalid, but some servers use it. */ - if (wa->algorithm != NULL) - { - if (0 == osip_strcasecmp ("MD5", wa->algorithm) - || 0 == osip_strcasecmp ("\"MD5\"", wa->algorithm)) - { - } else if (0 == osip_strcasecmp ("AKAv1-MD5", wa->algorithm) - || 0 == osip_strcasecmp ("\"AKAv1-MD5\"", wa->algorithm)) - { - Alg = "AKAv1-MD5"; - } else if (0 == osip_strcasecmp ("AKAv2-MD5", wa->algorithm) - || 0 == osip_strcasecmp ("\"AKAv2-MD5\"", wa->algorithm)) - { - Alg = "AKAv2-MD5"; - } else - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Authentication method not supported. (MD5, AKAv1-MD5, AKAv2-MD5)\n")); - return OSIP_UNDEFINED_ERROR; - } - } - - i = osip_proxy_authorization_init (&aut); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "allocation with authorization_init failed.\n")); - return i; - } - - /* just copy some feilds from response to new request */ - osip_proxy_authorization_set_auth_type (aut, osip_strdup ("Digest")); - osip_proxy_authorization_set_realm (aut, - osip_strdup - (osip_proxy_authenticate_get_realm (wa))); - osip_proxy_authorization_set_nonce (aut, - osip_strdup - (osip_proxy_authenticate_get_nonce (wa))); - if (osip_proxy_authenticate_get_opaque (wa) != NULL) - osip_proxy_authorization_set_opaque (aut, - osip_strdup - (osip_proxy_authenticate_get_opaque - (wa))); - /* copy the username field in new request */ - aut->username = osip_malloc (strlen (username) + 3); - if (aut->username == NULL) - { - osip_authorization_free (aut); - return OSIP_NOMEM; - } - sprintf (aut->username, "\"%s\"", username); - - { - char *tmp = osip_malloc (strlen (rquri) + 3); - if (tmp == NULL) - { - osip_authorization_free (aut); - return OSIP_NOMEM; - } - - sprintf (tmp, "\"%s\"", rquri); - osip_proxy_authorization_set_uri (aut, tmp); - } - osip_proxy_authorization_set_algorithm (aut, osip_strdup (Alg)); - - qop = osip_www_authenticate_get_qop_options (wa); - if (qop == NULL || qop[0] == '\0' || strlen (qop) < 4) - qop = NULL; - - { - char *pszNonce = NULL; - char *pszCNonce = NULL; - const char *pszUser = username; - char *pszRealm = NULL; - const char *pszPass = NULL; - char *szNonceCount = NULL; - char *pszMethod = (char *) method; /* previous_answer->cseq->method; */ - char *pszQop = NULL; - const char *pszURI = rquri; - - HASHHEX HA1; - HASHHEX HA2 = ""; - HASHHEX Response; - RESHEXAKA2 Response2; - const char *pha1 = NULL; - - if (osip_proxy_authorization_get_realm (aut) == NULL) - { - pszRealm = osip_strdup (""); - } else - { - pszRealm = - osip_strdup_without_quote (osip_proxy_authorization_get_realm (aut)); - } - - pszPass = passwd; - - if (osip_www_authenticate_get_nonce (wa) == NULL) - return OSIP_SYNTAXERROR; - pszNonce = osip_strdup_without_quote (osip_www_authenticate_get_nonce (wa)); - - if (qop != NULL) - { - /* only accept qop="auth" */ - pszQop = osip_strdup ("auth"); - if (pszQop == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszRealm); - return OSIP_NOMEM; - } - - szNonceCount = osip_malloc (10); - if (szNonceCount == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszRealm); - osip_free (pszQop); - return OSIP_NOMEM; - } - snprintf (szNonceCount, 9, "%.8i", iNonceCount); - - pszCNonce = osip_strdup (pCNonce); - if (pszCNonce == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszRealm); - osip_free (pszQop); - osip_free (szNonceCount); - return OSIP_NOMEM; - } - - osip_proxy_authorization_set_message_qop (aut, osip_strdup ("auth")); - osip_proxy_authorization_set_nonce_count (aut, osip_strdup (szNonceCount)); - - { - char *tmp = osip_malloc (strlen (pszCNonce) + 3); - if (tmp == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszCNonce); - osip_free (pszRealm); - osip_free (pszQop); - osip_free (szNonceCount); - return OSIP_NOMEM; - } - sprintf (tmp, "\"%s\"", pszCNonce); - osip_proxy_authorization_set_cnonce (aut, tmp); - } - } - - if (0 == osip_strcasecmp (Alg, "MD5")) - { - if (ha1 && ha1[0]) - { - /* Depending on algorithm=md5 */ - pha1 = ha1; - } else - { - DigestCalcHA1 ("MD5", pszUser, pszRealm, pszPass, pszNonce, - pszCNonce, HA1); - pha1 = HA1; - } - version = 0; - DigestCalcResponse ((char *) pha1, pszNonce, szNonceCount, pszCNonce, - pszQop, version, pszMethod, pszURI, HA2, Response); - } else - { - if (0 == osip_strcasecmp (Alg, "AKAv1-MD5")) - version = 1; - else - version = 2; - - DigestCalcResponseAka (pszPass, pszNonce, pszCNonce, pszQop, pszMethod, - pszURI, version, Response2); - if (ha1 && ha1[0]) - { - /* Depending on algorithm=md5 */ - pha1 = ha1; - } else - { - DigestCalcHA1 ("MD5", pszUser, pszRealm, Response2, pszNonce, - pszCNonce, HA1); - pha1 = HA1; - } - - DigestCalcResponse ((char *) pha1, pszNonce, szNonceCount, pszCNonce, - pszQop, version, pszMethod, pszURI, HA2, Response); - } - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO4, NULL, - "Response in proxy_authorization |%s|\n", Response)); - { - char *resp = osip_malloc (35); - if (resp == NULL) - { - osip_authorization_free (aut); - osip_free (pszNonce); - osip_free (pszCNonce); - osip_free (pszRealm); - osip_free (pszQop); - osip_free (szNonceCount); - return OSIP_NOMEM; - } - - sprintf (resp, "\"%s\"", Response); - osip_proxy_authorization_set_response (aut, resp); - } - osip_free (pszNonce); - osip_free (pszCNonce); - osip_free (pszRealm); - osip_free (pszQop); - osip_free (szNonceCount); - } + char *qop = NULL; + char *Alg = "MD5"; + int version = 0; + int i; + + /* make some test */ + if (passwd == NULL) + return OSIP_BADPARAMETER; + if (wa == NULL) + return OSIP_BADPARAMETER; + + if (wa->auth_type == NULL || (wa->nonce == NULL)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "www_authenticate header is not acceptable.\n")); + return OSIP_SYNTAXERROR; + } + + if (wa->realm == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "www_authenticate header contains an empty realm: contact your admin!\n")); + } + + if (0 != osip_strcasecmp("Digest", wa->auth_type)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Authentication method not supported. (Digest only).\n")); + return OSIP_UNDEFINED_ERROR; + } + + /* "MD5" is invalid, but some servers use it. */ + if (wa->algorithm != NULL) { + if (0 == osip_strcasecmp("MD5", wa->algorithm) + || 0 == osip_strcasecmp("\"MD5\"", wa->algorithm)) { + } else if (0 == osip_strcasecmp("AKAv1-MD5", wa->algorithm) + || 0 == osip_strcasecmp("\"AKAv1-MD5\"", wa->algorithm)) { + Alg = "AKAv1-MD5"; + } else if (0 == osip_strcasecmp("AKAv2-MD5", wa->algorithm) + || 0 == osip_strcasecmp("\"AKAv2-MD5\"", wa->algorithm)) { + Alg = "AKAv2-MD5"; + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Authentication method not supported. (MD5, AKAv1-MD5, AKAv2-MD5)\n")); + return OSIP_UNDEFINED_ERROR; + } + } + + i = osip_proxy_authorization_init(&aut); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "allocation with authorization_init failed.\n")); + return i; + } + + /* just copy some feilds from response to new request */ + osip_proxy_authorization_set_auth_type(aut, osip_strdup("Digest")); + osip_proxy_authorization_set_realm(aut, + osip_strdup + (osip_proxy_authenticate_get_realm(wa))); + if (aut->realm == NULL) { + aut->realm = (char *) osip_malloc(3); + aut->realm[0] = '"'; + aut->realm[1] = '"'; + aut->realm[2] = '\0'; + } + osip_proxy_authorization_set_nonce(aut, + osip_strdup + (osip_proxy_authenticate_get_nonce(wa))); + if (osip_proxy_authenticate_get_opaque(wa) != NULL) + osip_proxy_authorization_set_opaque(aut, + osip_strdup + (osip_proxy_authenticate_get_opaque + (wa))); + /* copy the username field in new request */ + aut->username = osip_malloc(strlen(username) + 3); + if (aut->username == NULL) { + osip_authorization_free(aut); + return OSIP_NOMEM; + } + sprintf(aut->username, "\"%s\"", username); + + { + char *tmp = osip_malloc(strlen(rquri) + 3); + if (tmp == NULL) { + osip_authorization_free(aut); + return OSIP_NOMEM; + } + + sprintf(tmp, "\"%s\"", rquri); + osip_proxy_authorization_set_uri(aut, tmp); + } + osip_proxy_authorization_set_algorithm(aut, osip_strdup(Alg)); + + qop = osip_www_authenticate_get_qop_options(wa); + if (qop == NULL || qop[0] == '\0' || strlen(qop) < 4) + qop = NULL; + + { + char *pszNonce = NULL; + char *pszCNonce = NULL; + const char *pszUser = username; + char *pszRealm = NULL; + const char *pszPass = NULL; + char *szNonceCount = NULL; + char *pszMethod = (char *) method; /* previous_answer->cseq->method; */ + char *pszQop = NULL; + const char *pszURI = rquri; + + HASHHEX HA1; + HASHHEX HA2 = ""; + HASHHEX Response; + RESHEXAKA2 Response2; + const char *pha1 = NULL; + + if (osip_proxy_authorization_get_realm(aut) == NULL) { + pszRealm = osip_strdup(""); + } else { + pszRealm = + osip_strdup_without_quote(osip_proxy_authorization_get_realm(aut)); + } + + pszPass = passwd; + + if (osip_www_authenticate_get_nonce(wa) == NULL) + { + osip_authorization_free(aut); + osip_free(pszRealm); + return OSIP_SYNTAXERROR; + } + pszNonce = osip_strdup_without_quote(osip_www_authenticate_get_nonce(wa)); + + if (qop != NULL) { + /* only accept qop="auth" */ + pszQop = osip_strdup("auth"); + if (pszQop == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszRealm); + return OSIP_NOMEM; + } + + szNonceCount = osip_malloc(10); + if (szNonceCount == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszRealm); + osip_free(pszQop); + return OSIP_NOMEM; + } + snprintf(szNonceCount, 9, "%.8i", iNonceCount); + + pszCNonce = osip_strdup(pCNonce); + if (pszCNonce == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszRealm); + osip_free(pszQop); + osip_free(szNonceCount); + return OSIP_NOMEM; + } + + osip_proxy_authorization_set_message_qop(aut, osip_strdup("auth")); + osip_proxy_authorization_set_nonce_count(aut, + osip_strdup(szNonceCount)); + + { + char *tmp = osip_malloc(strlen(pszCNonce) + 3); + if (tmp == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszCNonce); + osip_free(pszRealm); + osip_free(pszQop); + osip_free(szNonceCount); + return OSIP_NOMEM; + } + sprintf(tmp, "\"%s\"", pszCNonce); + osip_proxy_authorization_set_cnonce(aut, tmp); + } + } + + if (0 == osip_strcasecmp(Alg, "MD5")) { + if (ha1 && ha1[0]) { + /* Depending on algorithm=md5 */ + pha1 = ha1; + } else { + DigestCalcHA1("MD5", pszUser, pszRealm, pszPass, pszNonce, + pszCNonce, HA1); + pha1 = HA1; + } + version = 0; + DigestCalcResponse((char *) pha1, pszNonce, szNonceCount, pszCNonce, + pszQop, version, pszMethod, pszURI, HA2, Response); + } else { + if (0 == osip_strcasecmp(Alg, "AKAv1-MD5")) + version = 1; + else + version = 2; + + DigestCalcResponseAka(pszPass, pszNonce, pszCNonce, pszQop, pszMethod, + pszURI, version, Response2); + if (ha1 && ha1[0]) { + /* Depending on algorithm=md5 */ + pha1 = ha1; + } else { + DigestCalcHA1("MD5", pszUser, pszRealm, Response2, pszNonce, + pszCNonce, HA1); + pha1 = HA1; + } + + DigestCalcResponse((char *) pha1, pszNonce, szNonceCount, pszCNonce, + pszQop, version, pszMethod, pszURI, HA2, Response); + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO4, NULL, + "Response in proxy_authorization |%s|\n", Response)); + { + char *resp = osip_malloc(35); + if (resp == NULL) { + osip_authorization_free(aut); + osip_free(pszNonce); + osip_free(pszCNonce); + osip_free(pszRealm); + osip_free(pszQop); + osip_free(szNonceCount); + return OSIP_NOMEM; + } + + snprintf(resp, 35, "\"%s\"", Response); + resp[34] = 0; + osip_proxy_authorization_set_response(aut, resp); + } + osip_free(pszNonce); + osip_free(pszCNonce); + osip_free(pszRealm); + osip_free(pszQop); + osip_free(szNonceCount); + } - *auth = aut; - return OSIP_SUCCESS; + *auth = aut; + return OSIP_SUCCESS; } int -_eXosip_store_nonce (const char *call_id, osip_proxy_authenticate_t * wa, - int answer_code) +_eXosip_store_nonce(const char *call_id, osip_proxy_authenticate_t * wa, + int answer_code) { - struct eXosip_http_auth *http_auth; - int pos; + struct eXosip_http_auth *http_auth; + int pos; - /* update entries with same call_id */ - for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) - { - http_auth = &eXosip.http_auths[pos]; - if (http_auth->pszCallId[0] == '\0') - continue; - if (osip_strcasecmp (http_auth->pszCallId, call_id) == 0 - && ((http_auth->wa->realm == NULL && wa->realm == NULL) - || (http_auth->wa->realm != NULL - && wa->realm != NULL - && osip_strcasecmp (http_auth->wa->realm, wa->realm) == 0))) - { - osip_proxy_authenticate_free (http_auth->wa); - http_auth->wa = NULL; - osip_proxy_authenticate_clone (wa, &(http_auth->wa)); - http_auth->iNonceCount = 1; - if (http_auth->wa == NULL) - memset (http_auth, 0, sizeof (struct eXosip_http_auth)); - return OSIP_SUCCESS; - } - } - - /* not found */ - for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) - { - http_auth = &eXosip.http_auths[pos]; - if (http_auth->pszCallId[0] == '\0') - { - snprintf (http_auth->pszCallId, sizeof (http_auth->pszCallId), "%s", call_id); - snprintf (http_auth->pszCNonce, sizeof (http_auth->pszCNonce), - "0a4f113b"); - http_auth->iNonceCount = 1; - osip_proxy_authenticate_clone (wa, &(http_auth->wa)); - http_auth->answer_code = answer_code; - if (http_auth->wa == NULL) - memset (http_auth, 0, sizeof (struct eXosip_http_auth)); - return OSIP_SUCCESS; - } - } - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Compile with higher MAX_EXOSIP_HTTP_AUTH value (current=%i)\n", - MAX_EXOSIP_HTTP_AUTH)); - return OSIP_UNDEFINED_ERROR; + /* update entries with same call_id */ + for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) { + http_auth = &eXosip.http_auths[pos]; + if (http_auth->pszCallId[0] == '\0') + continue; + if (osip_strcasecmp(http_auth->pszCallId, call_id) == 0 + && ((http_auth->wa->realm == NULL && wa->realm == NULL) + || (http_auth->wa->realm != NULL + && wa->realm != NULL + && osip_strcasecmp(http_auth->wa->realm, wa->realm) == 0))) { + osip_proxy_authenticate_free(http_auth->wa); + http_auth->wa = NULL; + osip_proxy_authenticate_clone(wa, &(http_auth->wa)); + http_auth->iNonceCount = 1; + if (http_auth->wa == NULL) + memset(http_auth, 0, sizeof(struct eXosip_http_auth)); + return OSIP_SUCCESS; + } + } + + /* not found */ + for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) { + http_auth = &eXosip.http_auths[pos]; + if (http_auth->pszCallId[0] == '\0') { + snprintf(http_auth->pszCallId, sizeof(http_auth->pszCallId), "%s", call_id); + snprintf(http_auth->pszCNonce, sizeof(http_auth->pszCNonce), + "0a4f113b"); + http_auth->iNonceCount = 1; + osip_proxy_authenticate_clone(wa, &(http_auth->wa)); + http_auth->answer_code = answer_code; + if (http_auth->wa == NULL) + memset(http_auth, 0, sizeof(struct eXosip_http_auth)); + return OSIP_SUCCESS; + } + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Compile with higher MAX_EXOSIP_HTTP_AUTH value (current=%i)\n", + MAX_EXOSIP_HTTP_AUTH)); + return OSIP_UNDEFINED_ERROR; } -int -_eXosip_delete_nonce (const char *call_id) +int _eXosip_delete_nonce(const char *call_id) { - struct eXosip_http_auth *http_auth; - int pos; + struct eXosip_http_auth *http_auth; + int pos; - /* update entries with same call_id */ - for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) - { - http_auth = &eXosip.http_auths[pos]; - if (http_auth->pszCallId[0] == '\0') - continue; - if (osip_strcasecmp (http_auth->pszCallId, call_id) == 0) - { - osip_proxy_authenticate_free (http_auth->wa); - memset (http_auth, 0, sizeof (struct eXosip_http_auth)); - return OSIP_SUCCESS; - } - } - return OSIP_NOTFOUND; + /* update entries with same call_id */ + for (pos = 0; pos < MAX_EXOSIP_HTTP_AUTH; pos++) { + http_auth = &eXosip.http_auths[pos]; + if (http_auth->pszCallId[0] == '\0') + continue; + if (osip_strcasecmp(http_auth->pszCallId, call_id) == 0) { + osip_proxy_authenticate_free(http_auth->wa); + memset(http_auth, 0, sizeof(struct eXosip_http_auth)); + return OSIP_SUCCESS; + } + } + return OSIP_NOTFOUND; } diff -Nru libexosip2-3.3.0/src/jcallback.c libexosip2-3.6.0/src/jcallback.c --- libexosip2-3.3.0/src/jcallback.c 2008-12-17 20:40:06.000000000 +0000 +++ libexosip2-3.6.0/src/jcallback.c 2011-09-27 23:56:28.000000000 +0000 @@ -57,1969 +57,1877 @@ extern eXosip_t eXosip; +void udp_tl_learn_port_from_via(osip_message_t * sip); /* Private functions */ -static void rcvregister_failure (osip_transaction_t * tr, osip_message_t * sip); -static void cb_xixt_kill_transaction (int type, osip_transaction_t * tr); +static void rcvregister_failure(osip_transaction_t * tr, osip_message_t * sip); +static void cb_xixt_kill_transaction(int type, osip_transaction_t * tr); #ifndef MINISIZE -static void cb_rcvinvite (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_rcvack (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_rcvack2 (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_rcvcancel (int type, osip_transaction_t * tr, osip_message_t * sip); -#endif -static void cb_rcvregister (int type, osip_transaction_t * tr, - osip_message_t * sip); -static void cb_rcvrequest (int type, osip_transaction_t * tr, - osip_message_t * sip); -#ifndef MINISIZE -static void cb_sndinvite (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_sndack (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_sndregister (int type, osip_transaction_t * tr, - osip_message_t * sip); -static void cb_sndbye (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_sndcancel (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_sndinfo (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_sndoptions (int type, osip_transaction_t * tr, - osip_message_t * sip); -static void cb_sndnotify (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_sndsubscribe (int type, osip_transaction_t * tr, - osip_message_t * sip); -static void cb_sndunkrequest (int type, osip_transaction_t * tr, - osip_message_t * sip); -#endif -static void cb_rcv1xx (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_rcv2xx_4invite (osip_transaction_t * tr, osip_message_t * sip); -#ifndef MINISIZE -static void cb_rcv2xx_4subscribe (osip_transaction_t * tr, osip_message_t * sip); -#endif -static void cb_rcv2xx (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_rcv3xx (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_rcv4xx (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_rcv5xx (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_rcv6xx (int type, osip_transaction_t * tr, osip_message_t * sip); -static void cb_snd123456xx (int type, osip_transaction_t * tr, - osip_message_t * sip); -#ifndef MINISIZE -static void cb_rcvresp_retransmission (int type, osip_transaction_t * tr, - osip_message_t * sip); -static void cb_sndreq_retransmission (int type, osip_transaction_t * tr, - osip_message_t * sip); -static void cb_sndresp_retransmission (int type, osip_transaction_t * tr, - osip_message_t * sip); -static void cb_rcvreq_retransmission (int type, osip_transaction_t * tr, - osip_message_t * sip); +static void cb_rcvinvite(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_rcvack(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_rcvack2(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_rcvcancel(int type, osip_transaction_t * tr, osip_message_t * sip); +#endif +static void cb_rcvregister(int type, osip_transaction_t * tr, + osip_message_t * sip); +static void cb_rcvrequest(int type, osip_transaction_t * tr, osip_message_t * sip); +#ifndef MINISIZE +static void cb_sndinvite(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_sndack(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_sndregister(int type, osip_transaction_t * tr, + osip_message_t * sip); +static void cb_sndbye(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_sndcancel(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_sndinfo(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_sndoptions(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_sndnotify(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_sndsubscribe(int type, osip_transaction_t * tr, + osip_message_t * sip); +static void cb_sndunkrequest(int type, osip_transaction_t * tr, + osip_message_t * sip); +#endif +static void cb_rcv1xx(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_rcv2xx_4invite(osip_transaction_t * tr, osip_message_t * sip); +#ifndef MINISIZE +static void cb_rcv2xx_4subscribe(osip_transaction_t * tr, osip_message_t * sip); +#endif +static void cb_rcv2xx(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_rcv3xx(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_rcv4xx(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_rcv5xx(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_rcv6xx(int type, osip_transaction_t * tr, osip_message_t * sip); +static void cb_snd123456xx(int type, osip_transaction_t * tr, + osip_message_t * sip); +#ifndef MINISIZE +static void cb_rcvresp_retransmission(int type, osip_transaction_t * tr, + osip_message_t * sip); +static void cb_sndreq_retransmission(int type, osip_transaction_t * tr, + osip_message_t * sip); +static void cb_sndresp_retransmission(int type, osip_transaction_t * tr, + osip_message_t * sip); +static void cb_rcvreq_retransmission(int type, osip_transaction_t * tr, + osip_message_t * sip); #endif -static void cb_transport_error (int type, osip_transaction_t * tr, int error); +static void cb_transport_error(int type, osip_transaction_t * tr, int error); int -cb_snd_message (osip_transaction_t * tr, osip_message_t * sip, char *host, - int port, int out_socket) +cb_snd_message(osip_transaction_t * tr, osip_message_t * sip, char *host, + int port, int out_socket) { - int i; - osip_via_t *via; + int i; + osip_via_t *via; #ifndef MINISIZE - if (eXosip.dontsend_101 != 0 && sip->status_code == 101) - return OSIP_SUCCESS; + if (eXosip.dontsend_101 != 0 && sip->status_code == 101) + return OSIP_SUCCESS; #else - if (sip->status_code == 101) - return OSIP_SUCCESS; + if (sip->status_code == 101) + return OSIP_SUCCESS; #endif - via = (osip_via_t *) osip_list_get (&sip->vias, 0); - if (via == NULL || via->protocol == NULL) - return -1; - - if (host == NULL) - { - if (MSG_IS_REQUEST (sip)) - { - osip_route_t *route; - - osip_message_get_route (sip, 0, &route); - if (route != NULL) - { - osip_uri_param_t *lr_param = NULL; - - osip_uri_uparam_get_byname (route->url, "lr", &lr_param); - if (lr_param == NULL) - route = NULL; - } - - if (route != NULL) - { - port = 5060; - if (route->url->port != NULL) - port = osip_atoi (route->url->port); - host = route->url->host; - } else - { - /* search for maddr parameter */ - osip_uri_param_t *maddr_param = NULL; - osip_uri_uparam_get_byname (sip->req_uri, "maddr", &maddr_param); - host = NULL; - if (maddr_param != NULL && maddr_param->gvalue != NULL) - host = maddr_param->gvalue; - - port = 5060; - if (sip->req_uri->port != NULL) - port = osip_atoi (sip->req_uri->port); - - if (host == NULL) - host = sip->req_uri->host; - } - } else - { - osip_generic_param_t *maddr; - osip_generic_param_t *received; - osip_generic_param_t *rport; - - osip_via_param_get_byname (via, "maddr", &maddr); - osip_via_param_get_byname (via, "received", &received); - osip_via_param_get_byname (via, "rport", &rport); - if (maddr != NULL && maddr->gvalue != NULL) - host = maddr->gvalue; - else if (received != NULL && received->gvalue != NULL) - host = received->gvalue; - else - host = via->host; - - if (rport == NULL || rport->gvalue == NULL) - { - if (via->port != NULL) - port = osip_atoi (via->port); - else - port = 5060; - } else - port = osip_atoi (rport->gvalue); - } - } - - if (eXosip.cbsipCallback != NULL) - { - eXosip.cbsipCallback (sip, 0); - } - - i = -1; - if (osip_strcasecmp (via->protocol, "udp") == 0) - { - i = eXtl_udp.tl_send_message (tr, sip, host, port, out_socket); - } else if (osip_strcasecmp (via->protocol, "tcp") == 0) - { - i = eXtl_tcp.tl_send_message (tr, sip, host, port, out_socket); - } + via = (osip_via_t *) osip_list_get(&sip->vias, 0); + if (via == NULL || via->protocol == NULL) + return -1; + + if (host == NULL) { + if (MSG_IS_REQUEST(sip)) { + osip_route_t *route; + + osip_message_get_route(sip, 0, &route); + if (route != NULL) { + osip_uri_param_t *lr_param = NULL; + + osip_uri_uparam_get_byname(route->url, "lr", &lr_param); + if (lr_param == NULL) + route = NULL; + } + + if (route != NULL) { + port = 5060; + if (route->url->port != NULL) + port = osip_atoi(route->url->port); + host = route->url->host; + } else { + /* search for maddr parameter */ + osip_uri_param_t *maddr_param = NULL; + osip_uri_uparam_get_byname(sip->req_uri, "maddr", &maddr_param); + host = NULL; + if (maddr_param != NULL && maddr_param->gvalue != NULL) + host = maddr_param->gvalue; + + port = 5060; + if (sip->req_uri->port != NULL) + port = osip_atoi(sip->req_uri->port); + + if (host == NULL) + host = sip->req_uri->host; + } + } else { + osip_generic_param_t *maddr; + osip_generic_param_t *received; + osip_generic_param_t *rport; + + osip_via_param_get_byname(via, "maddr", &maddr); + osip_via_param_get_byname(via, "received", &received); + osip_via_param_get_byname(via, "rport", &rport); + if (maddr != NULL && maddr->gvalue != NULL) + host = maddr->gvalue; + else if (received != NULL && received->gvalue != NULL) + host = received->gvalue; + else + host = via->host; + + if (rport == NULL || rport->gvalue == NULL) { + if (via->port != NULL) + port = osip_atoi(via->port); + else + port = 5060; + } else + port = osip_atoi(rport->gvalue); + } + } + + if (eXosip.cbsipCallback != NULL) { + eXosip.cbsipCallback(sip, 0); + } + + i = -1; + if (osip_strcasecmp(via->protocol, "udp") == 0) { + i = eXtl_udp.tl_send_message(tr, sip, host, port, out_socket); + } else if (osip_strcasecmp(via->protocol, "tcp") == 0) { + i = eXtl_tcp.tl_send_message(tr, sip, host, port, out_socket); + } #ifdef HAVE_OPENSSL_SSL_H - else if (osip_strcasecmp (via->protocol, "tls") == 0) - { - i = eXtl_tls.tl_send_message (tr, sip, host, port, out_socket); - } else if (osip_strcasecmp (via->protocol, "dtls-udp") == 0) - { - i = -1; + else if (osip_strcasecmp(via->protocol, "tls") == 0) { + i = eXtl_tls.tl_send_message(tr, sip, host, port, out_socket); + } else if (osip_strcasecmp(via->protocol, "dtls-udp") == 0) { + i = -1; #if !(OPENSSL_VERSION_NUMBER < 0x00908000L) - i = eXtl_dtls.tl_send_message (tr, sip, host, port, out_socket); + i = eXtl_dtls.tl_send_message(tr, sip, host, port, out_socket); #endif - } + } #endif - if (i != 0) - { - return -1; - } + if (i != 0) { + return i; + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -static void -cb_xixt_kill_transaction (int type, osip_transaction_t * tr) +static void cb_xixt_kill_transaction(int type, osip_transaction_t * tr) { - int i; + int i; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "cb_nict_kill_transaction (id=%i)\r\n", tr->transactionid)); - i = osip_remove_transaction (eXosip.j_osip, tr); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_BUG, NULL, - "cb_nict_kill_transaction Error: Could not remove transaction from the oSIP stack? (id=%i)\r\n", - tr->transactionid)); - } - - if (MSG_IS_REGISTER (tr->orig_request) - && type == OSIP_NICT_KILL_TRANSACTION && tr->last_response == NULL) - { - rcvregister_failure (tr, NULL); - return; - } -#ifndef MINISIZE - if (type == OSIP_NICT_KILL_TRANSACTION) - { - eXosip_dialog_t *jd; - eXosip_subscribe_t *js; - eXosip_notify_t *jn; - eXosip_call_t *jc; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - if (jinfo == NULL && tr->last_response == NULL) - { - eXosip_event_t *je; - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_REQUESTFAILURE, tr); - report_event (je, NULL); - return; - } + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "cb_nict_kill_transaction (id=%i)\r\n", tr->transactionid)); + i = osip_remove_transaction(eXosip.j_osip, tr); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_BUG, NULL, + "cb_nict_kill_transaction Error: Could not remove transaction from the oSIP stack? (id=%i)\r\n", + tr->transactionid)); + } - if (jinfo == NULL) - { - return; - } + if (MSG_IS_REGISTER(tr->orig_request) + && type == OSIP_NICT_KILL_TRANSACTION && tr->last_response == NULL) { + rcvregister_failure(tr, NULL); + return; + } +#ifndef MINISIZE + if (type == OSIP_NICT_KILL_TRANSACTION) { + eXosip_dialog_t *jd; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; + eXosip_call_t *jc; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); - jc = jinfo->jc; - jd = jinfo->jd; - jn = jinfo->jn; - js = jinfo->js; - - if (jn == NULL && js == NULL) - { - eXosip_event_t *je; - if (jc != NULL && tr->last_response == NULL) - { - report_call_event (EXOSIP_CALL_MESSAGE_REQUESTFAILURE, jc, jd, tr); - return; - } - - if (jc == NULL && tr->last_response == NULL) - { - je = - eXosip_event_init_for_message (EXOSIP_MESSAGE_REQUESTFAILURE, tr); - report_event (je, NULL); - } - return; - } + if (jinfo == NULL && tr->last_response == NULL) { + eXosip_event_t *je; + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_REQUESTFAILURE, tr); + report_event(je, NULL); + return; + } - /* no answer to a NOTIFY request! */ - if (MSG_IS_NOTIFY (tr->orig_request) && tr->last_response == NULL) - { - /* delete the dialog! */ - eXosip_event_t *je; - - je = eXosip_event_init_for_notify (EXOSIP_NOTIFICATION_REQUESTFAILURE, - jn, jd, tr); - report_event (je, NULL); - - REMOVE_ELEMENT (eXosip.j_notifies, jn); - eXosip_notify_free (jn); - return; - } + if (jinfo == NULL) { + return; + } - if (MSG_IS_NOTIFY (tr->orig_request) - && tr->last_response != NULL && tr->last_response->status_code > 299) - { - /* delete the dialog! */ - if (tr->last_response->status_code != 407 - && tr->last_response->status_code != 401) - { - REMOVE_ELEMENT (eXosip.j_notifies, jn); - eXosip_notify_free (jn); - return; - } - } + jc = jinfo->jc; + jd = jinfo->jd; + jn = jinfo->jn; + js = jinfo->js; - if (MSG_IS_NOTIFY (tr->orig_request) - && tr->last_response != NULL - && tr->last_response->status_code > 199 - && tr->last_response->status_code < 300) - { - if (jn->n_ss_status == EXOSIP_SUBCRSTATE_TERMINATED) - { - /* delete the dialog! */ - REMOVE_ELEMENT (eXosip.j_notifies, jn); - eXosip_notify_free (jn); - return; - } - } + if (jn == NULL && js == NULL) { + eXosip_event_t *je; + if (jc != NULL && tr->last_response == NULL) { + report_call_event(EXOSIP_CALL_MESSAGE_REQUESTFAILURE, jc, jd, tr); + return; + } - /* no answer to a SUBSCRIBE request! */ - if (MSG_IS_SUBSCRIBE (tr->orig_request) - && (tr->last_response == NULL || tr->last_response->status_code <= 199)) - { - eXosip_event_t *je; - - je = eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_REQUESTFAILURE, - js, jd, tr); - report_event (je, NULL); - - /* delete the dialog! */ - REMOVE_ELEMENT (eXosip.j_subscribes, js); - eXosip_subscribe_free (js); - return; - } + if (jc == NULL && tr->last_response == NULL) { + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_REQUESTFAILURE, + tr); + report_event(je, NULL); + } + return; + } - /* detect SUBSCRIBE request that close the dialogs! */ - if (MSG_IS_SUBSCRIBE (tr->orig_request)) - { - osip_header_t *expires; - - osip_message_get_expires (tr->orig_request, 0, &expires); - if (expires == NULL || expires->hvalue == NULL) - { - } else if (0 == strcmp (expires->hvalue, "0")) - { - /* delete the dialog! */ - REMOVE_ELEMENT (eXosip.j_subscribes, js); - eXosip_subscribe_free (js); - return; - } - } - } + /* no answer to a NOTIFY request! */ + if (MSG_IS_NOTIFY(tr->orig_request) && tr->last_response == NULL) { + /* delete the dialog! */ + eXosip_event_t *je; + + je = eXosip_event_init_for_notify(EXOSIP_NOTIFICATION_REQUESTFAILURE, + jn, jd, tr); + report_event(je, NULL); + + REMOVE_ELEMENT(eXosip.j_notifies, jn); + eXosip_notify_free(jn); + return; + } + + if (jn != NULL && MSG_IS_NOTIFY(tr->orig_request) + && tr->last_response != NULL && tr->last_response->status_code > 299) { + /* delete the dialog! */ + if (tr->last_response->status_code != 407 + && tr->last_response->status_code != 401) { + REMOVE_ELEMENT(eXosip.j_notifies, jn); + eXosip_notify_free(jn); + return; + } + } + + if (jn != NULL && MSG_IS_NOTIFY(tr->orig_request) + && tr->last_response != NULL + && tr->last_response->status_code > 199 + && tr->last_response->status_code < 300) { + if (jn->n_ss_status == EXOSIP_SUBCRSTATE_TERMINATED) { + /* delete the dialog! */ + REMOVE_ELEMENT(eXosip.j_notifies, jn); + eXosip_notify_free(jn); + return; + } + } + + /* no answer to a SUBSCRIBE request! */ + if (js != NULL && MSG_IS_SUBSCRIBE(tr->orig_request) + && (tr->last_response == NULL + || tr->last_response->status_code <= 199)) { + eXosip_event_t *je; + + je = eXosip_event_init_for_subscribe + (EXOSIP_SUBSCRIPTION_REQUESTFAILURE, js, jd, tr); + report_event(je, NULL); + + /* delete the dialog! */ + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + return; + } + + /* detect SUBSCRIBE request that close the dialogs! */ + if (MSG_IS_SUBSCRIBE(tr->orig_request) + && tr->last_response != NULL + && (tr->last_response->status_code == 401 + || tr->last_response->status_code == 407)) { + /* delete the dialog later because we need to authenticate */ + } else if (js != NULL && MSG_IS_SUBSCRIBE(tr->orig_request)) { + osip_header_t *expires; + + osip_message_get_expires(tr->orig_request, 0, &expires); + if (expires == NULL || expires->hvalue == NULL) { + } else if (0 == strcmp(expires->hvalue, "0")) { + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + return; + } + } + } #endif } #ifndef MINISIZE -static void -cb_rcvinvite (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_rcvinvite(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcvinvite (id=%i)\n", - tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcvinvite (id=%i)\n", + tr->transactionid)); } -static void -cb_rcvack (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_rcvack(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcvack (id=%i)\n", - tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcvack (id=%i)\n", + tr->transactionid)); } -static void -cb_rcvack2 (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_rcvack2(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcvack2 (id=%i)\r\n", - tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcvack2 (id=%i)\r\n", + tr->transactionid)); } -static void -cb_rcvcancel (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_rcvcancel(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_rcvcancel (id=%i)\r\n", tr->transactionid)); + jinfo_t* jinfo; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_rcvcancel (id=%i)\r\n", tr->transactionid)); + + jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); + if (jinfo == NULL) + { + return; + } + + if ((jinfo->jd != NULL) && (jinfo->jc != NULL)) + { + /* do propagate CANCEL to the application */ + report_call_event (EXOSIP_CALL_CANCELLED, jinfo->jc, jinfo->jd, tr); + } } #endif -static void -cb_rcvregister (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_rcvregister(int type, osip_transaction_t * tr, osip_message_t * sip) { - eXosip_event_t *je; + eXosip_event_t *je; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_rcvregister (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_rcvregister (id=%i)\r\n", tr->transactionid)); - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_NEW, tr); - eXosip_event_add (je); - return; + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_NEW, tr); + eXosip_event_add(je); + return; } -static void -cb_rcvrequest (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_rcvrequest(int type, osip_transaction_t * tr, osip_message_t * sip) { - eXosip_dialog_t *jd; - eXosip_call_t *jc; + eXosip_dialog_t *jd; + eXosip_call_t *jc; #ifndef MINISIZE - eXosip_notify_t *jn; - eXosip_subscribe_t *js; + eXosip_notify_t *jn; + eXosip_subscribe_t *js; #endif - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_rcvunkrequest (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_rcvunkrequest (id=%i)\r\n", tr->transactionid)); - if (jinfo == NULL) - { - eXosip_event_t *je; + if (jinfo == NULL) { + eXosip_event_t *je; - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_NEW, tr); - eXosip_event_add (je); - return; - } + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_NEW, tr); + eXosip_event_add(je); + return; + } - jd = jinfo->jd; - jc = jinfo->jc; + jd = jinfo->jd; + jc = jinfo->jc; #ifndef MINISIZE - jn = jinfo->jn; - js = jinfo->js; - if (jc == NULL && jn == NULL && js == NULL) - { - eXosip_event_t *je; + jn = jinfo->jn; + js = jinfo->js; + if (jc == NULL && jn == NULL && js == NULL) { + eXosip_event_t *je; - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_NEW, tr); - eXosip_event_add (je); - return; - } + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_NEW, tr); + eXosip_event_add(je); + return; + } #else - if (jc == NULL) - { - eXosip_event_t *je; - - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_NEW, tr); - eXosip_event_add (je); - return; - } -#endif - else if (jc != NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_rcv? (id=%i)\r\n", tr->transactionid)); - - if (MSG_IS_BYE (sip)) - { - /* already sent */ - } else - report_call_event (EXOSIP_CALL_MESSAGE_NEW, jc, jd, tr); - return; - } -#ifndef MINISIZE - else if (jn != NULL) - { - if (MSG_IS_SUBSCRIBE (sip)) - { - eXosip_event_t *je; - je = - eXosip_event_init_for_notify (EXOSIP_IN_SUBSCRIPTION_NEW, jn, jd, tr); - report_event (je, NULL); - return; - } - return; - } else if (js != NULL) - { - if (MSG_IS_NOTIFY (sip)) - { - eXosip_event_t *je; - je = - eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_NOTIFY, js, - jd, tr); - report_event (je, NULL); - return; - } - return; - } + if (jc == NULL) { + eXosip_event_t *je; + + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_NEW, tr); + eXosip_event_add(je); + return; + } +#endif + else if (jc != NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_rcv? (id=%i)\r\n", tr->transactionid)); + + if (MSG_IS_BYE(sip)) { + /* already sent */ + } else + report_call_event(EXOSIP_CALL_MESSAGE_NEW, jc, jd, tr); + return; + } +#ifndef MINISIZE + else if (jn != NULL) { + if (MSG_IS_SUBSCRIBE(sip)) { + eXosip_event_t *je; + je = eXosip_event_init_for_notify(EXOSIP_IN_SUBSCRIPTION_NEW, jn, jd, + tr); + report_event(je, NULL); + return; + } + return; + } else if (js != NULL) { + if (MSG_IS_NOTIFY(sip)) { + eXosip_event_t *je; + je = eXosip_event_init_for_subscribe(EXOSIP_SUBSCRIPTION_NOTIFY, js, + jd, tr); + report_event(je, NULL); + return; + } + return; + } #endif } #ifndef MINISIZE -static void -cb_sndinvite (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_sndinvite(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_sndinvite (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_sndinvite (id=%i)\r\n", tr->transactionid)); } -static void -cb_sndack (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_sndack(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_sndack (id=%i)\r\n", - tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_sndack (id=%i)\r\n", + tr->transactionid)); } -static void -cb_sndregister (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_sndregister(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_sndregister (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_sndregister (id=%i)\r\n", tr->transactionid)); } -static void -cb_sndbye (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_sndbye(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_sndbye (id=%i)\r\n", - tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_sndbye (id=%i)\r\n", + tr->transactionid)); } -static void -cb_sndcancel (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_sndcancel(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_sndcancel (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_sndcancel (id=%i)\r\n", tr->transactionid)); } -static void -cb_sndinfo (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_sndinfo(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_sndinfo (id=%i)\r\n", - tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_sndinfo (id=%i)\r\n", + tr->transactionid)); } -static void -cb_sndoptions (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_sndoptions(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_sndoptions (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_sndoptions (id=%i)\r\n", tr->transactionid)); } -static void -cb_sndnotify (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_sndnotify(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_sndnotify (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_sndnotify (id=%i)\r\n", tr->transactionid)); } static void -cb_sndsubscribe (int type, osip_transaction_t * tr, osip_message_t * sip) +cb_sndsubscribe(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_sndsubscibe (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_sndsubscribe (id=%i)\r\n", tr->transactionid)); } static void -cb_sndunkrequest (int type, osip_transaction_t * tr, osip_message_t * sip) +cb_sndunkrequest(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_sndunkrequest (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_sndunkrequest (id=%i)\r\n", tr->transactionid)); } #endif -void -__eXosip_delete_jinfo (osip_transaction_t * transaction) +void __eXosip_delete_jinfo(osip_transaction_t * transaction) { - jinfo_t *ji; + jinfo_t *ji; - if (transaction == NULL) - return; - ji = osip_transaction_get_your_instance (transaction); - osip_free (ji); - osip_transaction_set_your_instance (transaction, NULL); + if (transaction == NULL) + return; + ji = osip_transaction_get_your_instance(transaction); + osip_free(ji); + osip_transaction_set_your_instance(transaction, NULL); } #ifndef MINISIZE -jinfo_t * -__eXosip_new_jinfo (eXosip_call_t * jc, eXosip_dialog_t * jd, - eXosip_subscribe_t * js, eXosip_notify_t * jn) +jinfo_t *__eXosip_new_jinfo(eXosip_call_t * jc, eXosip_dialog_t * jd, + eXosip_subscribe_t * js, eXosip_notify_t * jn) #else -jinfo_t * -__eXosip_new_jinfo (eXosip_call_t * jc, eXosip_dialog_t * jd) +jinfo_t *__eXosip_new_jinfo(eXosip_call_t * jc, eXosip_dialog_t * jd) #endif { - jinfo_t *ji = (jinfo_t *) osip_malloc (sizeof (jinfo_t)); + jinfo_t *ji = (jinfo_t *) osip_malloc(sizeof(jinfo_t)); - if (ji == NULL) - return NULL; - ji->jd = jd; - ji->jc = jc; -#ifndef MINISIZE - ji->js = js; - ji->jn = jn; -#endif - return ji; -} - - -static void -cb_rcv1xx (int type, osip_transaction_t * tr, osip_message_t * sip) -{ - eXosip_dialog_t *jd; - eXosip_call_t *jc; -#ifndef MINISIZE - eXosip_subscribe_t *js; - eXosip_notify_t *jn; -#endif - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv1xx (id=%i)\r\n", - tr->transactionid)); - - udp_tl_learn_port_from_via (sip); - - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; -#ifndef MINISIZE - jn = jinfo->jn; - js = jinfo->js; -#endif - - if (MSG_IS_RESPONSE_FOR (sip, "OPTIONS")) - { - if (jc == NULL) - { - eXosip_event_t *je; - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "cb_rcv1xx (id=%i) OPTIONS outside of any call\r\n", - tr->transactionid)); - - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_PROCEEDING, tr); - eXosip_event_add (je); - return; - } - report_call_event (EXOSIP_CALL_MESSAGE_PROCEEDING, jc, jd, tr); - return; - } - - if (MSG_IS_RESPONSE_FOR (sip, "INVITE") && MSG_TEST_CODE (sip, 100)) - { - report_call_event (EXOSIP_CALL_PROCEEDING, jc, jd, tr); - } - - if ((MSG_IS_RESPONSE_FOR (sip, "INVITE") -#ifndef MINISIZE - || MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE") -#endif - ) && !MSG_TEST_CODE (sip, 100)) - { - int i; - -#ifndef MINISIZE - /* for SUBSCRIBE, test if the dialog has been already created - with a previous NOTIFY */ - if (jd == NULL && js != NULL && js->s_dialogs != NULL - && MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - /* find if existing dialog match the to tag */ - osip_generic_param_t *tag; - int i; - - i = osip_to_get_tag (sip->to, &tag); - if (i == 0 && tag != NULL && tag->gvalue != NULL) - { - for (jd = js->s_dialogs; jd != NULL; jd = jd->next) - { - if (0 == strcmp (jd->d_dialog->remote_tag, tag->gvalue)) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: found established early dialog for this subscribe\n")); - jinfo->jd = jd; - break; - } - } - } - } -#endif - - if (jd == NULL) /* This transaction initiate a dialog in the case of - INVITE (else it would be attached to a "jd" element. */ - { - /* allocate a jd */ - - i = eXosip_dialog_init_as_uac (&jd, sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot establish a dialog\n")); - return; - } - if (jc != NULL) - { - ADD_ELEMENT (jc->c_dialogs, jd); - jinfo->jd = jd; - eXosip_update (); - } -#ifndef MINISIZE - else if (js != NULL) - { - ADD_ELEMENT (js->s_dialogs, jd); - jinfo->jd = jd; - eXosip_update (); - } else if (jn != NULL) - { - ADD_ELEMENT (jn->n_dialogs, jd); - jinfo->jd = jd; - eXosip_update (); - } -#endif - else - { - } - osip_transaction_set_your_instance (tr, jinfo); - } else - { - if (jd->d_dialog == NULL) - { - } else if (jd->d_dialog->remote_tag == NULL) - { - osip_dialog_update_route_set_as_uac (jd->d_dialog, sip); - osip_dialog_update_tag_as_uac (jd->d_dialog, sip); - } else - { - osip_generic_param_t *tag; - int i; - - i = osip_to_get_tag (sip->to, &tag); - if (tag != NULL && tag->gvalue != NULL - && 0 == strcmp (jd->d_dialog->remote_tag, tag->gvalue)) - { - /* Update only if it is the same dialog */ - osip_dialog_update_route_set_as_uac (jd->d_dialog, sip); - } -#if 1 /* to be tested */ - else - { - /* the best thing is to replace the current dialog - information... Much easier than creating a useless dialog! */ - osip_dialog_free (jd->d_dialog); - i = osip_dialog_init_as_uac (&(jd->d_dialog), sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Cannot replace the dialog.\r\n")); - } else - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, NULL, - "The dialog has been replaced with the new one from 1xx.\r\n")); - } - } -#endif - } - } - - if (jd != NULL) - jd->d_STATE = JD_TRYING; - if (jd != NULL && MSG_IS_RESPONSE_FOR (sip, "INVITE") - && sip->status_code < 180) - { - report_call_event (EXOSIP_CALL_PROCEEDING, jc, jd, tr); - } else if (jd != NULL && MSG_IS_RESPONSE_FOR (sip, "INVITE") - && sip->status_code >= 180) - { - report_call_event (EXOSIP_CALL_RINGING, jc, jd, tr); - } -#ifndef MINISIZE - else if (jd != NULL && MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_PROCEEDING, - js, jd, tr); - report_event (je, sip); - } -#endif - if (MSG_TEST_CODE (sip, 180) && jd != NULL) - { - jd->d_STATE = JD_RINGING; - } else if (MSG_TEST_CODE (sip, 183) && jd != NULL) - { - jd->d_STATE = JD_QUEUED; - } - } -} - -static void -cb_rcv2xx_4invite (osip_transaction_t * tr, osip_message_t * sip) -{ - int i; - eXosip_dialog_t *jd; - eXosip_call_t *jc; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; - if (jd == NULL) /* This transaction initiate a dialog in the case of - INVITE (else it would be attached to a "jd" element. */ - { - /* allocate a jd */ - i = eXosip_dialog_init_as_uac (&jd, sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot establish a dialog\n")); - return; - } - ADD_ELEMENT (jc->c_dialogs, jd); - jinfo->jd = jd; - eXosip_update (); - osip_transaction_set_your_instance (tr, jinfo); - } else - { - /* Here is a special case: - We have initiated a dialog and we have received informationnal - answers from 2 or more remote SIP UA. Those answer can be - differentiated with the "To" header's tag. - - We have used the first informationnal answer to create a - dialog, but we now want to be sure the 200ok received is - for the dialog this dialog. - - We have to check the To tag and if it does not match, we - just have to modify the existing dialog and replace it. */ - osip_generic_param_t *tag; - int i; - - i = osip_to_get_tag (sip->to, &tag); - i = 1; /* default is the same dialog */ - - if (jd->d_dialog == NULL || jd->d_dialog->remote_tag == NULL) - { - /* There are real use-case where a BYE is received/processed before - the 200ok of the previous INVITE. In this case, jd->d_dialog is - empty and the transaction should be silently discarded. */ - /* a ACK should still be sent... -but there is no dialog built- */ - return; - } - - if (jd->d_dialog->remote_tag == NULL && tag == NULL) - { - } /* non compliant remote UA -> assume it is the same dialog */ - else if (jd->d_dialog->remote_tag != NULL && tag == NULL) - { - i = 0; - } /* different dialog! */ - else if (jd->d_dialog->remote_tag == NULL && tag != NULL) - { - i = 0; - } /* different dialog! */ - else if (jd->d_dialog->remote_tag != NULL && tag != NULL - && tag->gvalue != NULL - && 0 != strcmp (jd->d_dialog->remote_tag, tag->gvalue)) - { - i = 0; - } - /* different dialog! */ - if (i == 1) /* just update the dialog */ - { - osip_dialog_update_route_set_as_uac (jd->d_dialog, sip); - if (jd->d_dialog->remote_tag == NULL) - osip_dialog_update_tag_as_uac (jd->d_dialog, sip); - osip_dialog_set_state (jd->d_dialog, DIALOG_CONFIRMED); - } else - { - /* the best thing is to replace the current dialog - information... Much easier than creating a useless dialog! */ - osip_dialog_free (jd->d_dialog); - i = osip_dialog_init_as_uac (&(jd->d_dialog), sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Cannot replace the dialog.\r\n")); - } else - { - jd->d_dialog->local_cseq = jd->d_dialog->local_cseq + jd->d_mincseq; - jd->d_mincseq = 0; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_WARNING, NULL, - "The dialog has been replaced with the new one from 200ok.\r\n")); - } - } - } - - jd->d_STATE = JD_ESTABLISHED; - - /* eXosip_dialog_set_200ok (jd, sip); */ - - report_call_event (EXOSIP_CALL_ANSWERED, jc, jd, tr); - - /* look for the SDP information and decide if this answer was for - an initial INVITE, an HoldCall, or a RetreiveCall */ - - /* don't handle hold/unhold by now... */ - /* eXosip_update_audio_session(tr); */ - -} - -#ifndef MINISIZE -static void -cb_rcv2xx_4subscribe (osip_transaction_t * tr, osip_message_t * sip) -{ - int i; - eXosip_dialog_t *jd; - eXosip_subscribe_t *js; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - if (jinfo == NULL) - return; - jd = jinfo->jd; - js = jinfo->js; - _eXosip_subscribe_set_refresh_interval (js, sip); - - - /* for SUBSCRIBE, test if the dialog has been already created - with a previous NOTIFY */ - if (jd == NULL && js != NULL && js->s_dialogs != NULL - && MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - /* find if existing dialog match the to tag */ - osip_generic_param_t *tag; - int i; - - i = osip_to_get_tag (sip->to, &tag); - if (i == 0 && tag != NULL && tag->gvalue != NULL) - { - for (jd = js->s_dialogs; jd != NULL; jd = jd->next) - { - if (0 == strcmp (jd->d_dialog->remote_tag, tag->gvalue)) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: found established early dialog for this subscribe\n")); - jinfo->jd = jd; - break; - } - } - } - } - - if (jd == NULL) /* This transaction initiate a dialog in the case of - SUBSCRIBE (else it would be attached to a "jd" element. */ - { - /* allocate a jd */ - i = eXosip_dialog_init_as_uac (&jd, sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot establish a dialog\n")); - return; - } - ADD_ELEMENT (js->s_dialogs, jd); - jinfo->jd = jd; - eXosip_update (); - osip_transaction_set_your_instance (tr, jinfo); - } else - { - osip_dialog_update_route_set_as_uac (jd->d_dialog, sip); - if (jd->d_dialog->remote_tag == NULL) - osip_dialog_update_tag_as_uac (jd->d_dialog, sip); - osip_dialog_set_state (jd->d_dialog, DIALOG_CONFIRMED); - } - - jd->d_STATE = JD_ESTABLISHED; - /* look for the body information */ - - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_ANSWERED, js, jd, tr); - report_event (je, sip); - } + if (ji == NULL) + return NULL; + ji->jd = jd; + ji->jc = jc; +#ifndef MINISIZE + ji->js = js; + ji->jn = jn; +#endif + return ji; +} + + +static void cb_rcv1xx(int type, osip_transaction_t * tr, osip_message_t * sip) +{ + eXosip_dialog_t *jd; + eXosip_call_t *jc; +#ifndef MINISIZE + eXosip_subscribe_t *js; + eXosip_notify_t *jn; +#endif + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv1xx (id=%i)\r\n", + tr->transactionid)); + + udp_tl_learn_port_from_via(sip); + + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; +#ifndef MINISIZE + jn = jinfo->jn; + js = jinfo->js; +#endif + + if (MSG_IS_RESPONSE_FOR(sip, "OPTIONS")) { + if (jc == NULL) { + eXosip_event_t *je; + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "cb_rcv1xx (id=%i) OPTIONS outside of any call\r\n", + tr->transactionid)); + + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_PROCEEDING, tr); + eXosip_event_add(je); + return; + } + report_call_event(EXOSIP_CALL_MESSAGE_PROCEEDING, jc, jd, tr); + return; + } + + if (MSG_IS_RESPONSE_FOR(sip, "INVITE") && MSG_TEST_CODE(sip, 100)) { + report_call_event(EXOSIP_CALL_PROCEEDING, jc, jd, tr); + } + + if ((MSG_IS_RESPONSE_FOR(sip, "INVITE") +#ifndef MINISIZE + || MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE") +#endif + ) && !MSG_TEST_CODE(sip, 100)) { + int i; + +#ifndef MINISIZE + /* for SUBSCRIBE, test if the dialog has been already created + with a previous NOTIFY */ + if (jd == NULL && js != NULL && js->s_dialogs != NULL + && MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + /* find if existing dialog match the to tag */ + osip_generic_param_t *tag; + int i; + + i = osip_to_get_tag(sip->to, &tag); + if (i == 0 && tag != NULL && tag->gvalue != NULL) { + for (jd = js->s_dialogs; jd != NULL; jd = jd->next) { + if (0 == strcmp(jd->d_dialog->remote_tag, tag->gvalue)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: found established early dialog for this subscribe\n")); + jinfo->jd = jd; + break; + } + } + } + } +#endif + + if (jd == NULL) { /* This transaction initiate a dialog in the case of + INVITE (else it would be attached to a "jd" element. */ + /* allocate a jd */ + + i = eXosip_dialog_init_as_uac(&jd, sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot establish a dialog\n")); + return; + } + if (jc != NULL) { + ADD_ELEMENT(jc->c_dialogs, jd); + jinfo->jd = jd; + eXosip_update(); + } +#ifndef MINISIZE + else if (js != NULL) { + ADD_ELEMENT(js->s_dialogs, jd); + jinfo->jd = jd; + eXosip_update(); + } else if (jn != NULL) { + ADD_ELEMENT(jn->n_dialogs, jd); + jinfo->jd = jd; + eXosip_update(); + } +#endif + else { + } + osip_transaction_set_your_instance(tr, jinfo); + } else { + if (jd->d_dialog == NULL) { + } else if (jd->d_dialog->remote_tag == NULL) { + osip_dialog_update_route_set_as_uac(jd->d_dialog, sip); + osip_dialog_update_tag_as_uac(jd->d_dialog, sip); + } else { + osip_generic_param_t *tag; + int i; + + i = osip_to_get_tag(sip->to, &tag); + if (tag != NULL && tag->gvalue != NULL + && 0 == strcmp(jd->d_dialog->remote_tag, tag->gvalue)) { + /* Update only if it is the same dialog */ + osip_dialog_update_route_set_as_uac(jd->d_dialog, sip); + } +#if 1 /* to be tested */ + else { + /* the best thing is to replace the current dialog + information... Much easier than creating a useless dialog! */ + osip_dialog_free(jd->d_dialog); + i = osip_dialog_init_as_uac(&(jd->d_dialog), sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot replace the dialog.\r\n")); + } else { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, NULL, + "The dialog has been replaced with the new one from 1xx.\r\n")); + } + } +#endif + } + } + + if (jd != NULL) + jd->d_STATE = JD_TRYING; + if (jd != NULL && MSG_IS_RESPONSE_FOR(sip, "INVITE") + && sip->status_code < 180) { + report_call_event(EXOSIP_CALL_PROCEEDING, jc, jd, tr); + } else if (jd != NULL && MSG_IS_RESPONSE_FOR(sip, "INVITE") + && sip->status_code >= 180) { + report_call_event(EXOSIP_CALL_RINGING, jc, jd, tr); + } +#ifndef MINISIZE + else if (jd != NULL && MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + eXosip_event_t *je; + + je = eXosip_event_init_for_subscribe(EXOSIP_SUBSCRIPTION_PROCEEDING, + js, jd, tr); + report_event(je, sip); + } +#endif + if (MSG_TEST_CODE(sip, 180) && jd != NULL) { + jd->d_STATE = JD_RINGING; + } else if (MSG_TEST_CODE(sip, 183) && jd != NULL) { + jd->d_STATE = JD_QUEUED; + } + if (jc != NULL && MSG_IS_RESPONSE_FOR(sip, "INVITE")) { + eXosip_call_renew_expire_time(jc); + } + } +} + +static void cb_rcv2xx_4invite(osip_transaction_t * tr, osip_message_t * sip) +{ + int i; + eXosip_dialog_t *jd; + eXosip_call_t *jc; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); + + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; + if (jd == NULL) { /* This transaction initiate a dialog in the case of + INVITE (else it would be attached to a "jd" element. */ + /* allocate a jd */ + i = eXosip_dialog_init_as_uac(&jd, sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot establish a dialog\n")); + return; + } + ADD_ELEMENT(jc->c_dialogs, jd); + jinfo->jd = jd; + eXosip_update(); + osip_transaction_set_your_instance(tr, jinfo); + } else { + /* Here is a special case: + We have initiated a dialog and we have received informationnal + answers from 2 or more remote SIP UA. Those answer can be + differentiated with the "To" header's tag. + + We have used the first informationnal answer to create a + dialog, but we now want to be sure the 200ok received is + for the dialog this dialog. + + We have to check the To tag and if it does not match, we + just have to modify the existing dialog and replace it. */ + osip_generic_param_t *tag; + int i; + + i = osip_to_get_tag(sip->to, &tag); + i = 1; /* default is the same dialog */ + + if (jd->d_dialog == NULL) { + /* There are real use-case where a BYE is received/processed before + the 200ok of the previous INVITE. In this case, jd->d_dialog is + empty and the transaction should be silently discarded. */ + /* a ACK should still be sent... -but there is no dialog built- */ + return; + } + + if (jd->d_dialog->remote_tag == NULL && tag == NULL) { + } /* non compliant remote UA -> assume it is the same dialog */ + else if (jd->d_dialog->remote_tag != NULL && tag == NULL) { + i = 0; + } /* different dialog! */ + else if (jd->d_dialog->remote_tag == NULL && tag != NULL) { + i = 0; + } /* different dialog! */ + else if (jd->d_dialog->remote_tag != NULL && tag != NULL + && tag->gvalue != NULL + && 0 != strcmp(jd->d_dialog->remote_tag, tag->gvalue)) { + i = 0; + } + /* different dialog! */ + if (i == 1) { /* just update the dialog */ + osip_dialog_update_route_set_as_uac(jd->d_dialog, sip); + if (jd->d_dialog->remote_tag == NULL) + osip_dialog_update_tag_as_uac(jd->d_dialog, sip); + osip_dialog_set_state(jd->d_dialog, DIALOG_CONFIRMED); + } else { + /* the best thing is to replace the current dialog + information... Much easier than creating a useless dialog! */ + osip_dialog_free(jd->d_dialog); + i = osip_dialog_init_as_uac(&(jd->d_dialog), sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot replace the dialog.\r\n")); + } else { + jd->d_dialog->local_cseq = + jd->d_dialog->local_cseq + jd->d_mincseq; + jd->d_mincseq = 0; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_WARNING, NULL, + "The dialog has been replaced with the new one from 200ok.\r\n")); + } + } + } + + if (jd != NULL) { + osip_header_t *se_exp = NULL; + osip_header_t *se_exp_answer = NULL; + osip_message_header_get_byname(tr->orig_request, "session-expires", 0, + &se_exp); + if (se_exp == NULL) + osip_message_header_get_byname(tr->orig_request, "x", 0, &se_exp); + osip_message_header_get_byname(sip, "session-expires", 0, &se_exp_answer); + if (se_exp_answer == NULL) + osip_message_header_get_byname(sip, "x", 0, &se_exp_answer); + + if (se_exp != NULL && se_exp_answer != NULL) { + osip_content_disposition_t *exp_h = NULL; + /* syntax of Session-Expires is equivalent to "Content-Disposition" */ + osip_content_disposition_init(&exp_h); + if (exp_h != NULL) { + osip_content_disposition_parse(exp_h, se_exp_answer->hvalue); + if (exp_h->element != NULL) { + osip_generic_param_t *param = NULL; + osip_generic_param_get_byname(&exp_h->gen_params, "refresher", + ¶m); + if (param == NULL) { + jd->d_refresher = 0; /* me? in which case? */ + } else { + if (osip_strcasecmp(param->gvalue, "uac") == 0) + jd->d_refresher = 0; + else + jd->d_refresher = 1; + } + jd->d_session_timer_start = time(NULL); + jd->d_session_timer_length = atoi(exp_h->element); + if (jd->d_session_timer_length <= 90) + jd->d_session_timer_length = 90; + } + osip_content_disposition_free(exp_h); + exp_h = NULL; + } + } + } + + jd->d_STATE = JD_ESTABLISHED; + + /* eXosip_dialog_set_200ok (jd, sip); */ + + report_call_event(EXOSIP_CALL_ANSWERED, jc, jd, tr); + + /* look for the SDP information and decide if this answer was for + an initial INVITE, an HoldCall, or a RetreiveCall */ + + /* don't handle hold/unhold by now... */ + /* eXosip_update_audio_session(tr); */ +} + +#ifndef MINISIZE +static void cb_rcv2xx_4subscribe(osip_transaction_t * tr, osip_message_t * sip) +{ + int i; + eXosip_dialog_t *jd; + eXosip_subscribe_t *js; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); + + if (jinfo == NULL) + return; + jd = jinfo->jd; + js = jinfo->js; + _eXosip_subscribe_set_refresh_interval(js, sip); + + + /* for SUBSCRIBE, test if the dialog has been already created + with a previous NOTIFY */ + if (jd == NULL && js != NULL && js->s_dialogs != NULL + && MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + /* find if existing dialog match the to tag */ + osip_generic_param_t *tag; + int i; + + i = osip_to_get_tag(sip->to, &tag); + if (i == 0 && tag != NULL && tag->gvalue != NULL) { + for (jd = js->s_dialogs; jd != NULL; jd = jd->next) { + if (0 == strcmp(jd->d_dialog->remote_tag, tag->gvalue)) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: found established early dialog for this subscribe\n")); + jinfo->jd = jd; + break; + } + } + } + } + + if (jd == NULL) { /* This transaction initiate a dialog in the case of + SUBSCRIBE (else it would be attached to a "jd" element. */ + /* allocate a jd */ + i = eXosip_dialog_init_as_uac(&jd, sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot establish a dialog\n")); + return; + } + ADD_ELEMENT(js->s_dialogs, jd); + jinfo->jd = jd; + eXosip_update(); + osip_transaction_set_your_instance(tr, jinfo); + } else { + osip_dialog_update_route_set_as_uac(jd->d_dialog, sip); + if (jd->d_dialog->remote_tag == NULL) + osip_dialog_update_tag_as_uac(jd->d_dialog, sip); + osip_dialog_set_state(jd->d_dialog, DIALOG_CONFIRMED); + } + + jd->d_STATE = JD_ESTABLISHED; + /* look for the body information */ + + { + eXosip_event_t *je; + + je = eXosip_event_init_for_subscribe(EXOSIP_SUBSCRIPTION_ANSWERED, js, jd, + tr); + report_event(je, sip); + } } #endif static int -_eXosip_update_expires_according_to_contact (eXosip_reg_t * jreg, - osip_transaction_t * tr, - osip_message_t * sip) -{ - osip_contact_t *co_register; - int pos; - if (jreg == NULL) - return OSIP_BADPARAMETER; - - /* only update if only one Contact was in INVITE */ - if (tr->orig_request == NULL) - return OSIP_BADPARAMETER; - - if (osip_list_size (&tr->orig_request->contacts) != 1) - return OSIP_SUCCESS; - - - /* search for matching contact (line parameter must be equal) */ - pos = 0; - co_register = (osip_contact_t *) osip_list_get (&sip->contacts, pos); - while (co_register != NULL) - { - osip_uri_param_t *line_param = NULL; - if (co_register->url != NULL) - osip_uri_uparam_get_byname (co_register->url, "line", &line_param); - - if (line_param != NULL && line_param->gvalue != NULL) - { - if (osip_strcasecmp (jreg->r_line, line_param->gvalue) == 0) - { - /* found contact */ - int val; - osip_generic_param_t *exp_param = NULL; - osip_contact_param_get_byname (co_register, "expires", &exp_param); - if (exp_param != NULL && exp_param->gvalue != NULL) - { - val = atoi (exp_param->gvalue); - /* update only if expires value has REALLY be - decreased (more than one minutes): - In many cases value is decreased because a few seconds has - elapsed when server send the 200ok. */ - if (val < jreg->r_reg_period - 60) - { - jreg->r_reg_period = val + 60; - return OSIP_SUCCESS; - } - } - return OSIP_SUCCESS; - } - } - - pos++; - co_register = (osip_contact_t *) osip_list_get (&sip->contacts, pos); - } - +_eXosip_update_expires_according_to_contact(eXosip_reg_t * jreg, + osip_transaction_t * tr, + osip_message_t * sip) +{ + osip_contact_t *co_register; + int pos; + int maxval = 0; + if (jreg == NULL) + return OSIP_BADPARAMETER; + + /* only update if only one Contact was in INVITE */ + if (tr->orig_request == NULL) + return OSIP_BADPARAMETER; + + if (osip_list_size(&tr->orig_request->contacts) != 1) + return OSIP_SUCCESS; + + + /* search for matching contact (line parameter must be equal) */ + pos = 0; + co_register = (osip_contact_t *) osip_list_get(&sip->contacts, pos); + while (co_register != NULL) { + osip_uri_param_t *line_param = NULL; + if (co_register->url != NULL) + osip_uri_uparam_get_byname(co_register->url, "line", &line_param); + + if (line_param != NULL && line_param->gvalue != NULL) { + if (osip_strcasecmp(jreg->r_line, line_param->gvalue) == 0) { + /* found contact */ + int val; + osip_generic_param_t *exp_param = NULL; + osip_contact_param_get_byname(co_register, "expires", &exp_param); + if (exp_param != NULL && exp_param->gvalue != NULL) { + val = atoi(exp_param->gvalue); + if (val>maxval) + { + maxval=val; + } + } + } + } + + pos++; + co_register = (osip_contact_t *) osip_list_get(&sip->contacts, pos); + } + + if (maxval==0) + return OSIP_NOTFOUND; + + /* update only if expires value has REALLY be + decreased (more than one minutes): + In many cases value is decreased because a few seconds has + elapsed when server send the 200ok. */ + if (maxval < jreg->r_reg_period - 15) + { + jreg->r_reg_period = maxval; + } + else if (maxval>jreg->r_reg_period) + { + jreg->r_reg_period = maxval; + } + return OSIP_SUCCESS; +} + + +static void cb_rcv2xx(int type, osip_transaction_t * tr, osip_message_t * sip) +{ + eXosip_dialog_t *jd; + eXosip_call_t *jc; +#ifndef MINISIZE + eXosip_subscribe_t *js; + eXosip_notify_t *jn; +#endif + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv2xx (id=%i)\r\n", + tr->transactionid)); + + udp_tl_learn_port_from_via(sip); + +#ifndef MINISIZE + if (MSG_IS_RESPONSE_FOR(sip, "PUBLISH")) { + eXosip_pub_t *pub = NULL; + eXosip_event_t *je; + int i; + + i = _eXosip_pub_update(&pub, tr, sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "cb_rcv2xx (id=%i) No publication to update\r\n", + tr->transactionid)); + } + if (pub != NULL) { + /* update registration interval */ + osip_header_t *exp; + + osip_message_header_get_byname(sip, "expires", 0, &exp); + if (exp != NULL && exp->hvalue != NULL) { + int val = atoi(exp->hvalue); + if (val > 0) { + /* update only if expires value has REALLY be + decreased (more than one minutes): + In many cases value is decreased because a few seconds has + elapsed when server send the 200ok. */ + if (val < pub->p_period - 15) { + pub->p_period = val; + } + } + } + pub->p_retry = 0; /* reset value */ + } + + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_ANSWERED, tr); + report_event(je, sip); + return; + } else +#endif + if (MSG_IS_RESPONSE_FOR(sip, "REGISTER")) { + eXosip_event_t *je; + eXosip_reg_t *jreg = NULL; + + /* find matching j_reg */ + _eXosip_reg_find(&jreg, tr); + if (jreg != NULL) { + /* update registration interval */ + osip_header_t *exp; + + osip_message_header_get_byname(sip, "expires", 0, &exp); + if (exp != NULL && exp->hvalue != NULL) { + int val = atoi(exp->hvalue); + if (val > 0) { + /* update only if expires value has REALLY be + decreased (more than one minutes): + In many cases value is decreased because a few seconds has + elapsed when server send the 200ok. */ + if (val < jreg->r_reg_period - 15) { + jreg->r_reg_period = val; + } + } + } + + _eXosip_update_expires_according_to_contact(jreg, tr, sip); + + je = eXosip_event_init_for_reg(EXOSIP_REGISTRATION_SUCCESS, jreg, tr); + report_event(je, sip); + jreg->r_retry = 0; /* reset value */ + } + + return; + } + + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; +#ifndef MINISIZE + jn = jinfo->jn; + js = jinfo->js; +#endif + + if (jd != NULL) + jd->d_retry = 0; /* reset marker for authentication */ + if (jc != NULL) + jc->c_retry = 0; /* reset marker for authentication */ +#ifndef MINISIZE + if (js != NULL) + js->s_retry = 0; /* reset marker for authentication */ +#endif + + if (MSG_IS_RESPONSE_FOR(sip, "INVITE")) { + cb_rcv2xx_4invite(tr, sip); + } else if (MSG_IS_RESPONSE_FOR(sip, "BYE")) { + if (jd != NULL) + jd->d_STATE = JD_TERMINATED; + report_call_event(EXOSIP_CALL_MESSAGE_ANSWERED, jc, jd, tr); + } +#ifndef MINISIZE + else if (MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + cb_rcv2xx_4subscribe(tr, sip); + } else if (MSG_IS_RESPONSE_FOR(sip, "NOTIFY") && jn != NULL) { + eXosip_event_t *je; + osip_header_t *sub_state; + + je = eXosip_event_init_for_notify(EXOSIP_NOTIFICATION_ANSWERED, jn, jd, + tr); + report_event(je, sip); + + osip_message_header_get_byname(tr->orig_request, "subscription-state", + 0, &sub_state); + if (sub_state == NULL || sub_state->hvalue == NULL) { + /* UNCOMPLIANT UA without a subscription-state header */ + } else if (0 == osip_strncasecmp(sub_state->hvalue, "terminated", 10)) { + /* delete the dialog! */ + if (jn != NULL) { + REMOVE_ELEMENT(eXosip.j_notifies, jn); + eXosip_notify_free(jn); + } + } + } +#endif + else if (jc != NULL) { + if (MSG_IS_RESPONSE_FOR(sip, "UPDATE")) { + if (jd != NULL) { + osip_header_t *se_exp = NULL; + osip_header_t *se_exp_answer = NULL; + osip_message_header_get_byname(tr->orig_request, "session-expires", + 0, &se_exp); + if (se_exp == NULL) + osip_message_header_get_byname(tr->orig_request, "x", 0, + &se_exp); + osip_message_header_get_byname(sip, "session-expires", 0, + &se_exp_answer); + if (se_exp_answer == NULL) + osip_message_header_get_byname(sip, "x", 0, &se_exp_answer); + + if (se_exp != NULL && se_exp_answer != NULL) { + osip_content_disposition_t *exp_h = NULL; + /* syntax of Session-Expires is equivalent to "Content-Disposition" */ + osip_content_disposition_init(&exp_h); + if (exp_h != NULL) { + osip_content_disposition_parse(exp_h, + se_exp_answer->hvalue); + if (exp_h->element != NULL) { + osip_generic_param_t *param = NULL; + osip_generic_param_get_byname(&exp_h->gen_params, + "refresher", ¶m); + if (param == NULL) { + jd->d_refresher = 0; /* me? in which case? */ + } else { + if (osip_strcasecmp(param->gvalue, "uac") == 0) + jd->d_refresher = 0; + else + jd->d_refresher = 1; + } + jd->d_session_timer_start = time(NULL); + jd->d_session_timer_length = atoi(exp_h->element); + if (jd->d_session_timer_length <= 90) + jd->d_session_timer_length = 90; + } + osip_content_disposition_free(exp_h); + exp_h = NULL; + } + } + } + } + report_call_event(EXOSIP_CALL_MESSAGE_ANSWERED, jc, jd, tr); + return; + } +#ifndef MINISIZE + else if (jc == NULL && js == NULL && jn == NULL) { + eXosip_event_t *je; + + /* For all requests outside of calls */ + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_ANSWERED, tr); + report_event(je, sip); + return; + } +#else + else if (jc == NULL) { + eXosip_event_t *je; + /* For all requests outside of calls */ + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_ANSWERED, tr); + report_event(je, sip); + return; + } +#endif +} + +void eXosip_delete_early_dialog(eXosip_dialog_t * jd) +{ + if (jd == NULL) /* bug? */ + return; + + /* an early dialog was created, but the call is not established */ + if (jd->d_dialog != NULL && jd->d_dialog->state == DIALOG_EARLY) { + osip_dialog_free(jd->d_dialog); + jd->d_dialog = NULL; + eXosip_update(); /* AMD 30/09/05 */ + eXosip_dialog_set_state(jd, JD_TERMINATED); + } +} + +static void rcvregister_failure(osip_transaction_t * tr, osip_message_t * sip) +{ + eXosip_event_t *je; + eXosip_reg_t *jreg = NULL; + + /* find matching j_reg */ + _eXosip_reg_find(&jreg, tr); + if (jreg != NULL) { + je = eXosip_event_init_for_reg(EXOSIP_REGISTRATION_FAILURE, jreg, tr); + report_event(je, sip); + } +} + +#ifndef MINISIZE + +static void cb_rcv3xx(int type, osip_transaction_t * tr, osip_message_t * sip) +{ + eXosip_dialog_t *jd; + eXosip_call_t *jc; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv3xx (id=%i)\r\n", + tr->transactionid)); + + udp_tl_learn_port_from_via(sip); + + if (MSG_IS_RESPONSE_FOR(sip, "PUBLISH")) { + eXosip_event_t *je; + eXosip_pub_t *pub; + int i; + + i = _eXosip_pub_update(&pub, tr, sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "cb_rcv3xx (id=%i) No publication to update\r\n", + tr->transactionid)); + } + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_REDIRECTED, tr); + report_event(je, sip); + return; + } else if (MSG_IS_RESPONSE_FOR(sip, "REGISTER")) { + rcvregister_failure(tr, sip); + return; + } + + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; + jn = jinfo->jn; + js = jinfo->js; + + if (MSG_IS_RESPONSE_FOR(sip, "INVITE")) { + report_call_event(EXOSIP_CALL_REDIRECTED, jc, jd, tr); + } else if (MSG_IS_RESPONSE_FOR(sip, "NOTIFY") && jn != NULL) { + eXosip_event_t *je; + + je = eXosip_event_init_for_notify(EXOSIP_NOTIFICATION_REDIRECTED, jn, jd, + tr); + report_event(je, sip); + } else if (MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + eXosip_event_t *je; + + je = eXosip_event_init_for_subscribe(EXOSIP_SUBSCRIPTION_REDIRECTED, js, + jd, tr); + report_event(je, sip); + } else if (jc != NULL) { + report_call_event(EXOSIP_CALL_MESSAGE_REDIRECTED, jc, jd, tr); + return; + } else if (jc == NULL && js == NULL && jn == NULL) { + eXosip_event_t *je; + + /* For all requests outside of calls */ + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_REDIRECTED, tr); + report_event(je, sip); + return; + } + + if (jd == NULL) + return; + if (MSG_IS_RESPONSE_FOR(sip, "INVITE") + || MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + eXosip_delete_early_dialog(jd); + if (jd->d_dialog == NULL) + jd->d_STATE = JD_REDIRECTED; + } + +} + +static void cb_rcv4xx(int type, osip_transaction_t * tr, osip_message_t * sip) +{ + eXosip_dialog_t *jd; + eXosip_call_t *jc; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv4xx (id=%i)\r\n", + tr->transactionid)); + + udp_tl_learn_port_from_via(sip); + + if (MSG_IS_RESPONSE_FOR(sip, "PUBLISH")) { + eXosip_pub_t *pub; + eXosip_event_t *je; + int i; + + i = _eXosip_pub_update(&pub, tr, sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "cb_rcv4xx (id=%i) No publication to update\r\n", + tr->transactionid)); + } + /* For all requests outside of calls */ + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_REQUESTFAILURE, tr); + report_event(je, sip); + return; + } else if (MSG_IS_RESPONSE_FOR(sip, "REGISTER")) { + rcvregister_failure(tr, sip); + return; + } + + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; + jn = jinfo->jn; + js = jinfo->js; + + if (MSG_IS_RESPONSE_FOR(sip, "INVITE")) { + report_call_event(EXOSIP_CALL_REQUESTFAILURE, jc, jd, tr); + } else if (MSG_IS_RESPONSE_FOR(sip, "NOTIFY") && jn != NULL) { + eXosip_event_t *je; + + je = eXosip_event_init_for_notify(EXOSIP_NOTIFICATION_REQUESTFAILURE, + jn, jd, tr); + report_event(je, sip); + } else if (MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + eXosip_event_t *je; + + je = eXosip_event_init_for_subscribe(EXOSIP_SUBSCRIPTION_REQUESTFAILURE, + js, jd, tr); + report_event(je, sip); + } else if (jc != NULL) { + report_call_event(EXOSIP_CALL_MESSAGE_REQUESTFAILURE, jc, jd, tr); + return; + } else if (jc == NULL && js == NULL && jn == NULL) { + eXosip_event_t *je; + + /* For all requests outside of calls */ + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_REQUESTFAILURE, tr); + report_event(je, sip); + return; + } + + if (jd == NULL) + return; + if (MSG_IS_RESPONSE_FOR(sip, "INVITE") + || MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + eXosip_delete_early_dialog(jd); + if (MSG_TEST_CODE(sip, 401) || MSG_TEST_CODE(sip, 407)) + jd->d_STATE = JD_AUTH_REQUIRED; + else + jd->d_STATE = JD_CLIENTERROR; + } + +} + +static void cb_rcv5xx(int type, osip_transaction_t * tr, osip_message_t * sip) +{ + eXosip_dialog_t *jd; + eXosip_call_t *jc; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv5xx (id=%i)\r\n", + tr->transactionid)); + + udp_tl_learn_port_from_via(sip); + + if (MSG_IS_RESPONSE_FOR(sip, "PUBLISH")) { + eXosip_pub_t *pub; + eXosip_event_t *je; + int i; + + i = _eXosip_pub_update(&pub, tr, sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "cb_rcv3xx (id=%i) No publication to update\r\n", + tr->transactionid)); + } + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_SERVERFAILURE, tr); + report_event(je, sip); + return; + } else if (MSG_IS_RESPONSE_FOR(sip, "REGISTER")) { + rcvregister_failure(tr, sip); + return; + } + + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; + jn = jinfo->jn; + js = jinfo->js; + + if (MSG_IS_RESPONSE_FOR(sip, "INVITE")) { + report_call_event(EXOSIP_CALL_SERVERFAILURE, jc, jd, tr); + } else if (MSG_IS_RESPONSE_FOR(sip, "NOTIFY") && jn != NULL) { + eXosip_event_t *je; + + je = eXosip_event_init_for_notify(EXOSIP_NOTIFICATION_SERVERFAILURE, + jn, jd, tr); + report_event(je, sip); + } else if (MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + eXosip_event_t *je; + + je = eXosip_event_init_for_subscribe(EXOSIP_SUBSCRIPTION_SERVERFAILURE, + js, jd, tr); + report_event(je, sip); + } else if (jc != NULL) { + report_call_event(EXOSIP_CALL_MESSAGE_SERVERFAILURE, jc, jd, tr); + return; + } else if (jc == NULL && js == NULL && jn == NULL) { + eXosip_event_t *je; + + /* For all requests outside of calls */ + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_SERVERFAILURE, tr); + report_event(je, sip); + return; + } + + if (jd == NULL) + return; + if (MSG_IS_RESPONSE_FOR(sip, "INVITE") + || MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + eXosip_delete_early_dialog(jd); + jd->d_STATE = JD_SERVERERROR; + } + +} + +static void cb_rcv6xx(int type, osip_transaction_t * tr, osip_message_t * sip) +{ + eXosip_dialog_t *jd; + eXosip_call_t *jc; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); + + udp_tl_learn_port_from_via(sip); + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv6xx (id=%i)\r\n", + tr->transactionid)); + + if (MSG_IS_RESPONSE_FOR(sip, "PUBLISH")) { + eXosip_pub_t *pub; + eXosip_event_t *je; + int i; + + i = _eXosip_pub_update(&pub, tr, sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "cb_rcv6xx (id=%i) No publication to update\r\n", + tr->transactionid)); + } + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_GLOBALFAILURE, tr); + report_event(je, sip); + return; + } else if (MSG_IS_RESPONSE_FOR(sip, "REGISTER")) { + rcvregister_failure(tr, sip); + return; + } + + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; + jn = jinfo->jn; + js = jinfo->js; + + if (MSG_IS_RESPONSE_FOR(sip, "INVITE")) { + report_call_event(EXOSIP_CALL_GLOBALFAILURE, jc, jd, tr); + } else if (MSG_IS_RESPONSE_FOR(sip, "NOTIFY") && jn != NULL) { + eXosip_event_t *je; + + je = eXosip_event_init_for_notify(EXOSIP_NOTIFICATION_GLOBALFAILURE, + jn, jd, tr); + report_event(je, sip); + } else if (MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + eXosip_event_t *je; + + je = eXosip_event_init_for_subscribe(EXOSIP_SUBSCRIPTION_GLOBALFAILURE, + js, jd, tr); + report_event(je, sip); + } else if (jc != NULL) { + report_call_event(EXOSIP_CALL_MESSAGE_GLOBALFAILURE, jc, jd, tr); + return; + } else if (jc == NULL && js == NULL && jn == NULL) { + eXosip_event_t *je; + + /* For all requests outside of calls */ + je = eXosip_event_init_for_message(EXOSIP_MESSAGE_GLOBALFAILURE, tr); + report_event(je, sip); + return; + } + + if (jd == NULL) + return; + if (MSG_IS_RESPONSE_FOR(sip, "INVITE") + || MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE")) { + eXosip_delete_early_dialog(jd); + jd->d_STATE = JD_GLOBALFAILURE; + } - return OSIP_NOTFOUND; } - -static void -cb_rcv2xx (int type, osip_transaction_t * tr, osip_message_t * sip) -{ - eXosip_dialog_t *jd; - eXosip_call_t *jc; -#ifndef MINISIZE - eXosip_subscribe_t *js; - eXosip_notify_t *jn; -#endif - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv2xx (id=%i)\r\n", - tr->transactionid)); - - udp_tl_learn_port_from_via (sip); - -#ifndef MINISIZE - if (MSG_IS_RESPONSE_FOR (sip, "PUBLISH")) - { - eXosip_pub_t *pub = NULL; - eXosip_event_t *je; - int i; - - i = _eXosip_pub_update (&pub, tr, sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "cb_rcv2xx (id=%i) No publication to update\r\n", - tr->transactionid)); - } - if (pub != NULL) - { - /* update registration interval */ - osip_header_t *exp; - - osip_message_header_get_byname (sip, "expires", 0, &exp); - if (exp != NULL && exp->hvalue != NULL) - { - int val = atoi (exp->hvalue); - if (val > 0) - { - /* update only if expires value has REALLY be - decreased (more than one minutes): - In many cases value is decreased because a few seconds has - elapsed when server send the 200ok. */ - if (val < pub->p_period - 60) - { - pub->p_period = val + 60; - } - } - } - pub->p_retry = 0; /* reset value */ - } - - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_ANSWERED, tr); - report_event (je, sip); - return; - } else -#endif - if (MSG_IS_RESPONSE_FOR (sip, "REGISTER")) - { - eXosip_event_t *je; - eXosip_reg_t *jreg = NULL; - - /* find matching j_reg */ - _eXosip_reg_find (&jreg, tr); - if (jreg != NULL) - { - /* update registration interval */ - osip_header_t *exp; - - osip_message_header_get_byname (sip, "expires", 0, &exp); - if (exp != NULL && exp->hvalue != NULL) - { - int val = atoi (exp->hvalue); - if (val > 0) - { - /* update only if expires value has REALLY be - decreased (more than one minutes): - In many cases value is decreased because a few seconds has - elapsed when server send the 200ok. */ - if (val < jreg->r_reg_period - 60) - { - jreg->r_reg_period = val + 60; - } - } - } - - _eXosip_update_expires_according_to_contact (jreg, tr, sip); - - je = eXosip_event_init_for_reg (EXOSIP_REGISTRATION_SUCCESS, jreg, tr); - report_event (je, sip); - jreg->r_retry = 0; /* reset value */ - } - - return; - } - - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; -#ifndef MINISIZE - jn = jinfo->jn; - js = jinfo->js; -#endif - - if (jd != NULL) - jd->d_retry = 0; /* reset marker for authentication */ - if (jc != NULL) - jc->c_retry = 0; /* reset marker for authentication */ -#ifndef MINISIZE - if (js != NULL) - js->s_retry = 0; /* reset marker for authentication */ -#endif - - if (MSG_IS_RESPONSE_FOR (sip, "INVITE")) - { - cb_rcv2xx_4invite (tr, sip); - } else if (MSG_IS_RESPONSE_FOR (sip, "BYE")) - { - if (jd != NULL) - jd->d_STATE = JD_TERMINATED; - report_call_event (EXOSIP_CALL_MESSAGE_ANSWERED, jc, jd, tr); - } -#ifndef MINISIZE - else if (MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - cb_rcv2xx_4subscribe (tr, sip); - } else if (MSG_IS_RESPONSE_FOR (sip, "NOTIFY") && jn != NULL) - { - eXosip_event_t *je; - osip_header_t *sub_state; - - je = eXosip_event_init_for_notify (EXOSIP_NOTIFICATION_ANSWERED, jn, jd, tr); - report_event (je, sip); - - osip_message_header_get_byname (tr->orig_request, "subscription-state", - 0, &sub_state); - if (sub_state == NULL || sub_state->hvalue == NULL) - { - /* UNCOMPLIANT UA without a subscription-state header */ - } else if (0 == osip_strncasecmp (sub_state->hvalue, "terminated", 10)) - { - /* delete the dialog! */ - if (jn != NULL) - { - REMOVE_ELEMENT (eXosip.j_notifies, jn); - eXosip_notify_free (jn); - } - } - } -#endif - else if (jc != NULL) - { - report_call_event (EXOSIP_CALL_MESSAGE_ANSWERED, jc, jd, tr); - return; - } -#ifndef MINISIZE - else if (jc == NULL && js == NULL && jn == NULL) - { - eXosip_event_t *je; - - /* For all requests outside of calls */ - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_ANSWERED, tr); - report_event (je, sip); - return; - } #else - else if (jc == NULL) - { - eXosip_event_t *je; - - /* For all requests outside of calls */ - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_ANSWERED, tr); - report_event (je, sip); - return; - } -#endif -} - -void -eXosip_delete_early_dialog (eXosip_dialog_t * jd) -{ - if (jd == NULL) /* bug? */ - return; - - /* an early dialog was created, but the call is not established */ - if (jd->d_dialog != NULL && jd->d_dialog->state == DIALOG_EARLY) - { - osip_dialog_free (jd->d_dialog); - jd->d_dialog = NULL; - eXosip_update (); /* AMD 30/09/05 */ - eXosip_dialog_set_state (jd, JD_TERMINATED); - } -} static void -rcvregister_failure (osip_transaction_t * tr, osip_message_t * sip) -{ - eXosip_event_t *je; - eXosip_reg_t *jreg = NULL; - - /* find matching j_reg */ - _eXosip_reg_find (&jreg, tr); - if (jreg != NULL) - { - je = eXosip_event_init_for_reg (EXOSIP_REGISTRATION_FAILURE, jreg, tr); - report_event (je, sip); - } -} - -#ifndef MINISIZE +cb_rcv3456xx(int type, osip_transaction_t * tr, osip_message_t * sip, + int invite_event, int call_event, int outcall_event, int state); static void -cb_rcv3xx (int type, osip_transaction_t * tr, osip_message_t * sip) +cb_rcv3456xx(int type, osip_transaction_t * tr, osip_message_t * sip, + int invite_event, int call_event, int outcall_event, int state) { - eXosip_dialog_t *jd; - eXosip_call_t *jc; - eXosip_subscribe_t *js; - eXosip_notify_t *jn; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv3xx (id=%i)\r\n", - tr->transactionid)); - - udp_tl_learn_port_from_via (sip); - - if (MSG_IS_RESPONSE_FOR (sip, "PUBLISH")) - { - eXosip_event_t *je; - eXosip_pub_t *pub; - int i; - - i = _eXosip_pub_update (&pub, tr, sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "cb_rcv3xx (id=%i) No publication to update\r\n", - tr->transactionid)); - } - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_REDIRECTED, tr); - report_event (je, sip); - return; - } else if (MSG_IS_RESPONSE_FOR (sip, "REGISTER")) - { - rcvregister_failure (tr, sip); - return; - } - - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; - jn = jinfo->jn; - js = jinfo->js; - - if (MSG_IS_RESPONSE_FOR (sip, "INVITE")) - { - report_call_event (EXOSIP_CALL_REDIRECTED, jc, jd, tr); - } else if (MSG_IS_RESPONSE_FOR (sip, "NOTIFY") && jn != NULL) - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_notify (EXOSIP_NOTIFICATION_REDIRECTED, jn, jd, tr); - report_event (je, sip); - } else if (MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_REDIRECTED, js, - jd, tr); - report_event (je, sip); - } else if (jc != NULL) - { - report_call_event (EXOSIP_CALL_MESSAGE_REDIRECTED, jc, jd, tr); - return; - } else if (jc == NULL && js == NULL && jn == NULL) - { - eXosip_event_t *je; - - /* For all requests outside of calls */ - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_REDIRECTED, tr); - report_event (je, sip); - return; - } - - if (jd == NULL) - return; - if (MSG_IS_RESPONSE_FOR (sip, "INVITE") - || MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - eXosip_delete_early_dialog (jd); - if (jd->d_dialog == NULL) - jd->d_STATE = JD_REDIRECTED; - } + eXosip_dialog_t *jd; + eXosip_call_t *jc; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); -} + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv3456xx (id=%i)\r\n", + tr->transactionid)); -static void -cb_rcv4xx (int type, osip_transaction_t * tr, osip_message_t * sip) -{ - eXosip_dialog_t *jd; - eXosip_call_t *jc; - eXosip_subscribe_t *js; - eXosip_notify_t *jn; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv4xx (id=%i)\r\n", - tr->transactionid)); - - udp_tl_learn_port_from_via (sip); - - if (MSG_IS_RESPONSE_FOR (sip, "PUBLISH")) - { - eXosip_pub_t *pub; - eXosip_event_t *je; - int i; - - i = _eXosip_pub_update (&pub, tr, sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "cb_rcv4xx (id=%i) No publication to update\r\n", - tr->transactionid)); - } - /* For all requests outside of calls */ - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_REQUESTFAILURE, tr); - report_event (je, sip); - return; - } else if (MSG_IS_RESPONSE_FOR (sip, "REGISTER")) - { - rcvregister_failure (tr, sip); - return; - } - - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; - jn = jinfo->jn; - js = jinfo->js; - - if (MSG_IS_RESPONSE_FOR (sip, "INVITE")) - { - report_call_event (EXOSIP_CALL_REQUESTFAILURE, jc, jd, tr); - } else if (MSG_IS_RESPONSE_FOR (sip, "NOTIFY") && jn != NULL) - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_notify (EXOSIP_NOTIFICATION_REQUESTFAILURE, - jn, jd, tr); - report_event (je, sip); - } else if (MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_REQUESTFAILURE, - js, jd, tr); - report_event (je, sip); - } else if (jc != NULL) - { - report_call_event (EXOSIP_CALL_MESSAGE_REQUESTFAILURE, jc, jd, tr); - return; - } else if (jc == NULL && js == NULL && jn == NULL) - { - eXosip_event_t *je; - - /* For all requests outside of calls */ - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_REQUESTFAILURE, tr); - report_event (je, sip); - return; - } - - if (jd == NULL) - return; - if (MSG_IS_RESPONSE_FOR (sip, "INVITE") - || MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - eXosip_delete_early_dialog (jd); - if (MSG_TEST_CODE (sip, 401) || MSG_TEST_CODE (sip, 407)) - jd->d_STATE = JD_AUTH_REQUIRED; - else - jd->d_STATE = JD_CLIENTERROR; - } + udp_tl_learn_port_from_via(sip); -} + if (MSG_IS_RESPONSE_FOR(sip, "REGISTER")) { + rcvregister_failure(tr, sip); + return; + } -static void -cb_rcv5xx (int type, osip_transaction_t * tr, osip_message_t * sip) -{ - eXosip_dialog_t *jd; - eXosip_call_t *jc; - eXosip_subscribe_t *js; - eXosip_notify_t *jn; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv5xx (id=%i)\r\n", - tr->transactionid)); - - udp_tl_learn_port_from_via (sip); - - if (MSG_IS_RESPONSE_FOR (sip, "PUBLISH")) - { - eXosip_pub_t *pub; - eXosip_event_t *je; - int i; - - i = _eXosip_pub_update (&pub, tr, sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "cb_rcv3xx (id=%i) No publication to update\r\n", - tr->transactionid)); - } - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_SERVERFAILURE, tr); - report_event (je, sip); - return; - } else if (MSG_IS_RESPONSE_FOR (sip, "REGISTER")) - { - rcvregister_failure (tr, sip); - return; - } - - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; - jn = jinfo->jn; - js = jinfo->js; - - if (MSG_IS_RESPONSE_FOR (sip, "INVITE")) - { - report_call_event (EXOSIP_CALL_SERVERFAILURE, jc, jd, tr); - } else if (MSG_IS_RESPONSE_FOR (sip, "NOTIFY") && jn != NULL) - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_notify (EXOSIP_NOTIFICATION_SERVERFAILURE, - jn, jd, tr); - report_event (je, sip); - } else if (MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_SERVERFAILURE, - js, jd, tr); - report_event (je, sip); - } else if (jc != NULL) - { - report_call_event (EXOSIP_CALL_MESSAGE_SERVERFAILURE, jc, jd, tr); - return; - } else if (jc == NULL && js == NULL && jn == NULL) - { - eXosip_event_t *je; - - /* For all requests outside of calls */ - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_SERVERFAILURE, tr); - report_event (je, sip); - return; - } - - if (jd == NULL) - return; - if (MSG_IS_RESPONSE_FOR (sip, "INVITE") - || MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - eXosip_delete_early_dialog (jd); - jd->d_STATE = JD_SERVERERROR; - } + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; -} + if (MSG_IS_RESPONSE_FOR(sip, "INVITE")) { + report_call_event(invite_event, jc, jd, tr); + } else if (jc != NULL) { + report_call_event(call_event, jc, jd, tr); + return; + } else if (jc == NULL) { + eXosip_event_t *je; -static void -cb_rcv6xx (int type, osip_transaction_t * tr, osip_message_t * sip) -{ - eXosip_dialog_t *jd; - eXosip_call_t *jc; - eXosip_subscribe_t *js; - eXosip_notify_t *jn; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - udp_tl_learn_port_from_via (sip); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv6xx (id=%i)\r\n", - tr->transactionid)); - - if (MSG_IS_RESPONSE_FOR (sip, "PUBLISH")) - { - eXosip_pub_t *pub; - eXosip_event_t *je; - int i; - - i = _eXosip_pub_update (&pub, tr, sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "cb_rcv6xx (id=%i) No publication to update\r\n", - tr->transactionid)); - } - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_GLOBALFAILURE, tr); - report_event (je, sip); - return; - } else if (MSG_IS_RESPONSE_FOR (sip, "REGISTER")) - { - rcvregister_failure (tr, sip); - return; - } - - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; - jn = jinfo->jn; - js = jinfo->js; - - if (MSG_IS_RESPONSE_FOR (sip, "INVITE")) - { - report_call_event (EXOSIP_CALL_GLOBALFAILURE, jc, jd, tr); - } else if (MSG_IS_RESPONSE_FOR (sip, "NOTIFY") && jn != NULL) - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_notify (EXOSIP_NOTIFICATION_GLOBALFAILURE, - jn, jd, tr); - report_event (je, sip); - } else if (MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_GLOBALFAILURE, - js, jd, tr); - report_event (je, sip); - } else if (jc != NULL) - { - report_call_event (EXOSIP_CALL_MESSAGE_GLOBALFAILURE, jc, jd, tr); - return; - } else if (jc == NULL && js == NULL && jn == NULL) - { - eXosip_event_t *je; - - /* For all requests outside of calls */ - je = eXosip_event_init_for_message (EXOSIP_MESSAGE_GLOBALFAILURE, tr); - report_event (je, sip); - return; - } - - if (jd == NULL) - return; - if (MSG_IS_RESPONSE_FOR (sip, "INVITE") - || MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE")) - { - eXosip_delete_early_dialog (jd); - jd->d_STATE = JD_GLOBALFAILURE; - } + /* For all requests outside of calls */ + je = eXosip_event_init_for_message(outcall_event, tr); + report_event(je, sip); + return; + } + if (jd == NULL) + return; + if (MSG_IS_RESPONSE_FOR(sip, "INVITE")) { + eXosip_delete_early_dialog(jd); + if (MSG_TEST_CODE(sip, 401) || MSG_TEST_CODE(sip, 407)) + jd->d_STATE = JD_AUTH_REQUIRED; + else + jd->d_STATE = state; + } } -#else - -static void -cb_rcv3456xx (int type, osip_transaction_t * tr, osip_message_t * sip, - int invite_event, int call_event, int outcall_event, int state); - -static void -cb_rcv3456xx (int type, osip_transaction_t * tr, osip_message_t * sip, - int invite_event, int call_event, int outcall_event, int state) +static void cb_rcv3xx(int type, osip_transaction_t * tr, osip_message_t * sip) { - eXosip_dialog_t *jd; - eXosip_call_t *jc; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_rcv3456xx (id=%i)\r\n", - tr->transactionid)); - - udp_tl_learn_port_from_via (sip); - - if (MSG_IS_RESPONSE_FOR (sip, "REGISTER")) - { - rcvregister_failure (tr, sip); - return; - } - - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; - - if (MSG_IS_RESPONSE_FOR (sip, "INVITE")) - { - report_call_event (invite_event, jc, jd, tr); - } else if (jc != NULL) - { - report_call_event (call_event, jc, jd, tr); - return; - } else if (jc == NULL) - { - eXosip_event_t *je; - - /* For all requests outside of calls */ - je = eXosip_event_init_for_message (outcall_event, tr); - report_event (je, sip); - return; - } - - if (jd == NULL) - return; - if (MSG_IS_RESPONSE_FOR (sip, "INVITE")) - { - eXosip_delete_early_dialog (jd); - if (MSG_TEST_CODE (sip, 401) || MSG_TEST_CODE (sip, 407)) - jd->d_STATE = JD_AUTH_REQUIRED; - else - jd->d_STATE = state; - } + cb_rcv3456xx(type, tr, sip, + EXOSIP_CALL_REDIRECTED, + EXOSIP_CALL_MESSAGE_REDIRECTED, + EXOSIP_MESSAGE_REDIRECTED, JD_REDIRECTED); } -static void -cb_rcv3xx (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_rcv4xx(int type, osip_transaction_t * tr, osip_message_t * sip) { - cb_rcv3456xx (type, tr, sip, - EXOSIP_CALL_REDIRECTED, - EXOSIP_CALL_MESSAGE_REDIRECTED, - EXOSIP_MESSAGE_REDIRECTED, JD_REDIRECTED); + cb_rcv3456xx(type, tr, sip, + EXOSIP_CALL_REQUESTFAILURE, + EXOSIP_CALL_MESSAGE_REQUESTFAILURE, + EXOSIP_MESSAGE_REQUESTFAILURE, JD_CLIENTERROR); } -static void -cb_rcv4xx (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_rcv5xx(int type, osip_transaction_t * tr, osip_message_t * sip) { - cb_rcv3456xx (type, tr, sip, - EXOSIP_CALL_REQUESTFAILURE, - EXOSIP_CALL_MESSAGE_REQUESTFAILURE, - EXOSIP_MESSAGE_REQUESTFAILURE, JD_CLIENTERROR); + cb_rcv3456xx(type, tr, sip, + EXOSIP_CALL_SERVERFAILURE, + EXOSIP_CALL_MESSAGE_SERVERFAILURE, + EXOSIP_MESSAGE_SERVERFAILURE, JD_SERVERERROR); } -static void -cb_rcv5xx (int type, osip_transaction_t * tr, osip_message_t * sip) +static void cb_rcv6xx(int type, osip_transaction_t * tr, osip_message_t * sip) { - cb_rcv3456xx (type, tr, sip, - EXOSIP_CALL_SERVERFAILURE, - EXOSIP_CALL_MESSAGE_SERVERFAILURE, - EXOSIP_MESSAGE_SERVERFAILURE, JD_SERVERERROR); + cb_rcv3456xx(type, tr, sip, + EXOSIP_CALL_GLOBALFAILURE, + EXOSIP_CALL_MESSAGE_GLOBALFAILURE, + EXOSIP_MESSAGE_GLOBALFAILURE, JD_REDIRECTED); } -static void -cb_rcv6xx (int type, osip_transaction_t * tr, osip_message_t * sip) +#endif + +static void cb_snd123456xx(int type, osip_transaction_t * tr, osip_message_t * sip) { - cb_rcv3456xx (type, tr, sip, - EXOSIP_CALL_GLOBALFAILURE, - EXOSIP_CALL_MESSAGE_GLOBALFAILURE, - EXOSIP_MESSAGE_GLOBALFAILURE, JD_REDIRECTED); -} + eXosip_dialog_t *jd; + eXosip_call_t *jc; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_snd123456xx (id=%i)\r\n", + tr->transactionid)); + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; + if (jd == NULL) + return; + if (type == OSIP_IST_STATUS_1XX_SENT || type == OSIP_NIST_STATUS_1XX_SENT) { + jd->d_STATE = JD_TRYING; + return; + } + if (type == OSIP_IST_STATUS_2XX_SENT || type == OSIP_NIST_STATUS_2XX_SENT) { + jd->d_STATE = JD_ESTABLISHED; + return; + } + + if (type == OSIP_IST_STATUS_3XX_SENT || type == OSIP_NIST_STATUS_3XX_SENT) + jd->d_STATE = JD_REDIRECTED; + else if (type == OSIP_IST_STATUS_4XX_SENT || type == OSIP_NIST_STATUS_4XX_SENT) + jd->d_STATE = JD_CLIENTERROR; + else if (type == OSIP_IST_STATUS_5XX_SENT || type == OSIP_NIST_STATUS_5XX_SENT) + jd->d_STATE = JD_SERVERERROR; + else if (type == OSIP_IST_STATUS_6XX_SENT || type == OSIP_NIST_STATUS_6XX_SENT) + jd->d_STATE = JD_GLOBALFAILURE; + + if (MSG_IS_RESPONSE_FOR(sip, "INVITE") +#ifndef MINISIZE + || MSG_IS_RESPONSE_FOR(sip, "SUBSCRIBE") #endif + ) { + eXosip_delete_early_dialog(jd); + } -static void -cb_snd123456xx (int type, osip_transaction_t * tr, osip_message_t * sip) -{ - eXosip_dialog_t *jd; - eXosip_call_t *jc; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, "cb_snd123456xx (id=%i)\r\n", - tr->transactionid)); - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; - if (jd == NULL) - return; - if (type == OSIP_IST_STATUS_1XX_SENT || type == OSIP_NIST_STATUS_1XX_SENT) - { - jd->d_STATE = JD_TRYING; - return; - } - if (type == OSIP_IST_STATUS_2XX_SENT || type == OSIP_NIST_STATUS_2XX_SENT) - { - jd->d_STATE = JD_ESTABLISHED; - return; - } - - if (type == OSIP_IST_STATUS_3XX_SENT || type == OSIP_NIST_STATUS_3XX_SENT) - jd->d_STATE = JD_REDIRECTED; - else if (type == OSIP_IST_STATUS_4XX_SENT || type == OSIP_NIST_STATUS_4XX_SENT) - jd->d_STATE = JD_CLIENTERROR; - else if (type == OSIP_IST_STATUS_5XX_SENT || type == OSIP_NIST_STATUS_5XX_SENT) - jd->d_STATE = JD_SERVERERROR; - else if (type == OSIP_IST_STATUS_6XX_SENT || type == OSIP_NIST_STATUS_6XX_SENT) - jd->d_STATE = JD_GLOBALFAILURE; - - if (MSG_IS_RESPONSE_FOR (sip, "INVITE") -#ifndef MINISIZE - || MSG_IS_RESPONSE_FOR (sip, "SUBSCRIBE") -#endif - ) - { - eXosip_delete_early_dialog (jd); - } - - if (MSG_IS_RESPONSE_FOR (sip, "INVITE")) - { - /* only close calls if this is the initial INVITE */ - if (jc != NULL && tr == jc->c_inc_tr) - { - report_call_event (EXOSIP_CALL_CLOSED, jc, jd, tr); - } - } + if (MSG_IS_RESPONSE_FOR(sip, "INVITE")) { + /* only close calls if this is the initial INVITE */ + if (jc != NULL && tr == jc->c_inc_tr) { + report_call_event(EXOSIP_CALL_CLOSED, jc, jd, tr); + } + } } #ifndef MINISIZE static void -cb_rcvresp_retransmission (int type, osip_transaction_t * tr, osip_message_t * sip) +cb_rcvresp_retransmission(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "cb_rcvresp_retransmission (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "cb_rcvresp_retransmission (id=%i)\r\n", tr->transactionid)); } static void -cb_sndreq_retransmission (int type, osip_transaction_t * tr, osip_message_t * sip) +cb_sndreq_retransmission(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "cb_sndreq_retransmission (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "cb_sndreq_retransmission (id=%i)\r\n", tr->transactionid)); } static void -cb_sndresp_retransmission (int type, osip_transaction_t * tr, osip_message_t * sip) +cb_sndresp_retransmission(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "cb_sndresp_retransmission (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "cb_sndresp_retransmission (id=%i)\r\n", tr->transactionid)); } static void -cb_rcvreq_retransmission (int type, osip_transaction_t * tr, osip_message_t * sip) +cb_rcvreq_retransmission(int type, osip_transaction_t * tr, osip_message_t * sip) { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "cb_rcvreq_retransmission (id=%i)\r\n", tr->transactionid)); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "cb_rcvreq_retransmission (id=%i)\r\n", tr->transactionid)); } #endif -static void -cb_transport_error (int type, osip_transaction_t * tr, int error) +static void cb_transport_error(int type, osip_transaction_t * tr, int error) { #ifndef MINISIZE - eXosip_dialog_t *jd; - eXosip_call_t *jc; - eXosip_subscribe_t *js; - eXosip_notify_t *jn; - jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance (tr); -#endif - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "cb_transport_error (id=%i)\r\n", tr->transactionid)); - -#ifndef MINISIZE - if (jinfo == NULL) - return; - jd = jinfo->jd; - jc = jinfo->jc; - jn = jinfo->jn; - js = jinfo->js; - - if (jn == NULL && js == NULL) - return; - - if (jn != NULL && MSG_IS_NOTIFY (tr->orig_request) - && type == OSIP_NICT_TRANSPORT_ERROR) - { - /* delete the dialog! */ - REMOVE_ELEMENT (eXosip.j_notifies, jn); - eXosip_notify_free (jn); - } - - if (js != NULL && MSG_IS_SUBSCRIBE (tr->orig_request) - && type == OSIP_NICT_TRANSPORT_ERROR) - { - /* delete the dialog! */ - REMOVE_ELEMENT (eXosip.j_subscribes, js); - eXosip_subscribe_free (js); - } + eXosip_dialog_t *jd; + eXosip_call_t *jc; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; + jinfo_t *jinfo = (jinfo_t *) osip_transaction_get_your_instance(tr); +#endif + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "cb_transport_error (id=%i)\r\n", tr->transactionid)); + +#ifndef MINISIZE + if (jinfo == NULL) + return; + jd = jinfo->jd; + jc = jinfo->jc; + jn = jinfo->jn; + js = jinfo->js; + + if (jn == NULL && js == NULL) + return; + + if (jn != NULL && MSG_IS_NOTIFY(tr->orig_request) + && type == OSIP_NICT_TRANSPORT_ERROR) { + /* delete the dialog! */ + REMOVE_ELEMENT(eXosip.j_notifies, jn); + eXosip_notify_free(jn); + } + + if (js != NULL && MSG_IS_SUBSCRIBE(tr->orig_request) + && type == OSIP_NICT_TRANSPORT_ERROR) { + /* delete the dialog! */ + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + } #endif #if 0 - if (jc->c_dialogs == NULL && type == OSIP_NICT_TRANSPORT_ERROR) - { - /* delete the dialog! */ - REMOVE_ELEMENT (eXosip.j_calls, jc); - eXosip_call_free (jc); - } + if (jc->c_dialogs == NULL && type == OSIP_NICT_TRANSPORT_ERROR) { + /* delete the dialog! */ + REMOVE_ELEMENT(eXosip.j_calls, jc); + eXosip_call_free(jc); + } #endif } -int -eXosip_set_callbacks (osip_t * osip) -{ - /* register all callbacks */ - - osip_set_cb_send_message (osip, &cb_snd_message); - - osip_set_kill_transaction_callback (osip, OSIP_ICT_KILL_TRANSACTION, - &cb_xixt_kill_transaction); - osip_set_kill_transaction_callback (osip, OSIP_IST_KILL_TRANSACTION, - &cb_xixt_kill_transaction); - osip_set_kill_transaction_callback (osip, OSIP_NICT_KILL_TRANSACTION, - &cb_xixt_kill_transaction); - osip_set_kill_transaction_callback (osip, OSIP_NIST_KILL_TRANSACTION, - &cb_xixt_kill_transaction); - -#ifndef MINISIZE - osip_set_message_callback (osip, OSIP_ICT_STATUS_2XX_RECEIVED_AGAIN, - &cb_rcvresp_retransmission); - osip_set_message_callback (osip, OSIP_ICT_STATUS_3456XX_RECEIVED_AGAIN, - &cb_rcvresp_retransmission); - osip_set_message_callback (osip, OSIP_ICT_INVITE_SENT_AGAIN, - &cb_sndreq_retransmission); - osip_set_message_callback (osip, OSIP_IST_STATUS_2XX_SENT_AGAIN, - &cb_sndresp_retransmission); - osip_set_message_callback (osip, OSIP_IST_STATUS_3456XX_SENT_AGAIN, - &cb_sndresp_retransmission); - osip_set_message_callback (osip, OSIP_IST_INVITE_RECEIVED_AGAIN, - &cb_rcvreq_retransmission); - osip_set_message_callback (osip, OSIP_NICT_STATUS_2XX_RECEIVED_AGAIN, - &cb_rcvresp_retransmission); - osip_set_message_callback (osip, OSIP_NICT_STATUS_3456XX_RECEIVED_AGAIN, - &cb_rcvresp_retransmission); - osip_set_message_callback (osip, OSIP_NICT_REQUEST_SENT_AGAIN, - &cb_sndreq_retransmission); - osip_set_message_callback (osip, OSIP_NIST_STATUS_2XX_SENT_AGAIN, - &cb_sndresp_retransmission); - osip_set_message_callback (osip, OSIP_NIST_STATUS_3456XX_SENT_AGAIN, - &cb_sndresp_retransmission); - osip_set_message_callback (osip, OSIP_NIST_REQUEST_RECEIVED_AGAIN, - &cb_rcvreq_retransmission); -#endif - - osip_set_transport_error_callback (osip, OSIP_ICT_TRANSPORT_ERROR, - &cb_transport_error); - osip_set_transport_error_callback (osip, OSIP_IST_TRANSPORT_ERROR, - &cb_transport_error); - osip_set_transport_error_callback (osip, OSIP_NICT_TRANSPORT_ERROR, - &cb_transport_error); - osip_set_transport_error_callback (osip, OSIP_NIST_TRANSPORT_ERROR, - &cb_transport_error); - -#ifndef MINISIZE - osip_set_message_callback (osip, OSIP_ICT_INVITE_SENT, &cb_sndinvite); - osip_set_message_callback (osip, OSIP_ICT_ACK_SENT, &cb_sndack); - osip_set_message_callback (osip, OSIP_NICT_REGISTER_SENT, &cb_sndregister); - osip_set_message_callback (osip, OSIP_NICT_BYE_SENT, &cb_sndbye); - osip_set_message_callback (osip, OSIP_NICT_CANCEL_SENT, &cb_sndcancel); - osip_set_message_callback (osip, OSIP_NICT_INFO_SENT, &cb_sndinfo); - osip_set_message_callback (osip, OSIP_NICT_OPTIONS_SENT, &cb_sndoptions); - osip_set_message_callback (osip, OSIP_NICT_SUBSCRIBE_SENT, &cb_sndsubscribe); - osip_set_message_callback (osip, OSIP_NICT_NOTIFY_SENT, &cb_sndnotify); - /* osip_set_cb_nict_sndprack (osip,&cb_sndprack); */ - osip_set_message_callback (osip, OSIP_NICT_UNKNOWN_REQUEST_SENT, - &cb_sndunkrequest); -#endif - - osip_set_message_callback (osip, OSIP_ICT_STATUS_1XX_RECEIVED, &cb_rcv1xx); - osip_set_message_callback (osip, OSIP_ICT_STATUS_2XX_RECEIVED, &cb_rcv2xx); - osip_set_message_callback (osip, OSIP_ICT_STATUS_3XX_RECEIVED, &cb_rcv3xx); - osip_set_message_callback (osip, OSIP_ICT_STATUS_4XX_RECEIVED, &cb_rcv4xx); - osip_set_message_callback (osip, OSIP_ICT_STATUS_5XX_RECEIVED, &cb_rcv5xx); - osip_set_message_callback (osip, OSIP_ICT_STATUS_6XX_RECEIVED, &cb_rcv6xx); - - osip_set_message_callback (osip, OSIP_IST_STATUS_1XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_IST_STATUS_2XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_IST_STATUS_3XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_IST_STATUS_4XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_IST_STATUS_5XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_IST_STATUS_6XX_SENT, &cb_snd123456xx); - - osip_set_message_callback (osip, OSIP_NICT_STATUS_1XX_RECEIVED, &cb_rcv1xx); - osip_set_message_callback (osip, OSIP_NICT_STATUS_2XX_RECEIVED, &cb_rcv2xx); - osip_set_message_callback (osip, OSIP_NICT_STATUS_3XX_RECEIVED, &cb_rcv3xx); - osip_set_message_callback (osip, OSIP_NICT_STATUS_4XX_RECEIVED, &cb_rcv4xx); - osip_set_message_callback (osip, OSIP_NICT_STATUS_5XX_RECEIVED, &cb_rcv5xx); - osip_set_message_callback (osip, OSIP_NICT_STATUS_6XX_RECEIVED, &cb_rcv6xx); - - osip_set_message_callback (osip, OSIP_NIST_STATUS_1XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_NIST_STATUS_2XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_NIST_STATUS_3XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_NIST_STATUS_4XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_NIST_STATUS_5XX_SENT, &cb_snd123456xx); - osip_set_message_callback (osip, OSIP_NIST_STATUS_6XX_SENT, &cb_snd123456xx); - -#ifndef MINISIZE - osip_set_message_callback (osip, OSIP_IST_INVITE_RECEIVED, &cb_rcvinvite); - osip_set_message_callback (osip, OSIP_IST_ACK_RECEIVED, &cb_rcvack); - osip_set_message_callback (osip, OSIP_IST_ACK_RECEIVED_AGAIN, &cb_rcvack2); - osip_set_message_callback (osip, OSIP_NIST_CANCEL_RECEIVED, &cb_rcvcancel); -#endif - osip_set_message_callback (osip, OSIP_NIST_REGISTER_RECEIVED, &cb_rcvregister); - osip_set_message_callback (osip, OSIP_NIST_BYE_RECEIVED, &cb_rcvrequest); - osip_set_message_callback (osip, OSIP_NIST_INFO_RECEIVED, &cb_rcvrequest); - osip_set_message_callback (osip, OSIP_NIST_OPTIONS_RECEIVED, &cb_rcvrequest); - osip_set_message_callback (osip, OSIP_NIST_SUBSCRIBE_RECEIVED, &cb_rcvrequest); - osip_set_message_callback (osip, OSIP_NIST_NOTIFY_RECEIVED, &cb_rcvrequest); - osip_set_message_callback (osip, OSIP_NIST_UNKNOWN_REQUEST_RECEIVED, - &cb_rcvrequest); +int eXosip_set_callbacks(osip_t * osip) +{ + /* register all callbacks */ + + osip_set_cb_send_message(osip, &cb_snd_message); + + osip_set_kill_transaction_callback(osip, OSIP_ICT_KILL_TRANSACTION, + &cb_xixt_kill_transaction); + osip_set_kill_transaction_callback(osip, OSIP_IST_KILL_TRANSACTION, + &cb_xixt_kill_transaction); + osip_set_kill_transaction_callback(osip, OSIP_NICT_KILL_TRANSACTION, + &cb_xixt_kill_transaction); + osip_set_kill_transaction_callback(osip, OSIP_NIST_KILL_TRANSACTION, + &cb_xixt_kill_transaction); + +#ifndef MINISIZE + osip_set_message_callback(osip, OSIP_ICT_STATUS_2XX_RECEIVED_AGAIN, + &cb_rcvresp_retransmission); + osip_set_message_callback(osip, OSIP_ICT_STATUS_3456XX_RECEIVED_AGAIN, + &cb_rcvresp_retransmission); + osip_set_message_callback(osip, OSIP_ICT_INVITE_SENT_AGAIN, + &cb_sndreq_retransmission); + osip_set_message_callback(osip, OSIP_IST_STATUS_2XX_SENT_AGAIN, + &cb_sndresp_retransmission); + osip_set_message_callback(osip, OSIP_IST_STATUS_3456XX_SENT_AGAIN, + &cb_sndresp_retransmission); + osip_set_message_callback(osip, OSIP_IST_INVITE_RECEIVED_AGAIN, + &cb_rcvreq_retransmission); + osip_set_message_callback(osip, OSIP_NICT_STATUS_2XX_RECEIVED_AGAIN, + &cb_rcvresp_retransmission); + osip_set_message_callback(osip, OSIP_NICT_STATUS_3456XX_RECEIVED_AGAIN, + &cb_rcvresp_retransmission); + osip_set_message_callback(osip, OSIP_NICT_REQUEST_SENT_AGAIN, + &cb_sndreq_retransmission); + osip_set_message_callback(osip, OSIP_NIST_STATUS_2XX_SENT_AGAIN, + &cb_sndresp_retransmission); + osip_set_message_callback(osip, OSIP_NIST_STATUS_3456XX_SENT_AGAIN, + &cb_sndresp_retransmission); + osip_set_message_callback(osip, OSIP_NIST_REQUEST_RECEIVED_AGAIN, + &cb_rcvreq_retransmission); +#endif + + osip_set_transport_error_callback(osip, OSIP_ICT_TRANSPORT_ERROR, + &cb_transport_error); + osip_set_transport_error_callback(osip, OSIP_IST_TRANSPORT_ERROR, + &cb_transport_error); + osip_set_transport_error_callback(osip, OSIP_NICT_TRANSPORT_ERROR, + &cb_transport_error); + osip_set_transport_error_callback(osip, OSIP_NIST_TRANSPORT_ERROR, + &cb_transport_error); + +#ifndef MINISIZE + osip_set_message_callback(osip, OSIP_ICT_INVITE_SENT, &cb_sndinvite); + osip_set_message_callback(osip, OSIP_ICT_ACK_SENT, &cb_sndack); + osip_set_message_callback(osip, OSIP_NICT_REGISTER_SENT, &cb_sndregister); + osip_set_message_callback(osip, OSIP_NICT_BYE_SENT, &cb_sndbye); + osip_set_message_callback(osip, OSIP_NICT_CANCEL_SENT, &cb_sndcancel); + osip_set_message_callback(osip, OSIP_NICT_INFO_SENT, &cb_sndinfo); + osip_set_message_callback(osip, OSIP_NICT_OPTIONS_SENT, &cb_sndoptions); + osip_set_message_callback(osip, OSIP_NICT_SUBSCRIBE_SENT, &cb_sndsubscribe); + osip_set_message_callback(osip, OSIP_NICT_NOTIFY_SENT, &cb_sndnotify); + /* osip_set_cb_nict_sndprack (osip,&cb_sndprack); */ + osip_set_message_callback(osip, OSIP_NICT_UNKNOWN_REQUEST_SENT, + &cb_sndunkrequest); +#endif + + osip_set_message_callback(osip, OSIP_ICT_STATUS_1XX_RECEIVED, &cb_rcv1xx); + osip_set_message_callback(osip, OSIP_ICT_STATUS_2XX_RECEIVED, &cb_rcv2xx); + osip_set_message_callback(osip, OSIP_ICT_STATUS_3XX_RECEIVED, &cb_rcv3xx); + osip_set_message_callback(osip, OSIP_ICT_STATUS_4XX_RECEIVED, &cb_rcv4xx); + osip_set_message_callback(osip, OSIP_ICT_STATUS_5XX_RECEIVED, &cb_rcv5xx); + osip_set_message_callback(osip, OSIP_ICT_STATUS_6XX_RECEIVED, &cb_rcv6xx); + + osip_set_message_callback(osip, OSIP_IST_STATUS_1XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_IST_STATUS_2XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_IST_STATUS_3XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_IST_STATUS_4XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_IST_STATUS_5XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_IST_STATUS_6XX_SENT, &cb_snd123456xx); + + osip_set_message_callback(osip, OSIP_NICT_STATUS_1XX_RECEIVED, &cb_rcv1xx); + osip_set_message_callback(osip, OSIP_NICT_STATUS_2XX_RECEIVED, &cb_rcv2xx); + osip_set_message_callback(osip, OSIP_NICT_STATUS_3XX_RECEIVED, &cb_rcv3xx); + osip_set_message_callback(osip, OSIP_NICT_STATUS_4XX_RECEIVED, &cb_rcv4xx); + osip_set_message_callback(osip, OSIP_NICT_STATUS_5XX_RECEIVED, &cb_rcv5xx); + osip_set_message_callback(osip, OSIP_NICT_STATUS_6XX_RECEIVED, &cb_rcv6xx); + + osip_set_message_callback(osip, OSIP_NIST_STATUS_1XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_NIST_STATUS_2XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_NIST_STATUS_3XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_NIST_STATUS_4XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_NIST_STATUS_5XX_SENT, &cb_snd123456xx); + osip_set_message_callback(osip, OSIP_NIST_STATUS_6XX_SENT, &cb_snd123456xx); + +#ifndef MINISIZE + osip_set_message_callback(osip, OSIP_IST_INVITE_RECEIVED, &cb_rcvinvite); + osip_set_message_callback(osip, OSIP_IST_ACK_RECEIVED, &cb_rcvack); + osip_set_message_callback(osip, OSIP_IST_ACK_RECEIVED_AGAIN, &cb_rcvack2); + osip_set_message_callback(osip, OSIP_NIST_CANCEL_RECEIVED, &cb_rcvcancel); +#endif + osip_set_message_callback(osip, OSIP_NIST_REGISTER_RECEIVED, &cb_rcvregister); + osip_set_message_callback(osip, OSIP_NIST_BYE_RECEIVED, &cb_rcvrequest); + osip_set_message_callback(osip, OSIP_NIST_INFO_RECEIVED, &cb_rcvrequest); + osip_set_message_callback(osip, OSIP_NIST_OPTIONS_RECEIVED, &cb_rcvrequest); + osip_set_message_callback(osip, OSIP_NIST_SUBSCRIBE_RECEIVED, &cb_rcvrequest); + osip_set_message_callback(osip, OSIP_NIST_NOTIFY_RECEIVED, &cb_rcvrequest); + osip_set_message_callback(osip, OSIP_NIST_UNKNOWN_REQUEST_RECEIVED, + &cb_rcvrequest); - return OSIP_SUCCESS; + return OSIP_SUCCESS; } diff -Nru libexosip2-3.3.0/src/jcall.c libexosip2-3.6.0/src/jcall.c --- libexosip2-3.3.0/src/jcall.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/jcall.c 2010-01-06 14:57:57.000000000 +0000 @@ -27,95 +27,93 @@ extern eXosip_t eXosip; -int -eXosip_call_find (int cid, eXosip_call_t ** jc) +int eXosip_call_find(int cid, eXosip_call_t ** jc) { - if (cid <= 0) - return OSIP_BADPARAMETER; + if (cid <= 0) + return OSIP_BADPARAMETER; - for (*jc = eXosip.j_calls; *jc != NULL; *jc = (*jc)->next) - { - if ((*jc)->c_id == cid) - { - return OSIP_SUCCESS; - } - } - *jc = NULL; - return OSIP_NOTFOUND; + for (*jc = eXosip.j_calls; *jc != NULL; *jc = (*jc)->next) { + if ((*jc)->c_id == cid) { + return OSIP_SUCCESS; + } + } + *jc = NULL; + return OSIP_NOTFOUND; } -int -eXosip_call_init (eXosip_call_t ** jc) +void eXosip_call_renew_expire_time(eXosip_call_t * jc) { - *jc = (eXosip_call_t *) osip_malloc (sizeof (eXosip_call_t)); - if (*jc == NULL) - return OSIP_NOMEM; - memset (*jc, 0, sizeof (eXosip_call_t)); + time_t now = time(NULL); + jc->expire_time = now + 180; +} + +int eXosip_call_init(eXosip_call_t ** jc) +{ + *jc = (eXosip_call_t *) osip_malloc(sizeof(eXosip_call_t)); + if (*jc == NULL) + return OSIP_NOMEM; + memset(*jc, 0, sizeof(eXosip_call_t)); - (*jc)->c_id = -1; /* make sure the eXosip_update will assign a valid id to the call */ - return OSIP_SUCCESS; + (*jc)->c_id = -1; /* make sure the eXosip_update will assign a valid id to the call */ + return OSIP_SUCCESS; } void -__eXosip_call_remove_dialog_reference_in_call (eXosip_call_t * jc, - eXosip_dialog_t * jd) +__eXosip_call_remove_dialog_reference_in_call(eXosip_call_t * jc, + eXosip_dialog_t * jd) { - eXosip_dialog_t *_jd; - jinfo_t *ji; + eXosip_dialog_t *_jd; + jinfo_t *ji; - if (jc == NULL) - return; - if (jd == NULL) - return; - - - for (_jd = jc->c_dialogs; _jd != NULL; _jd = _jd->next) - { - if (jd == _jd) - break; - } - if (_jd == NULL) - { - /* dialog not found??? */ - } - - ji = osip_transaction_get_your_instance (jc->c_inc_tr); - if (ji != NULL && ji->jd == jd) - ji->jd = NULL; - ji = osip_transaction_get_your_instance (jc->c_out_tr); - if (ji != NULL && ji->jd == jd) - ji->jd = NULL; + if (jc == NULL) + return; + if (jd == NULL) + return; + + + for (_jd = jc->c_dialogs; _jd != NULL; _jd = _jd->next) { + if (jd == _jd) + break; + } + if (_jd == NULL) { + /* dialog not found??? */ + } + + ji = osip_transaction_get_your_instance(jc->c_inc_tr); + if (ji != NULL && ji->jd == jd) + ji->jd = NULL; + ji = osip_transaction_get_your_instance(jc->c_out_tr); + if (ji != NULL && ji->jd == jd) + ji->jd = NULL; } -void -eXosip_call_free (eXosip_call_t * jc) +void eXosip_call_free(eXosip_call_t * jc) { - /* ... */ + /* ... */ - eXosip_dialog_t *jd; + eXosip_dialog_t *jd; - if (jc->c_inc_tr != NULL && jc->c_inc_tr->orig_request != NULL - && jc->c_inc_tr->orig_request->call_id != NULL - && jc->c_inc_tr->orig_request->call_id->number != NULL) - _eXosip_delete_nonce (jc->c_inc_tr->orig_request->call_id->number); - else if (jc->c_out_tr != NULL && jc->c_out_tr->orig_request != NULL - && jc->c_out_tr->orig_request->call_id != NULL - && jc->c_out_tr->orig_request->call_id->number != NULL) - _eXosip_delete_nonce (jc->c_out_tr->orig_request->call_id->number); - - for (jd = jc->c_dialogs; jd != NULL; jd = jc->c_dialogs) - { - REMOVE_ELEMENT (jc->c_dialogs, jd); - eXosip_dialog_free (jd); - } - - __eXosip_delete_jinfo (jc->c_inc_tr); - __eXosip_delete_jinfo (jc->c_out_tr); - if (jc->c_inc_tr != NULL) - osip_list_add (&eXosip.j_transactions, jc->c_inc_tr, 0); - if (jc->c_out_tr != NULL) - osip_list_add (&eXosip.j_transactions, jc->c_out_tr, 0); + if (jc->c_inc_tr != NULL && jc->c_inc_tr->orig_request != NULL + && jc->c_inc_tr->orig_request->call_id != NULL + && jc->c_inc_tr->orig_request->call_id->number != NULL) + _eXosip_delete_nonce(jc->c_inc_tr->orig_request->call_id->number); + else if (jc->c_out_tr != NULL && jc->c_out_tr->orig_request != NULL + && jc->c_out_tr->orig_request->call_id != NULL + && jc->c_out_tr->orig_request->call_id->number != NULL) + _eXosip_delete_nonce(jc->c_out_tr->orig_request->call_id->number); + + for (jd = jc->c_dialogs; jd != NULL; jd = jc->c_dialogs) { + REMOVE_ELEMENT(jc->c_dialogs, jd); + eXosip_dialog_free(jd); + } + + __eXosip_delete_jinfo(jc->c_inc_tr); + __eXosip_delete_jinfo(jc->c_out_tr); + if (jc->c_inc_tr != NULL) + osip_list_add(&eXosip.j_transactions, jc->c_inc_tr, 0); + if (jc->c_out_tr != NULL) + osip_list_add(&eXosip.j_transactions, jc->c_out_tr, 0); - osip_free (jc); + osip_free(jc); } diff -Nru libexosip2-3.3.0/src/jdialog.c libexosip2-3.6.0/src/jdialog.c --- libexosip2-3.3.0/src/jdialog.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/jdialog.c 2010-01-06 14:57:57.000000000 +0000 @@ -26,232 +26,217 @@ extern eXosip_t eXosip; -void -eXosip_dialog_set_state (eXosip_dialog_t * jd, int state) +void eXosip_dialog_set_state(eXosip_dialog_t * jd, int state) { - jd->d_STATE = state; + jd->d_STATE = state; } -int -eXosip_call_dialog_find (int jid, eXosip_call_t ** jc, eXosip_dialog_t ** jd) +int eXosip_call_dialog_find(int jid, eXosip_call_t ** jc, eXosip_dialog_t ** jd) { - if (jid <= 0) - return OSIP_BADPARAMETER; + if (jid <= 0) + return OSIP_BADPARAMETER; - for (*jc = eXosip.j_calls; *jc != NULL; *jc = (*jc)->next) - { - for (*jd = (*jc)->c_dialogs; *jd != NULL; *jd = (*jd)->next) - { - if ((*jd)->d_id == jid) - return OSIP_SUCCESS; - } - } - *jd = NULL; - *jc = NULL; - return OSIP_NOTFOUND; + for (*jc = eXosip.j_calls; *jc != NULL; *jc = (*jc)->next) { + for (*jd = (*jc)->c_dialogs; *jd != NULL; *jd = (*jd)->next) { + if ((*jd)->d_id == jid) + return OSIP_SUCCESS; + } + } + *jd = NULL; + *jc = NULL; + return OSIP_NOTFOUND; } #ifndef MINISIZE int -eXosip_notify_dialog_find (int nid, eXosip_notify_t ** jn, eXosip_dialog_t ** jd) +eXosip_notify_dialog_find(int nid, eXosip_notify_t ** jn, eXosip_dialog_t ** jd) { - if (nid <= 0) - return OSIP_BADPARAMETER; - for (*jn = eXosip.j_notifies; *jn != NULL; *jn = (*jn)->next) - { - for (*jd = (*jn)->n_dialogs; *jd != NULL; *jd = (*jd)->next) - { - if ((*jd)->d_id == nid) - return OSIP_SUCCESS; - } - } - *jd = NULL; - *jn = NULL; - return OSIP_NOTFOUND; + if (nid <= 0) + return OSIP_BADPARAMETER; + for (*jn = eXosip.j_notifies; *jn != NULL; *jn = (*jn)->next) { + for (*jd = (*jn)->n_dialogs; *jd != NULL; *jd = (*jd)->next) { + if ((*jd)->d_id == nid) + return OSIP_SUCCESS; + } + } + *jd = NULL; + *jn = NULL; + return OSIP_NOTFOUND; } int -eXosip_subscribe_dialog_find (int sid, eXosip_subscribe_t ** js, - eXosip_dialog_t ** jd) -{ - if (sid <= 0) - return OSIP_BADPARAMETER; - for (*js = eXosip.j_subscribes; *js != NULL; *js = (*js)->next) - { - *jd = NULL; - if ((*js)->s_id == sid) - return OSIP_SUCCESS; - for (*jd = (*js)->s_dialogs; *jd != NULL; *jd = (*jd)->next) - { - if ((*jd)->d_id == sid) - return OSIP_SUCCESS; - } - } - *jd = NULL; - *js = NULL; - return OSIP_NOTFOUND; +eXosip_subscribe_dialog_find(int sid, eXosip_subscribe_t ** js, + eXosip_dialog_t ** jd) +{ + if (sid <= 0) + return OSIP_BADPARAMETER; + for (*js = eXosip.j_subscribes; *js != NULL; *js = (*js)->next) { + *jd = NULL; + if ((*js)->s_id == sid) + return OSIP_SUCCESS; + for (*jd = (*js)->s_dialogs; *jd != NULL; *jd = (*jd)->next) { + if ((*jd)->d_id == sid) + return OSIP_SUCCESS; + } + } + *jd = NULL; + *js = NULL; + return OSIP_NOTFOUND; } #endif -int -eXosip_dialog_set_200ok (eXosip_dialog_t * jd, osip_message_t * _200Ok) -{ - int i; - - if (jd == NULL) - return OSIP_BADPARAMETER; - if (jd->d_200Ok != NULL) - osip_message_free (jd->d_200Ok); - jd->d_timer = time (NULL) + 1; - jd->d_count = 0; - i = osip_message_clone (_200Ok, &(jd->d_200Ok)); - if (i != 0) - return i; - return OSIP_SUCCESS; -} - -int -eXosip_dialog_init_as_uac (eXosip_dialog_t ** _jd, osip_message_t * _200Ok) -{ - int i; - eXosip_dialog_t *jd; - - *_jd = NULL; - jd = (eXosip_dialog_t *) osip_malloc (sizeof (eXosip_dialog_t)); - if (jd == NULL) - return OSIP_NOMEM; - memset (jd, 0, sizeof (eXosip_dialog_t)); - - jd->d_id = -1; /* not yet available to user */ - jd->d_STATE = JD_EMPTY; - - if (MSG_IS_REQUEST (_200Ok)) - { - i = - osip_dialog_init_as_uac_with_remote_request (&(jd->d_dialog), _200Ok, -1); - } else - { /* normal usage with response */ - i = osip_dialog_init_as_uac (&(jd->d_dialog), _200Ok); - } - if (i != 0) - { - osip_free (jd); - return i; - } - - jd->d_count = 0; - jd->d_timer = time (NULL); - jd->d_200Ok = NULL; - jd->d_ack = NULL; - jd->next = NULL; - jd->parent = NULL; - jd->d_out_trs = (osip_list_t *) osip_malloc (sizeof (osip_list_t)); - if (jd->d_out_trs == NULL) - { - osip_dialog_free (jd->d_dialog); - osip_free (jd); - return OSIP_NOMEM; - } - osip_list_init (jd->d_out_trs); - jd->d_inc_trs = (osip_list_t *) osip_malloc (sizeof (osip_list_t)); - if (jd->d_inc_trs == NULL) - { - osip_dialog_free (jd->d_dialog); - osip_free (jd->d_out_trs); - osip_free (jd); - return OSIP_NOMEM; - } - osip_list_init (jd->d_inc_trs); - - *_jd = jd; - return OSIP_SUCCESS; -} - -int -eXosip_dialog_init_as_uas (eXosip_dialog_t ** _jd, osip_message_t * _invite, - osip_message_t * _200Ok) +int eXosip_dialog_set_200ok(eXosip_dialog_t * jd, osip_message_t * _200Ok) { - int i; - eXosip_dialog_t *jd; + int i; - *_jd = NULL; - jd = (eXosip_dialog_t *) osip_malloc (sizeof (eXosip_dialog_t)); - if (jd == NULL) - return OSIP_NOMEM; - memset (jd, 0, sizeof (eXosip_dialog_t)); - jd->d_id = -1; /* not yet available to user */ - jd->d_STATE = JD_EMPTY; - i = osip_dialog_init_as_uas (&(jd->d_dialog), _invite, _200Ok); - if (i != 0) - { - osip_free (jd); - return i; - } - - jd->d_count = 0; - jd->d_timer = time (NULL); - jd->d_200Ok = NULL; - jd->d_ack = NULL; - jd->next = NULL; - jd->parent = NULL; - jd->d_out_trs = (osip_list_t *) osip_malloc (sizeof (osip_list_t)); - if (jd->d_out_trs == NULL) - { - osip_dialog_free (jd->d_dialog); - osip_free (jd); - return OSIP_NOMEM; - } - osip_list_init (jd->d_out_trs); - jd->d_inc_trs = (osip_list_t *) osip_malloc (sizeof (osip_list_t)); - if (jd->d_inc_trs == NULL) - { - osip_dialog_free (jd->d_dialog); - osip_free (jd->d_out_trs); - osip_free (jd); - return OSIP_NOMEM; - } - osip_list_init (jd->d_inc_trs); - - jd->d_dialog->local_cseq = 1; - - *_jd = jd; - return OSIP_SUCCESS; -} - -void -eXosip_dialog_free (eXosip_dialog_t * jd) -{ - while (!osip_list_eol (jd->d_inc_trs, 0)) - { - osip_transaction_t *tr; - - tr = (osip_transaction_t *) osip_list_get (jd->d_inc_trs, 0); - osip_list_remove (jd->d_inc_trs, 0); - __eXosip_delete_jinfo (tr); - osip_list_add (&eXosip.j_transactions, tr, 0); - } - - while (!osip_list_eol (jd->d_out_trs, 0)) - { - osip_transaction_t *tr; - - tr = (osip_transaction_t *) osip_list_get (jd->d_out_trs, 0); - osip_list_remove (jd->d_out_trs, 0); - __eXosip_delete_jinfo (tr); - osip_list_add (&eXosip.j_transactions, tr, 0); - } - - osip_message_free (jd->d_200Ok); - osip_message_free (jd->d_ack); - - osip_dialog_free (jd->d_dialog); - - osip_free (jd->d_out_trs); - osip_free (jd->d_inc_trs); - osip_free (jd); + if (jd == NULL) + return OSIP_BADPARAMETER; + if (jd->d_200Ok != NULL) + osip_message_free(jd->d_200Ok); + jd->d_timer = time(NULL) + 1; + jd->d_count = 0; + i = osip_message_clone(_200Ok, &(jd->d_200Ok)); + if (i != 0) + return i; + return OSIP_SUCCESS; +} + +int eXosip_dialog_init_as_uac(eXosip_dialog_t ** _jd, osip_message_t * _200Ok) +{ + int i; + eXosip_dialog_t *jd; + + *_jd = NULL; + jd = (eXosip_dialog_t *) osip_malloc(sizeof(eXosip_dialog_t)); + if (jd == NULL) + return OSIP_NOMEM; + memset(jd, 0, sizeof(eXosip_dialog_t)); + + jd->d_id = -1; /* not yet available to user */ + jd->d_STATE = JD_EMPTY; + + if (MSG_IS_REQUEST(_200Ok)) { + i = osip_dialog_init_as_uac_with_remote_request(&(jd->d_dialog), _200Ok, + -1); + } else { /* normal usage with response */ + i = osip_dialog_init_as_uac(&(jd->d_dialog), _200Ok); + } + if (i != 0) { + osip_free(jd); + return i; + } + + jd->d_count = 0; + jd->d_session_timer_start = 0; + jd->d_session_timer_length = 0; + jd->d_refresher = -1; /* 0 -> me / 1 -> remote */ + jd->d_timer = time(NULL); + jd->d_200Ok = NULL; + jd->d_ack = NULL; + jd->next = NULL; + jd->parent = NULL; + jd->d_out_trs = (osip_list_t *) osip_malloc(sizeof(osip_list_t)); + if (jd->d_out_trs == NULL) { + osip_dialog_free(jd->d_dialog); + osip_free(jd); + return OSIP_NOMEM; + } + osip_list_init(jd->d_out_trs); + jd->d_inc_trs = (osip_list_t *) osip_malloc(sizeof(osip_list_t)); + if (jd->d_inc_trs == NULL) { + osip_dialog_free(jd->d_dialog); + osip_free(jd->d_out_trs); + osip_free(jd); + return OSIP_NOMEM; + } + osip_list_init(jd->d_inc_trs); + + *_jd = jd; + return OSIP_SUCCESS; +} + +int +eXosip_dialog_init_as_uas(eXosip_dialog_t ** _jd, osip_message_t * _invite, + osip_message_t * _200Ok) +{ + int i; + eXosip_dialog_t *jd; + + *_jd = NULL; + jd = (eXosip_dialog_t *) osip_malloc(sizeof(eXosip_dialog_t)); + if (jd == NULL) + return OSIP_NOMEM; + memset(jd, 0, sizeof(eXosip_dialog_t)); + jd->d_id = -1; /* not yet available to user */ + jd->d_STATE = JD_EMPTY; + i = osip_dialog_init_as_uas(&(jd->d_dialog), _invite, _200Ok); + if (i != 0) { + osip_free(jd); + return i; + } + + jd->d_count = 0; + jd->d_session_timer_start = 0; + jd->d_session_timer_length = 0; + jd->d_refresher = -1; /* 0 -> me / 1 -> remote */ + jd->d_timer = time(NULL); + jd->d_200Ok = NULL; + jd->d_ack = NULL; + jd->next = NULL; + jd->parent = NULL; + jd->d_out_trs = (osip_list_t *) osip_malloc(sizeof(osip_list_t)); + if (jd->d_out_trs == NULL) { + osip_dialog_free(jd->d_dialog); + osip_free(jd); + return OSIP_NOMEM; + } + osip_list_init(jd->d_out_trs); + jd->d_inc_trs = (osip_list_t *) osip_malloc(sizeof(osip_list_t)); + if (jd->d_inc_trs == NULL) { + osip_dialog_free(jd->d_dialog); + osip_free(jd->d_out_trs); + osip_free(jd); + return OSIP_NOMEM; + } + osip_list_init(jd->d_inc_trs); + + jd->d_dialog->local_cseq = 1; + + *_jd = jd; + return OSIP_SUCCESS; +} + +void eXosip_dialog_free(eXosip_dialog_t * jd) +{ + while (!osip_list_eol(jd->d_inc_trs, 0)) { + osip_transaction_t *tr; + + tr = (osip_transaction_t *) osip_list_get(jd->d_inc_trs, 0); + osip_list_remove(jd->d_inc_trs, 0); + __eXosip_delete_jinfo(tr); + osip_list_add(&eXosip.j_transactions, tr, 0); + } + + while (!osip_list_eol(jd->d_out_trs, 0)) { + osip_transaction_t *tr; + + tr = (osip_transaction_t *) osip_list_get(jd->d_out_trs, 0); + osip_list_remove(jd->d_out_trs, 0); + __eXosip_delete_jinfo(tr); + osip_list_add(&eXosip.j_transactions, tr, 0); + } + + osip_message_free(jd->d_200Ok); + osip_message_free(jd->d_ack); + + osip_dialog_free(jd->d_dialog); + + osip_free(jd->d_out_trs); + osip_free(jd->d_inc_trs); + osip_free(jd); - eXosip_update (); + eXosip_update(); } diff -Nru libexosip2-3.3.0/src/jevents.c libexosip2-3.6.0/src/jevents.c --- libexosip2-3.3.0/src/jevents.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/jevents.c 2010-12-01 12:53:16.000000000 +0000 @@ -28,352 +28,297 @@ extern eXosip_t eXosip; -static int _eXosip_event_fill_messages (eXosip_event_t * je, - osip_transaction_t * tr); +static int _eXosip_event_fill_messages(eXosip_event_t * je, + osip_transaction_t * tr); static int -_eXosip_event_fill_messages (eXosip_event_t * je, osip_transaction_t * tr) +_eXosip_event_fill_messages(eXosip_event_t * je, osip_transaction_t * tr) { - int i; + int i; - if (tr != NULL && tr->orig_request != NULL) - { - i = osip_message_clone (tr->orig_request, &je->request); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "failed to clone request for event\n")); - } - } - if (tr != NULL && tr->last_response != NULL) - { - i = osip_message_clone (tr->last_response, &je->response); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "failed to clone response for event\n")); - } - } - if (tr != NULL && tr->ack != NULL) - { - i = osip_message_clone (tr->ack, &je->ack); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "failed to clone ACK for event\n")); - } - } - return OSIP_SUCCESS; -} - -eXosip_event_t * -eXosip_event_init_for_call (int type, eXosip_call_t * jc, - eXosip_dialog_t * jd, osip_transaction_t * tr) -{ - eXosip_event_t *je; - - eXosip_event_init (&je, type); - if (je == NULL) - return NULL; - if (jc == NULL) - return NULL; - - je->cid = jc->c_id; - if (jd != NULL) - je->did = jd->d_id; - if (tr != NULL) - je->tid = tr->transactionid; + if (tr != NULL && tr->orig_request != NULL) { + i = osip_message_clone(tr->orig_request, &je->request); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "failed to clone request for event\n")); + } + } + if (tr != NULL && tr->last_response != NULL) { + i = osip_message_clone(tr->last_response, &je->response); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "failed to clone response for event\n")); + } + } + if (tr != NULL && tr->ack != NULL) { + i = osip_message_clone(tr->ack, &je->ack); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "failed to clone ACK for event\n")); + } + } + return OSIP_SUCCESS; +} + +eXosip_event_t *eXosip_event_init_for_call(int type, eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_transaction_t * tr) +{ + eXosip_event_t *je; + + if (jc == NULL) + return NULL; + eXosip_event_init(&je, type); + if (je == NULL) + return NULL; + + je->cid = jc->c_id; + if (jd != NULL) + je->did = jd->d_id; + if (tr != NULL) + je->tid = tr->transactionid; - je->external_reference = jc->external_reference; + je->external_reference = jc->external_reference; - _eXosip_event_fill_messages (je, tr); - return je; + _eXosip_event_fill_messages(je, tr); + return je; } #ifndef MINISIZE -eXosip_event_t * -eXosip_event_init_for_subscribe (int type, eXosip_subscribe_t * js, - eXosip_dialog_t * jd, osip_transaction_t * tr) +eXosip_event_t *eXosip_event_init_for_subscribe(int type, eXosip_subscribe_t * js, + eXosip_dialog_t * jd, + osip_transaction_t * tr) { - eXosip_event_t *je; + eXosip_event_t *je; - eXosip_event_init (&je, type); - if (je == NULL) - return NULL; - if (js == NULL) - return NULL; + if (js == NULL) + return NULL; + eXosip_event_init(&je, type); + if (je == NULL) + return NULL; - je->sid = js->s_id; - if (jd != NULL) - je->did = jd->d_id; - if (tr != NULL) - je->tid = tr->transactionid; + je->sid = js->s_id; + if (jd != NULL) + je->did = jd->d_id; + if (tr != NULL) + je->tid = tr->transactionid; - je->ss_status = js->s_ss_status; - je->ss_reason = js->s_ss_reason; + je->ss_status = js->s_ss_status; + je->ss_reason = js->s_ss_reason; - /* je->external_reference = js->external_reference; */ + /* je->external_reference = js->external_reference; */ - _eXosip_event_fill_messages (je, tr); + _eXosip_event_fill_messages(je, tr); - return je; + return je; } -eXosip_event_t * -eXosip_event_init_for_notify (int type, eXosip_notify_t * jn, - eXosip_dialog_t * jd, osip_transaction_t * tr) +eXosip_event_t *eXosip_event_init_for_notify(int type, eXosip_notify_t * jn, + eXosip_dialog_t * jd, + osip_transaction_t * tr) { - eXosip_event_t *je; + eXosip_event_t *je; - eXosip_event_init (&je, type); - if (je == NULL) - return NULL; - if (jn == NULL) - return NULL; + if (jn == NULL) + return NULL; + eXosip_event_init(&je, type); + if (je == NULL) + return NULL; - je->nid = jn->n_id; - if (jd != NULL) - je->did = jd->d_id; - if (tr != NULL) - je->tid = tr->transactionid; + je->nid = jn->n_id; + if (jd != NULL) + je->did = jd->d_id; + if (tr != NULL) + je->tid = tr->transactionid; - je->ss_status = jn->n_ss_status; - je->ss_reason = jn->n_ss_reason; + je->ss_status = jn->n_ss_status; + je->ss_reason = jn->n_ss_reason; - /*je->external_reference = jc->external_reference; */ + /*je->external_reference = jc->external_reference; */ - _eXosip_event_fill_messages (je, tr); + _eXosip_event_fill_messages(je, tr); - return je; + return je; } #endif -eXosip_event_t * -eXosip_event_init_for_reg (int type, eXosip_reg_t * jr, osip_transaction_t * tr) +eXosip_event_t *eXosip_event_init_for_reg(int type, eXosip_reg_t * jr, + osip_transaction_t * tr) { - eXosip_event_t *je; + eXosip_event_t *je; - eXosip_event_init (&je, type); - if (je == NULL) - return NULL; - if (jr == NULL) - return NULL; - je->rid = jr->r_id; + if (jr == NULL) + return NULL; + eXosip_event_init(&je, type); + if (je == NULL) + return NULL; + je->rid = jr->r_id; - _eXosip_event_fill_messages (je, tr); - return je; + _eXosip_event_fill_messages(je, tr); + return je; } -eXosip_event_t * -eXosip_event_init_for_message (int type, osip_transaction_t * tr) +eXosip_event_t *eXosip_event_init_for_message(int type, osip_transaction_t * tr) { - eXosip_event_t *je; + eXosip_event_t *je; - eXosip_event_init (&je, type); - if (je == NULL) - return NULL; + eXosip_event_init(&je, type); + if (je == NULL) + return NULL; - if (tr != NULL) - je->tid = tr->transactionid; + if (tr != NULL) + je->tid = tr->transactionid; - _eXosip_event_fill_messages (je, tr); + _eXosip_event_fill_messages(je, tr); - return je; + return je; } -int -eXosip_event_init (eXosip_event_t ** je, int type) +int eXosip_event_init(eXosip_event_t ** je, int type) { - *je = (eXosip_event_t *) osip_malloc (sizeof (eXosip_event_t)); - if (*je == NULL) - return OSIP_NOMEM; + *je = (eXosip_event_t *) osip_malloc(sizeof(eXosip_event_t)); + if (*je == NULL) + return OSIP_NOMEM; - memset (*je, 0, sizeof (eXosip_event_t)); - (*je)->type = type; + memset(*je, 0, sizeof(eXosip_event_t)); + (*je)->type = type; #if !defined(_WIN32_WCE) - if (type == EXOSIP_CALL_NOANSWER) - { - sprintf ((*je)->textinfo, "No answer for this Call!"); - } else if (type == EXOSIP_CALL_PROCEEDING) - { - sprintf ((*je)->textinfo, "Call is being processed!"); - } else if (type == EXOSIP_CALL_RINGING) - { - sprintf ((*je)->textinfo, "Remote phone is ringing!"); - } else if (type == EXOSIP_CALL_ANSWERED) - { - sprintf ((*je)->textinfo, "Remote phone has answered!"); - } else if (type == EXOSIP_CALL_REDIRECTED) - { - sprintf ((*je)->textinfo, "Call is redirected!"); - } else if (type == EXOSIP_CALL_REQUESTFAILURE) - { - sprintf ((*je)->textinfo, "4xx received for Call!"); - } else if (type == EXOSIP_CALL_SERVERFAILURE) - { - sprintf ((*je)->textinfo, "5xx received for Call!"); - } else if (type == EXOSIP_CALL_GLOBALFAILURE) - { - sprintf ((*je)->textinfo, "6xx received for Call!"); - } else if (type == EXOSIP_CALL_INVITE) - { - sprintf ((*je)->textinfo, "New call received!"); - } else if (type == EXOSIP_CALL_ACK) - { - sprintf ((*je)->textinfo, "ACK received!"); - } else if (type == EXOSIP_CALL_CANCELLED) - { - sprintf ((*je)->textinfo, "Call has been cancelled!"); - } else if (type == EXOSIP_CALL_TIMEOUT) - { - sprintf ((*je)->textinfo, "Timeout. Gave up!"); - } else if (type == EXOSIP_CALL_REINVITE) - { - sprintf ((*je)->textinfo, "INVITE within call received!"); - } else if (type == EXOSIP_CALL_CLOSED) - { - sprintf ((*je)->textinfo, "Bye Received!"); - } else if (type == EXOSIP_CALL_RELEASED) - { - sprintf ((*je)->textinfo, "Call Context is released!"); - } else if (type == EXOSIP_REGISTRATION_SUCCESS) - { - sprintf ((*je)->textinfo, "User is successfully registred!"); - } else if (type == EXOSIP_REGISTRATION_FAILURE) - { - sprintf ((*je)->textinfo, "Registration failed!"); - } else if (type == EXOSIP_CALL_MESSAGE_NEW) - { - sprintf ((*je)->textinfo, "New request received!"); - } else if (type == EXOSIP_CALL_MESSAGE_PROCEEDING) - { - sprintf ((*je)->textinfo, "request is being processed!"); - } else if (type == EXOSIP_CALL_MESSAGE_ANSWERED) - { - sprintf ((*je)->textinfo, "2xx received for request!"); - } else if (type == EXOSIP_CALL_MESSAGE_REDIRECTED) - { - sprintf ((*je)->textinfo, "3xx received for request!"); - } else if (type == EXOSIP_CALL_MESSAGE_REQUESTFAILURE) - { - sprintf ((*je)->textinfo, "4xx received for request!"); - } else if (type == EXOSIP_CALL_MESSAGE_SERVERFAILURE) - { - sprintf ((*je)->textinfo, "5xx received for request!"); - } else if (type == EXOSIP_CALL_MESSAGE_GLOBALFAILURE) - { - sprintf ((*je)->textinfo, "5xx received for request!"); - } else if (type == EXOSIP_MESSAGE_NEW) - { - sprintf ((*je)->textinfo, "New request outside call received!"); - } else if (type == EXOSIP_MESSAGE_PROCEEDING) - { - sprintf ((*je)->textinfo, "request outside call is being processed!"); - } else if (type == EXOSIP_MESSAGE_ANSWERED) - { - sprintf ((*je)->textinfo, "2xx received for request outside call!"); - } else if (type == EXOSIP_MESSAGE_REDIRECTED) - { - sprintf ((*je)->textinfo, "3xx received for request outside call!"); - } else if (type == EXOSIP_MESSAGE_REQUESTFAILURE) - { - sprintf ((*je)->textinfo, "4xx received for request outside call!"); - } else if (type == EXOSIP_MESSAGE_SERVERFAILURE) - { - sprintf ((*je)->textinfo, "5xx received for request outside call!"); - } else if (type == EXOSIP_MESSAGE_GLOBALFAILURE) - { - sprintf ((*je)->textinfo, "5xx received for request outside call!"); - } else if (type == EXOSIP_SUBSCRIPTION_NOANSWER) - { - sprintf ((*je)->textinfo, "No answer for this SUBSCRIBE!"); - } else if (type == EXOSIP_SUBSCRIPTION_PROCEEDING) - { - sprintf ((*je)->textinfo, "SUBSCRIBE is being processed!"); - } else if (type == EXOSIP_SUBSCRIPTION_ANSWERED) - { - sprintf ((*je)->textinfo, "2xx received for SUBSCRIBE!"); - } else if (type == EXOSIP_SUBSCRIPTION_REDIRECTED) - { - sprintf ((*je)->textinfo, "3xx received for SUBSCRIBE!"); - } else if (type == EXOSIP_SUBSCRIPTION_REQUESTFAILURE) - { - sprintf ((*je)->textinfo, "4xx received for SUBSCRIBE!"); - } else if (type == EXOSIP_SUBSCRIPTION_SERVERFAILURE) - { - sprintf ((*je)->textinfo, "5xx received for SUBSCRIBE!"); - } else if (type == EXOSIP_SUBSCRIPTION_GLOBALFAILURE) - { - sprintf ((*je)->textinfo, "5xx received for SUBSCRIBE!"); - } else if (type == EXOSIP_SUBSCRIPTION_NOTIFY) - { - sprintf ((*je)->textinfo, "NOTIFY request for subscription!"); - } else if (type == EXOSIP_SUBSCRIPTION_RELEASED) - { - sprintf ((*je)->textinfo, "Subscription has terminate!"); - } else if (type == EXOSIP_IN_SUBSCRIPTION_NEW) - { - sprintf ((*je)->textinfo, "New incoming SUBSCRIBE!"); - } else if (type == EXOSIP_IN_SUBSCRIPTION_RELEASED) - { - sprintf ((*je)->textinfo, "Incoming Subscription has terminate!"); - } else - { - (*je)->textinfo[0] = '\0'; - } -#endif - return OSIP_SUCCESS; -} - -void -eXosip_event_free (eXosip_event_t * je) -{ - if (je == NULL) - return; - if (je->request != NULL) - osip_message_free (je->request); - if (je->response != NULL) - osip_message_free (je->response); - if (je->ack != NULL) - osip_message_free (je->ack); - osip_free (je); -} - -void -report_event (eXosip_event_t * je, osip_message_t * sip) -{ - if (je != NULL) - { - eXosip_event_add (je); - } + if (type == EXOSIP_CALL_NOANSWER) { + sprintf((*je)->textinfo, "No answer for this Call!"); + } else if (type == EXOSIP_CALL_PROCEEDING) { + sprintf((*je)->textinfo, "Call is being processed!"); + } else if (type == EXOSIP_CALL_RINGING) { + sprintf((*je)->textinfo, "Remote phone is ringing!"); + } else if (type == EXOSIP_CALL_ANSWERED) { + sprintf((*je)->textinfo, "Remote phone has answered!"); + } else if (type == EXOSIP_CALL_REDIRECTED) { + sprintf((*je)->textinfo, "Call is redirected!"); + } else if (type == EXOSIP_CALL_REQUESTFAILURE) { + sprintf((*je)->textinfo, "4xx received for Call!"); + } else if (type == EXOSIP_CALL_SERVERFAILURE) { + sprintf((*je)->textinfo, "5xx received for Call!"); + } else if (type == EXOSIP_CALL_GLOBALFAILURE) { + sprintf((*je)->textinfo, "6xx received for Call!"); + } else if (type == EXOSIP_CALL_INVITE) { + sprintf((*je)->textinfo, "New call received!"); + } else if (type == EXOSIP_CALL_ACK) { + sprintf((*je)->textinfo, "ACK received!"); + } else if (type == EXOSIP_CALL_CANCELLED) { + sprintf((*je)->textinfo, "Call has been cancelled!"); + } else if (type == EXOSIP_CALL_TIMEOUT) { + sprintf((*je)->textinfo, "Timeout. Gave up!"); + } else if (type == EXOSIP_CALL_REINVITE) { + sprintf((*je)->textinfo, "INVITE within call received!"); + } else if (type == EXOSIP_CALL_CLOSED) { + sprintf((*je)->textinfo, "Bye Received!"); + } else if (type == EXOSIP_CALL_RELEASED) { + sprintf((*je)->textinfo, "Call Context is released!"); + } else if (type == EXOSIP_REGISTRATION_SUCCESS) { + sprintf((*je)->textinfo, "User is successfully registred!"); + } else if (type == EXOSIP_REGISTRATION_FAILURE) { + sprintf((*je)->textinfo, "Registration failed!"); + } else if (type == EXOSIP_CALL_MESSAGE_NEW) { + sprintf((*je)->textinfo, "New request received!"); + } else if (type == EXOSIP_CALL_MESSAGE_PROCEEDING) { + sprintf((*je)->textinfo, "request is being processed!"); + } else if (type == EXOSIP_CALL_MESSAGE_ANSWERED) { + sprintf((*je)->textinfo, "2xx received for request!"); + } else if (type == EXOSIP_CALL_MESSAGE_REDIRECTED) { + sprintf((*je)->textinfo, "3xx received for request!"); + } else if (type == EXOSIP_CALL_MESSAGE_REQUESTFAILURE) { + sprintf((*je)->textinfo, "4xx received for request!"); + } else if (type == EXOSIP_CALL_MESSAGE_SERVERFAILURE) { + sprintf((*je)->textinfo, "5xx received for request!"); + } else if (type == EXOSIP_CALL_MESSAGE_GLOBALFAILURE) { + sprintf((*je)->textinfo, "5xx received for request!"); + } else if (type == EXOSIP_MESSAGE_NEW) { + sprintf((*je)->textinfo, "New request outside call received!"); + } else if (type == EXOSIP_MESSAGE_PROCEEDING) { + sprintf((*je)->textinfo, "request outside call is being processed!"); + } else if (type == EXOSIP_MESSAGE_ANSWERED) { + sprintf((*je)->textinfo, "2xx received for request outside call!"); + } else if (type == EXOSIP_MESSAGE_REDIRECTED) { + sprintf((*je)->textinfo, "3xx received for request outside call!"); + } else if (type == EXOSIP_MESSAGE_REQUESTFAILURE) { + sprintf((*je)->textinfo, "4xx received for request outside call!"); + } else if (type == EXOSIP_MESSAGE_SERVERFAILURE) { + sprintf((*je)->textinfo, "5xx received for request outside call!"); + } else if (type == EXOSIP_MESSAGE_GLOBALFAILURE) { + sprintf((*je)->textinfo, "5xx received for request outside call!"); + } else if (type == EXOSIP_SUBSCRIPTION_NOANSWER) { + sprintf((*je)->textinfo, "No answer for this SUBSCRIBE!"); + } else if (type == EXOSIP_SUBSCRIPTION_PROCEEDING) { + sprintf((*je)->textinfo, "SUBSCRIBE is being processed!"); + } else if (type == EXOSIP_SUBSCRIPTION_ANSWERED) { + sprintf((*je)->textinfo, "2xx received for SUBSCRIBE!"); + } else if (type == EXOSIP_SUBSCRIPTION_REDIRECTED) { + sprintf((*je)->textinfo, "3xx received for SUBSCRIBE!"); + } else if (type == EXOSIP_SUBSCRIPTION_REQUESTFAILURE) { + sprintf((*je)->textinfo, "4xx received for SUBSCRIBE!"); + } else if (type == EXOSIP_SUBSCRIPTION_SERVERFAILURE) { + sprintf((*je)->textinfo, "5xx received for SUBSCRIBE!"); + } else if (type == EXOSIP_SUBSCRIPTION_GLOBALFAILURE) { + sprintf((*je)->textinfo, "5xx received for SUBSCRIBE!"); + } else if (type == EXOSIP_SUBSCRIPTION_NOTIFY) { + sprintf((*je)->textinfo, "NOTIFY request for subscription!"); + } else if (type == EXOSIP_SUBSCRIPTION_RELEASED) { + sprintf((*je)->textinfo, "Subscription has terminate!"); + } else if (type == EXOSIP_IN_SUBSCRIPTION_NEW) { + sprintf((*je)->textinfo, "New incoming SUBSCRIBE!"); + } else if (type == EXOSIP_IN_SUBSCRIPTION_RELEASED) { + sprintf((*je)->textinfo, "Incoming Subscription has terminate!"); + } else { + (*je)->textinfo[0] = '\0'; + } +#endif + return OSIP_SUCCESS; +} + +void eXosip_event_free(eXosip_event_t * je) +{ + if (je == NULL) + return; + if (je->request != NULL) + osip_message_free(je->request); + if (je->response != NULL) + osip_message_free(je->response); + if (je->ack != NULL) + osip_message_free(je->ack); + osip_free(je); +} + +void report_event(eXosip_event_t * je, osip_message_t * sip) +{ + if (je != NULL) { + eXosip_event_add(je); + } } void -report_call_event (int evt, eXosip_call_t * jc, - eXosip_dialog_t * jd, osip_transaction_t * tr) +report_call_event(int evt, eXosip_call_t * jc, + eXosip_dialog_t * jd, osip_transaction_t * tr) { - eXosip_event_t *je; + eXosip_event_t *je; - je = eXosip_event_init_for_call (evt, jc, jd, tr); - report_event (je, NULL); + je = eXosip_event_init_for_call(evt, jc, jd, tr); + report_event(je, NULL); } -int -eXosip_event_add (eXosip_event_t * je) +int eXosip_event_add(eXosip_event_t * je) { - int i = osip_fifo_add (eXosip.j_events, (void *) je); + int i = osip_fifo_add(eXosip.j_events, (void *) je); #ifdef OSIP_MT #if !defined (_WIN32_WCE) - osip_cond_signal ((struct osip_cond *) eXosip.j_cond); + osip_cond_signal((struct osip_cond *) eXosip.j_cond); #endif #endif - __eXosip_wakeup_event (); - return i; + __eXosip_wakeup_event(); + return i; } #if 0 @@ -382,10 +327,9 @@ #define OSIP_CLOCK_REALTIME CLOCK_REALTIME -void -__eXosip_clock_gettime (clockid_t cid, struct timespec *time) +void __eXosip_clock_gettime(clockid_t cid, struct timespec *time) { - clock_gettime (cid, time); + clock_gettime(cid, time); } #elif defined (WIN32) || defined (_WIN32_WCE) @@ -395,165 +339,132 @@ #define OSIP_CLOCK_REALTIME 4002 -void -__eXosip_clock_gettime (unsigned int clock_id, struct timespec *time) +void __eXosip_clock_gettime(unsigned int clock_id, struct timespec *time) { - struct _timeb time_val; + struct _timeb time_val; - if (clock_id != OSIP_CLOCK_REALTIME) - return; + if (clock_id != OSIP_CLOCK_REALTIME) + return; - _ftime (&time_val); - time->tv_sec = time_val.time; - time->tv_nsec = time_val.millitm * 1000000; - return; + _ftime(&time_val); + time->tv_sec = time_val.time; + time->tv_nsec = time_val.millitm * 1000000; + return; } #endif #endif #ifndef OSIP_MT -eXosip_event_t * -eXosip_event_wait (int tv_s, int tv_ms) +eXosip_event_t *eXosip_event_wait(int tv_s, int tv_ms) { - eXosip_event_t *je = NULL; - je = (eXosip_event_t *) osip_fifo_tryget (eXosip.j_events); - if (je != NULL) - return je; - - eXosip_lock (); - eXosip_retransmit_lost200ok (); - eXosip_unlock (); + eXosip_event_t *je = NULL; + je = (eXosip_event_t *) osip_fifo_tryget(eXosip.j_events); + if (je != NULL) + return je; + + eXosip_lock(); + eXosip_retransmit_lost200ok(); + eXosip_unlock(); - return NULL; + return NULL; } #else -eXosip_event_t * -eXosip_event_wait (int tv_s, int tv_ms) +eXosip_event_t *eXosip_event_wait(int tv_s, int tv_ms) { - eXosip_event_t *je = NULL; - -#if 0 /* this does not seems to work. by now */ -#if defined (CLOCK_REALTIME) || defined (WIN32) || defined (_WIN32_WCE) - int i; - - struct timespec deadline; - struct timespec interval; - long tot_ms = (tv_s * 1000) + tv_ms; - - static struct osip_mutex *mlock = NULL; - - if (mlock == NULL) - mlock = osip_mutex_init (); - - je = (eXosip_event_t *) osip_fifo_tryget (eXosip.j_events); - if (je) - return je; + eXosip_event_t *je = NULL; - interval.tv_sec = tot_ms / 1000; - interval.tv_nsec = (tot_ms % 1000) * 1000000L; + fd_set fdset; + struct timeval tv; + int max, i; - __eXosip_clock_gettime (OSIP_CLOCK_REALTIME, &deadline); - - if ((deadline.tv_nsec += interval.tv_nsec) >= 1000000000L) - { - deadline.tv_nsec -= 1000000000L; - deadline.tv_sec += 1; - } else - deadline.tv_nsec += interval.tv_nsec; - - deadline.tv_sec += interval.tv_sec; - - i = osip_cond_timedwait ((struct osip_cond *) eXosip.j_cond, - (struct osip_mutex *) mlock, &deadline); - -#endif -#else - /* basic replacement */ - { - fd_set fdset; - struct timeval tv; - int max, i; - - FD_ZERO (&fdset); + FD_ZERO(&fdset); #if defined (WIN32) || defined (_WIN32_WCE) - FD_SET ((unsigned int) jpipe_get_read_descr (eXosip.j_socketctl_event), - &fdset); + FD_SET((unsigned int) jpipe_get_read_descr(eXosip.j_socketctl_event), &fdset); #else - FD_SET (jpipe_get_read_descr (eXosip.j_socketctl_event), &fdset); + FD_SET(jpipe_get_read_descr(eXosip.j_socketctl_event), &fdset); #endif - max = jpipe_get_read_descr (eXosip.j_socketctl_event); + max = jpipe_get_read_descr(eXosip.j_socketctl_event); - je = (eXosip_event_t *) osip_fifo_tryget (eXosip.j_events); - if (je != NULL) - return je; - - tv.tv_sec = 0; - tv.tv_usec = 0; - i = select (max + 1, &fdset, NULL, NULL, &tv); - if (FD_ISSET (jpipe_get_read_descr (eXosip.j_socketctl_event), &fdset)) - { - char buf[500]; - int c = jpipe_read (eXosip.j_socketctl_event, buf, 499); - } - - eXosip_lock (); - eXosip_retransmit_lost200ok (); - eXosip_unlock (); + je = (eXosip_event_t *) osip_fifo_tryget(eXosip.j_events); + if (je != NULL) + return je; + + tv.tv_sec = 0; + tv.tv_usec = 0; + i = select(max + 1, &fdset, NULL, NULL, &tv); + if (FD_ISSET(jpipe_get_read_descr(eXosip.j_socketctl_event), &fdset)) { + char buf[500]; + jpipe_read(eXosip.j_socketctl_event, buf, 499); + } + + eXosip_lock(); + eXosip_retransmit_lost200ok(); + eXosip_unlock(); - FD_ZERO (&fdset); + FD_ZERO(&fdset); #if defined (WIN32) || defined (_WIN32_WCE) - FD_SET ((unsigned int) jpipe_get_read_descr (eXosip.j_socketctl_event), - &fdset); + FD_SET((unsigned int) jpipe_get_read_descr(eXosip.j_socketctl_event), &fdset); #else - FD_SET (jpipe_get_read_descr (eXosip.j_socketctl_event), &fdset); + FD_SET(jpipe_get_read_descr(eXosip.j_socketctl_event), &fdset); #endif - tv.tv_sec = tv_s; - tv.tv_usec = tv_ms * 1000; + tv.tv_sec = tv_s; + tv.tv_usec = tv_ms * 1000; - if (tv_s == 0 && tv_ms == 0) - return NULL; + if (tv_s == 0 && tv_ms == 0) + return NULL; - i = select (max + 1, &fdset, NULL, NULL, &tv); - if (i <= 0) - return OSIP_SUCCESS; - - if (eXosip.j_stop_ua) - return NULL; - - if (FD_ISSET (jpipe_get_read_descr (eXosip.j_socketctl_event), &fdset)) - { - char buf[500]; - int c = jpipe_read (eXosip.j_socketctl_event, buf, 499); - } - - je = (eXosip_event_t *) osip_fifo_tryget (eXosip.j_events); - if (je != NULL) - return je; - } -#endif + i = select(max + 1, &fdset, NULL, NULL, &tv); + if (i <= 0) + return OSIP_SUCCESS; - return je; + if (eXosip.j_stop_ua) + return NULL; + + if (FD_ISSET(jpipe_get_read_descr(eXosip.j_socketctl_event), &fdset)) { + char buf[500]; + jpipe_read(eXosip.j_socketctl_event, buf, 499); + } + + je = (eXosip_event_t *) osip_fifo_tryget(eXosip.j_events); + if (je != NULL) + return je; + + return je; } -int -eXosip_event_geteventsocket (void) +int eXosip_event_geteventsocket(void) { - return jpipe_get_read_descr (eXosip.j_socketctl_event); + return jpipe_get_read_descr(eXosip.j_socketctl_event); } -eXosip_event_t * -eXosip_event_get () +eXosip_event_t *eXosip_event_get() { - eXosip_event_t *je; + eXosip_event_t *je; + fd_set fdset; + struct timeval tv; + int max, i; + + FD_ZERO(&fdset); +#if defined (WIN32) || defined (_WIN32_WCE) + FD_SET((unsigned int) jpipe_get_read_descr(eXosip.j_socketctl_event), &fdset); +#else + FD_SET(jpipe_get_read_descr(eXosip.j_socketctl_event), &fdset); +#endif + max = jpipe_get_read_descr(eXosip.j_socketctl_event); - char buf[500]; - jpipe_read (eXosip.j_socketctl_event, buf, 499); + tv.tv_sec = 0; + tv.tv_usec = 0; + i = select(max + 1, &fdset, NULL, NULL, &tv); + if (FD_ISSET(jpipe_get_read_descr(eXosip.j_socketctl_event), &fdset)) { + char buf[500]; + jpipe_read(eXosip.j_socketctl_event, buf, 499); + } - je = (eXosip_event_t *) osip_fifo_get (eXosip.j_events); - return je; + je = (eXosip_event_t *) osip_fifo_get(eXosip.j_events); + return je; } #endif diff -Nru libexosip2-3.3.0/src/jnotify.c libexosip2-3.6.0/src/jnotify.c --- libexosip2-3.3.0/src/jnotify.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/jnotify.c 2011-09-27 23:56:28.000000000 +0000 @@ -28,150 +28,140 @@ extern eXosip_t eXosip; -osip_transaction_t * -eXosip_find_last_inc_subscribe (eXosip_notify_t * jn, eXosip_dialog_t * jd) +osip_transaction_t *eXosip_find_last_inc_subscribe(eXosip_notify_t * jn, + eXosip_dialog_t * jd) { - osip_transaction_t *inc_tr; - int pos; + osip_transaction_t *inc_tr; + int pos; - inc_tr = NULL; - pos = 0; - if (jd != NULL) - { - while (!osip_list_eol (jd->d_inc_trs, pos)) - { - inc_tr = osip_list_get (jd->d_inc_trs, pos); - if (0 == strcmp (inc_tr->cseq->method, "SUBSCRIBE")) - break; - else - inc_tr = NULL; - pos++; - } - } else - inc_tr = NULL; - - if (inc_tr == NULL) - return jn->n_inc_tr; /* can be NULL */ - - return inc_tr; + inc_tr = NULL; + pos = 0; + if (jd != NULL) { + while (!osip_list_eol(jd->d_inc_trs, pos)) { + inc_tr = osip_list_get(jd->d_inc_trs, pos); + if (0 == strcmp(inc_tr->cseq->method, "SUBSCRIBE")) + break; + else + inc_tr = NULL; + pos++; + } + } else + inc_tr = NULL; + + if (inc_tr == NULL) + return jn->n_inc_tr; /* can be NULL */ + + return inc_tr; } -osip_transaction_t * -eXosip_find_last_out_notify (eXosip_notify_t * jn, eXosip_dialog_t * jd) -{ - osip_transaction_t *out_tr; - int pos; - - out_tr = NULL; - pos = 0; - if (jd != NULL) - { - while (!osip_list_eol (jd->d_out_trs, pos)) - { - out_tr = osip_list_get (jd->d_out_trs, pos); - if (0 == strcmp (out_tr->cseq->method, "NOTIFY")) - return out_tr; - pos++; - } - } +osip_transaction_t *eXosip_find_last_out_notify(eXosip_notify_t * jn, + eXosip_dialog_t * jd) +{ + osip_transaction_t *out_tr; + int pos; + + out_tr = NULL; + pos = 0; + if (jd != NULL) { + while (!osip_list_eol(jd->d_out_trs, pos)) { + out_tr = osip_list_get(jd->d_out_trs, pos); + if (0 == strcmp(out_tr->cseq->method, "NOTIFY")) + return out_tr; + pos++; + } + } - return NULL; + return NULL; } -int -eXosip_notify_init (eXosip_notify_t ** jn, osip_message_t * inc_subscribe) +int eXosip_notify_init(eXosip_notify_t ** jn, osip_message_t * inc_subscribe) { - osip_contact_t *co; + osip_contact_t *co; - *jn = NULL; - co = (osip_contact_t *) osip_list_get (&inc_subscribe->contacts, 0); - if (co == NULL || co->url == NULL) - return -1; + *jn = NULL; + co = (osip_contact_t *) osip_list_get(&inc_subscribe->contacts, 0); + if (co == NULL || co->url == NULL) + return -1; - *jn = (eXosip_notify_t *) osip_malloc (sizeof (eXosip_notify_t)); - if (*jn == NULL) - return OSIP_NOMEM; - memset (*jn, 0, sizeof (eXosip_notify_t)); + *jn = (eXosip_notify_t *) osip_malloc(sizeof(eXosip_notify_t)); + if (*jn == NULL) + return OSIP_NOMEM; + memset(*jn, 0, sizeof(eXosip_notify_t)); - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -void -eXosip_notify_free (eXosip_notify_t * jn) +void eXosip_notify_free(eXosip_notify_t * jn) { - /* ... */ + /* ... */ + + eXosip_dialog_t *jd; + + if (jn->n_inc_tr != NULL && jn->n_inc_tr->orig_request != NULL + && jn->n_inc_tr->orig_request->call_id != NULL + && jn->n_inc_tr->orig_request->call_id->number != NULL) + _eXosip_delete_nonce(jn->n_inc_tr->orig_request->call_id->number); + else if (jn->n_out_tr != NULL && jn->n_out_tr->orig_request != NULL + && jn->n_out_tr->orig_request->call_id != NULL + && jn->n_out_tr->orig_request->call_id->number != NULL) + _eXosip_delete_nonce(jn->n_out_tr->orig_request->call_id->number); - eXosip_dialog_t *jd; + for (jd = jn->n_dialogs; jd != NULL; jd = jn->n_dialogs) { + REMOVE_ELEMENT(jn->n_dialogs, jd); + eXosip_dialog_free(jd); + } - if (jn->n_inc_tr != NULL && jn->n_inc_tr->orig_request != NULL - && jn->n_inc_tr->orig_request->call_id != NULL - && jn->n_inc_tr->orig_request->call_id->number != NULL) - _eXosip_delete_nonce (jn->n_inc_tr->orig_request->call_id->number); - else if (jn->n_out_tr != NULL && jn->n_out_tr->orig_request != NULL - && jn->n_out_tr->orig_request->call_id != NULL - && jn->n_out_tr->orig_request->call_id->number != NULL) - _eXosip_delete_nonce (jn->n_out_tr->orig_request->call_id->number); - - for (jd = jn->n_dialogs; jd != NULL; jd = jn->n_dialogs) - { - REMOVE_ELEMENT (jn->n_dialogs, jd); - eXosip_dialog_free (jd); - } - - __eXosip_delete_jinfo (jn->n_inc_tr); - __eXosip_delete_jinfo (jn->n_out_tr); - if (jn->n_inc_tr != NULL) - osip_list_add (&eXosip.j_transactions, jn->n_inc_tr, 0); - if (jn->n_out_tr != NULL) - osip_list_add (&eXosip.j_transactions, jn->n_out_tr, 0); - osip_free (jn); + __eXosip_delete_jinfo(jn->n_inc_tr); + __eXosip_delete_jinfo(jn->n_out_tr); + if (jn->n_inc_tr != NULL) + osip_list_add(&eXosip.j_transactions, jn->n_inc_tr, 0); + if (jn->n_out_tr != NULL) + osip_list_add(&eXosip.j_transactions, jn->n_out_tr, 0); + osip_free(jn); } int -_eXosip_notify_set_refresh_interval (eXosip_notify_t * jn, - osip_message_t * inc_subscribe) +_eXosip_notify_set_refresh_interval(eXosip_notify_t * jn, + osip_message_t * inc_subscribe) { - osip_header_t *exp; - time_t now; + osip_header_t *exp; + time_t now; - now = time (NULL); - if (jn == NULL || inc_subscribe == NULL) - return -1; - - osip_message_get_expires (inc_subscribe, 0, &exp); - if (exp == NULL || exp->hvalue == NULL) - jn->n_ss_expires = now + 600; - else - { - jn->n_ss_expires = osip_atoi (exp->hvalue); - if (jn->n_ss_expires != -1) - jn->n_ss_expires = now + jn->n_ss_expires; - else /* on error, set it to default */ - jn->n_ss_expires = now + 600; - } + now = time(NULL); + if (jn == NULL || inc_subscribe == NULL) + return -1; + + osip_message_get_expires(inc_subscribe, 0, &exp); + if (exp == NULL || exp->hvalue == NULL) + jn->n_ss_expires = now + 600; + else { + jn->n_ss_expires = osip_atoi(exp->hvalue); + if (jn->n_ss_expires != -1) + jn->n_ss_expires = now + jn->n_ss_expires; + else /* on error, set it to default */ + jn->n_ss_expires = now + 600; + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } void -_eXosip_notify_add_expires_in_2XX_for_subscribe (eXosip_notify_t * jn, - osip_message_t * answer) +_eXosip_notify_add_expires_in_2XX_for_subscribe(eXosip_notify_t * jn, + osip_message_t * answer) { - char tmp[20]; - time_t now; + char tmp[20]; + time_t now; - now = time (NULL); + now = time(NULL); - if (jn->n_ss_expires - now < 0) - { - tmp[0] = '0'; - tmp[1] = '\0'; - } else - { - sprintf (tmp, "%li", jn->n_ss_expires - now); - } - osip_message_set_expires (answer, tmp); + if (jn->n_ss_expires - now < 0) { + tmp[0] = '0'; + tmp[1] = '\0'; + } else { + snprintf(tmp, 20, "%li", jn->n_ss_expires - now); + } + osip_message_set_expires(answer, tmp); } #endif diff -Nru libexosip2-3.3.0/src/jpipe.c libexosip2-3.6.0/src/jpipe.c --- libexosip2-3.3.0/src/jpipe.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/jpipe.c 2011-05-16 12:37:55.000000000 +0000 @@ -30,256 +30,255 @@ #include -jpipe_t * -jpipe () +jpipe_t *jpipe() { - jpipe_t *my_pipe = (jpipe_t *) osip_malloc (sizeof (jpipe_t)); + jpipe_t *my_pipe = (jpipe_t *) osip_malloc(sizeof(jpipe_t)); - if (my_pipe == NULL) - return NULL; + if (my_pipe == NULL) + return NULL; - if (0 != pipe (my_pipe->pipes)) - { - osip_free (my_pipe); - return NULL; - } - - if (fcntl (my_pipe->pipes[1], F_SETFL, O_NONBLOCK) == -1) - { - /* failed for some reason... */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "cannot set O_NONBLOCK to the pipe[1]!\n")); - } + if (0 != pipe(my_pipe->pipes)) { + osip_free(my_pipe); + return NULL; + } + + if (fcntl(my_pipe->pipes[1], F_SETFL, O_NONBLOCK) == -1) { + /* failed for some reason... */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "cannot set O_NONBLOCK to the pipe[1]!\n")); + } - return my_pipe; + return my_pipe; } -int -jpipe_close (jpipe_t * apipe) +int jpipe_close(jpipe_t * apipe) { - if (apipe == NULL) - return OSIP_BADPARAMETER; - close (apipe->pipes[0]); - close (apipe->pipes[1]); - osip_free (apipe); - return OSIP_SUCCESS; + if (apipe == NULL) + return OSIP_BADPARAMETER; + close(apipe->pipes[0]); + close(apipe->pipes[1]); + osip_free(apipe); + return OSIP_SUCCESS; } /** * Write in a pipe. */ -int -jpipe_write (jpipe_t * apipe, const void *buf, int count) +int jpipe_write(jpipe_t * apipe, const void *buf, int count) { - if (apipe == NULL) - return OSIP_BADPARAMETER; - return write (apipe->pipes[1], buf, count); + if (apipe == NULL) + return OSIP_BADPARAMETER; + return write(apipe->pipes[1], buf, count); } /** * Read in a pipe. */ -int -jpipe_read (jpipe_t * apipe, void *buf, int count) +int jpipe_read(jpipe_t * apipe, void *buf, int count) { - if (apipe == NULL) - return OSIP_BADPARAMETER; - return read (apipe->pipes[0], buf, count); + if (apipe == NULL) + return OSIP_BADPARAMETER; + return read(apipe->pipes[0], buf, count); } /** * Get descriptor of reading pipe. */ -int -jpipe_get_read_descr (jpipe_t * apipe) +int jpipe_get_read_descr(jpipe_t * apipe) { - if (apipe == NULL) - return OSIP_BADPARAMETER; - return apipe->pipes[0]; + if (apipe == NULL) + return OSIP_BADPARAMETER; + return apipe->pipes[0]; } #else -jpipe_t * -jpipe () +int setNonBlocking(int fd) +{ + int flags; + + /* If they have O_NONBLOCK, use the Posix way to do it */ +#if defined(O_NONBLOCK) + /* Fixme: O_NONBLOCK is defined but broken on SunOS 4.1.x and AIX 3.2.5. */ + if (-1 == (flags = fcntl(fd, F_GETFL, 0))) + flags = 0; + return fcntl(fd, F_SETFL, flags | O_NONBLOCK); +#else + /* Otherwise, use the old way of doing it */ + flags = 1; + return ioctlsocket(fd, FIONBIO, &flags); +#endif +} + +jpipe_t *jpipe() { - int s = 0; - int timeout = 0; - static int aport = 10500; - struct sockaddr_in raddr; - int j; - - jpipe_t *my_pipe = (jpipe_t *) osip_malloc (sizeof (jpipe_t)); - - if (my_pipe == NULL) - return NULL; - - s = (int) socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (0 > s) - { - osip_free (my_pipe); - return NULL; - } - my_pipe->pipes[1] = (int) socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (0 > my_pipe->pipes[1]) - { + int s = 0; + int timeout = 0; + static int aport = 10500; + struct sockaddr_in raddr; + int j; + + jpipe_t *my_pipe = (jpipe_t *) osip_malloc(sizeof(jpipe_t)); + + if (my_pipe == NULL) + return NULL; + + s = (int) socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (0 > s) { + osip_free(my_pipe); + return NULL; + } + my_pipe->pipes[1] = (int) socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + if (0 > my_pipe->pipes[1]) { #if defined(__arc__) - close (s); + close(s); #else - closesocket (s); + closesocket(s); #endif - osip_free (my_pipe); - return NULL; - } - - raddr.sin_addr.s_addr = inet_addr ("127.0.0.1"); - raddr.sin_family = AF_INET; - - j = 50; - while (aport++ && j-- > 0) - { - raddr.sin_port = htons ((short) aport); - if (bind (s, (struct sockaddr *) &raddr, sizeof (raddr)) < 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_WARNING, NULL, - "Failed to bind one local socket %i!\n", aport)); - } else - break; - } - - if (j == 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Failed to bind a local socket, aborting!\n")); + osip_free(my_pipe); + return NULL; + } + + raddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + raddr.sin_family = AF_INET; + + j = 50; + while (aport++ && j-- > 0) { + raddr.sin_port = htons((short) aport); + if (bind(s, (struct sockaddr *) &raddr, sizeof(raddr)) < 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_WARNING, NULL, + "Failed to bind one local socket %i!\n", aport)); + } else + break; + } + + if (j == 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Failed to bind a local socket, aborting!\n")); #if defined(__arc__) - close (s); - close (my_pipe->pipes[1]); + close(s); + close(my_pipe->pipes[1]); #else - closesocket (s); - closesocket (my_pipe->pipes[1]); + closesocket(s); + closesocket(my_pipe->pipes[1]); #endif - osip_free (my_pipe); - return NULL; - } - - j = listen (s, 1); - if (j != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Failed to listen on a local socket, aborting!\n")); + osip_free(my_pipe); + return NULL; + } + + j = listen(s, 1); + if (j != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Failed to listen on a local socket, aborting!\n")); #if defined(__arc__) - close (s); - close (my_pipe->pipes[1]); + close(s); + close(my_pipe->pipes[1]); #else - closesocket (s); - closesocket (my_pipe->pipes[1]); + closesocket(s); + closesocket(my_pipe->pipes[1]); #endif - osip_free (my_pipe); - return NULL; - } - - j = setsockopt (my_pipe->pipes[1], - SOL_SOCKET, - SO_RCVTIMEO, (const char *) &timeout, sizeof (timeout)); + osip_free(my_pipe); + return NULL; + } + + j = setsockopt(my_pipe->pipes[1], + SOL_SOCKET, + SO_RCVTIMEO, (const char *) &timeout, sizeof(timeout)); #if defined(__arc__) - if (j != 0) - { - /* failed for some reason... */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "udp plugin; cannot set O_NONBLOCK to the file desciptor!\n")); - close (s); - close (my_pipe->pipes[1]); - osip_free (my_pipe); - return NULL; - } + if (j != 0) { + /* failed for some reason... */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "udp plugin; cannot set O_NONBLOCK to the file desciptor!\n")); + close(s); + close(my_pipe->pipes[1]); + osip_free(my_pipe); + return NULL; + } #elif !defined(_WIN32_WCE) - if (j != NO_ERROR) - { - /* failed for some reason... */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "udp plugin; cannot set O_NONBLOCK to the file desciptor!\n")); - closesocket (s); - closesocket (my_pipe->pipes[1]); - osip_free (my_pipe); - return NULL; - } + if (j != NO_ERROR) { + /* failed for some reason... */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "udp plugin; cannot set O_NONBLOCK to the file desciptor!\n")); + closesocket(s); + closesocket(my_pipe->pipes[1]); + osip_free(my_pipe); + return NULL; + } #endif - connect (my_pipe->pipes[1], (struct sockaddr *) &raddr, sizeof (raddr)); + connect(my_pipe->pipes[1], (struct sockaddr *) &raddr, sizeof(raddr)); - my_pipe->pipes[0] = accept (s, NULL, NULL); + my_pipe->pipes[0] = accept(s, NULL, NULL); - if (my_pipe->pipes[0] <= 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "udp plugin; Failed to call accept!\n")); + if (my_pipe->pipes[0] <= 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "udp plugin; Failed to call accept!\n")); #if defined(__arc__) - close (s); - close (my_pipe->pipes[1]); + close(s); + close(my_pipe->pipes[1]); #else - closesocket (s); - closesocket (my_pipe->pipes[1]); + closesocket(s); + closesocket(my_pipe->pipes[1]); #endif - osip_free (my_pipe); - return NULL; - } - - return my_pipe; + osip_free(my_pipe); + return NULL; + } + + /* set the socket to non-blocking to avoid a deadly embrace problem. */ + setNonBlocking(my_pipe->pipes[1]); + + return my_pipe; } -int -jpipe_close (jpipe_t * apipe) +int jpipe_close(jpipe_t * apipe) { - if (apipe == NULL) - return OSIP_BADPARAMETER; + if (apipe == NULL) + return OSIP_BADPARAMETER; #if defined(__arc__) - close (apipe->pipes[0]); - close (apipe->pipes[1]); + close(apipe->pipes[0]); + close(apipe->pipes[1]); #else - closesocket (apipe->pipes[0]); - closesocket (apipe->pipes[1]); + closesocket(apipe->pipes[0]); + closesocket(apipe->pipes[1]); #endif - osip_free (apipe); - return OSIP_SUCCESS; + osip_free(apipe); + return OSIP_SUCCESS; } /** * Write in a pipe. */ -int -jpipe_write (jpipe_t * apipe, const void *buf, int count) +int jpipe_write(jpipe_t * apipe, const void *buf, int count) { - if (apipe == NULL) - return OSIP_BADPARAMETER; - return send (apipe->pipes[1], buf, count, 0); + if (apipe == NULL) + return OSIP_BADPARAMETER; + return send(apipe->pipes[1], buf, count, 0); } /** * Read in a pipe. */ -int -jpipe_read (jpipe_t * apipe, void *buf, int count) +int jpipe_read(jpipe_t * apipe, void *buf, int count) { - if (apipe == NULL) - return OSIP_BADPARAMETER; - return recv (apipe->pipes[0], buf, count, 0 /* MSG_DONTWAIT */ ); /* BUG?? */ + if (apipe == NULL) + return OSIP_BADPARAMETER; + return recv(apipe->pipes[0], buf, count, 0 /* MSG_DONTWAIT */ ); /* BUG?? */ } /** * Get descriptor of reading pipe. */ -int -jpipe_get_read_descr (jpipe_t * apipe) +int jpipe_get_read_descr(jpipe_t * apipe) { - if (apipe == NULL) - return OSIP_BADPARAMETER; - return apipe->pipes[0]; + if (apipe == NULL) + return OSIP_BADPARAMETER; + return apipe->pipes[0]; } #endif diff -Nru libexosip2-3.3.0/src/jpipe.h libexosip2-3.6.0/src/jpipe.h --- libexosip2-3.3.0/src/jpipe.h 2008-10-26 15:10:58.000000000 +0000 +++ libexosip2-3.6.0/src/jpipe.h 2010-01-06 14:57:57.000000000 +0000 @@ -60,8 +60,7 @@ */ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifndef WIN32 @@ -70,12 +69,11 @@ * Structure for storing a pipe descriptor * @defvar jpipe_t */ - typedef struct jpipe_t jpipe_t; + typedef struct jpipe_t jpipe_t; - struct jpipe_t - { - int pipes[2]; - }; + struct jpipe_t { + int pipes[2]; + }; #else @@ -83,45 +81,42 @@ * Structure for storing a pipe descriptor * @defvar ppl_pipe_t */ - typedef struct jpipe_t jpipe_t; + typedef struct jpipe_t jpipe_t; - struct jpipe_t - { - int pipes[2]; - }; + struct jpipe_t { + int pipes[2]; + }; #endif /** * Get New pipe pair. */ - jpipe_t *jpipe (void); + jpipe_t *jpipe(void); /** * Close pipe */ - int jpipe_close (jpipe_t * apipe); + int jpipe_close(jpipe_t * apipe); /** * Write in a pipe. */ - int jpipe_write (jpipe_t * pipe, const void *buf, int count); + int jpipe_write(jpipe_t * pipe, const void *buf, int count); /** * Read in a pipe. */ - int jpipe_read (jpipe_t * pipe, void *buf, int count); + int jpipe_read(jpipe_t * pipe, void *buf, int count); /** * Get descriptor of reading pipe. */ - int jpipe_get_read_descr (jpipe_t * pipe); + int jpipe_get_read_descr(jpipe_t * pipe); #ifdef __cplusplus } #endif - #endif - /** @} */ #endif diff -Nru libexosip2-3.3.0/src/jpublish.c libexosip2-3.6.0/src/jpublish.c --- libexosip2-3.3.0/src/jpublish.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/jpublish.c 2010-01-06 14:57:57.000000000 +0000 @@ -28,111 +28,97 @@ extern eXosip_t eXosip; int -_eXosip_pub_update (eXosip_pub_t ** pub, osip_transaction_t * tr, - osip_message_t * answer) +_eXosip_pub_update(eXosip_pub_t ** pub, osip_transaction_t * tr, + osip_message_t * answer) { - eXosip_pub_t *jpub; + eXosip_pub_t *jpub; - *pub = NULL; + *pub = NULL; - for (jpub = eXosip.j_pub; jpub != NULL; jpub = jpub->next) - { - if (jpub->p_last_tr == NULL) - { /*bug? */ - } else if (tr == jpub->p_last_tr) - { - /* update the sip_etag parameter */ - if (answer == NULL) - { /* bug? */ - } else if (MSG_IS_STATUS_2XX (answer)) - { - osip_header_t *sip_etag = NULL; - - osip_message_header_get_byname (answer, "SIP-ETag", 0, &sip_etag); - if (sip_etag != NULL && sip_etag->hvalue != NULL) - snprintf (jpub->p_sip_etag, 64, "%s", sip_etag->hvalue); - } - *pub = jpub; - return OSIP_SUCCESS; - } - } - return OSIP_NOTFOUND; + for (jpub = eXosip.j_pub; jpub != NULL; jpub = jpub->next) { + if (jpub->p_last_tr == NULL) { /*bug? */ + } else if (tr == jpub->p_last_tr) { + /* update the sip_etag parameter */ + if (answer == NULL) { /* bug? */ + } else if (MSG_IS_STATUS_2XX(answer)) { + osip_header_t *sip_etag = NULL; + + osip_message_header_get_byname(answer, "SIP-ETag", 0, &sip_etag); + if (sip_etag != NULL && sip_etag->hvalue != NULL) + snprintf(jpub->p_sip_etag, 64, "%s", sip_etag->hvalue); + } + *pub = jpub; + return OSIP_SUCCESS; + } + } + return OSIP_NOTFOUND; } -int -_eXosip_pub_find_by_aor (eXosip_pub_t ** pub, const char *aor) +int _eXosip_pub_find_by_aor(eXosip_pub_t ** pub, const char *aor) { - eXosip_pub_t *jpub; - *pub = NULL; + eXosip_pub_t *jpub; + *pub = NULL; - for (jpub = eXosip.j_pub; jpub != NULL; jpub = jpub->next) - { - if (osip_strcasecmp (aor, jpub->p_aor) == 0) - { - *pub = jpub; - return OSIP_SUCCESS; - } - } - return OSIP_NOTFOUND; + for (jpub = eXosip.j_pub; jpub != NULL; jpub = jpub->next) { + if (osip_strcasecmp(aor, jpub->p_aor) == 0) { + *pub = jpub; + return OSIP_SUCCESS; + } + } + return OSIP_NOTFOUND; } -int -_eXosip_pub_find_by_tid (eXosip_pub_t ** pjp, int tid) +int _eXosip_pub_find_by_tid(eXosip_pub_t ** pjp, int tid) { - eXosip_pub_t *pub = eXosip.j_pub; + eXosip_pub_t *pub = eXosip.j_pub; - *pjp = NULL; - while (pub) - { - if (pub->p_last_tr && pub->p_last_tr->transactionid == tid) - { - *pjp = pub; - return OSIP_SUCCESS; - } + *pjp = NULL; + while (pub) { + if (pub->p_last_tr && pub->p_last_tr->transactionid == tid) { + *pjp = pub; + return OSIP_SUCCESS; + } - pub = pub->next; - } + pub = pub->next; + } - return OSIP_NOTFOUND; + return OSIP_NOTFOUND; } -int -_eXosip_pub_init (eXosip_pub_t ** pub, const char *aor, const char *exp) +int _eXosip_pub_init(eXosip_pub_t ** pub, const char *aor, const char *exp) { - static int p_id; - eXosip_pub_t *jpub; + static int p_id = 0; + eXosip_pub_t *jpub; - if (p_id > 1000000) /* keep it non-negative */ - p_id = 0; + if (p_id == 32767) /* keep it non-negative */ + p_id = 0; - *pub = NULL; + *pub = NULL; - jpub = (eXosip_pub_t *) osip_malloc (sizeof (eXosip_pub_t)); - if (jpub == 0) - return OSIP_NOMEM; - memset (jpub, 0, sizeof (eXosip_pub_t)); - snprintf (jpub->p_aor, 256, "%s", aor); + jpub = (eXosip_pub_t *) osip_malloc(sizeof(eXosip_pub_t)); + if (jpub == 0) + return OSIP_NOMEM; + memset(jpub, 0, sizeof(eXosip_pub_t)); + snprintf(jpub->p_aor, 256, "%s", aor); - jpub->p_period = atoi (exp); - jpub->p_id = ++p_id; + jpub->p_period = atoi(exp); + jpub->p_id = ++p_id; - *pub = jpub; - return OSIP_SUCCESS; + *pub = jpub; + return OSIP_SUCCESS; } -void -_eXosip_pub_free (eXosip_pub_t * pub) +void _eXosip_pub_free(eXosip_pub_t * pub) { - if (pub->p_last_tr != NULL) - { - if (pub->p_last_tr != NULL && pub->p_last_tr->orig_request != NULL - && pub->p_last_tr->orig_request->call_id != NULL - && pub->p_last_tr->orig_request->call_id->number != NULL) - _eXosip_delete_nonce (pub->p_last_tr->orig_request->call_id->number); - - osip_list_add (&eXosip.j_transactions, pub->p_last_tr, 0); - } - osip_free (pub); + if (pub->p_last_tr != NULL) { + if (pub->p_last_tr != NULL && pub->p_last_tr->orig_request != NULL + && pub->p_last_tr->orig_request->call_id != NULL + && pub->p_last_tr->orig_request->call_id->number != NULL) + _eXosip_delete_nonce(pub->p_last_tr->orig_request->call_id->number); + + osip_list_add(&eXosip.j_transactions, pub->p_last_tr, 0); + } + osip_free(pub); } #endif diff -Nru libexosip2-3.3.0/src/jreg.c libexosip2-3.6.0/src/jreg.c --- libexosip2-3.3.0/src/jreg.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/jreg.c 2011-09-30 15:49:45.000000000 +0000 @@ -32,160 +32,160 @@ #define HASHHEXLEN 32 typedef char HASHHEX[HASHHEXLEN + 1]; -void CvtHex (HASH Bin, HASHHEX Hex); +void CvtHex(HASH Bin, HASHHEX Hex); extern eXosip_t eXosip; int -eXosip_reg_init (eXosip_reg_t ** jr, const char *from, const char *proxy, - const char *contact) +eXosip_reg_init(eXosip_reg_t ** jr, const char *from, const char *proxy, + const char *contact) { - static int r_id; + static int r_id = 0; - *jr = (eXosip_reg_t *) osip_malloc (sizeof (eXosip_reg_t)); - if (*jr == NULL) - return OSIP_NOMEM; - - if (r_id > 1000000) /* keep it non-negative */ - r_id = 0; - - memset (*jr, '\0', sizeof (eXosip_reg_t)); - - (*jr)->r_id = ++r_id; - (*jr)->r_reg_period = 3600; /* delay between registration */ - (*jr)->r_aor = osip_strdup (from); /* sip identity */ - if ((*jr)->r_aor == NULL) - { - osip_free (*jr); - *jr = NULL; - return OSIP_NOMEM; - } - (*jr)->r_contact = osip_strdup (contact); /* sip identity */ - (*jr)->r_registrar = osip_strdup (proxy); /* registrar */ - if ((*jr)->r_registrar == NULL) - { - osip_free ((*jr)->r_contact); - osip_free ((*jr)->r_aor); - osip_free (*jr); - *jr = NULL; - return OSIP_NOMEM; - } - - { - osip_MD5_CTX Md5Ctx; - HASH hval; - HASHHEX key_line; - char localip[128]; - char firewall_ip[65]; - char firewall_port[10]; - - memset (localip, '\0', sizeof (localip)); - memset (firewall_ip, '\0', sizeof (firewall_ip)); - memset (firewall_port, '\0', sizeof (firewall_port)); - - eXosip_guess_localip (AF_INET, localip, 128); - if (eXosip.eXtl != NULL && eXosip.eXtl->tl_get_masquerade_contact != NULL) - { - eXosip.eXtl->tl_get_masquerade_contact (firewall_ip, sizeof (firewall_ip), - firewall_port, - sizeof (firewall_port)); - } - - osip_MD5Init (&Md5Ctx); - osip_MD5Update (&Md5Ctx, (unsigned char *) from, strlen (from)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) proxy, strlen (proxy)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) localip, strlen (localip)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) firewall_ip, strlen (firewall_ip)); - osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1); - osip_MD5Update (&Md5Ctx, (unsigned char *) firewall_port, - strlen (firewall_port)); - osip_MD5Final ((unsigned char *) hval, &Md5Ctx); - CvtHex (hval, key_line); + *jr = (eXosip_reg_t *) osip_malloc(sizeof(eXosip_reg_t)); + if (*jr == NULL) + return OSIP_NOMEM; + + if (r_id == 32767) /* keep it non-negative */ + r_id = 0; + + memset(*jr, '\0', sizeof(eXosip_reg_t)); + + (*jr)->r_id = ++r_id; + (*jr)->r_reg_period = 3600; /* delay between registration */ + (*jr)->r_aor = osip_strdup(from); /* sip identity */ + if ((*jr)->r_aor == NULL) { + osip_free(*jr); + *jr = NULL; + return OSIP_NOMEM; + } + (*jr)->r_contact = osip_strdup(contact); /* sip identity */ + (*jr)->r_registrar = osip_strdup(proxy); /* registrar */ + if ((*jr)->r_registrar == NULL) { + osip_free((*jr)->r_contact); + osip_free((*jr)->r_aor); + osip_free(*jr); + *jr = NULL; + return OSIP_NOMEM; + } + + { + osip_MD5_CTX Md5Ctx; + HASH hval; + HASHHEX key_line; + char localip[128]; + char firewall_ip[65]; + char firewall_port[10]; + char somerandom[31]; + memset(somerandom, 0, sizeof(somerandom)); + eXosip_generate_random(somerandom, 16); + + memset(localip, '\0', sizeof(localip)); + memset(firewall_ip, '\0', sizeof(firewall_ip)); + memset(firewall_port, '\0', sizeof(firewall_port)); + + eXosip_guess_localip(AF_INET, localip, 128); + if (eXosip.eXtl != NULL && eXosip.eXtl->tl_get_masquerade_contact != NULL) { + eXosip.eXtl->tl_get_masquerade_contact(firewall_ip, + sizeof(firewall_ip), + firewall_port, + sizeof(firewall_port)); + } + + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, (unsigned char *) from, strlen(from)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) proxy, strlen(proxy)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) localip, strlen(localip)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) firewall_ip, + strlen(firewall_ip)); + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) firewall_port, + strlen(firewall_port)); + + /* previously, "line" was common accross several identical restart. */ + /* including random will help to read a correct "expires" parameter */ + /* from 2xx REGISTER answers */ + osip_MD5Update(&Md5Ctx, (unsigned char *) ":", 1); + osip_MD5Update(&Md5Ctx, (unsigned char *) somerandom, + strlen(somerandom)); + + osip_MD5Final((unsigned char *) hval, &Md5Ctx); + CvtHex(hval, key_line); - osip_strncpy ((*jr)->r_line, key_line, sizeof ((*jr)->r_line) - 1); - } + osip_strncpy((*jr)->r_line, key_line, sizeof((*jr)->r_line) - 1); + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } -void -eXosip_reg_free (eXosip_reg_t * jreg) +void eXosip_reg_free(eXosip_reg_t * jreg) { - osip_free (jreg->r_aor); - osip_free (jreg->r_contact); - osip_free (jreg->r_registrar); - - if (jreg->r_last_tr != NULL) - { - if (jreg->r_last_tr != NULL && jreg->r_last_tr->orig_request != NULL - && jreg->r_last_tr->orig_request->call_id != NULL - && jreg->r_last_tr->orig_request->call_id->number != NULL) - _eXosip_delete_nonce (jreg->r_last_tr->orig_request->call_id->number); - - if (jreg->r_last_tr->state == IST_TERMINATED || - jreg->r_last_tr->state == ICT_TERMINATED || - jreg->r_last_tr->state == NICT_TERMINATED || - jreg->r_last_tr->state == NIST_TERMINATED) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Release a terminated transaction\n")); - __eXosip_delete_jinfo (jreg->r_last_tr); - if (jreg->r_last_tr != NULL) - osip_list_add (&eXosip.j_transactions, jreg->r_last_tr, 0); - } else - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Release a non-terminated transaction\n")); - __eXosip_delete_jinfo (jreg->r_last_tr); - if (jreg->r_last_tr != NULL) - osip_list_add (&eXosip.j_transactions, jreg->r_last_tr, 0); - } - } + osip_free(jreg->r_aor); + osip_free(jreg->r_contact); + osip_free(jreg->r_registrar); + + if (jreg->r_last_tr != NULL) { + if (jreg->r_last_tr != NULL && jreg->r_last_tr->orig_request != NULL + && jreg->r_last_tr->orig_request->call_id != NULL + && jreg->r_last_tr->orig_request->call_id->number != NULL) + _eXosip_delete_nonce(jreg->r_last_tr->orig_request->call_id->number); + + if (jreg->r_last_tr->state == IST_TERMINATED || + jreg->r_last_tr->state == ICT_TERMINATED || + jreg->r_last_tr->state == NICT_TERMINATED || + jreg->r_last_tr->state == NIST_TERMINATED) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Release a terminated transaction\n")); + __eXosip_delete_jinfo(jreg->r_last_tr); + if (jreg->r_last_tr != NULL) + osip_list_add(&eXosip.j_transactions, jreg->r_last_tr, 0); + } else { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Release a non-terminated transaction\n")); + __eXosip_delete_jinfo(jreg->r_last_tr); + if (jreg->r_last_tr != NULL) + osip_list_add(&eXosip.j_transactions, jreg->r_last_tr, 0); + } + } - osip_free (jreg); + osip_free(jreg); } -int -_eXosip_reg_find (eXosip_reg_t ** reg, osip_transaction_t * tr) +int _eXosip_reg_find(eXosip_reg_t ** reg, osip_transaction_t * tr) { - eXosip_reg_t *jreg; + eXosip_reg_t *jreg; - *reg = NULL; - if (tr == NULL) - return OSIP_BADPARAMETER; - - for (jreg = eXosip.j_reg; jreg != NULL; jreg = jreg->next) - { - if (jreg->r_last_tr == tr) - { - *reg = jreg; - return OSIP_SUCCESS; - } - } - return OSIP_NOTFOUND; + *reg = NULL; + if (tr == NULL) + return OSIP_BADPARAMETER; + + for (jreg = eXosip.j_reg; jreg != NULL; jreg = jreg->next) { + if (jreg->r_last_tr == tr) { + *reg = jreg; + return OSIP_SUCCESS; + } + } + return OSIP_NOTFOUND; } -int -eXosip_reg_find_id (eXosip_reg_t ** reg, int rid) +int eXosip_reg_find_id(eXosip_reg_t ** reg, int rid) { - eXosip_reg_t *jreg; + eXosip_reg_t *jreg; - *reg = NULL; - if (rid <= 0) - return OSIP_BADPARAMETER; - - for (jreg = eXosip.j_reg; jreg != NULL; jreg = jreg->next) - { - if (jreg->r_id == rid) - { - *reg = jreg; - return OSIP_SUCCESS; - } - } - return OSIP_NOTFOUND; + *reg = NULL; + if (rid <= 0) + return OSIP_BADPARAMETER; + + for (jreg = eXosip.j_reg; jreg != NULL; jreg = jreg->next) { + if (jreg->r_id == rid) { + *reg = jreg; + return OSIP_SUCCESS; + } + } + return OSIP_NOTFOUND; } diff -Nru libexosip2-3.3.0/src/jrequest.c libexosip2-3.6.0/src/jrequest.c --- libexosip2-3.3.0/src/jrequest.c 2009-02-27 08:47:00.000000000 +0000 +++ libexosip2-3.6.0/src/jrequest.c 2011-10-04 07:56:59.000000000 +0000 @@ -38,239 +38,227 @@ extern eXosip_t eXosip; -extern int ipv6_enable; - /* Private functions */ -static int dialog_fill_route_set (osip_dialog_t * dialog, - osip_message_t * request); +static int dialog_fill_route_set(osip_dialog_t * dialog, osip_message_t * request); /* should use cryptographically random identifier is RECOMMENDED.... */ /* by now this should lead to identical call-id when application are started at the same time... */ -char * -osip_call_id_new_random () +char *osip_call_id_new_random() { - char *tmp = (char *) osip_malloc (33); - unsigned int number = osip_build_random_number (); - if (tmp == NULL) - return NULL; + char *tmp = (char *) osip_malloc(33); + unsigned int number = osip_build_random_number(); + if (tmp == NULL) + return NULL; - sprintf (tmp, "%u", number); - return tmp; + sprintf(tmp, "%u", number); + return tmp; } -int -eXosip_generate_random (char *buf, int buf_size) +int eXosip_generate_random(char *buf, int buf_size) { - unsigned int number = osip_build_random_number (); + unsigned int number = osip_build_random_number(); - snprintf (buf, buf_size, "%u", number); - return OSIP_SUCCESS; + snprintf(buf, buf_size, "%u", number); + return OSIP_SUCCESS; } -char * -osip_from_tag_new_random (void) +char *osip_from_tag_new_random(void) { - return osip_call_id_new_random (); + return osip_call_id_new_random(); } -char * -osip_to_tag_new_random (void) +char *osip_to_tag_new_random(void) { - return osip_call_id_new_random (); + return osip_call_id_new_random(); } -unsigned int -via_branch_new_random (void) +unsigned int via_branch_new_random(void) { - return osip_build_random_number (); + return osip_build_random_number(); } -int -_eXosip_dialog_add_contact (osip_message_t * request, osip_message_t * answer) +int _eXosip_dialog_add_contact(osip_message_t * request, osip_message_t * answer) { - osip_via_t *via; - osip_from_t *a_from; - char *contact = NULL; - char locip[65]; - char firewall_ip[65]; - char firewall_port[10]; - int len; - - if (eXosip.eXtl == NULL) - return OSIP_NO_NETWORK; - if (request == NULL) - return OSIP_BADPARAMETER; - - firewall_ip[0] = '\0'; - firewall_port[0] = '\0'; - if (eXosip.eXtl->tl_get_masquerade_contact != NULL) - { - eXosip.eXtl->tl_get_masquerade_contact (firewall_ip, sizeof (firewall_ip), - firewall_port, - sizeof (firewall_port)); - } - - /* search for topmost Via which indicate the transport protocol */ - via = (osip_via_t *) osip_list_get (&request->vias, 0); - if (via == NULL || via->protocol == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: missing via header\n")); - return OSIP_SYNTAXERROR; - } - - if (answer == NULL) - a_from = request->from; - else - a_from = answer->to; - - if (a_from == NULL || a_from->url == NULL) - return OSIP_SYNTAXERROR; - - /*guess the local ip since req uri is known */ - memset (locip, '\0', sizeof (locip)); - - if (a_from->url->username != NULL) - len = - 2 + 4 + strlen (a_from->url->username) + 1 + 100 + 6 + 10 + - strlen (eXosip.transport); - else - len = 2 + 4 + 100 + 6 + 10 + strlen (eXosip.transport); - - contact = (char *) osip_malloc (len + 1); - if (contact == NULL) - return OSIP_NOMEM; - if (firewall_ip[0] != '\0') - { - char *c_address = request->req_uri->host; - - struct addrinfo *addrinfo; - struct __eXosip_sockaddr addr; - int i; - - i = - eXosip_get_addrinfo (&addrinfo, request->req_uri->host, 5060, IPPROTO_TCP); - if (i == 0) - { - memcpy (&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); - eXosip_freeaddrinfo (addrinfo); - c_address = inet_ntoa (((struct sockaddr_in *) &addr)->sin_addr); - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: here is the resolved destination host=%s\n", - c_address)); - } - - if (eXosip_is_public_address (c_address)) - { - memcpy (locip, firewall_ip, sizeof (locip)); - } - } - - if (locip[0] == '\0') - { - eXosip_guess_ip_for_via (eXosip.eXtl->proto_family, locip, 49); - if (locip[0] == '\0') - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: no default interface defined\n")); - return OSIP_NO_NETWORK; - } - } - - if (eXosip.eXtl->proto_family == AF_INET6) - { - if (a_from->url->username != NULL) - snprintf (contact, len, "", a_from->url->username, - locip, firewall_port); - else - snprintf (contact, len - strlen (eXosip.transport) - 10, "", - locip, firewall_port); - } else - { - if (a_from->url->username != NULL) - snprintf (contact, len, "", a_from->url->username, - locip, firewall_port); - else - snprintf (contact, len - strlen (eXosip.transport) - 10, "", - locip, firewall_port); - } - if (osip_strcasecmp (eXosip.transport, "UDP") != 0) - { - contact[strlen (contact) - 1] = '\0'; - strcat (contact, ";transport="); - strcat (contact, eXosip.transport); - strcat (contact, ">"); - } - osip_message_set_contact (request, contact); - osip_free (contact); + osip_via_t *via; + osip_from_t *a_from; + char *contact = NULL; + char locip[65]; + char firewall_ip[65]; + char firewall_port[10]; + int len; + + if (eXosip.eXtl == NULL) + return OSIP_NO_NETWORK; + if (request == NULL) + return OSIP_BADPARAMETER; + + firewall_ip[0] = '\0'; + firewall_port[0] = '\0'; + if (eXosip.eXtl->tl_get_masquerade_contact != NULL) { + eXosip.eXtl->tl_get_masquerade_contact(firewall_ip, sizeof(firewall_ip), + firewall_port, + sizeof(firewall_port)); + } + + /* search for topmost Via which indicate the transport protocol */ + via = (osip_via_t *) osip_list_get(&request->vias, 0); + if (via == NULL || via->protocol == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: missing via header\n")); + return OSIP_SYNTAXERROR; + } + + if (answer == NULL) + a_from = request->from; + else + a_from = answer->to; + + if (a_from == NULL || a_from->url == NULL) + return OSIP_SYNTAXERROR; + + /*guess the local ip since req uri is known */ + memset(locip, '\0', sizeof(locip)); + + if (a_from->url->username != NULL) + len = + 2 + 4 + (strlen(a_from->url->username)*3) + 1 + 100 + 6 + 10 + + strlen(eXosip.transport); + else + len = 2 + 4 + 100 + 6 + 10 + strlen(eXosip.transport); + + contact = (char *) osip_malloc(len + 1); + if (contact == NULL) + return OSIP_NOMEM; + if (firewall_ip[0] != '\0') { +#ifdef USE_LOCALIP_WITH_LOCALPROXY /* disable this code for local testing because it adds an extra DNS */ + char *c_address = request->req_uri->host; + + struct addrinfo *addrinfo; + struct __eXosip_sockaddr addr; + int i; + + i = eXosip_get_addrinfo(&addrinfo, request->req_uri->host, 5060, + IPPROTO_TCP); + if (i == 0) { + memcpy(&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); + eXosip_freeaddrinfo(addrinfo); + c_address = inet_ntoa(((struct sockaddr_in *) &addr)->sin_addr); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: here is the resolved destination host=%s\n", + c_address)); + } + + if (eXosip_is_public_address(c_address)) { + memcpy(locip, firewall_ip, sizeof(locip)); + } +#else + memcpy(locip, firewall_ip, sizeof(locip)); +#endif + } + + if (locip[0] == '\0') { + eXosip_guess_ip_for_via(eXosip.eXtl->proto_family, locip, 49); + if (locip[0] == '\0') { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: no default interface defined\n")); + osip_free(contact); + return OSIP_NO_NETWORK; + } + } + + if (eXosip.eXtl->proto_family == AF_INET6) { + if (a_from->url->username != NULL) + { + char *tmp2 = __osip_uri_escape_userinfo(a_from->url->username); + snprintf(contact, len, "", tmp2, locip, firewall_port); + osip_free(tmp2); + } + else + snprintf(contact, len - strlen(eXosip.transport) - 10, "", + locip, firewall_port); + } else { + if (a_from->url->username != NULL) + { + char *tmp2 = __osip_uri_escape_userinfo(a_from->url->username); + snprintf(contact, len, "", tmp2, locip, firewall_port); + osip_free(tmp2); + } + else + snprintf(contact, len - strlen(eXosip.transport) - 10, "", + locip, firewall_port); + } + if (osip_strcasecmp(eXosip.transport, "UDP") != 0) { + contact[strlen(contact) - 1] = '\0'; + strcat(contact, ";transport="); + strcat(contact, eXosip.transport); + strcat(contact, ">"); + } + osip_message_set_contact(request, contact); + osip_free(contact); - return OSIP_SUCCESS; + return OSIP_SUCCESS; } int -_eXosip_request_add_via (osip_message_t * request, const char *transport, - const char *locip) +_eXosip_request_add_via(osip_message_t * request, const char *transport, + const char *locip) { - char tmp[200]; - const char *ip = NULL; - char firewall_ip[65]; - char firewall_port[10]; - - if (request == NULL) - return OSIP_BADPARAMETER; - - if (request->call_id == NULL) - return OSIP_SYNTAXERROR; - - if (locip == NULL && request->call_id->host == NULL) - return OSIP_SYNTAXERROR; - - if (locip != NULL) - ip = locip; - else if (request->call_id->host != NULL) - ip = request->call_id->host; - - firewall_ip[0] = '\0'; - firewall_port[0] = '\0'; - if (eXosip.eXtl != NULL && eXosip.eXtl->tl_get_masquerade_contact != NULL) - { - eXosip.eXtl->tl_get_masquerade_contact (firewall_ip, sizeof (firewall_ip), - firewall_port, - sizeof (firewall_port)); - } + char tmp[200]; + const char *ip = NULL; + char firewall_ip[65]; + char firewall_port[10]; + + if (request == NULL) + return OSIP_BADPARAMETER; + + if (request->call_id == NULL) + return OSIP_SYNTAXERROR; + + if (locip == NULL && request->call_id->host == NULL) + return OSIP_SYNTAXERROR; + + if (locip != NULL) + ip = locip; + else if (request->call_id->host != NULL) + ip = request->call_id->host; + + firewall_ip[0] = '\0'; + firewall_port[0] = '\0'; + if (eXosip.eXtl != NULL && eXosip.eXtl->tl_get_masquerade_contact != NULL) { + eXosip.eXtl->tl_get_masquerade_contact(firewall_ip, sizeof(firewall_ip), + firewall_port, + sizeof(firewall_port)); + } #ifdef MASQUERADE_VIA - /* this helps to work with a server that don't handle the - "received" parameter correctly. Some still exists. */ - if (firewall_ip[0] != '\0') - { - ip = firewall_ip; - } + /* this helps to work with a server that don't handle the + "received" parameter correctly. Some still exists. */ + if (firewall_ip[0] != '\0') { + ip = firewall_ip; + } #endif - if (firewall_port[0] == '\0') - { - snprintf (firewall_port, sizeof (firewall_port), "5060"); - } - - if (eXosip.eXtl->proto_family == AF_INET6) - snprintf (tmp, 200, "SIP/2.0/%s [%s]:%s;branch=z9hG4bK%u", - eXosip.transport, ip, firewall_port, via_branch_new_random ()); - else - { - if (eXosip.use_rport != 0) - snprintf (tmp, 200, "SIP/2.0/%s %s:%s;rport;branch=z9hG4bK%u", - eXosip.transport, ip, firewall_port, via_branch_new_random ()); - else - snprintf (tmp, 200, "SIP/2.0/%s %s:%s;branch=z9hG4bK%u", - eXosip.transport, ip, firewall_port, via_branch_new_random ()); - } + if (firewall_port[0] == '\0') { + snprintf(firewall_port, sizeof(firewall_port), "5060"); + } + + if (eXosip.eXtl->proto_family == AF_INET6) + snprintf(tmp, 200, "SIP/2.0/%s [%s]:%s;branch=z9hG4bK%u", + eXosip.transport, ip, firewall_port, via_branch_new_random()); + else { + if (eXosip.use_rport != 0) + snprintf(tmp, 200, "SIP/2.0/%s %s:%s;rport;branch=z9hG4bK%u", + eXosip.transport, ip, firewall_port, via_branch_new_random()); + else + snprintf(tmp, 200, "SIP/2.0/%s %s:%s;branch=z9hG4bK%u", + eXosip.transport, ip, firewall_port, via_branch_new_random()); + } - osip_message_set_via (request, tmp); + osip_message_set_via(request, tmp); - return OSIP_SUCCESS; + return OSIP_SUCCESS; } /* prepare a minimal request (outside of a dialog) with required headers */ @@ -280,826 +268,882 @@ transport is either "TCP" or "UDP" (by now, only UDP is implemented!) */ int -generating_request_out_of_dialog (osip_message_t ** dest, const char *method, - const char *to, const char *transport, - const char *from, const char *proxy) +generating_request_out_of_dialog(osip_message_t ** dest, const char *method, + const char *to, const char *transport, + const char *from, const char *proxy) { - /* Section 8.1: - A valid request contains at a minimum "To, From, Call-iD, Cseq, - Max-Forwards and Via - */ - int i; - osip_message_t *request; - char locip[65]; - int doing_register; - char *register_callid_number = NULL; - - *dest = NULL; - - if (eXosip.eXtl == NULL) - return OSIP_NO_NETWORK; - - /*guess the local ip since req uri is known */ - memset (locip, '\0', sizeof (locip)); - eXosip_guess_ip_for_via (eXosip.eXtl->proto_family, locip, 49); - if (locip[0] == '\0') - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: no default interface defined\n")); - return OSIP_NO_NETWORK; - } - - i = osip_message_init (&request); - if (i != 0) - return i; - - /* prepare the request-line */ - osip_message_set_method (request, osip_strdup (method)); - osip_message_set_version (request, osip_strdup ("SIP/2.0")); - osip_message_set_status_code (request, 0); - osip_message_set_reason_phrase (request, NULL); - - doing_register = 0 == strcmp ("REGISTER", method); - - if (doing_register) - { - osip_uri_init (&(request->req_uri)); - i = osip_uri_parse (request->req_uri, proxy); - if (i != 0) - { - osip_message_free (request); - return i; - } - i = osip_message_set_to (request, from); - if (i != 0 || request->to == NULL) - { - if (i >= 0) - i = OSIP_SYNTAXERROR; - osip_message_free (request); - return i; - } - } else - { - /* in any cases except REGISTER: */ - i = osip_message_set_to (request, to); - if (i != 0 || request->to == NULL) - { - if (i >= 0) - i = OSIP_SYNTAXERROR; - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: callee address does not seems to be a sipurl: %s\n", - to)); - osip_message_free (request); - return i; - } - - /* REMOVE ALL URL PARAMETERS from to->url headers and add them as headers */ - if (request->to != NULL && request->to->url != NULL) - { - osip_uri_t *url = request->to->url; - while (osip_list_size (&url->url_headers) > 0) - { - osip_uri_header_t *u_header; - u_header = (osip_uri_param_t *) osip_list_get (&url->url_headers, 0); - if (u_header == NULL) - break; - - if (osip_strcasecmp (u_header->gname, "from") == 0) - { - } else if (osip_strcasecmp (u_header->gname, "to") == 0) - { - } else if (osip_strcasecmp (u_header->gname, "call-id") == 0) - { - } else if (osip_strcasecmp (u_header->gname, "cseq") == 0) - { - } else if (osip_strcasecmp (u_header->gname, "via") == 0) - { - } else if (osip_strcasecmp (u_header->gname, "contact") == 0) - { - } else - osip_message_set_header (request, u_header->gname, - u_header->gvalue); - osip_list_remove (&url->url_headers, 0); - osip_uri_param_free (u_header); - } - } - - if (proxy != NULL && proxy[0] != 0) - { /* equal to a pre-existing route set */ - /* if the pre-existing route set contains a "lr" (compliance - with bis-08) then the req_uri should contains the remote target - URI */ - osip_uri_param_t *lr_param; - osip_route_t *o_proxy; - - osip_route_init (&o_proxy); - i = osip_route_parse (o_proxy, proxy); - if (i != 0) - { - osip_route_free (o_proxy); - osip_message_free (request); - return i; - } - - osip_uri_uparam_get_byname (o_proxy->url, "lr", &lr_param); - if (lr_param != NULL) /* to is the remote target URI in this case! */ - { - osip_uri_clone (request->to->url, &(request->req_uri)); - /* "[request] MUST includes a Route header field containing - the route set values in order." */ - osip_list_add (&request->routes, o_proxy, 0); - } else - /* if the first URI of route set does not contain "lr", the req_uri - is set to the first uri of route set */ - { - request->req_uri = o_proxy->url; - o_proxy->url = NULL; - osip_route_free (o_proxy); - /* add the route set */ - /* "The UAC MUST add a route header field containing - the remainder of the route set values in order. - The UAC MUST then place the remote target URI into - the route header field as the last value - */ - osip_message_set_route (request, to); - } - } else /* No route set (outbound proxy) is used */ - { - /* The UAC must put the remote target URI (to field) in the req_uri */ - i = osip_uri_clone (request->to->url, &(request->req_uri)); - if (i != 0) - { - osip_message_free (request); - return i; - } - } - } - - /* set To and From */ - i = osip_message_set_from (request, from); - if (i != 0 || request->from == NULL) - { - if (i >= 0) - i = OSIP_SYNTAXERROR; - osip_message_free (request); - return i; - } - - /* add a tag */ - osip_from_set_tag (request->from, osip_from_tag_new_random ()); - - /* set the cseq and call_id header */ - { - osip_call_id_t *callid; - osip_cseq_t *cseq; - char *num; - char *cidrand; - - /* call-id is always the same for REGISTRATIONS */ - i = osip_call_id_init (&callid); - if (i != 0) - { - osip_message_free (request); - return i; - } - cidrand = osip_call_id_new_random (); - osip_call_id_set_number (callid, cidrand); - if (doing_register) - register_callid_number = cidrand; - - request->call_id = callid; - - i = osip_cseq_init (&cseq); - if (i != 0) - { - osip_message_free (request); - return i; - } - num = osip_strdup (doing_register ? "1" : "20"); - osip_cseq_set_number (cseq, num); - osip_cseq_set_method (cseq, osip_strdup (method)); - request->cseq = cseq; - - if (cseq->method == NULL || cseq->number == NULL) - { - osip_message_free (request); - return OSIP_NOMEM; - } - } - - i = _eXosip_request_add_via (request, transport, locip); - if (i != 0) - { - osip_message_free (request); - return i; - } - - /* always add the Max-Forward header */ - osip_message_set_max_forwards (request, "70"); /* a UA should start a request with 70 */ - - if (0 == strcmp ("REGISTER", method)) - { - } else if (0 == strcmp ("INFO", method)) - { - } else if (0 == strcmp ("OPTIONS", method)) - { - osip_message_set_accept (request, "application/sdp"); - } - - osip_message_set_user_agent (request, eXosip.user_agent); - /* else if ... */ - *dest = request; - return OSIP_SUCCESS; + /* Section 8.1: + A valid request contains at a minimum "To, From, Call-iD, Cseq, + Max-Forwards and Via + */ + int i; + osip_message_t *request; + char locip[65]; + int doing_register; + char *register_callid_number = NULL; + + *dest = NULL; + + if (!method || !*method) + return OSIP_BADPARAMETER; + + if (eXosip.eXtl == NULL) + return OSIP_NO_NETWORK; + + /*guess the local ip since req uri is known */ + memset(locip, '\0', sizeof(locip)); + eXosip_guess_ip_for_via(eXosip.eXtl->proto_family, locip, 49); + if (locip[0] == '\0') { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: no default interface defined\n")); + return OSIP_NO_NETWORK; + } + + i = osip_message_init(&request); + if (i != 0) + return i; + + /* prepare the request-line */ + osip_message_set_method(request, osip_strdup(method)); + osip_message_set_version(request, osip_strdup("SIP/2.0")); + osip_message_set_status_code(request, 0); + osip_message_set_reason_phrase(request, NULL); + + doing_register = 0 == strcmp("REGISTER", method); + + if (doing_register) { + i = osip_uri_init(&(request->req_uri)); + if (i != 0) { + osip_message_free(request); + return i; + } + i = osip_uri_parse(request->req_uri, proxy); + if (i != 0) { + osip_message_free(request); + return i; + } + i = osip_message_set_to(request, from); + if (i != 0 || request->to == NULL) { + if (i >= 0) + i = OSIP_SYNTAXERROR; + osip_message_free(request); + return i; + } + + /* REMOVE ALL URL PARAMETERS from to->url headers and add them as headers */ + if (request->to != NULL && request->to->url != NULL) { + osip_uri_t *url = request->to->url; + while (osip_list_size(&url->url_headers) > 0) { + osip_uri_header_t *u_header; + u_header = + (osip_uri_param_t *) osip_list_get(&url->url_headers, 0); + if (u_header == NULL) + break; + + if (osip_strcasecmp(u_header->gname, "from") == 0) { + } else if (osip_strcasecmp(u_header->gname, "to") == 0) { + } else if (osip_strcasecmp(u_header->gname, "call-id") == 0) { + } else if (osip_strcasecmp(u_header->gname, "cseq") == 0) { + } else if (osip_strcasecmp(u_header->gname, "via") == 0) { + } else if (osip_strcasecmp(u_header->gname, "contact") == 0) { + } else if (osip_strcasecmp(u_header->gname, "route") == 0) { + osip_message_set_route(request, u_header->gvalue); + } else if (osip_strcasecmp(u_header->gname, "content-type") == 0) { + osip_message_set_content_type(request, u_header->gvalue); + } else + osip_message_set_header(request, u_header->gname, + u_header->gvalue); + osip_list_remove(&url->url_headers, 0); + osip_uri_param_free(u_header); + } + } + } else { + /* in any cases except REGISTER: */ + i = osip_message_set_to(request, to); + if (i != 0 || request->to == NULL) { + if (i >= 0) + i = OSIP_SYNTAXERROR; + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: callee address does not seems to be a sipurl: %s\n", + to)); + osip_message_free(request); + return i; + } + + /* REMOVE ALL URL PARAMETERS from to->url headers and add them as headers */ + if (request->to != NULL && request->to->url != NULL) { + osip_uri_t *url = request->to->url; + while (osip_list_size(&url->url_headers) > 0) { + osip_uri_header_t *u_header; + u_header = + (osip_uri_param_t *) osip_list_get(&url->url_headers, 0); + if (u_header == NULL) + break; + + if (osip_strcasecmp(u_header->gname, "from") == 0) { + } else if (osip_strcasecmp(u_header->gname, "to") == 0) { + } else if (osip_strcasecmp(u_header->gname, "call-id") == 0) { + } else if (osip_strcasecmp(u_header->gname, "cseq") == 0) { + } else if (osip_strcasecmp(u_header->gname, "via") == 0) { + } else if (osip_strcasecmp(u_header->gname, "contact") == 0) { + } else if (osip_strcasecmp(u_header->gname, "route") == 0) { + osip_message_set_route(request, u_header->gvalue); + } else if (osip_strcasecmp(u_header->gname, "content-type") == 0) { + osip_message_set_content_type(request, u_header->gvalue); + } else + osip_message_set_header(request, u_header->gname, + u_header->gvalue); + osip_list_remove(&url->url_headers, 0); + osip_uri_param_free(u_header); + } + } + + if (proxy != NULL && proxy[0] != 0) { /* equal to a pre-existing route set */ + /* if the pre-existing route set contains a "lr" (compliance + with bis-08) then the req_uri should contains the remote target + URI */ + osip_uri_param_t *lr_param; + osip_route_t *o_proxy; + + osip_route_init(&o_proxy); + i = osip_route_parse(o_proxy, proxy); + if (i != 0) { + osip_route_free(o_proxy); + osip_message_free(request); + return i; + } + + osip_uri_uparam_get_byname(o_proxy->url, "lr", &lr_param); + if (lr_param != NULL) { /* to is the remote target URI in this case! */ + i = osip_uri_clone(request->to->url, &(request->req_uri)); + if (i != 0) { + osip_route_free(o_proxy); + osip_message_free(request); + return i; + } + + /* "[request] MUST includes a Route header field containing + the route set values in order." */ + osip_list_add(&request->routes, o_proxy, 0); + } else + /* if the first URI of route set does not contain "lr", the req_uri + is set to the first uri of route set */ + { + request->req_uri = o_proxy->url; + o_proxy->url = NULL; + osip_route_free(o_proxy); + /* add the route set */ + /* "The UAC MUST add a route header field containing + the remainder of the route set values in order. + The UAC MUST then place the remote target URI into + the route header field as the last value + */ + osip_message_set_route(request, to); + } + } else { /* No route set (outbound proxy) is used */ + + /* The UAC must put the remote target URI (to field) in the req_uri */ + i = osip_uri_clone(request->to->url, &(request->req_uri)); + if (i != 0) { + osip_message_free(request); + return i; + } + } + } + + /* set To and From */ + i = osip_message_set_from(request, from); + if (i != 0 || request->from == NULL) { + if (i >= 0) + i = OSIP_SYNTAXERROR; + osip_message_free(request); + return i; + } + + /* REMOVE ALL URL PARAMETERS from from->url headers and add them as headers */ + if (doing_register && request->from != NULL && request->from->url != NULL) { + osip_uri_t *url = request->from->url; + while (osip_list_size(&url->url_headers) > 0) { + osip_uri_header_t *u_header; + u_header = (osip_uri_param_t *) osip_list_get(&url->url_headers, 0); + if (u_header == NULL) + break; + + osip_list_remove(&url->url_headers, 0); + osip_uri_param_free(u_header); + } + } + + if (request->to != NULL && request->to->url != NULL) { + int pos = 0; + size_t pname_len; + osip_uri_param_t *u_param; + + pname_len = strlen("method"); + while (!osip_list_eol(&request->to->url->url_params, pos)) { + size_t len; + + u_param = (osip_uri_param_t *) osip_list_get(&request->to->url->url_params, pos); + len = strlen(u_param->gname); + if (pname_len == len + && osip_strncasecmp(u_param->gname, "method", pname_len) == 0 + && u_param->gvalue!=NULL) { + osip_list_remove(&request->to->url->url_params, pos); + osip_uri_param_free(u_param); + break; + } + pos++; + } + } + + if (request->from != NULL && request->from->url != NULL) { + int pos = 0; + size_t pname_len; + osip_uri_param_t *u_param; + + pname_len = strlen("method"); + while (!osip_list_eol(&request->from->url->url_params, pos)) { + size_t len; + + u_param = (osip_uri_param_t *) osip_list_get(&request->from->url->url_params, pos); + len = strlen(u_param->gname); + if (pname_len == len + && osip_strncasecmp(u_param->gname, "method", pname_len) == 0 + && u_param->gvalue!=NULL) { + osip_list_remove(&request->from->url->url_params, pos); + osip_uri_param_free(u_param); + break; + } + pos++; + } + } + + if (request->req_uri) { + int pos = 0; + size_t pname_len; + osip_uri_param_t *u_param; + + pname_len = strlen("method"); + while (!osip_list_eol(&request->req_uri->url_params, pos)) { + size_t len; + + u_param = (osip_uri_param_t *) osip_list_get(&request->req_uri->url_params, pos); + len = strlen(u_param->gname); + if (pname_len == len + && osip_strncasecmp(u_param->gname, "method", pname_len) == 0 + && u_param->gvalue!=NULL) { + osip_list_remove(&request->req_uri->url_params, pos); + osip_uri_param_free(u_param); + break; + } + pos++; + } + } + + /* add a tag */ + osip_from_set_tag(request->from, osip_from_tag_new_random()); + + /* set the cseq and call_id header */ + { + osip_call_id_t *callid; + osip_cseq_t *cseq; + char *num; + char *cidrand; + + /* call-id is always the same for REGISTRATIONS */ + i = osip_call_id_init(&callid); + if (i != 0) { + osip_message_free(request); + return i; + } + cidrand = osip_call_id_new_random(); + osip_call_id_set_number(callid, cidrand); + if (doing_register) + register_callid_number = cidrand; + + request->call_id = callid; + + i = osip_cseq_init(&cseq); + if (i != 0) { + osip_message_free(request); + return i; + } + num = osip_strdup(doing_register ? "1" : "20"); + osip_cseq_set_number(cseq, num); + osip_cseq_set_method(cseq, osip_strdup(method)); + request->cseq = cseq; + + if (cseq->method == NULL || cseq->number == NULL) { + osip_message_free(request); + return OSIP_NOMEM; + } + } + + i = _eXosip_request_add_via(request, transport, locip); + if (i != 0) { + osip_message_free(request); + return i; + } + + /* always add the Max-Forward header */ + osip_message_set_max_forwards(request, "70"); /* a UA should start a request with 70 */ + + if (0 == strcmp("REGISTER", method)) { + } else if (0 == strcmp("INFO", method)) { + } else if (0 == strcmp("OPTIONS", method)) { + osip_message_set_accept(request, "application/sdp"); + } + + osip_message_set_user_agent(request, eXosip.user_agent); + /* else if ... */ + *dest = request; + return OSIP_SUCCESS; } int -generating_register (eXosip_reg_t * jreg, osip_message_t ** reg, char *transport, - char *from, char *proxy, char *contact, int expires) +generating_register(eXosip_reg_t * jreg, osip_message_t ** reg, char *transport, + char *from, char *proxy, char *contact, int expires) { - int i; - char locip[65]; - char firewall_ip[65]; - char firewall_port[10]; - if (eXosip.eXtl == NULL) - return OSIP_NO_NETWORK; - - firewall_ip[0] = '\0'; - firewall_port[0] = '\0'; - if (eXosip.eXtl->tl_get_masquerade_contact != NULL) - { - eXosip.eXtl->tl_get_masquerade_contact (firewall_ip, sizeof (firewall_ip), - firewall_port, - sizeof (firewall_port)); - } - - i = - generating_request_out_of_dialog (reg, "REGISTER", NULL, transport, from, - proxy); - if (i != 0) - return i; - - memset (locip, '\0', sizeof (locip)); - eXosip_guess_ip_for_via (eXosip.eXtl->proto_family, locip, 49); - - if (locip[0] == '\0') - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: no default interface defined\n")); - osip_message_free (*reg); - *reg = NULL; - return OSIP_NO_NETWORK; - } - - if (contact == NULL) - { - osip_contact_t *new_contact = NULL; - osip_uri_t *new_contact_url = NULL; - - i = osip_contact_init (&new_contact); - if (i == 0) - i = osip_uri_init (&new_contact_url); - - new_contact->url = new_contact_url; - - if (i == 0 && (*reg)->from != NULL - && (*reg)->from->url != NULL && (*reg)->from->url->username != NULL) - { - new_contact_url->username = osip_strdup ((*reg)->from->url->username); - } - - if (i == 0 && (*reg)->from != NULL && (*reg)->from->url != NULL) - { - /* serach for correct ip */ - if (firewall_ip[0] != '\0') - { - char *c_address = (*reg)->req_uri->host; - - struct addrinfo *addrinfo; - struct __eXosip_sockaddr addr; - - i = - eXosip_get_addrinfo (&addrinfo, (*reg)->req_uri->host, 5060, - IPPROTO_UDP); - if (i == 0) - { - memcpy (&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); - eXosip_freeaddrinfo (addrinfo); - c_address = inet_ntoa (((struct sockaddr_in *) &addr)->sin_addr); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: here is the resolved destination host=%s\n", - c_address)); - } - - if (eXosip_is_public_address (c_address)) - { - new_contact_url->host = osip_strdup (firewall_ip); - new_contact_url->port = osip_strdup (firewall_port); - } else - { - new_contact_url->host = osip_strdup (locip); - new_contact_url->port = osip_strdup (firewall_port); - } - } else - { - new_contact_url->host = osip_strdup (locip); - new_contact_url->port = osip_strdup (firewall_port); - } - - if (transport != NULL && osip_strcasecmp (transport, "UDP") != 0) - { - osip_uri_uparam_add (new_contact_url, osip_strdup ("transport"), - osip_strdup (transport)); - } - - if (jreg->r_line[0] != '\0') - { - osip_uri_uparam_add (new_contact_url, osip_strdup ("line"), - osip_strdup (jreg->r_line)); - } - - osip_list_add (&(*reg)->contacts, new_contact, -1); - } - } else - { - osip_message_set_contact (*reg, contact); - } - - { - char exp[10]; /* MUST never be ouside 1 and 3600 */ - - snprintf (exp, 9, "%i", expires); - osip_message_set_expires (*reg, exp); - } + int i; + char locip[65]; + char firewall_ip[65]; + char firewall_port[10]; + if (eXosip.eXtl == NULL) + return OSIP_NO_NETWORK; + + firewall_ip[0] = '\0'; + firewall_port[0] = '\0'; + if (eXosip.eXtl->tl_get_masquerade_contact != NULL) { + eXosip.eXtl->tl_get_masquerade_contact(firewall_ip, sizeof(firewall_ip), + firewall_port, + sizeof(firewall_port)); + } + + i = generating_request_out_of_dialog(reg, "REGISTER", NULL, transport, from, + proxy); + if (i != 0) + return i; + + memset(locip, '\0', sizeof(locip)); + eXosip_guess_ip_for_via(eXosip.eXtl->proto_family, locip, 49); + + if (locip[0] == '\0') { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: no default interface defined\n")); + osip_message_free(*reg); + *reg = NULL; + return OSIP_NO_NETWORK; + } + + if (contact == NULL) { + osip_contact_t *new_contact = NULL; + osip_uri_t *new_contact_url = NULL; + + i = osip_contact_init(&new_contact); + if (i == 0) + i = osip_uri_init(&new_contact_url); + + new_contact->url = new_contact_url; + + if (i == 0 && (*reg)->from != NULL + && (*reg)->from->url != NULL && (*reg)->from->url->username != NULL) { + new_contact_url->username = osip_strdup((*reg)->from->url->username); + } + + if (i == 0 && (*reg)->from != NULL && (*reg)->from->url != NULL) { + /* serach for correct ip */ + if (firewall_ip[0] != '\0' && (*reg)->req_uri->host != NULL) { +#ifdef USE_LOCALIP_WITH_LOCALPROXY /* disable this code for local testing because it adds an extra DNS */ + char *c_address = (*reg)->req_uri->host; + + struct addrinfo *addrinfo; + struct __eXosip_sockaddr addr; + + i = eXosip_get_addrinfo(&addrinfo, (*reg)->req_uri->host, 5060, + IPPROTO_UDP); + if (i == 0) { + memcpy(&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); + eXosip_freeaddrinfo(addrinfo); + c_address = + inet_ntoa(((struct sockaddr_in *) &addr)->sin_addr); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: here is the resolved destination host=%s\n", + c_address)); + } + + if (eXosip_is_public_address(c_address)) { + new_contact_url->host = osip_strdup(firewall_ip); + new_contact_url->port = osip_strdup(firewall_port); + } else { + new_contact_url->host = osip_strdup(locip); + new_contact_url->port = osip_strdup(firewall_port); + } +#else + new_contact_url->host = osip_strdup(firewall_ip); + new_contact_url->port = osip_strdup(firewall_port); +#endif + } else { + new_contact_url->host = osip_strdup(locip); + new_contact_url->port = osip_strdup(firewall_port); + } + + if (transport != NULL && osip_strcasecmp(transport, "UDP") != 0) { + osip_uri_uparam_add(new_contact_url, osip_strdup("transport"), + osip_strdup(transport)); + } + + if (jreg->r_line[0] != '\0') { + osip_uri_uparam_add(new_contact_url, osip_strdup("line"), + osip_strdup(jreg->r_line)); + } + if(jreg->r_qvalue[0] != 0) + osip_contact_param_add(new_contact, osip_strdup("q"), osip_strdup(jreg->r_qvalue)); + + osip_list_add(&(*reg)->contacts, new_contact, -1); + } + else + osip_contact_free(new_contact); + } else { + osip_message_set_contact(*reg, contact); + } + + { + char exp[10]; /* MUST never be ouside 1 and 3600 */ + + snprintf(exp, 9, "%i", expires); + osip_message_set_expires(*reg, exp); + } - osip_message_set_content_length (*reg, "0"); + osip_message_set_content_length(*reg, "0"); - return OSIP_SUCCESS; + return OSIP_SUCCESS; } #ifndef MINISIZE int -generating_publish (osip_message_t ** message, const char *to, - const char *from, const char *route) +generating_publish(osip_message_t ** message, const char *to, + const char *from, const char *route) { - int i; + int i; - if (to != NULL && *to == '\0') - return OSIP_BADPARAMETER; + if (to != NULL && *to == '\0') + return OSIP_BADPARAMETER; - if (route != NULL && *route == '\0') - route = NULL; + if (route != NULL && *route == '\0') + route = NULL; - i = generating_request_out_of_dialog (message, "PUBLISH", to, "UDP", from, - route); - if (i != 0) - return i; + i = generating_request_out_of_dialog(message, "PUBLISH", to, "UDP", from, + route); + if (i != 0) + return i; - /* osip_message_set_organization(*message, "Jack's Org"); */ + /* osip_message_set_organization(*message, "Jack's Org"); */ - return OSIP_SUCCESS; + return OSIP_SUCCESS; } #endif -static int -dialog_fill_route_set (osip_dialog_t * dialog, osip_message_t * request) +static int dialog_fill_route_set(osip_dialog_t * dialog, osip_message_t * request) { - /* if the pre-existing route set contains a "lr" (compliance - with bis-08) then the req_uri should contains the remote target - URI */ - int i; - int pos = 0; - osip_uri_param_t *lr_param; - osip_route_t *route; - char *last_route; - - /* AMD bug: fixed 17/06/2002 */ - - route = (osip_route_t *) osip_list_get (&dialog->route_set, 0); - - osip_uri_uparam_get_byname (route->url, "lr", &lr_param); - if (lr_param != NULL) /* the remote target URI is the req_uri! */ - { - i = osip_uri_clone (dialog->remote_contact_uri->url, &(request->req_uri)); - if (i != 0) - return i; - /* "[request] MUST includes a Route header field containing - the route set values in order." */ - /* AMD bug: fixed 17/06/2002 */ - pos = 0; /* first element is at index 0 */ - while (!osip_list_eol (&dialog->route_set, pos)) - { - osip_route_t *route2; - - route = osip_list_get (&dialog->route_set, pos); - i = osip_route_clone (route, &route2); - if (i != 0) - return i; - osip_list_add (&request->routes, route2, -1); - pos++; - } - return OSIP_SUCCESS; - } - - /* if the first URI of route set does not contain "lr", the req_uri - is set to the first uri of route set */ - - - i = osip_uri_clone (route->url, &(request->req_uri)); - if (i != 0) - return i; - /* add the route set */ - /* "The UAC MUST add a route header field containing - the remainder of the route set values in order. */ - pos = 0; /* yes it is */ - - while (!osip_list_eol (&dialog->route_set, pos)) /* not the first one in the list */ - { - osip_route_t *route2; - - route = osip_list_get (&dialog->route_set, pos); - i = osip_route_clone (route, &route2); - if (i != 0) - return i; - if (!osip_list_eol (&dialog->route_set, pos + 1)) - osip_list_add (&request->routes, route2, -1); - else - osip_route_free (route2); - pos++; - } - - /* The UAC MUST then place the remote target URI into - the route header field as the last value */ - i = osip_uri_to_str (dialog->remote_contact_uri->url, &last_route); - if (i != 0) - return i; - i = osip_message_set_route (request, last_route); - osip_free (last_route); - if (i != 0) - { - return i; - } + /* if the pre-existing route set contains a "lr" (compliance + with bis-08) then the req_uri should contains the remote target + URI */ + int i; + int pos = 0; + osip_uri_param_t *lr_param; + osip_route_t *route; + char *last_route; + + /* AMD bug: fixed 17/06/2002 */ + + route = (osip_route_t *) osip_list_get(&dialog->route_set, 0); + + osip_uri_uparam_get_byname(route->url, "lr", &lr_param); + if (lr_param != NULL) { /* the remote target URI is the req_uri! */ + i = osip_uri_clone(dialog->remote_contact_uri->url, &(request->req_uri)); + if (i != 0) + return i; + /* "[request] MUST includes a Route header field containing + the route set values in order." */ + /* AMD bug: fixed 17/06/2002 */ + pos = 0; /* first element is at index 0 */ + while (!osip_list_eol(&dialog->route_set, pos)) { + osip_route_t *route2; + + route = osip_list_get(&dialog->route_set, pos); + i = osip_route_clone(route, &route2); + if (i != 0) + return i; + osip_list_add(&request->routes, route2, -1); + pos++; + } + return OSIP_SUCCESS; + } + + /* if the first URI of route set does not contain "lr", the req_uri + is set to the first uri of route set */ + + + i = osip_uri_clone(route->url, &(request->req_uri)); + if (i != 0) + return i; + /* add the route set */ + /* "The UAC MUST add a route header field containing + the remainder of the route set values in order. */ + pos = 0; /* yes it is */ + + while (!osip_list_eol(&dialog->route_set, pos)) { /* not the first one in the list */ + osip_route_t *route2; + + route = osip_list_get(&dialog->route_set, pos); + i = osip_route_clone(route, &route2); + if (i != 0) + return i; + if (!osip_list_eol(&dialog->route_set, pos + 1)) + osip_list_add(&request->routes, route2, -1); + else + osip_route_free(route2); + pos++; + } + + /* The UAC MUST then place the remote target URI into + the route header field as the last value */ + i = osip_uri_to_str(dialog->remote_contact_uri->url, &last_route); + if (i != 0) + return i; + i = osip_message_set_route(request, last_route); + osip_free(last_route); + if (i != 0) { + return i; + } - /* route header and req_uri set */ - return OSIP_SUCCESS; + /* route header and req_uri set */ + return OSIP_SUCCESS; } int -_eXosip_build_request_within_dialog (osip_message_t ** dest, - const char *method, - osip_dialog_t * dialog, const char *transport) +_eXosip_build_request_within_dialog(osip_message_t ** dest, + const char *method, + osip_dialog_t * dialog, const char *transport) { - int i; - osip_message_t *request; - char locip[65]; - char firewall_ip[65]; - char firewall_port[10]; - - *dest = NULL; - - if (dialog == NULL) - return OSIP_BADPARAMETER; - - if (eXosip.eXtl == NULL) - return OSIP_NO_NETWORK; - - firewall_ip[0] = '\0'; - firewall_port[0] = '\0'; - if (eXosip.eXtl->tl_get_masquerade_contact != NULL) - { - eXosip.eXtl->tl_get_masquerade_contact (firewall_ip, sizeof (firewall_ip), - firewall_port, - sizeof (firewall_port)); - } - - i = osip_message_init (&request); - if (i != 0) - return i; - - if (dialog->remote_contact_uri == NULL) - { - /* this dialog is probably not established! or the remote UA - is not compliant with the latest RFC - */ - osip_message_free (request); - return OSIP_SYNTAXERROR; - } - - - memset (locip, '\0', sizeof (locip)); - eXosip_guess_ip_for_via (eXosip.eXtl->proto_family, locip, 49); - if (locip[0] == '\0') - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: no default interface defined\n")); - osip_message_free (request); - return OSIP_NO_NETWORK; - } - - /* prepare the request-line */ - request->sip_method = osip_strdup (method); - if (request->sip_method == NULL) - { - osip_message_free (request); - return OSIP_NOMEM; - } - request->sip_version = osip_strdup ("SIP/2.0"); - if (request->sip_version == NULL) - { - osip_message_free (request); - return OSIP_NOMEM; - } - request->status_code = 0; - request->reason_phrase = NULL; - - /* and the request uri???? */ - if (osip_list_eol (&dialog->route_set, 0)) - { - /* The UAC must put the remote target URI (to field) in the req_uri */ - i = osip_uri_clone (dialog->remote_contact_uri->url, &(request->req_uri)); - if (i != 0) - { - osip_message_free (request); - return i; - } - } else - { - /* fill the request-uri, and the route headers. */ - i = dialog_fill_route_set (dialog, request); - if (i != 0) - { - osip_message_free (request); - return i; - } - } - - /* To and From already contains the proper tag! */ - i = osip_to_clone (dialog->remote_uri, &(request->to)); - if (i != 0) - { - osip_message_free (request); - return i; - } - i = osip_from_clone (dialog->local_uri, &(request->from)); - if (i != 0) - { - osip_message_free (request); - return i; - } - - /* set the cseq and call_id header */ - osip_message_set_call_id (request, dialog->call_id); - - if (0 == strcmp ("ACK", method)) - { - osip_cseq_t *cseq; - char *tmp; - - i = osip_cseq_init (&cseq); - if (i != 0) - { - osip_message_free (request); - return i; - } - tmp = osip_malloc (20); - if (tmp == NULL) - { - osip_message_free (request); - return OSIP_NOMEM; - } - sprintf (tmp, "%i", dialog->local_cseq); - osip_cseq_set_number (cseq, tmp); - osip_cseq_set_method (cseq, osip_strdup (method)); - request->cseq = cseq; - } else - { - osip_cseq_t *cseq; - char *tmp; - - i = osip_cseq_init (&cseq); - if (i != 0) - { - osip_message_free (request); - return i; - } - dialog->local_cseq++; /* we should we do that?? */ - tmp = osip_malloc (20); - if (tmp == NULL) - { - osip_message_free (request); - return OSIP_NOMEM; - } - sprintf (tmp, "%i", dialog->local_cseq); - osip_cseq_set_number (cseq, tmp); - osip_cseq_set_method (cseq, osip_strdup (method)); - request->cseq = cseq; - } - - /* always add the Max-Forward header */ - osip_message_set_max_forwards (request, "70"); /* a UA should start a request with 70 */ - - - i = _eXosip_request_add_via (request, transport, locip); - if (i != 0) - { - osip_message_free (request); - return i; - } - - /* add specific headers for each kind of request... */ - - { - char contact[200]; - - if (firewall_ip[0] != '\0') - { - char *c_address = request->req_uri->host; - - struct addrinfo *addrinfo; - struct __eXosip_sockaddr addr; - - i = - eXosip_get_addrinfo (&addrinfo, request->req_uri->host, 5060, - IPPROTO_UDP); - if (i == 0) - { - memcpy (&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); - eXosip_freeaddrinfo (addrinfo); - c_address = inet_ntoa (((struct sockaddr_in *) &addr)->sin_addr); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: here is the resolved destination host=%s\n", - c_address)); - } - - if (eXosip_is_public_address (c_address)) - { - sprintf (contact, "", - dialog->local_uri->url->username, firewall_ip, firewall_port); - } else - { - sprintf (contact, "", - dialog->local_uri->url->username, locip, firewall_port); - } - } else - { - sprintf (contact, "", dialog->local_uri->url->username, - locip, firewall_port); - } - osip_message_set_contact (request, contact); - /* Here we'll add the supported header if it's needed! */ - /* the require header must be added by the upper layer if needed */ - } - - if (0 == strcmp ("NOTIFY", method)) - { - } else if (0 == strcmp ("INFO", method)) - { - - } else if (0 == strcmp ("OPTIONS", method)) - { - osip_message_set_accept (request, "application/sdp"); - } else if (0 == strcmp ("ACK", method)) - { - /* The ACK MUST contains the same credential than the INVITE!! */ - /* TODO... */ - } - - osip_message_set_user_agent (request, eXosip.user_agent); - /* else if ... */ - *dest = request; - return OSIP_SUCCESS; + int i; + osip_message_t *request; + char locip[65]; + char firewall_ip[65]; + char firewall_port[10]; + + *dest = NULL; + + if (dialog == NULL) + return OSIP_BADPARAMETER; + + if (eXosip.eXtl == NULL) + return OSIP_NO_NETWORK; + + firewall_ip[0] = '\0'; + firewall_port[0] = '\0'; + if (eXosip.eXtl->tl_get_masquerade_contact != NULL) { + eXosip.eXtl->tl_get_masquerade_contact(firewall_ip, sizeof(firewall_ip), + firewall_port, + sizeof(firewall_port)); + } + + i = osip_message_init(&request); + if (i != 0) + return i; + + if (dialog->remote_contact_uri == NULL) { + /* this dialog is probably not established! or the remote UA + is not compliant with the latest RFC + */ + osip_message_free(request); + return OSIP_SYNTAXERROR; + } + + + memset(locip, '\0', sizeof(locip)); + eXosip_guess_ip_for_via(eXosip.eXtl->proto_family, locip, 49); + if (locip[0] == '\0') { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: no default interface defined\n")); + osip_message_free(request); + return OSIP_NO_NETWORK; + } + + /* prepare the request-line */ + request->sip_method = osip_strdup(method); + if (request->sip_method == NULL) { + osip_message_free(request); + return OSIP_NOMEM; + } + request->sip_version = osip_strdup("SIP/2.0"); + if (request->sip_version == NULL) { + osip_message_free(request); + return OSIP_NOMEM; + } + request->status_code = 0; + request->reason_phrase = NULL; + + /* and the request uri???? */ + if (osip_list_eol(&dialog->route_set, 0)) { + /* The UAC must put the remote target URI (to field) in the req_uri */ + i = osip_uri_clone(dialog->remote_contact_uri->url, &(request->req_uri)); + if (i != 0) { + osip_message_free(request); + return i; + } + } else { + /* fill the request-uri, and the route headers. */ + i = dialog_fill_route_set(dialog, request); + if (i != 0) { + osip_message_free(request); + return i; + } + } + + /* To and From already contains the proper tag! */ + i = osip_to_clone(dialog->remote_uri, &(request->to)); + if (i != 0) { + osip_message_free(request); + return i; + } + i = osip_from_clone(dialog->local_uri, &(request->from)); + if (i != 0) { + osip_message_free(request); + return i; + } + + /* set the cseq and call_id header */ + osip_message_set_call_id(request, dialog->call_id); + + if (0 == strcmp("ACK", method)) { + osip_cseq_t *cseq; + char *tmp; + + i = osip_cseq_init(&cseq); + if (i != 0) { + osip_message_free(request); + return i; + } + tmp = osip_malloc(20); + if (tmp == NULL) { + osip_message_free(request); + return OSIP_NOMEM; + } + sprintf(tmp, "%i", dialog->local_cseq); + osip_cseq_set_number(cseq, tmp); + osip_cseq_set_method(cseq, osip_strdup(method)); + request->cseq = cseq; + } else { + osip_cseq_t *cseq; + char *tmp; + + i = osip_cseq_init(&cseq); + if (i != 0) { + osip_message_free(request); + return i; + } + dialog->local_cseq++; /* we should we do that?? */ + tmp = osip_malloc(20); + if (tmp == NULL) { + osip_message_free(request); + return OSIP_NOMEM; + } + snprintf(tmp, 20, "%i", dialog->local_cseq); + osip_cseq_set_number(cseq, tmp); + osip_cseq_set_method(cseq, osip_strdup(method)); + request->cseq = cseq; + } + + /* always add the Max-Forward header */ + osip_message_set_max_forwards(request, "70"); /* a UA should start a request with 70 */ + + + i = _eXosip_request_add_via(request, transport, locip); + if (i != 0) { + osip_message_free(request); + return i; + } + + /* add specific headers for each kind of request... */ + +#if 0 + { + char contact[200]; + + if (firewall_ip[0] != '\0') { + char *c_address = request->req_uri->host; + + struct addrinfo *addrinfo; + struct __eXosip_sockaddr addr; + + i = eXosip_get_addrinfo(&addrinfo, request->req_uri->host, 5060, + IPPROTO_UDP); + if (i == 0) { + memcpy(&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); + eXosip_freeaddrinfo(addrinfo); + c_address = inet_ntoa(((struct sockaddr_in *) &addr)->sin_addr); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: here is the resolved destination host=%s\n", + c_address)); + } + + if (eXosip_is_public_address(c_address)) { + sprintf(contact, "", + dialog->local_uri->url->username, firewall_ip, + firewall_port); + } else { + sprintf(contact, "", + dialog->local_uri->url->username, locip, firewall_port); + } + } else { + sprintf(contact, "", dialog->local_uri->url->username, + locip, firewall_port); + } + osip_message_set_contact(request, contact); + /* Here we'll add the supported header if it's needed! */ + /* the require header must be added by the upper layer if needed */ + } +#else + _eXosip_dialog_add_contact(request, NULL); +#endif + + if (0 == strcmp("NOTIFY", method)) { + } else if (0 == strcmp("INFO", method)) { + + } else if (0 == strcmp("OPTIONS", method)) { + osip_message_set_accept(request, "application/sdp"); + } else if (0 == strcmp("ACK", method)) { + /* The ACK MUST contains the same credential than the INVITE!! */ + /* TODO... */ + } + + osip_message_set_user_agent(request, eXosip.user_agent); + /* else if ... */ + *dest = request; + return OSIP_SUCCESS; } /* this request is only build within a dialog!! */ -int -generating_bye (osip_message_t ** bye, osip_dialog_t * dialog, char *transport) +int generating_bye(osip_message_t ** bye, osip_dialog_t * dialog, char *transport) { - int i; + int i; - i = _eXosip_build_request_within_dialog (bye, "BYE", dialog, transport); - if (i != 0) - return i; + i = _eXosip_build_request_within_dialog(bye, "BYE", dialog, transport); + if (i != 0) + return i; - return OSIP_SUCCESS; + return OSIP_SUCCESS; } /* It is RECOMMENDED to only cancel INVITE request */ -int -generating_cancel (osip_message_t ** dest, osip_message_t * request_cancelled) +int generating_cancel(osip_message_t ** dest, osip_message_t * request_cancelled) { - int i; - osip_message_t *request; + int i; + osip_message_t *request; - i = osip_message_init (&request); - if (i != 0) - return i; - - /* prepare the request-line */ - osip_message_set_method (request, osip_strdup ("CANCEL")); - osip_message_set_version (request, osip_strdup ("SIP/2.0")); - osip_message_set_status_code (request, 0); - osip_message_set_reason_phrase (request, NULL); - - i = osip_uri_clone (request_cancelled->req_uri, &(request->req_uri)); - if (i != 0) - { - osip_message_free (request); - *dest = NULL; - return i; - } - - i = osip_to_clone (request_cancelled->to, &(request->to)); - if (i != 0) - { - osip_message_free (request); - *dest = NULL; - return i; - } - i = osip_from_clone (request_cancelled->from, &(request->from)); - if (i != 0) - { - osip_message_free (request); - *dest = NULL; - return i; - } - - /* set the cseq and call_id header */ - i = osip_call_id_clone (request_cancelled->call_id, &(request->call_id)); - if (i != 0) - { - osip_message_free (request); - *dest = NULL; - return i; - } - i = osip_cseq_clone (request_cancelled->cseq, &(request->cseq)); - if (i != 0) - { - osip_message_free (request); - *dest = NULL; - return i; - } - osip_free (request->cseq->method); - request->cseq->method = osip_strdup ("CANCEL"); - if (request->cseq->method == NULL) - { - osip_message_free (request); - *dest = NULL; - return OSIP_NOMEM; - } - - /* copy ONLY the top most Via Field (this method is also used by proxy) */ - { - osip_via_t *via; - osip_via_t *via2; - - i = osip_message_get_via (request_cancelled, 0, &via); - if (i < 0) - { - osip_message_free (request); - *dest = NULL; - return i; - } - i = osip_via_clone (via, &via2); - if (i != 0) - { - osip_message_free (request); - *dest = NULL; - return i; - } - osip_list_add (&request->vias, via2, -1); - } - - /* add the same route-set than in the previous request */ - { - int pos = 0; - osip_route_t *route; - osip_route_t *route2; - - while (!osip_list_eol (&request_cancelled->routes, pos)) - { - route = (osip_route_t *) osip_list_get (&request_cancelled->routes, pos); - i = osip_route_clone (route, &route2); - if (i != 0) - { - osip_message_free (request); - *dest = NULL; - return i; - } - osip_list_add (&request->routes, route2, -1); - pos++; - } - } + i = osip_message_init(&request); + if (i != 0) + return i; + + /* prepare the request-line */ + osip_message_set_method(request, osip_strdup("CANCEL")); + osip_message_set_version(request, osip_strdup("SIP/2.0")); + osip_message_set_status_code(request, 0); + osip_message_set_reason_phrase(request, NULL); + + i = osip_uri_clone(request_cancelled->req_uri, &(request->req_uri)); + if (i != 0) { + osip_message_free(request); + *dest = NULL; + return i; + } + + i = osip_to_clone(request_cancelled->to, &(request->to)); + if (i != 0) { + osip_message_free(request); + *dest = NULL; + return i; + } + i = osip_from_clone(request_cancelled->from, &(request->from)); + if (i != 0) { + osip_message_free(request); + *dest = NULL; + return i; + } + + /* set the cseq and call_id header */ + i = osip_call_id_clone(request_cancelled->call_id, &(request->call_id)); + if (i != 0) { + osip_message_free(request); + *dest = NULL; + return i; + } + i = osip_cseq_clone(request_cancelled->cseq, &(request->cseq)); + if (i != 0) { + osip_message_free(request); + *dest = NULL; + return i; + } + osip_free(request->cseq->method); + request->cseq->method = osip_strdup("CANCEL"); + if (request->cseq->method == NULL) { + osip_message_free(request); + *dest = NULL; + return OSIP_NOMEM; + } + + /* copy ONLY the top most Via Field (this method is also used by proxy) */ + { + osip_via_t *via; + osip_via_t *via2; + + i = osip_message_get_via(request_cancelled, 0, &via); + if (i < 0) { + osip_message_free(request); + *dest = NULL; + return i; + } + i = osip_via_clone(via, &via2); + if (i != 0) { + osip_message_free(request); + *dest = NULL; + return i; + } + osip_list_add(&request->vias, via2, -1); + } + + /* add the same route-set than in the previous request */ + { + int pos = 0; + osip_route_t *route; + osip_route_t *route2; + + while (!osip_list_eol(&request_cancelled->routes, pos)) { + route = + (osip_route_t *) osip_list_get(&request_cancelled->routes, pos); + i = osip_route_clone(route, &route2); + if (i != 0) { + osip_message_free(request); + *dest = NULL; + return i; + } + osip_list_add(&request->routes, route2, -1); + pos++; + } + } - osip_message_set_max_forwards (request, "70"); /* a UA should start a request with 70 */ - osip_message_set_user_agent (request, eXosip.user_agent); + osip_message_set_max_forwards(request, "70"); /* a UA should start a request with 70 */ + osip_message_set_user_agent(request, eXosip.user_agent); - *dest = request; - return OSIP_SUCCESS; + *dest = request; + return OSIP_SUCCESS; } diff -Nru libexosip2-3.3.0/src/jresponse.c libexosip2-3.6.0/src/jresponse.c --- libexosip2-3.3.0/src/jresponse.c 2008-11-11 10:40:33.000000000 +0000 +++ libexosip2-3.6.0/src/jresponse.c 2011-09-27 23:56:28.000000000 +0000 @@ -28,458 +28,431 @@ int -_eXosip_build_response_default (osip_message_t ** dest, - osip_dialog_t * dialog, int status, - osip_message_t * request) +_eXosip_build_response_default(osip_message_t ** dest, + osip_dialog_t * dialog, int status, + osip_message_t * request) { - osip_generic_param_t *tag; - osip_message_t *response; - int pos; - int i; - - *dest = NULL; - if (request == NULL) - return OSIP_BADPARAMETER; - - i = osip_message_init (&response); - if (i != 0) - return i; - /* initialise osip_message_t structure */ - /* yet done... */ - - response->sip_version = (char *) osip_malloc (8 * sizeof (char)); - if (response->sip_version == NULL) - { - osip_message_free (response); - return OSIP_NOMEM; - } - sprintf (response->sip_version, "SIP/2.0"); - osip_message_set_status_code (response, status); + osip_generic_param_t *tag; + osip_message_t *response; + int pos; + int i; + + *dest = NULL; + if (request == NULL) + return OSIP_BADPARAMETER; + + i = osip_message_init(&response); + if (i != 0) + return i; + /* initialise osip_message_t structure */ + /* yet done... */ + + response->sip_version = (char *) osip_malloc(8 * sizeof(char)); + if (response->sip_version == NULL) { + osip_message_free(response); + return OSIP_NOMEM; + } + sprintf(response->sip_version, "SIP/2.0"); + osip_message_set_status_code(response, status); #ifndef MINISIZE - /* handle some internal reason definitions. */ - if (MSG_IS_NOTIFY (request) && status == 481) - { - response->reason_phrase = osip_strdup ("Subscription Does Not Exist"); - } else if (MSG_IS_SUBSCRIBE (request) && status == 202) - { - response->reason_phrase = osip_strdup ("Accepted subscription"); - } else - { - response->reason_phrase = osip_strdup (osip_message_get_reason (status)); - if (response->reason_phrase == NULL) - { - if (response->status_code == 101) - response->reason_phrase = osip_strdup ("Dialog Establishement"); - else - response->reason_phrase = osip_strdup ("Unknown code"); - } - response->req_uri = NULL; - response->sip_method = NULL; - } + /* handle some internal reason definitions. */ + if (MSG_IS_NOTIFY(request) && status == 481) { + response->reason_phrase = osip_strdup("Subscription Does Not Exist"); + } else if (MSG_IS_SUBSCRIBE(request) && status == 202) { + response->reason_phrase = osip_strdup("Accepted subscription"); + } else { + response->reason_phrase = osip_strdup(osip_message_get_reason(status)); + if (response->reason_phrase == NULL) { + if (response->status_code == 101) + response->reason_phrase = osip_strdup("Dialog Establishement"); + else + response->reason_phrase = osip_strdup("Unknown code"); + } + response->req_uri = NULL; + response->sip_method = NULL; + } #else - response->reason_phrase = osip_strdup (osip_message_get_reason (status)); - if (response->reason_phrase == NULL) - { - if (response->status_code == 101) - response->reason_phrase = osip_strdup ("Dialog Establishement"); - else - response->reason_phrase = osip_strdup ("Unknown code"); - } - response->req_uri = NULL; - response->sip_method = NULL; + response->reason_phrase = osip_strdup(osip_message_get_reason(status)); + if (response->reason_phrase == NULL) { + if (response->status_code == 101) + response->reason_phrase = osip_strdup("Dialog Establishement"); + else + response->reason_phrase = osip_strdup("Unknown code"); + } + response->req_uri = NULL; + response->sip_method = NULL; #endif - if (response->reason_phrase == NULL) - { - osip_message_free (response); - return OSIP_NOMEM; - } - - i = osip_to_clone (request->to, &(response->to)); - if (i != 0) - { - osip_message_free (response); - return i; - } - - i = osip_to_get_tag (response->to, &tag); - if (i != 0) - { /* we only add a tag if it does not already contains one! */ - if ((dialog != NULL) && (dialog->local_tag != NULL)) - /* it should contain the local TAG we created */ - { - osip_to_set_tag (response->to, osip_strdup (dialog->local_tag)); - } else - { - if (status != 100) - osip_to_set_tag (response->to, osip_to_tag_new_random ()); - } - } - - i = osip_from_clone (request->from, &(response->from)); - if (i != 0) - { - osip_message_free (response); - return i; - } - - pos = 0; - while (!osip_list_eol (&request->vias, pos)) - { - osip_via_t *via; - osip_via_t *via2; - - via = (osip_via_t *) osip_list_get (&request->vias, pos); - i = osip_via_clone (via, &via2); - if (i != 0) - { - osip_message_free (response); - return i; - } - osip_list_add (&response->vias, via2, -1); - pos++; - } - - i = osip_call_id_clone (request->call_id, &(response->call_id)); - if (i != 0) - { - osip_message_free (response); - return i; - } - i = osip_cseq_clone (request->cseq, &(response->cseq)); - if (i != 0) - { - osip_message_free (response); - return i; - } + if (response->reason_phrase == NULL) { + osip_message_free(response); + return OSIP_NOMEM; + } + + i = osip_to_clone(request->to, &(response->to)); + if (i != 0) { + osip_message_free(response); + return i; + } + + i = osip_to_get_tag(response->to, &tag); + if (i != 0) { /* we only add a tag if it does not already contains one! */ + if ((dialog != NULL) && (dialog->local_tag != NULL)) + /* it should contain the local TAG we created */ + { + osip_to_set_tag(response->to, osip_strdup(dialog->local_tag)); + } else { + if (status != 100) + osip_to_set_tag(response->to, osip_to_tag_new_random()); + } + } + + i = osip_from_clone(request->from, &(response->from)); + if (i != 0) { + osip_message_free(response); + return i; + } + + pos = 0; + while (!osip_list_eol(&request->vias, pos)) { + osip_via_t *via; + osip_via_t *via2; + + via = (osip_via_t *) osip_list_get(&request->vias, pos); + i = osip_via_clone(via, &via2); + if (i != 0) { + osip_message_free(response); + return i; + } + osip_list_add(&response->vias, via2, -1); + pos++; + } + + i = osip_call_id_clone(request->call_id, &(response->call_id)); + if (i != 0) { + osip_message_free(response); + return i; + } + i = osip_cseq_clone(request->cseq, &(response->cseq)); + if (i != 0) { + osip_message_free(response); + return i; + } #ifndef MINISIZE - if (MSG_IS_SUBSCRIBE (request)) - { - osip_header_t *exp; - osip_header_t *evt_hdr; - - osip_message_header_get_byname (request, "event", 0, &evt_hdr); - if (evt_hdr != NULL && evt_hdr->hvalue != NULL) - osip_message_set_header (response, "Event", evt_hdr->hvalue); - else - osip_message_set_header (response, "Event", "presence"); - i = osip_message_get_expires (request, 0, &exp); - if (exp == NULL) - { - osip_header_t *cp; - - i = osip_header_clone (exp, &cp); - if (cp != NULL) - osip_list_add (&response->headers, cp, 0); - } - } + if (MSG_IS_SUBSCRIBE(request)) { + osip_header_t *exp; + osip_header_t *evt_hdr; + + osip_message_header_get_byname(request, "event", 0, &evt_hdr); + if (evt_hdr != NULL && evt_hdr->hvalue != NULL) + osip_message_set_header(response, "Event", evt_hdr->hvalue); + else + osip_message_set_header(response, "Event", "presence"); + i = osip_message_get_expires(request, 0, &exp); + if (exp == NULL) { + osip_header_t *cp; + + i = osip_header_clone(exp, &cp); + if (cp != NULL) + osip_list_add(&response->headers, cp, 0); + } + } #endif - osip_message_set_user_agent (response, eXosip.user_agent); + osip_message_set_user_agent(response, eXosip.user_agent); - *dest = response; - return OSIP_SUCCESS; + *dest = response; + return OSIP_SUCCESS; } int -complete_answer_that_establish_a_dialog (osip_message_t * response, - osip_message_t * request) +complete_answer_that_establish_a_dialog(osip_message_t * response, + osip_message_t * request) { - int i; - int pos = 0; - char contact[1024]; - char locip[65]; - char firewall_ip[65]; - char firewall_port[10]; - firewall_ip[0] = '\0'; - firewall_port[0] = '\0'; - if (eXosip.eXtl->tl_get_masquerade_contact != NULL) - { - eXosip.eXtl->tl_get_masquerade_contact (firewall_ip, sizeof (firewall_ip), - firewall_port, - sizeof (firewall_port)); - } - - /* 12.1.1: - copy all record-route in response - add a contact with global scope - */ - while (!osip_list_eol (&request->record_routes, pos)) - { - osip_record_route_t *rr; - osip_record_route_t *rr2; - - rr = osip_list_get (&request->record_routes, pos); - i = osip_record_route_clone (rr, &rr2); - if (i != 0) - return i; - osip_list_add (&response->record_routes, rr2, -1); - pos++; - } - - memset (locip, '\0', sizeof (locip)); - eXosip_guess_ip_for_via (eXosip.eXtl->proto_family, locip, 49); - - if (request->to->url->username == NULL) - snprintf (contact, 1000, "", locip, firewall_port); - else - snprintf (contact, 1000, "", request->to->url->username, - locip, firewall_port); - - if (firewall_ip[0] != '\0') - { - osip_contact_t *con = - (osip_contact_t *) osip_list_get (&request->contacts, 0); - if (con != NULL && con->url != NULL && con->url->host != NULL) - { - char *c_address = con->url->host; - - struct addrinfo *addrinfo; - struct __eXosip_sockaddr addr; - - i = eXosip_get_addrinfo (&addrinfo, con->url->host, 5060, IPPROTO_UDP); - if (i == 0) - { - memcpy (&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); - eXosip_freeaddrinfo (addrinfo); - c_address = inet_ntoa (((struct sockaddr_in *) &addr)->sin_addr); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: here is the resolved destination host=%s\n", - c_address)); - } - - /* If c_address is a PUBLIC address, the request was - coming from the PUBLIC network. */ - if (eXosip_is_public_address (c_address)) - { - if (request->to->url->username == NULL) - snprintf (contact, 1000, "", - firewall_ip, firewall_port); - else - snprintf (contact, 1000, "", - request->to->url->username, firewall_ip, firewall_port); - } - } - } - - { - osip_via_t *via; - - via = (osip_via_t *) osip_list_get (&response->vias, 0); - if (via == NULL || via->protocol == NULL) - return OSIP_SYNTAXERROR; - if (strlen (contact) + strlen (via->protocol) < 1024 - && 0 != osip_strcasecmp (via->protocol, "UDP")) - { - contact[strlen (contact) - 1] = '\0'; - strcat (contact, ";transport="); - strcat (contact, via->protocol); - strcat (contact, ">"); - } - } + int i; + int pos = 0; + char contact[1024]; + char locip[65]; + char firewall_ip[65]; + char firewall_port[10]; + firewall_ip[0] = '\0'; + firewall_port[0] = '\0'; + if (eXosip.eXtl->tl_get_masquerade_contact != NULL) { + eXosip.eXtl->tl_get_masquerade_contact(firewall_ip, sizeof(firewall_ip), + firewall_port, + sizeof(firewall_port)); + } + + /* 12.1.1: + copy all record-route in response + add a contact with global scope + */ + while (!osip_list_eol(&request->record_routes, pos)) { + osip_record_route_t *rr; + osip_record_route_t *rr2; + + rr = osip_list_get(&request->record_routes, pos); + i = osip_record_route_clone(rr, &rr2); + if (i != 0) + return i; + osip_list_add(&response->record_routes, rr2, -1); + pos++; + } + + memset(locip, '\0', sizeof(locip)); + eXosip_guess_ip_for_via(eXosip.eXtl->proto_family, locip, 49); + + if (request->to->url->username == NULL) + snprintf(contact, 1000, "", locip, firewall_port); + else + { + char *tmp2 = __osip_uri_escape_userinfo(request->to->url->username); + snprintf(contact, 1000, "", tmp2, locip, firewall_port); + osip_free(tmp2); + } + if (firewall_ip[0] != '\0') { +#ifdef USE_LOCALIP_WITH_LOCALPROXY /* disable this code for local testing because it adds an extra DNS */ + osip_contact_t *con = + (osip_contact_t *) osip_list_get(&request->contacts, 0); + if (con != NULL && con->url != NULL && con->url->host != NULL) { + char *c_address = con->url->host; + + struct addrinfo *addrinfo; + struct __eXosip_sockaddr addr; + + i = eXosip_get_addrinfo(&addrinfo, con->url->host, 5060, IPPROTO_UDP); + if (i == 0) { + memcpy(&addr, addrinfo->ai_addr, addrinfo->ai_addrlen); + eXosip_freeaddrinfo(addrinfo); + c_address = inet_ntoa(((struct sockaddr_in *) &addr)->sin_addr); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: here is the resolved destination host=%s\n", + c_address)); + } + + /* If c_address is a PUBLIC address, the request was + coming from the PUBLIC network. */ + if (eXosip_is_public_address(c_address)) { + if (request->to->url->username == NULL) + snprintf(contact, 1000, "", firewall_ip, firewall_port); + else + { + char *tmp2 = __osip_uri_escape_userinfo(request->to->url->username); + snprintf(contact, 1000, "", tmp2, firewall_ip, firewall_port); + osip_free(tmp2); + } + } + } +#else + if (request->to->url->username == NULL) + snprintf(contact, 1000, "", firewall_ip, firewall_port); + else + { + char *tmp2 = __osip_uri_escape_userinfo(request->to->url->username); + snprintf(contact, 1000, "", tmp2, firewall_ip, firewall_port); + osip_free(tmp2); + } +#endif + } + + { + osip_via_t *via; + + via = (osip_via_t *) osip_list_get(&response->vias, 0); + if (via == NULL || via->protocol == NULL) + return OSIP_SYNTAXERROR; + if (strlen(contact) + strlen(via->protocol) + strlen(";transport=>") < 1024 + && 0 != osip_strcasecmp(via->protocol, "UDP")) { + contact[strlen(contact) - 1] = '\0'; + strcat(contact, ";transport="); + strcat(contact, via->protocol); + strcat(contact, ">"); + } + } - osip_message_set_contact (response, contact); + osip_message_set_contact(response, contact); - return OSIP_SUCCESS; + return OSIP_SUCCESS; } int -_eXosip_answer_invite_123456xx (eXosip_call_t * jc, eXosip_dialog_t * jd, int code, - osip_message_t ** answer, int send) +_eXosip_answer_invite_123456xx(eXosip_call_t * jc, eXosip_dialog_t * jd, int code, + osip_message_t ** answer, int send) { - int i; - osip_transaction_t *tr; + int i; + osip_transaction_t *tr; - *answer = NULL; - tr = eXosip_find_last_inc_invite (jc, jd); + *answer = NULL; + tr = eXosip_find_last_inc_invite(jc, jd); - if (tr == NULL || tr->orig_request == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot find transaction to answer\n")); - return OSIP_NOTFOUND; - } - - if (code >= 200 && code < 300 && jd != NULL && jd->d_dialog == NULL) - { /* element previously removed */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot answer this closed transaction\n")); - return OSIP_WRONG_STATE; - } - - /* is the transaction already answered? */ - if (tr->state == IST_COMPLETED - || tr->state == IST_CONFIRMED || tr->state == IST_TERMINATED) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: transaction already answered\n")); - return OSIP_WRONG_STATE; - } - - if (jd == NULL) - i = _eXosip_build_response_default (answer, NULL, code, tr->orig_request); - else - i = - _eXosip_build_response_default (answer, jd->d_dialog, code, - tr->orig_request); - - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "ERROR: Could not create response for invite\n")); - *answer = NULL; - return i; - } - - /* request that estabish a dialog: */ - /* 12.1.1 UAS Behavior */ - if (code > 100 && code < 300) - { - i = complete_answer_that_establish_a_dialog (*answer, tr->orig_request); - if (i != 0) - { - osip_message_free (*answer); - *answer = NULL; - return i; - } - } - - - if (send == 1) - { - osip_event_t *evt_answer; - if (code >= 200 && code < 300 && jd != NULL) - { - eXosip_dialog_set_200ok (jd, *answer); - /* wait for a ACK */ - osip_dialog_set_state (jd->d_dialog, DIALOG_CONFIRMED); - } - - evt_answer = osip_new_outgoing_sipmessage (*answer); - evt_answer->transactionid = tr->transactionid; - - osip_transaction_add_event (tr, evt_answer); - __eXosip_wakeup (); - *answer = NULL; - } + if (tr == NULL || tr->orig_request == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot find transaction to answer\n")); + return OSIP_NOTFOUND; + } + + if (code >= 200 && code < 300 && jd != NULL && jd->d_dialog == NULL) { /* element previously removed */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot answer this closed transaction\n")); + return OSIP_WRONG_STATE; + } + + /* is the transaction already answered? */ + if (tr->state == IST_COMPLETED + || tr->state == IST_CONFIRMED || tr->state == IST_TERMINATED) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: transaction already answered\n")); + return OSIP_WRONG_STATE; + } + + if (jd == NULL) + i = _eXosip_build_response_default(answer, NULL, code, tr->orig_request); + else + i = _eXosip_build_response_default(answer, jd->d_dialog, code, + tr->orig_request); + + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "ERROR: Could not create response for invite\n")); + *answer = NULL; + return i; + } + + /* request that estabish a dialog: */ + /* 12.1.1 UAS Behavior */ + if (code > 100 && code < 300) { + i = complete_answer_that_establish_a_dialog(*answer, tr->orig_request); + if (i != 0) { + osip_message_free(*answer); + *answer = NULL; + return i; + } + } + + + if (send == 1) { + osip_event_t *evt_answer; + if (code >= 200 && code < 300 && jd != NULL) { + eXosip_dialog_set_200ok(jd, *answer); + /* wait for a ACK */ + osip_dialog_set_state(jd->d_dialog, DIALOG_CONFIRMED); + } + + evt_answer = osip_new_outgoing_sipmessage(*answer); + evt_answer->transactionid = tr->transactionid; + + osip_transaction_add_event(tr, evt_answer); + __eXosip_wakeup(); + *answer = NULL; + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } #ifndef MINISIZE int -_eXosip_insubscription_answer_1xx (eXosip_notify_t * jn, eXosip_dialog_t * jd, - int code) +_eXosip_insubscription_answer_1xx(eXosip_notify_t * jn, eXosip_dialog_t * jd, + int code) { - osip_event_t *evt_answer; - osip_message_t *response; - int i; - osip_transaction_t *tr; - - tr = eXosip_find_last_inc_subscribe (jn, jd); - if (tr == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot find transaction to answer")); - return OSIP_NOTFOUND; - } - - if (jd == NULL) - i = _eXosip_build_response_default (&response, NULL, code, tr->orig_request); - else - i = - _eXosip_build_response_default (&response, jd->d_dialog, code, - tr->orig_request); - - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: Could not create response for subscribe\n")); - return i; - } - - if (code > 100) - { - /* request that estabish a dialog: */ - /* 12.1.1 UAS Behavior */ - i = complete_answer_that_establish_a_dialog (response, tr->orig_request); - if (i != 0) - { - } - - if (jd == NULL) - { - i = eXosip_dialog_init_as_uas (&jd, tr->orig_request, response); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot create dialog!\n")); - } else - ADD_ELEMENT (jn->n_dialogs, jd); - } - } - - evt_answer = osip_new_outgoing_sipmessage (response); - evt_answer->transactionid = tr->transactionid; - - osip_transaction_add_event (tr, evt_answer); - __eXosip_wakeup (); - return i; + osip_event_t *evt_answer; + osip_message_t *response; + int i; + osip_transaction_t *tr; + + tr = eXosip_find_last_inc_subscribe(jn, jd); + if (tr == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot find transaction to answer")); + return OSIP_NOTFOUND; + } + + if (jd == NULL) + i = _eXosip_build_response_default(&response, NULL, code, + tr->orig_request); + else + i = _eXosip_build_response_default(&response, jd->d_dialog, code, + tr->orig_request); + + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: Could not create response for subscribe\n")); + return i; + } + + if (code > 100) { + /* request that estabish a dialog: */ + /* 12.1.1 UAS Behavior */ + i = complete_answer_that_establish_a_dialog(response, tr->orig_request); + if (i != 0) { + } + + if (jd == NULL) { + i = eXosip_dialog_init_as_uas(&jd, tr->orig_request, response); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot create dialog!\n")); + } else + ADD_ELEMENT(jn->n_dialogs, jd); + } + } + + evt_answer = osip_new_outgoing_sipmessage(response); + evt_answer->transactionid = tr->transactionid; + + osip_transaction_add_event(tr, evt_answer); + __eXosip_wakeup(); + return i; } int -_eXosip_insubscription_answer_3456xx (eXosip_notify_t * jn, - eXosip_dialog_t * jd, int code) +_eXosip_insubscription_answer_3456xx(eXosip_notify_t * jn, + eXosip_dialog_t * jd, int code) { - osip_event_t *evt_answer; - osip_message_t *response; - int i; - osip_transaction_t *tr; - - tr = eXosip_find_last_inc_subscribe (jn, jd); - if (tr == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot find transaction to answer")); - return OSIP_NOTFOUND; - } - if (jd == NULL) - i = _eXosip_build_response_default (&response, NULL, code, tr->orig_request); - else - i = - _eXosip_build_response_default (&response, jd->d_dialog, code, - tr->orig_request); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "ERROR: Could not create response for subscribe\n")); - return i; - } - - if ((300 <= code) && (code <= 399)) - { - /* Should add contact fields */ - /* ... */ - } - - evt_answer = osip_new_outgoing_sipmessage (response); - evt_answer->transactionid = tr->transactionid; - - osip_transaction_add_event (tr, evt_answer); - __eXosip_wakeup (); - return OSIP_SUCCESS; + osip_event_t *evt_answer; + osip_message_t *response; + int i; + osip_transaction_t *tr; + + tr = eXosip_find_last_inc_subscribe(jn, jd); + if (tr == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot find transaction to answer")); + return OSIP_NOTFOUND; + } + if (jd == NULL) + i = _eXosip_build_response_default(&response, NULL, code, + tr->orig_request); + else + i = _eXosip_build_response_default(&response, jd->d_dialog, code, + tr->orig_request); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "ERROR: Could not create response for subscribe\n")); + return i; + } + + if ((300 <= code) && (code <= 399)) { + /* Should add contact fields */ + /* ... */ + } + + evt_answer = osip_new_outgoing_sipmessage(response); + evt_answer->transactionid = tr->transactionid; + + osip_transaction_add_event(tr, evt_answer); + __eXosip_wakeup(); + return OSIP_SUCCESS; } #endif diff -Nru libexosip2-3.3.0/src/jsubscribe.c libexosip2-3.6.0/src/jsubscribe.c --- libexosip2-3.3.0/src/jsubscribe.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/jsubscribe.c 2011-03-22 17:41:35.000000000 +0000 @@ -28,133 +28,127 @@ extern eXosip_t eXosip; -osip_transaction_t * -eXosip_find_last_out_subscribe (eXosip_subscribe_t * js, eXosip_dialog_t * jd) +osip_transaction_t *eXosip_find_last_out_subscribe(eXosip_subscribe_t * js, + eXosip_dialog_t * jd) { - osip_transaction_t *out_tr; - int pos; + osip_transaction_t *out_tr; + int pos; - out_tr = NULL; - pos = 0; - if (jd != NULL) - { - while (!osip_list_eol (jd->d_out_trs, pos)) - { - out_tr = osip_list_get (jd->d_out_trs, pos); - if (0 == strcmp (out_tr->cseq->method, "SUBSCRIBE")) - break; - else - out_tr = NULL; - pos++; - } - } else - out_tr = NULL; - - if (out_tr == NULL) - return js->s_out_tr; /* can be NULL */ - - return out_tr; -} - -osip_transaction_t * -eXosip_find_last_inc_notify (eXosip_subscribe_t * js, eXosip_dialog_t * jd) -{ - osip_transaction_t *out_tr; - int pos; - - out_tr = NULL; - pos = 0; - if (jd != NULL) - { - while (!osip_list_eol (jd->d_out_trs, pos)) - { - out_tr = osip_list_get (jd->d_out_trs, pos); - if (0 == strcmp (out_tr->cseq->method, "NOTIFY")) - return out_tr; - pos++; - } - } + out_tr = NULL; + pos = 0; + if (jd != NULL) { + while (!osip_list_eol(jd->d_out_trs, pos)) { + out_tr = osip_list_get(jd->d_out_trs, pos); + if (0 == strcmp(out_tr->cseq->method, "SUBSCRIBE")) + break; + else + out_tr = NULL; + pos++; + } + } else + out_tr = NULL; + + if (out_tr == NULL) + return js->s_out_tr; /* can be NULL */ + + return out_tr; +} + +osip_transaction_t *eXosip_find_last_inc_notify(eXosip_subscribe_t * js, + eXosip_dialog_t * jd) +{ + osip_transaction_t *out_tr; + int pos; + + out_tr = NULL; + pos = 0; + if (jd != NULL) { + while (!osip_list_eol(jd->d_out_trs, pos)) { + out_tr = osip_list_get(jd->d_out_trs, pos); + if (0 == strcmp(out_tr->cseq->method, "NOTIFY")) + return out_tr; + pos++; + } + } + + return NULL; +} + + +int eXosip_subscribe_init(eXosip_subscribe_t ** js) +{ + *js = (eXosip_subscribe_t *) osip_malloc(sizeof(eXosip_subscribe_t)); + if (*js == NULL) + return OSIP_NOMEM; + memset(*js, 0, sizeof(eXosip_subscribe_t)); + return OSIP_SUCCESS; +} + +void eXosip_subscribe_free(eXosip_subscribe_t * js) +{ + /* ... */ + + eXosip_dialog_t *jd; + + if (js->s_inc_tr != NULL && js->s_inc_tr->orig_request != NULL + && js->s_inc_tr->orig_request->call_id != NULL + && js->s_inc_tr->orig_request->call_id->number != NULL) + _eXosip_delete_nonce(js->s_inc_tr->orig_request->call_id->number); + else if (js->s_out_tr != NULL && js->s_out_tr->orig_request != NULL + && js->s_out_tr->orig_request->call_id != NULL + && js->s_out_tr->orig_request->call_id->number != NULL) + _eXosip_delete_nonce(js->s_out_tr->orig_request->call_id->number); + + for (jd = js->s_dialogs; jd != NULL; jd = js->s_dialogs) { + REMOVE_ELEMENT(js->s_dialogs, jd); + eXosip_dialog_free(jd); + } + + __eXosip_delete_jinfo(js->s_inc_tr); + __eXosip_delete_jinfo(js->s_out_tr); + if (js->s_inc_tr != NULL) + osip_list_add(&eXosip.j_transactions, js->s_inc_tr, 0); + if (js->s_out_tr != NULL) + osip_list_add(&eXosip.j_transactions, js->s_out_tr, 0); - return NULL; -} - - -int -eXosip_subscribe_init (eXosip_subscribe_t ** js) -{ - *js = (eXosip_subscribe_t *) osip_malloc (sizeof (eXosip_subscribe_t)); - if (*js == NULL) - return OSIP_NOMEM; - memset (*js, 0, sizeof (eXosip_subscribe_t)); - return OSIP_SUCCESS; -} - -void -eXosip_subscribe_free (eXosip_subscribe_t * js) -{ - /* ... */ - - eXosip_dialog_t *jd; - - if (js->s_inc_tr != NULL && js->s_inc_tr->orig_request != NULL - && js->s_inc_tr->orig_request->call_id != NULL - && js->s_inc_tr->orig_request->call_id->number != NULL) - _eXosip_delete_nonce (js->s_inc_tr->orig_request->call_id->number); - else if (js->s_out_tr != NULL && js->s_out_tr->orig_request != NULL - && js->s_out_tr->orig_request->call_id != NULL - && js->s_out_tr->orig_request->call_id->number != NULL) - _eXosip_delete_nonce (js->s_out_tr->orig_request->call_id->number); - - for (jd = js->s_dialogs; jd != NULL; jd = js->s_dialogs) - { - REMOVE_ELEMENT (js->s_dialogs, jd); - eXosip_dialog_free (jd); - } - - __eXosip_delete_jinfo (js->s_inc_tr); - __eXosip_delete_jinfo (js->s_out_tr); - if (js->s_inc_tr != NULL) - osip_list_add (&eXosip.j_transactions, js->s_inc_tr, 0); - if (js->s_out_tr != NULL) - osip_list_add (&eXosip.j_transactions, js->s_out_tr, 0); - - osip_free (js); + osip_free(js); } int -_eXosip_subscribe_set_refresh_interval (eXosip_subscribe_t * js, - osip_message_t * out_subscribe) +_eXosip_subscribe_set_refresh_interval(eXosip_subscribe_t * js, + osip_message_t * out_subscribe) { - osip_header_t *exp; + osip_header_t *exp; - if (js == NULL || out_subscribe == NULL) - return OSIP_BADPARAMETER; + if (js == NULL || out_subscribe == NULL) + return OSIP_BADPARAMETER; - osip_message_get_expires (out_subscribe, 0, &exp); - if (exp != NULL && exp->hvalue != NULL) - { - js->s_reg_period = osip_atoi (exp->hvalue); - if (js->s_reg_period < 0) - js->s_reg_period = 3600; - } + osip_message_get_expires(out_subscribe, 0, &exp); + if (exp != NULL && exp->hvalue != NULL) { + int val = osip_atoi(exp->hvalue); + if (val==0) + js->s_reg_period = 0; + else if (val < js->s_reg_period - 15) + js->s_reg_period = val; + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } int -eXosip_subscribe_need_refresh (eXosip_subscribe_t * js, eXosip_dialog_t * jd, - int now) +eXosip_subscribe_need_refresh(eXosip_subscribe_t * js, eXosip_dialog_t * jd, + int now) { - osip_transaction_t *out_tr = NULL; + osip_transaction_t *out_tr = NULL; - if (jd != NULL) - out_tr = osip_list_get (jd->d_out_trs, 0); - if (out_tr == NULL) - out_tr = js->s_out_tr; - - if (now - out_tr->birth_time > js->s_reg_period - 60) - return OSIP_SUCCESS; - return OSIP_UNDEFINED_ERROR; + if (jd != NULL) + out_tr = osip_list_get(jd->d_out_trs, 0); + if (out_tr == NULL) + out_tr = js->s_out_tr; + + if (now - out_tr->birth_time > js->s_reg_period - 15) + return OSIP_SUCCESS; + return OSIP_UNDEFINED_ERROR; } #endif diff -Nru libexosip2-3.3.0/src/Makefile.am libexosip2-3.6.0/src/Makefile.am --- libexosip2-3.3.0/src/Makefile.am 2008-09-18 11:50:19.000000000 +0000 +++ libexosip2-3.6.0/src/Makefile.am 2010-01-06 14:57:57.000000000 +0000 @@ -47,7 +47,7 @@ sdp_offans.c endif -libeXosip2_la_LDFLAGS = -version-info $(LIBEXOSIP_SO_VERSION) +libeXosip2_la_LDFLAGS = -version-info $(LIBEXOSIP_SO_VERSION) -no-undefined libeXosip2_la_LIBADD = @EXOSIP_LIB@ @PTHREAD_LIBS@ $(OSIP_LIBS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include $(OSIP_CFLAGS) diff -Nru libexosip2-3.3.0/src/Makefile.in libexosip2-3.6.0/src/Makefile.in --- libexosip2-3.3.0/src/Makefile.in 2009-03-04 11:05:37.000000000 +0000 +++ libexosip2-3.6.0/src/Makefile.in 2011-10-05 14:27:29.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +15,12 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -56,14 +54,29 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" -libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libeXosip2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) @@ -88,49 +101,44 @@ eXtl_tcp.lo eXtl_dtls.lo eXtl_tls.lo milenage.lo rijndael.lo \ $(am__objects_1) libeXosip2_la_OBJECTS = $(am_libeXosip2_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +libeXosip2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libeXosip2_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(libeXosip2_la_SOURCES) DIST_SOURCES = $(am__libeXosip2_la_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -139,35 +147,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -178,14 +194,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -197,6 +212,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -215,6 +231,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -224,8 +241,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libeXosip2.la # @@ -242,7 +263,7 @@ eXutils.c jevents.c misc.c jauth.c eXtransport.h eXosip2.h \ eXtl.c eXtl_udp.c eXtl_tcp.c eXtl_dtls.c eXtl_tls.c milenage.c \ rijndael.c milenage.h rijndael.h $(am__append_1) -libeXosip2_la_LDFLAGS = -version-info $(LIBEXOSIP_SO_VERSION) +libeXosip2_la_LDFLAGS = -version-info $(LIBEXOSIP_SO_VERSION) -no-undefined libeXosip2_la_LIBADD = @EXOSIP_LIB@ @PTHREAD_LIBS@ $(OSIP_LIBS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include $(OSIP_CFLAGS) all: all-am @@ -253,14 +274,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -278,23 +299,28 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + list2="$$list2 $$p"; \ else :; fi; \ - done + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ done clean-libLTLIBRARIES: @@ -306,7 +332,7 @@ rm -f "$${dir}/so_locations"; \ done libeXosip2.la: $(libeXosip2_la_OBJECTS) $(libeXosip2_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libeXosip2_la_LDFLAGS) $(libeXosip2_la_OBJECTS) $(libeXosip2_la_LIBADD) $(LIBS) + $(libeXosip2_la_LINK) -rpath $(libdir) $(libeXosip2_la_OBJECTS) $(libeXosip2_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -351,22 +377,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udp.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -377,82 +403,85 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -461,7 +490,7 @@ all-am: Makefile $(LTLIBRARIES) installdirs: for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -483,6 +512,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -496,7 +526,7 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -504,18 +534,38 @@ html: html-am +html-am: + info: info-am info-am: install-data-am: +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: install-libLTLIBRARIES +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -536,20 +586,24 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES +uninstall-am: uninstall-libLTLIBRARIES + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libLTLIBRARIES clean-libtool ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-strip installcheck \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES + tags uninstall uninstall-am uninstall-libLTLIBRARIES + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libexosip2-3.3.0/src/milenage.c libexosip2-3.6.0/src/milenage.c --- libexosip2-3.3.0/src/milenage.c 2008-10-26 15:09:11.000000000 +0000 +++ libexosip2-3.6.0/src/milenage.c 2010-01-06 14:57:57.000000000 +0000 @@ -22,14 +22,15 @@ /*--------- Operator Variant Algorithm Configuration Field --------*/ - /*------- Insert your value of OP here -------*/ + /*------- Insert your value of OP here -------*/ /*u8 OP[16] = {0x63, 0xbf, 0xa5, 0x0e, 0xe6, 0x52, 0x33, 0x65, 0xff, 0x14, 0xc1, 0xf4, 0x5f, 0x88, 0x73, 0x7d}; */ -u8 OP[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; +u8 OP[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; - /*------- Insert your value of OP here -------*/ + /*------- Insert your value of OP here -------*/ /*--------------------------- prototypes --------------------------*/ @@ -46,58 +47,55 @@ * *-----------------------------------------------------------------*/ -void f1 ( u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2], - u8 mac_a[8] ) +void f1(u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2], u8 mac_a[8]) { - u8 op_c[16]; - u8 temp[16]; - u8 in1[16]; - u8 out1[16]; - u8 rijndaelInput[16]; - u8 i; - - RijndaelKeySchedule( k ); - - ComputeOPc( op_c ); - - for (i=0; i<16; i++) - rijndaelInput[i] = rand[i] ^ op_c[i]; - RijndaelEncrypt( rijndaelInput, temp ); - - for (i=0; i<6; i++) - { - in1[i] = sqn[i]; - in1[i+8] = sqn[i]; - } - for (i=0; i<2; i++) - { - in1[i+6] = amf[i]; - in1[i+14] = amf[i]; - } - - /* XOR op_c and in1, rotate by r1=64, and XOR * - * on the constant c1 (which is all zeroes) */ - - for (i=0; i<16; i++) - rijndaelInput[(i+8) % 16] = in1[i] ^ op_c[i]; - - /* XOR on the value temp computed before */ - - for (i=0; i<16; i++) - rijndaelInput[i] ^= temp[i]; - - RijndaelEncrypt( rijndaelInput, out1 ); - for (i=0; i<16; i++) - out1[i] ^= op_c[i]; + u8 op_c[16]; + u8 temp[16]; + u8 in1[16]; + u8 out1[16]; + u8 rijndaelInput[16]; + u8 i; + + RijndaelKeySchedule(k); + + ComputeOPc(op_c); + + for (i = 0; i < 16; i++) + rijndaelInput[i] = rand[i] ^ op_c[i]; + RijndaelEncrypt(rijndaelInput, temp); + + for (i = 0; i < 6; i++) { + in1[i] = sqn[i]; + in1[i + 8] = sqn[i]; + } + for (i = 0; i < 2; i++) { + in1[i + 6] = amf[i]; + in1[i + 14] = amf[i]; + } + + /* XOR op_c and in1, rotate by r1=64, and XOR * + * on the constant c1 (which is all zeroes) */ + + for (i = 0; i < 16; i++) + rijndaelInput[(i + 8) % 16] = in1[i] ^ op_c[i]; + + /* XOR on the value temp computed before */ + + for (i = 0; i < 16; i++) + rijndaelInput[i] ^= temp[i]; + + RijndaelEncrypt(rijndaelInput, out1); + for (i = 0; i < 16; i++) + out1[i] ^= op_c[i]; - for (i=0; i<8; i++) - mac_a[i] = out1[i]; + for (i = 0; i < 8; i++) + mac_a[i] = out1[i]; + + return; +} /* end of function f1 */ - return; -} /* end of function f1 */ - /*------------------------------------------------------------------- * Algorithms f2-f5 *------------------------------------------------------------------- @@ -107,74 +105,73 @@ * *-----------------------------------------------------------------*/ -void f2345 ( u8 k[16], u8 rand[16], - u8 res[8], u8 ck[16], u8 ik[16], u8 ak[6] ) +void f2345(u8 k[16], u8 rand[16], u8 res[8], u8 ck[16], u8 ik[16], u8 ak[6]) { - u8 op_c[16]; - u8 temp[16]; - u8 out[16]; - u8 rijndaelInput[16]; - u8 i; + u8 op_c[16]; + u8 temp[16]; + u8 out[16]; + u8 rijndaelInput[16]; + u8 i; + + RijndaelKeySchedule(k); - RijndaelKeySchedule( k ); + ComputeOPc(op_c); - ComputeOPc( op_c ); + for (i = 0; i < 16; i++) + rijndaelInput[i] = rand[i] ^ op_c[i]; + RijndaelEncrypt(rijndaelInput, temp); - for (i=0; i<16; i++) - rijndaelInput[i] = rand[i] ^ op_c[i]; - RijndaelEncrypt( rijndaelInput, temp ); + /* To obtain output block OUT2: XOR OPc and TEMP, * + * rotate by r2=0, and XOR on the constant c2 (which * + * is all zeroes except that the last bit is 1). */ - /* To obtain output block OUT2: XOR OPc and TEMP, * - * rotate by r2=0, and XOR on the constant c2 (which * - * is all zeroes except that the last bit is 1). */ + for (i = 0; i < 16; i++) + rijndaelInput[i] = temp[i] ^ op_c[i]; + rijndaelInput[15] ^= 1; - for (i=0; i<16; i++) - rijndaelInput[i] = temp[i] ^ op_c[i]; - rijndaelInput[15] ^= 1; + RijndaelEncrypt(rijndaelInput, out); + for (i = 0; i < 16; i++) + out[i] ^= op_c[i]; - RijndaelEncrypt( rijndaelInput, out ); - for (i=0; i<16; i++) - out[i] ^= op_c[i]; + for (i = 0; i < 8; i++) + res[i] = out[i + 8]; + for (i = 0; i < 6; i++) + ak[i] = out[i]; - for (i=0; i<8; i++) - res[i] = out[i+8]; - for (i=0; i<6; i++) - ak[i] = out[i]; + /* To obtain output block OUT3: XOR OPc and TEMP, * + * rotate by r3=32, and XOR on the constant c3 (which * + * is all zeroes except that the next to last bit is 1). */ - /* To obtain output block OUT3: XOR OPc and TEMP, * - * rotate by r3=32, and XOR on the constant c3 (which * - * is all zeroes except that the next to last bit is 1). */ + for (i = 0; i < 16; i++) + rijndaelInput[(i + 12) % 16] = temp[i] ^ op_c[i]; + rijndaelInput[15] ^= 2; - for (i=0; i<16; i++) - rijndaelInput[(i+12) % 16] = temp[i] ^ op_c[i]; - rijndaelInput[15] ^= 2; + RijndaelEncrypt(rijndaelInput, out); + for (i = 0; i < 16; i++) + out[i] ^= op_c[i]; - RijndaelEncrypt( rijndaelInput, out ); - for (i=0; i<16; i++) - out[i] ^= op_c[i]; + for (i = 0; i < 16; i++) + ck[i] = out[i]; - for (i=0; i<16; i++) - ck[i] = out[i]; + /* To obtain output block OUT4: XOR OPc and TEMP, * + * rotate by r4=64, and XOR on the constant c4 (which * + * is all zeroes except that the 2nd from last bit is 1). */ - /* To obtain output block OUT4: XOR OPc and TEMP, * - * rotate by r4=64, and XOR on the constant c4 (which * - * is all zeroes except that the 2nd from last bit is 1). */ + for (i = 0; i < 16; i++) + rijndaelInput[(i + 8) % 16] = temp[i] ^ op_c[i]; + rijndaelInput[15] ^= 4; - for (i=0; i<16; i++) - rijndaelInput[(i+8) % 16] = temp[i] ^ op_c[i]; - rijndaelInput[15] ^= 4; + RijndaelEncrypt(rijndaelInput, out); + for (i = 0; i < 16; i++) + out[i] ^= op_c[i]; - RijndaelEncrypt( rijndaelInput, out ); - for (i=0; i<16; i++) - out[i] ^= op_c[i]; + for (i = 0; i < 16; i++) + ik[i] = out[i]; - for (i=0; i<16; i++) - ik[i] = out[i]; + return; +} /* end of function f2345 */ - return; -} /* end of function f2345 */ - /*------------------------------------------------------------------- * Algorithm f1* *------------------------------------------------------------------- @@ -185,57 +182,54 @@ * *-----------------------------------------------------------------*/ -void f1star( u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2], - u8 mac_s[8] ) +void f1star(u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2], u8 mac_s[8]) { - u8 op_c[16]; - u8 temp[16]; - u8 in1[16]; - u8 out1[16]; - u8 rijndaelInput[16]; - u8 i; - - RijndaelKeySchedule( k ); - - ComputeOPc( op_c ); - - for (i=0; i<16; i++) - rijndaelInput[i] = rand[i] ^ op_c[i]; - RijndaelEncrypt( rijndaelInput, temp ); - - for (i=0; i<6; i++) - { - in1[i] = sqn[i]; - in1[i+8] = sqn[i]; - } - for (i=0; i<2; i++) - { - in1[i+6] = amf[i]; - in1[i+14] = amf[i]; - } - - /* XOR op_c and in1, rotate by r1=64, and XOR * - * on the constant c1 (which is all zeroes) */ - - for (i=0; i<16; i++) - rijndaelInput[(i+8) % 16] = in1[i] ^ op_c[i]; - - /* XOR on the value temp computed before */ - - for (i=0; i<16; i++) - rijndaelInput[i] ^= temp[i]; - - RijndaelEncrypt( rijndaelInput, out1 ); - for (i=0; i<16; i++) - out1[i] ^= op_c[i]; + u8 op_c[16]; + u8 temp[16]; + u8 in1[16]; + u8 out1[16]; + u8 rijndaelInput[16]; + u8 i; + + RijndaelKeySchedule(k); + + ComputeOPc(op_c); + + for (i = 0; i < 16; i++) + rijndaelInput[i] = rand[i] ^ op_c[i]; + RijndaelEncrypt(rijndaelInput, temp); + + for (i = 0; i < 6; i++) { + in1[i] = sqn[i]; + in1[i + 8] = sqn[i]; + } + for (i = 0; i < 2; i++) { + in1[i + 6] = amf[i]; + in1[i + 14] = amf[i]; + } + + /* XOR op_c and in1, rotate by r1=64, and XOR * + * on the constant c1 (which is all zeroes) */ + + for (i = 0; i < 16; i++) + rijndaelInput[(i + 8) % 16] = in1[i] ^ op_c[i]; + + /* XOR on the value temp computed before */ + + for (i = 0; i < 16; i++) + rijndaelInput[i] ^= temp[i]; + + RijndaelEncrypt(rijndaelInput, out1); + for (i = 0; i < 16; i++) + out1[i] ^= op_c[i]; + + for (i = 0; i < 8; i++) + mac_s[i] = out1[i + 8]; - for (i=0; i<8; i++) - mac_s[i] = out1[i+8]; + return; +} /* end of function f1star */ - return; -} /* end of function f1star */ - /*------------------------------------------------------------------- * Algorithm f5* *------------------------------------------------------------------- @@ -245,54 +239,53 @@ * *-----------------------------------------------------------------*/ -void f5star( u8 k[16], u8 rand[16], - u8 ak[6] ) +void f5star(u8 k[16], u8 rand[16], u8 ak[6]) { - u8 op_c[16]; - u8 temp[16]; - u8 out[16]; - u8 rijndaelInput[16]; - u8 i; + u8 op_c[16]; + u8 temp[16]; + u8 out[16]; + u8 rijndaelInput[16]; + u8 i; - RijndaelKeySchedule( k ); + RijndaelKeySchedule(k); - ComputeOPc( op_c ); + ComputeOPc(op_c); - for (i=0; i<16; i++) - rijndaelInput[i] = rand[i] ^ op_c[i]; - RijndaelEncrypt( rijndaelInput, temp ); + for (i = 0; i < 16; i++) + rijndaelInput[i] = rand[i] ^ op_c[i]; + RijndaelEncrypt(rijndaelInput, temp); - /* To obtain output block OUT5: XOR OPc and TEMP, * - * rotate by r5=96, and XOR on the constant c5 (which * - * is all zeroes except that the 3rd from last bit is 1). */ + /* To obtain output block OUT5: XOR OPc and TEMP, * + * rotate by r5=96, and XOR on the constant c5 (which * + * is all zeroes except that the 3rd from last bit is 1). */ - for (i=0; i<16; i++) - rijndaelInput[(i+4) % 16] = temp[i] ^ op_c[i]; - rijndaelInput[15] ^= 8; + for (i = 0; i < 16; i++) + rijndaelInput[(i + 4) % 16] = temp[i] ^ op_c[i]; + rijndaelInput[15] ^= 8; - RijndaelEncrypt( rijndaelInput, out ); - for (i=0; i<16; i++) - out[i] ^= op_c[i]; + RijndaelEncrypt(rijndaelInput, out); + for (i = 0; i < 16; i++) + out[i] ^= op_c[i]; - for (i=0; i<6; i++) - ak[i] = out[i]; + for (i = 0; i < 6; i++) + ak[i] = out[i]; + + return; +} /* end of function f5star */ - return; -} /* end of function f5star */ - /*------------------------------------------------------------------- * Function to compute OPc from OP and K. Assumes key schedule has already been performed. *-----------------------------------------------------------------*/ -void ComputeOPc( u8 op_c[16] ) +void ComputeOPc(u8 op_c[16]) { - u8 i; - - RijndaelEncrypt( OP, op_c ); - for (i=0; i<16; i++) - op_c[i] ^= OP[i]; + u8 i; + + RijndaelEncrypt(OP, op_c); + for (i = 0; i < 16; i++) + op_c[i] ^= OP[i]; - return; -} /* end of function ComputeOPc */ + return; +} /* end of function ComputeOPc */ diff -Nru libexosip2-3.3.0/src/milenage.h libexosip2-3.6.0/src/milenage.h --- libexosip2-3.3.0/src/milenage.h 2008-10-26 15:09:11.000000000 +0000 +++ libexosip2-3.6.0/src/milenage.h 2010-01-06 14:57:57.000000000 +0000 @@ -21,15 +21,11 @@ typedef unsigned char u8; -void f1 ( u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2], - u8 mac_a[8] ); -void f2345 ( u8 k[16], u8 rand[16], - u8 res[8], u8 ck[16], u8 ik[16], u8 ak[6] ); -void f1star( u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2], - u8 mac_s[8] ); -void f5star( u8 k[16], u8 rand[16], - u8 ak[6] ); -void ComputeOPc( u8 op_c[16] ); +void f1(u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2], u8 mac_a[8]); +void f2345(u8 k[16], u8 rand[16], u8 res[8], u8 ck[16], u8 ik[16], u8 ak[6]); +void f1star(u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2], u8 mac_s[8]); +void f5star(u8 k[16], u8 rand[16], u8 ak[6]); +void ComputeOPc(u8 op_c[16]); #endif diff -Nru libexosip2-3.3.0/src/misc.c libexosip2-3.6.0/src/misc.c --- libexosip2-3.3.0/src/misc.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/misc.c 2010-01-06 14:57:57.000000000 +0000 @@ -31,288 +31,264 @@ /* some methods to extract transaction information from a eXosip_call_t */ int -eXosip_remove_transaction_from_call (osip_transaction_t * tr, eXosip_call_t * jc) +eXosip_remove_transaction_from_call(osip_transaction_t * tr, eXosip_call_t * jc) { - osip_transaction_t *inc_tr; - osip_transaction_t *out_tr; - eXosip_dialog_t *jd; - int pos = 0; - - if (jc->c_inc_tr == tr) - { - jc->c_inc_tr = NULL; /* can be NULL */ - return OSIP_SUCCESS; - } - - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - pos = 0; - while (!osip_list_eol (jd->d_inc_trs, pos)) - { - inc_tr = osip_list_get (jd->d_inc_trs, pos); - if (inc_tr == tr) - { - osip_list_remove (jd->d_inc_trs, pos); - return OSIP_SUCCESS; - } - pos++; - } - } - - if (jc->c_out_tr == tr) - { - jc->c_out_tr = NULL; /* can be NULL */ - return OSIP_SUCCESS; - } - - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - pos = 0; - while (!osip_list_eol (jd->d_out_trs, pos)) - { - out_tr = osip_list_get (jd->d_out_trs, pos); - if (out_tr == tr) - { - osip_list_remove (jd->d_out_trs, pos); - return OSIP_SUCCESS; - } - pos++; - } - } - - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: No information.\n")); - return OSIP_NOTFOUND; + osip_transaction_t *inc_tr; + osip_transaction_t *out_tr; + eXosip_dialog_t *jd; + int pos = 0; + + if (jc->c_inc_tr == tr) { + jc->c_inc_tr = NULL; /* can be NULL */ + return OSIP_SUCCESS; + } + + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + pos = 0; + while (!osip_list_eol(jd->d_inc_trs, pos)) { + inc_tr = osip_list_get(jd->d_inc_trs, pos); + if (inc_tr == tr) { + osip_list_remove(jd->d_inc_trs, pos); + return OSIP_SUCCESS; + } + pos++; + } + } + + if (jc->c_out_tr == tr) { + jc->c_out_tr = NULL; /* can be NULL */ + return OSIP_SUCCESS; + } + + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + pos = 0; + while (!osip_list_eol(jd->d_out_trs, pos)) { + out_tr = osip_list_get(jd->d_out_trs, pos); + if (out_tr == tr) { + osip_list_remove(jd->d_out_trs, pos); + return OSIP_SUCCESS; + } + pos++; + } + } + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: No information.\n")); + return OSIP_NOTFOUND; } -osip_transaction_t * -eXosip_find_last_transaction (eXosip_call_t * jc, eXosip_dialog_t * jd, - const char *method) +osip_transaction_t *eXosip_find_last_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, + const char *method) { - osip_transaction_t *inc_tr; - osip_transaction_t *out_tr; + osip_transaction_t *inc_tr; + osip_transaction_t *out_tr; - inc_tr = eXosip_find_last_inc_transaction (jc, jd, method); - out_tr = eXosip_find_last_out_transaction (jc, jd, method); - if (inc_tr == NULL) - return out_tr; - if (out_tr == NULL) - return inc_tr; - - if (inc_tr->birth_time > out_tr->birth_time) - return inc_tr; - return out_tr; + inc_tr = eXosip_find_last_inc_transaction(jc, jd, method); + out_tr = eXosip_find_last_out_transaction(jc, jd, method); + if (inc_tr == NULL) + return out_tr; + if (out_tr == NULL) + return inc_tr; + + if (inc_tr->birth_time > out_tr->birth_time) + return inc_tr; + return out_tr; } -osip_transaction_t * -eXosip_find_last_inc_transaction (eXosip_call_t * jc, eXosip_dialog_t * jd, - const char *method) +osip_transaction_t *eXosip_find_last_inc_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, + const char *method) { - osip_transaction_t *inc_tr; - int pos; + osip_transaction_t *inc_tr; + int pos; - inc_tr = NULL; - pos = 0; - if (method == NULL || method[0] == '\0') - return NULL; - if (jd != NULL) - { - while (!osip_list_eol (jd->d_inc_trs, pos)) - { - inc_tr = osip_list_get (jd->d_inc_trs, pos); - if (0 == osip_strcasecmp (inc_tr->cseq->method, method)) - break; - else - inc_tr = NULL; - pos++; - } - } else - inc_tr = NULL; + inc_tr = NULL; + pos = 0; + if (method == NULL || method[0] == '\0') + return NULL; + if (jd != NULL) { + while (!osip_list_eol(jd->d_inc_trs, pos)) { + inc_tr = osip_list_get(jd->d_inc_trs, pos); + if (0 == osip_strcasecmp(inc_tr->cseq->method, method)) + break; + else + inc_tr = NULL; + pos++; + } + } else + inc_tr = NULL; - return inc_tr; + return inc_tr; } -osip_transaction_t * -eXosip_find_last_out_transaction (eXosip_call_t * jc, eXosip_dialog_t * jd, - const char *method) +osip_transaction_t *eXosip_find_last_out_transaction(eXosip_call_t * jc, + eXosip_dialog_t * jd, + const char *method) { - osip_transaction_t *out_tr; - int pos; + osip_transaction_t *out_tr; + int pos; - out_tr = NULL; - pos = 0; - if (jd == NULL && jc == NULL) - return NULL; - if (method == NULL || method[0] == '\0') - return NULL; - - if (jd != NULL) - { - while (!osip_list_eol (jd->d_out_trs, pos)) - { - out_tr = osip_list_get (jd->d_out_trs, pos); - if (0 == osip_strcasecmp (out_tr->cseq->method, method)) - break; - else - out_tr = NULL; - pos++; - } - } + out_tr = NULL; + pos = 0; + if (jd == NULL && jc == NULL) + return NULL; + if (method == NULL || method[0] == '\0') + return NULL; + + if (jd != NULL) { + while (!osip_list_eol(jd->d_out_trs, pos)) { + out_tr = osip_list_get(jd->d_out_trs, pos); + if (0 == osip_strcasecmp(out_tr->cseq->method, method)) + break; + else + out_tr = NULL; + pos++; + } + } - return out_tr; + return out_tr; } -osip_transaction_t * -eXosip_find_last_invite (eXosip_call_t * jc, eXosip_dialog_t * jd) +osip_transaction_t *eXosip_find_last_invite(eXosip_call_t * jc, + eXosip_dialog_t * jd) { - osip_transaction_t *inc_tr; - osip_transaction_t *out_tr; + osip_transaction_t *inc_tr; + osip_transaction_t *out_tr; - inc_tr = eXosip_find_last_inc_invite (jc, jd); - out_tr = eXosip_find_last_out_invite (jc, jd); - if (inc_tr == NULL) - return out_tr; - if (out_tr == NULL) - return inc_tr; - - if (inc_tr->birth_time > out_tr->birth_time) - return inc_tr; - return out_tr; + inc_tr = eXosip_find_last_inc_invite(jc, jd); + out_tr = eXosip_find_last_out_invite(jc, jd); + if (inc_tr == NULL) + return out_tr; + if (out_tr == NULL) + return inc_tr; + + if (inc_tr->birth_time > out_tr->birth_time) + return inc_tr; + return out_tr; } -osip_transaction_t * -eXosip_find_last_inc_invite (eXosip_call_t * jc, eXosip_dialog_t * jd) +osip_transaction_t *eXosip_find_last_inc_invite(eXosip_call_t * jc, + eXosip_dialog_t * jd) { - osip_transaction_t *inc_tr; - int pos; + osip_transaction_t *inc_tr; + int pos; - inc_tr = NULL; - pos = 0; - if (jd != NULL) - { - while (!osip_list_eol (jd->d_inc_trs, pos)) - { - inc_tr = osip_list_get (jd->d_inc_trs, pos); - if (0 == strcmp (inc_tr->cseq->method, "INVITE")) - break; - else - inc_tr = NULL; - pos++; - } - } else - inc_tr = NULL; + inc_tr = NULL; + pos = 0; + if (jd != NULL) { + while (!osip_list_eol(jd->d_inc_trs, pos)) { + inc_tr = osip_list_get(jd->d_inc_trs, pos); + if (0 == strcmp(inc_tr->cseq->method, "INVITE")) + break; + else + inc_tr = NULL; + pos++; + } + } else + inc_tr = NULL; - if (inc_tr == NULL) - return jc->c_inc_tr; /* can be NULL */ + if (inc_tr == NULL) + return jc->c_inc_tr; /* can be NULL */ - return inc_tr; + return inc_tr; } -osip_transaction_t * -eXosip_find_last_out_invite (eXosip_call_t * jc, eXosip_dialog_t * jd) +osip_transaction_t *eXosip_find_last_out_invite(eXosip_call_t * jc, + eXosip_dialog_t * jd) { - osip_transaction_t *out_tr; - int pos; + osip_transaction_t *out_tr; + int pos; - out_tr = NULL; - pos = 0; - if (jd == NULL && jc == NULL) - return NULL; - - if (jd != NULL) - { - while (!osip_list_eol (jd->d_out_trs, pos)) - { - out_tr = osip_list_get (jd->d_out_trs, pos); - if (0 == strcmp (out_tr->cseq->method, "INVITE")) - break; - else - out_tr = NULL; - pos++; - } - } + out_tr = NULL; + pos = 0; + if (jd == NULL && jc == NULL) + return NULL; + + if (jd != NULL) { + while (!osip_list_eol(jd->d_out_trs, pos)) { + out_tr = osip_list_get(jd->d_out_trs, pos); + if (0 == strcmp(out_tr->cseq->method, "INVITE")) + break; + else + out_tr = NULL; + pos++; + } + } - if (out_tr == NULL) - return jc->c_out_tr; /* can be NULL */ + if (out_tr == NULL) + return jc->c_out_tr; /* can be NULL */ - return out_tr; + return out_tr; } #ifndef MINISIZE -osip_transaction_t * -eXosip_find_previous_invite (eXosip_call_t * jc, eXosip_dialog_t * jd, - osip_transaction_t * last_invite) +osip_transaction_t *eXosip_find_previous_invite(eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_transaction_t * last_invite) { - osip_transaction_t *inc_tr; - osip_transaction_t *out_tr; - int pos; - - inc_tr = NULL; - pos = 0; - if (jd != NULL) - { - while (!osip_list_eol (jd->d_inc_trs, pos)) - { - inc_tr = osip_list_get (jd->d_inc_trs, pos); - if (inc_tr == last_invite) - { - /* we don't want the current one */ - inc_tr = NULL; - } else if (0 == strcmp (inc_tr->cseq->method, "INVITE")) - break; - else - inc_tr = NULL; - pos++; - } - } else - inc_tr = NULL; - - if (inc_tr == NULL) - inc_tr = jc->c_inc_tr; /* can be NULL */ - if (inc_tr == last_invite) - { - /* we don't want the current one */ - inc_tr = NULL; - } - - out_tr = NULL; - pos = 0; - - if (jd != NULL) - { - while (!osip_list_eol (jd->d_out_trs, pos)) - { - out_tr = osip_list_get (jd->d_out_trs, pos); - if (out_tr == last_invite) - { - /* we don't want the current one */ - out_tr = NULL; - } else if (0 == strcmp (out_tr->cseq->method, "INVITE")) - break; - else - out_tr = NULL; - pos++; - } - } - - if (out_tr == NULL) - out_tr = jc->c_out_tr; /* can be NULL */ - - if (out_tr == last_invite) - { - /* we don't want the current one */ - out_tr = NULL; - } - - if (inc_tr == NULL) - return out_tr; - if (out_tr == NULL) - return inc_tr; - - if (inc_tr->birth_time > out_tr->birth_time) - return inc_tr; - return out_tr; + osip_transaction_t *inc_tr; + osip_transaction_t *out_tr; + int pos; + + inc_tr = NULL; + pos = 0; + if (jd != NULL) { + while (!osip_list_eol(jd->d_inc_trs, pos)) { + inc_tr = osip_list_get(jd->d_inc_trs, pos); + if (inc_tr == last_invite) { + /* we don't want the current one */ + inc_tr = NULL; + } else if (0 == strcmp(inc_tr->cseq->method, "INVITE")) + break; + else + inc_tr = NULL; + pos++; + } + } else + inc_tr = NULL; + + if (inc_tr == NULL) + inc_tr = jc->c_inc_tr; /* can be NULL */ + if (inc_tr == last_invite) { + /* we don't want the current one */ + inc_tr = NULL; + } + + out_tr = NULL; + pos = 0; + + if (jd != NULL) { + while (!osip_list_eol(jd->d_out_trs, pos)) { + out_tr = osip_list_get(jd->d_out_trs, pos); + if (out_tr == last_invite) { + /* we don't want the current one */ + out_tr = NULL; + } else if (0 == strcmp(out_tr->cseq->method, "INVITE")) + break; + else + out_tr = NULL; + pos++; + } + } + + if (out_tr == NULL) + out_tr = jc->c_out_tr; /* can be NULL */ + + if (out_tr == last_invite) { + /* we don't want the current one */ + out_tr = NULL; + } + + if (inc_tr == NULL) + return out_tr; + if (out_tr == NULL) + return inc_tr; + + if (inc_tr->birth_time > out_tr->birth_time) + return inc_tr; + return out_tr; } #endif diff -Nru libexosip2-3.3.0/src/rijndael.c libexosip2-3.6.0/src/rijndael.c --- libexosip2-3.3.0/src/rijndael.c 2008-10-26 15:09:00.000000000 +0000 +++ libexosip2-3.6.0/src/rijndael.c 2010-01-06 14:57:57.000000000 +0000 @@ -18,10 +18,10 @@ * *-----------------------------------------------------------------*/ -#define LITTLE_ENDIAN /* For INTEL architecture */ +#define LITTLE_ENDIAN /* For INTEL architecture */ -typedef unsigned char u8; -typedef unsigned int u32; +typedef unsigned char u8; +typedef unsigned int u32; /* Circular byte rotates of 32 bit values */ @@ -51,309 +51,556 @@ __inline u32 byte_swap(const u32 x) { - return rot1(x) & 0x00ff00ff | rot3(x) & 0xff00ff00; + return rot1(x) & 0x00ff00ff | rot3(x) & 0xff00ff00; } + __inline u32 u32_in(const u8 x[]) { - return byte_swap(*(u32*)x); + return byte_swap(*(u32 *) x); }; -__inline void u32_out(u8 x[], const u32 v) + +__inline void u32_out(u8 x[], const u32 v) { - *(u32*)x = byte_swap(v); + *(u32 *) x = byte_swap(v); }; #endif /*--------------- The lookup tables ----------------------------*/ -static u32 rnd_con[10] = -{ - 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36 +static u32 rnd_con[10] = { + 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36 }; -static u32 ft_tab[4][256] = -{ - { - 0xA56363C6,0x847C7CF8,0x997777EE,0x8D7B7BF6,0x0DF2F2FF,0xBD6B6BD6,0xB16F6FDE,0x54C5C591, - 0x50303060,0x03010102,0xA96767CE,0x7D2B2B56,0x19FEFEE7,0x62D7D7B5,0xE6ABAB4D,0x9A7676EC, - 0x45CACA8F,0x9D82821F,0x40C9C989,0x877D7DFA,0x15FAFAEF,0xEB5959B2,0xC947478E,0x0BF0F0FB, - 0xECADAD41,0x67D4D4B3,0xFDA2A25F,0xEAAFAF45,0xBF9C9C23,0xF7A4A453,0x967272E4,0x5BC0C09B, - 0xC2B7B775,0x1CFDFDE1,0xAE93933D,0x6A26264C,0x5A36366C,0x413F3F7E,0x02F7F7F5,0x4FCCCC83, - 0x5C343468,0xF4A5A551,0x34E5E5D1,0x08F1F1F9,0x937171E2,0x73D8D8AB,0x53313162,0x3F15152A, - 0x0C040408,0x52C7C795,0x65232346,0x5EC3C39D,0x28181830,0xA1969637,0x0F05050A,0xB59A9A2F, - 0x0907070E,0x36121224,0x9B80801B,0x3DE2E2DF,0x26EBEBCD,0x6927274E,0xCDB2B27F,0x9F7575EA, - 0x1B090912,0x9E83831D,0x742C2C58,0x2E1A1A34,0x2D1B1B36,0xB26E6EDC,0xEE5A5AB4,0xFBA0A05B, - 0xF65252A4,0x4D3B3B76,0x61D6D6B7,0xCEB3B37D,0x7B292952,0x3EE3E3DD,0x712F2F5E,0x97848413, - 0xF55353A6,0x68D1D1B9,0000000000,0x2CEDEDC1,0x60202040,0x1FFCFCE3,0xC8B1B179,0xED5B5BB6, - 0xBE6A6AD4,0x46CBCB8D,0xD9BEBE67,0x4B393972,0xDE4A4A94,0xD44C4C98,0xE85858B0,0x4ACFCF85, - 0x6BD0D0BB,0x2AEFEFC5,0xE5AAAA4F,0x16FBFBED,0xC5434386,0xD74D4D9A,0x55333366,0x94858511, - 0xCF45458A,0x10F9F9E9,0x06020204,0x817F7FFE,0xF05050A0,0x443C3C78,0xBA9F9F25,0xE3A8A84B, - 0xF35151A2,0xFEA3A35D,0xC0404080,0x8A8F8F05,0xAD92923F,0xBC9D9D21,0x48383870,0x04F5F5F1, - 0xDFBCBC63,0xC1B6B677,0x75DADAAF,0x63212142,0x30101020,0x1AFFFFE5,0x0EF3F3FD,0x6DD2D2BF, - 0x4CCDCD81,0x140C0C18,0x35131326,0x2FECECC3,0xE15F5FBE,0xA2979735,0xCC444488,0x3917172E, - 0x57C4C493,0xF2A7A755,0x827E7EFC,0x473D3D7A,0xAC6464C8,0xE75D5DBA,0x2B191932,0x957373E6, - 0xA06060C0,0x98818119,0xD14F4F9E,0x7FDCDCA3,0x66222244,0x7E2A2A54,0xAB90903B,0x8388880B, - 0xCA46468C,0x29EEEEC7,0xD3B8B86B,0x3C141428,0x79DEDEA7,0xE25E5EBC,0x1D0B0B16,0x76DBDBAD, - 0x3BE0E0DB,0x56323264,0x4E3A3A74,0x1E0A0A14,0xDB494992,0x0A06060C,0x6C242448,0xE45C5CB8, - 0x5DC2C29F,0x6ED3D3BD,0xEFACAC43,0xA66262C4,0xA8919139,0xA4959531,0x37E4E4D3,0x8B7979F2, - 0x32E7E7D5,0x43C8C88B,0x5937376E,0xB76D6DDA,0x8C8D8D01,0x64D5D5B1,0xD24E4E9C,0xE0A9A949, - 0xB46C6CD8,0xFA5656AC,0x07F4F4F3,0x25EAEACF,0xAF6565CA,0x8E7A7AF4,0xE9AEAE47,0x18080810, - 0xD5BABA6F,0x887878F0,0x6F25254A,0x722E2E5C,0x241C1C38,0xF1A6A657,0xC7B4B473,0x51C6C697, - 0x23E8E8CB,0x7CDDDDA1,0x9C7474E8,0x211F1F3E,0xDD4B4B96,0xDCBDBD61,0x868B8B0D,0x858A8A0F, - 0x907070E0,0x423E3E7C,0xC4B5B571,0xAA6666CC,0xD8484890,0x05030306,0x01F6F6F7,0x120E0E1C, - 0xA36161C2,0x5F35356A,0xF95757AE,0xD0B9B969,0x91868617,0x58C1C199,0x271D1D3A,0xB99E9E27, - 0x38E1E1D9,0x13F8F8EB,0xB398982B,0x33111122,0xBB6969D2,0x70D9D9A9,0x898E8E07,0xA7949433, - 0xB69B9B2D,0x221E1E3C,0x92878715,0x20E9E9C9,0x49CECE87,0xFF5555AA,0x78282850,0x7ADFDFA5, - 0x8F8C8C03,0xF8A1A159,0x80898909,0x170D0D1A,0xDABFBF65,0x31E6E6D7,0xC6424284,0xB86868D0, - 0xC3414182,0xB0999929,0x772D2D5A,0x110F0F1E,0xCBB0B07B,0xFC5454A8,0xD6BBBB6D,0x3A16162C - }, - { - 0x6363C6A5,0x7C7CF884,0x7777EE99,0x7B7BF68D,0xF2F2FF0D,0x6B6BD6BD,0x6F6FDEB1,0xC5C59154, - 0x30306050,0x01010203,0x6767CEA9,0x2B2B567D,0xFEFEE719,0xD7D7B562,0xABAB4DE6,0x7676EC9A, - 0xCACA8F45,0x82821F9D,0xC9C98940,0x7D7DFA87,0xFAFAEF15,0x5959B2EB,0x47478EC9,0xF0F0FB0B, - 0xADAD41EC,0xD4D4B367,0xA2A25FFD,0xAFAF45EA,0x9C9C23BF,0xA4A453F7,0x7272E496,0xC0C09B5B, - 0xB7B775C2,0xFDFDE11C,0x93933DAE,0x26264C6A,0x36366C5A,0x3F3F7E41,0xF7F7F502,0xCCCC834F, - 0x3434685C,0xA5A551F4,0xE5E5D134,0xF1F1F908,0x7171E293,0xD8D8AB73,0x31316253,0x15152A3F, - 0x0404080C,0xC7C79552,0x23234665,0xC3C39D5E,0x18183028,0x969637A1,0x05050A0F,0x9A9A2FB5, - 0x07070E09,0x12122436,0x80801B9B,0xE2E2DF3D,0xEBEBCD26,0x27274E69,0xB2B27FCD,0x7575EA9F, - 0x0909121B,0x83831D9E,0x2C2C5874,0x1A1A342E,0x1B1B362D,0x6E6EDCB2,0x5A5AB4EE,0xA0A05BFB, - 0x5252A4F6,0x3B3B764D,0xD6D6B761,0xB3B37DCE,0x2929527B,0xE3E3DD3E,0x2F2F5E71,0x84841397, - 0x5353A6F5,0xD1D1B968,0000000000,0xEDEDC12C,0x20204060,0xFCFCE31F,0xB1B179C8,0x5B5BB6ED, - 0x6A6AD4BE,0xCBCB8D46,0xBEBE67D9,0x3939724B,0x4A4A94DE,0x4C4C98D4,0x5858B0E8,0xCFCF854A, - 0xD0D0BB6B,0xEFEFC52A,0xAAAA4FE5,0xFBFBED16,0x434386C5,0x4D4D9AD7,0x33336655,0x85851194, - 0x45458ACF,0xF9F9E910,0x02020406,0x7F7FFE81,0x5050A0F0,0x3C3C7844,0x9F9F25BA,0xA8A84BE3, - 0x5151A2F3,0xA3A35DFE,0x404080C0,0x8F8F058A,0x92923FAD,0x9D9D21BC,0x38387048,0xF5F5F104, - 0xBCBC63DF,0xB6B677C1,0xDADAAF75,0x21214263,0x10102030,0xFFFFE51A,0xF3F3FD0E,0xD2D2BF6D, - 0xCDCD814C,0x0C0C1814,0x13132635,0xECECC32F,0x5F5FBEE1,0x979735A2,0x444488CC,0x17172E39, - 0xC4C49357,0xA7A755F2,0x7E7EFC82,0x3D3D7A47,0x6464C8AC,0x5D5DBAE7,0x1919322B,0x7373E695, - 0x6060C0A0,0x81811998,0x4F4F9ED1,0xDCDCA37F,0x22224466,0x2A2A547E,0x90903BAB,0x88880B83, - 0x46468CCA,0xEEEEC729,0xB8B86BD3,0x1414283C,0xDEDEA779,0x5E5EBCE2,0x0B0B161D,0xDBDBAD76, - 0xE0E0DB3B,0x32326456,0x3A3A744E,0x0A0A141E,0x494992DB,0x06060C0A,0x2424486C,0x5C5CB8E4, - 0xC2C29F5D,0xD3D3BD6E,0xACAC43EF,0x6262C4A6,0x919139A8,0x959531A4,0xE4E4D337,0x7979F28B, - 0xE7E7D532,0xC8C88B43,0x37376E59,0x6D6DDAB7,0x8D8D018C,0xD5D5B164,0x4E4E9CD2,0xA9A949E0, - 0x6C6CD8B4,0x5656ACFA,0xF4F4F307,0xEAEACF25,0x6565CAAF,0x7A7AF48E,0xAEAE47E9,0x08081018, - 0xBABA6FD5,0x7878F088,0x25254A6F,0x2E2E5C72,0x1C1C3824,0xA6A657F1,0xB4B473C7,0xC6C69751, - 0xE8E8CB23,0xDDDDA17C,0x7474E89C,0x1F1F3E21,0x4B4B96DD,0xBDBD61DC,0x8B8B0D86,0x8A8A0F85, - 0x7070E090,0x3E3E7C42,0xB5B571C4,0x6666CCAA,0x484890D8,0x03030605,0xF6F6F701,0x0E0E1C12, - 0x6161C2A3,0x35356A5F,0x5757AEF9,0xB9B969D0,0x86861791,0xC1C19958,0x1D1D3A27,0x9E9E27B9, - 0xE1E1D938,0xF8F8EB13,0x98982BB3,0x11112233,0x6969D2BB,0xD9D9A970,0x8E8E0789,0x949433A7, - 0x9B9B2DB6,0x1E1E3C22,0x87871592,0xE9E9C920,0xCECE8749,0x5555AAFF,0x28285078,0xDFDFA57A, - 0x8C8C038F,0xA1A159F8,0x89890980,0x0D0D1A17,0xBFBF65DA,0xE6E6D731,0x424284C6,0x6868D0B8, - 0x414182C3,0x999929B0,0x2D2D5A77,0x0F0F1E11,0xB0B07BCB,0x5454A8FC,0xBBBB6DD6,0x16162C3A - }, - { - 0x63C6A563,0x7CF8847C,0x77EE9977,0x7BF68D7B,0xF2FF0DF2,0x6BD6BD6B,0x6FDEB16F,0xC59154C5, - 0x30605030,0x01020301,0x67CEA967,0x2B567D2B,0xFEE719FE,0xD7B562D7,0xAB4DE6AB,0x76EC9A76, - 0xCA8F45CA,0x821F9D82,0xC98940C9,0x7DFA877D,0xFAEF15FA,0x59B2EB59,0x478EC947,0xF0FB0BF0, - 0xAD41ECAD,0xD4B367D4,0xA25FFDA2,0xAF45EAAF,0x9C23BF9C,0xA453F7A4,0x72E49672,0xC09B5BC0, - 0xB775C2B7,0xFDE11CFD,0x933DAE93,0x264C6A26,0x366C5A36,0x3F7E413F,0xF7F502F7,0xCC834FCC, - 0x34685C34,0xA551F4A5,0xE5D134E5,0xF1F908F1,0x71E29371,0xD8AB73D8,0x31625331,0x152A3F15, - 0x04080C04,0xC79552C7,0x23466523,0xC39D5EC3,0x18302818,0x9637A196,0x050A0F05,0x9A2FB59A, - 0x070E0907,0x12243612,0x801B9B80,0xE2DF3DE2,0xEBCD26EB,0x274E6927,0xB27FCDB2,0x75EA9F75, - 0x09121B09,0x831D9E83,0x2C58742C,0x1A342E1A,0x1B362D1B,0x6EDCB26E,0x5AB4EE5A,0xA05BFBA0, - 0x52A4F652,0x3B764D3B,0xD6B761D6,0xB37DCEB3,0x29527B29,0xE3DD3EE3,0x2F5E712F,0x84139784, - 0x53A6F553,0xD1B968D1,0000000000,0xEDC12CED,0x20406020,0xFCE31FFC,0xB179C8B1,0x5BB6ED5B, - 0x6AD4BE6A,0xCB8D46CB,0xBE67D9BE,0x39724B39,0x4A94DE4A,0x4C98D44C,0x58B0E858,0xCF854ACF, - 0xD0BB6BD0,0xEFC52AEF,0xAA4FE5AA,0xFBED16FB,0x4386C543,0x4D9AD74D,0x33665533,0x85119485, - 0x458ACF45,0xF9E910F9,0x02040602,0x7FFE817F,0x50A0F050,0x3C78443C,0x9F25BA9F,0xA84BE3A8, - 0x51A2F351,0xA35DFEA3,0x4080C040,0x8F058A8F,0x923FAD92,0x9D21BC9D,0x38704838,0xF5F104F5, - 0xBC63DFBC,0xB677C1B6,0xDAAF75DA,0x21426321,0x10203010,0xFFE51AFF,0xF3FD0EF3,0xD2BF6DD2, - 0xCD814CCD,0x0C18140C,0x13263513,0xECC32FEC,0x5FBEE15F,0x9735A297,0x4488CC44,0x172E3917, - 0xC49357C4,0xA755F2A7,0x7EFC827E,0x3D7A473D,0x64C8AC64,0x5DBAE75D,0x19322B19,0x73E69573, - 0x60C0A060,0x81199881,0x4F9ED14F,0xDCA37FDC,0x22446622,0x2A547E2A,0x903BAB90,0x880B8388, - 0x468CCA46,0xEEC729EE,0xB86BD3B8,0x14283C14,0xDEA779DE,0x5EBCE25E,0x0B161D0B,0xDBAD76DB, - 0xE0DB3BE0,0x32645632,0x3A744E3A,0x0A141E0A,0x4992DB49,0x060C0A06,0x24486C24,0x5CB8E45C, - 0xC29F5DC2,0xD3BD6ED3,0xAC43EFAC,0x62C4A662,0x9139A891,0x9531A495,0xE4D337E4,0x79F28B79, - 0xE7D532E7,0xC88B43C8,0x376E5937,0x6DDAB76D,0x8D018C8D,0xD5B164D5,0x4E9CD24E,0xA949E0A9, - 0x6CD8B46C,0x56ACFA56,0xF4F307F4,0xEACF25EA,0x65CAAF65,0x7AF48E7A,0xAE47E9AE,0x08101808, - 0xBA6FD5BA,0x78F08878,0x254A6F25,0x2E5C722E,0x1C38241C,0xA657F1A6,0xB473C7B4,0xC69751C6, - 0xE8CB23E8,0xDDA17CDD,0x74E89C74,0x1F3E211F,0x4B96DD4B,0xBD61DCBD,0x8B0D868B,0x8A0F858A, - 0x70E09070,0x3E7C423E,0xB571C4B5,0x66CCAA66,0x4890D848,0x03060503,0xF6F701F6,0x0E1C120E, - 0x61C2A361,0x356A5F35,0x57AEF957,0xB969D0B9,0x86179186,0xC19958C1,0x1D3A271D,0x9E27B99E, - 0xE1D938E1,0xF8EB13F8,0x982BB398,0x11223311,0x69D2BB69,0xD9A970D9,0x8E07898E,0x9433A794, - 0x9B2DB69B,0x1E3C221E,0x87159287,0xE9C920E9,0xCE8749CE,0x55AAFF55,0x28507828,0xDFA57ADF, - 0x8C038F8C,0xA159F8A1,0x89098089,0x0D1A170D,0xBF65DABF,0xE6D731E6,0x4284C642,0x68D0B868, - 0x4182C341,0x9929B099,0x2D5A772D,0x0F1E110F,0xB07BCBB0,0x54A8FC54,0xBB6DD6BB,0x162C3A16 - }, - { - 0xC6A56363,0xF8847C7C,0xEE997777,0xF68D7B7B,0xFF0DF2F2,0xD6BD6B6B,0xDEB16F6F,0x9154C5C5, - 0x60503030,0x02030101,0xCEA96767,0x567D2B2B,0xE719FEFE,0xB562D7D7,0x4DE6ABAB,0xEC9A7676, - 0x8F45CACA,0x1F9D8282,0x8940C9C9,0xFA877D7D,0xEF15FAFA,0xB2EB5959,0x8EC94747,0xFB0BF0F0, - 0x41ECADAD,0xB367D4D4,0x5FFDA2A2,0x45EAAFAF,0x23BF9C9C,0x53F7A4A4,0xE4967272,0x9B5BC0C0, - 0x75C2B7B7,0xE11CFDFD,0x3DAE9393,0x4C6A2626,0x6C5A3636,0x7E413F3F,0xF502F7F7,0x834FCCCC, - 0x685C3434,0x51F4A5A5,0xD134E5E5,0xF908F1F1,0xE2937171,0xAB73D8D8,0x62533131,0x2A3F1515, - 0x080C0404,0x9552C7C7,0x46652323,0x9D5EC3C3,0x30281818,0x37A19696,0x0A0F0505,0x2FB59A9A, - 0x0E090707,0x24361212,0x1B9B8080,0xDF3DE2E2,0xCD26EBEB,0x4E692727,0x7FCDB2B2,0xEA9F7575, - 0x121B0909,0x1D9E8383,0x58742C2C,0x342E1A1A,0x362D1B1B,0xDCB26E6E,0xB4EE5A5A,0x5BFBA0A0, - 0xA4F65252,0x764D3B3B,0xB761D6D6,0x7DCEB3B3,0x527B2929,0xDD3EE3E3,0x5E712F2F,0x13978484, - 0xA6F55353,0xB968D1D1,0000000000,0xC12CEDED,0x40602020,0xE31FFCFC,0x79C8B1B1,0xB6ED5B5B, - 0xD4BE6A6A,0x8D46CBCB,0x67D9BEBE,0x724B3939,0x94DE4A4A,0x98D44C4C,0xB0E85858,0x854ACFCF, - 0xBB6BD0D0,0xC52AEFEF,0x4FE5AAAA,0xED16FBFB,0x86C54343,0x9AD74D4D,0x66553333,0x11948585, - 0x8ACF4545,0xE910F9F9,0x04060202,0xFE817F7F,0xA0F05050,0x78443C3C,0x25BA9F9F,0x4BE3A8A8, - 0xA2F35151,0x5DFEA3A3,0x80C04040,0x058A8F8F,0x3FAD9292,0x21BC9D9D,0x70483838,0xF104F5F5, - 0x63DFBCBC,0x77C1B6B6,0xAF75DADA,0x42632121,0x20301010,0xE51AFFFF,0xFD0EF3F3,0xBF6DD2D2, - 0x814CCDCD,0x18140C0C,0x26351313,0xC32FECEC,0xBEE15F5F,0x35A29797,0x88CC4444,0x2E391717, - 0x9357C4C4,0x55F2A7A7,0xFC827E7E,0x7A473D3D,0xC8AC6464,0xBAE75D5D,0x322B1919,0xE6957373, - 0xC0A06060,0x19988181,0x9ED14F4F,0xA37FDCDC,0x44662222,0x547E2A2A,0x3BAB9090,0x0B838888, - 0x8CCA4646,0xC729EEEE,0x6BD3B8B8,0x283C1414,0xA779DEDE,0xBCE25E5E,0x161D0B0B,0xAD76DBDB, - 0xDB3BE0E0,0x64563232,0x744E3A3A,0x141E0A0A,0x92DB4949,0x0C0A0606,0x486C2424,0xB8E45C5C, - 0x9F5DC2C2,0xBD6ED3D3,0x43EFACAC,0xC4A66262,0x39A89191,0x31A49595,0xD337E4E4,0xF28B7979, - 0xD532E7E7,0x8B43C8C8,0x6E593737,0xDAB76D6D,0x018C8D8D,0xB164D5D5,0x9CD24E4E,0x49E0A9A9, - 0xD8B46C6C,0xACFA5656,0xF307F4F4,0xCF25EAEA,0xCAAF6565,0xF48E7A7A,0x47E9AEAE,0x10180808, - 0x6FD5BABA,0xF0887878,0x4A6F2525,0x5C722E2E,0x38241C1C,0x57F1A6A6,0x73C7B4B4,0x9751C6C6, - 0xCB23E8E8,0xA17CDDDD,0xE89C7474,0x3E211F1F,0x96DD4B4B,0x61DCBDBD,0x0D868B8B,0x0F858A8A, - 0xE0907070,0x7C423E3E,0x71C4B5B5,0xCCAA6666,0x90D84848,0x06050303,0xF701F6F6,0x1C120E0E, - 0xC2A36161,0x6A5F3535,0xAEF95757,0x69D0B9B9,0x17918686,0x9958C1C1,0x3A271D1D,0x27B99E9E, - 0xD938E1E1,0xEB13F8F8,0x2BB39898,0x22331111,0xD2BB6969,0xA970D9D9,0x07898E8E,0x33A79494, - 0x2DB69B9B,0x3C221E1E,0x15928787,0xC920E9E9,0x8749CECE,0xAAFF5555,0x50782828,0xA57ADFDF, - 0x038F8C8C,0x59F8A1A1,0x09808989,0x1A170D0D,0x65DABFBF,0xD731E6E6,0x84C64242,0xD0B86868, - 0x82C34141,0x29B09999,0x5A772D2D,0x1E110F0F,0x7BCBB0B0,0xA8FC5454,0x6DD6BBBB,0x2C3A1616 - } +static u32 ft_tab[4][256] = { + { + 0xA56363C6, 0x847C7CF8, 0x997777EE, 0x8D7B7BF6, 0x0DF2F2FF, 0xBD6B6BD6, + 0xB16F6FDE, 0x54C5C591, + 0x50303060, 0x03010102, 0xA96767CE, 0x7D2B2B56, 0x19FEFEE7, 0x62D7D7B5, + 0xE6ABAB4D, 0x9A7676EC, + 0x45CACA8F, 0x9D82821F, 0x40C9C989, 0x877D7DFA, 0x15FAFAEF, 0xEB5959B2, + 0xC947478E, 0x0BF0F0FB, + 0xECADAD41, 0x67D4D4B3, 0xFDA2A25F, 0xEAAFAF45, 0xBF9C9C23, 0xF7A4A453, + 0x967272E4, 0x5BC0C09B, + 0xC2B7B775, 0x1CFDFDE1, 0xAE93933D, 0x6A26264C, 0x5A36366C, 0x413F3F7E, + 0x02F7F7F5, 0x4FCCCC83, + 0x5C343468, 0xF4A5A551, 0x34E5E5D1, 0x08F1F1F9, 0x937171E2, 0x73D8D8AB, + 0x53313162, 0x3F15152A, + 0x0C040408, 0x52C7C795, 0x65232346, 0x5EC3C39D, 0x28181830, 0xA1969637, + 0x0F05050A, 0xB59A9A2F, + 0x0907070E, 0x36121224, 0x9B80801B, 0x3DE2E2DF, 0x26EBEBCD, 0x6927274E, + 0xCDB2B27F, 0x9F7575EA, + 0x1B090912, 0x9E83831D, 0x742C2C58, 0x2E1A1A34, 0x2D1B1B36, 0xB26E6EDC, + 0xEE5A5AB4, 0xFBA0A05B, + 0xF65252A4, 0x4D3B3B76, 0x61D6D6B7, 0xCEB3B37D, 0x7B292952, 0x3EE3E3DD, + 0x712F2F5E, 0x97848413, + 0xF55353A6, 0x68D1D1B9, 0000000000, 0x2CEDEDC1, 0x60202040, 0x1FFCFCE3, + 0xC8B1B179, 0xED5B5BB6, + 0xBE6A6AD4, 0x46CBCB8D, 0xD9BEBE67, 0x4B393972, 0xDE4A4A94, 0xD44C4C98, + 0xE85858B0, 0x4ACFCF85, + 0x6BD0D0BB, 0x2AEFEFC5, 0xE5AAAA4F, 0x16FBFBED, 0xC5434386, 0xD74D4D9A, + 0x55333366, 0x94858511, + 0xCF45458A, 0x10F9F9E9, 0x06020204, 0x817F7FFE, 0xF05050A0, 0x443C3C78, + 0xBA9F9F25, 0xE3A8A84B, + 0xF35151A2, 0xFEA3A35D, 0xC0404080, 0x8A8F8F05, 0xAD92923F, 0xBC9D9D21, + 0x48383870, 0x04F5F5F1, + 0xDFBCBC63, 0xC1B6B677, 0x75DADAAF, 0x63212142, 0x30101020, 0x1AFFFFE5, + 0x0EF3F3FD, 0x6DD2D2BF, + 0x4CCDCD81, 0x140C0C18, 0x35131326, 0x2FECECC3, 0xE15F5FBE, 0xA2979735, + 0xCC444488, 0x3917172E, + 0x57C4C493, 0xF2A7A755, 0x827E7EFC, 0x473D3D7A, 0xAC6464C8, 0xE75D5DBA, + 0x2B191932, 0x957373E6, + 0xA06060C0, 0x98818119, 0xD14F4F9E, 0x7FDCDCA3, 0x66222244, 0x7E2A2A54, + 0xAB90903B, 0x8388880B, + 0xCA46468C, 0x29EEEEC7, 0xD3B8B86B, 0x3C141428, 0x79DEDEA7, 0xE25E5EBC, + 0x1D0B0B16, 0x76DBDBAD, + 0x3BE0E0DB, 0x56323264, 0x4E3A3A74, 0x1E0A0A14, 0xDB494992, 0x0A06060C, + 0x6C242448, 0xE45C5CB8, + 0x5DC2C29F, 0x6ED3D3BD, 0xEFACAC43, 0xA66262C4, 0xA8919139, 0xA4959531, + 0x37E4E4D3, 0x8B7979F2, + 0x32E7E7D5, 0x43C8C88B, 0x5937376E, 0xB76D6DDA, 0x8C8D8D01, 0x64D5D5B1, + 0xD24E4E9C, 0xE0A9A949, + 0xB46C6CD8, 0xFA5656AC, 0x07F4F4F3, 0x25EAEACF, 0xAF6565CA, 0x8E7A7AF4, + 0xE9AEAE47, 0x18080810, + 0xD5BABA6F, 0x887878F0, 0x6F25254A, 0x722E2E5C, 0x241C1C38, 0xF1A6A657, + 0xC7B4B473, 0x51C6C697, + 0x23E8E8CB, 0x7CDDDDA1, 0x9C7474E8, 0x211F1F3E, 0xDD4B4B96, 0xDCBDBD61, + 0x868B8B0D, 0x858A8A0F, + 0x907070E0, 0x423E3E7C, 0xC4B5B571, 0xAA6666CC, 0xD8484890, 0x05030306, + 0x01F6F6F7, 0x120E0E1C, + 0xA36161C2, 0x5F35356A, 0xF95757AE, 0xD0B9B969, 0x91868617, 0x58C1C199, + 0x271D1D3A, 0xB99E9E27, + 0x38E1E1D9, 0x13F8F8EB, 0xB398982B, 0x33111122, 0xBB6969D2, 0x70D9D9A9, + 0x898E8E07, 0xA7949433, + 0xB69B9B2D, 0x221E1E3C, 0x92878715, 0x20E9E9C9, 0x49CECE87, 0xFF5555AA, + 0x78282850, 0x7ADFDFA5, + 0x8F8C8C03, 0xF8A1A159, 0x80898909, 0x170D0D1A, 0xDABFBF65, 0x31E6E6D7, + 0xC6424284, 0xB86868D0, + 0xC3414182, 0xB0999929, 0x772D2D5A, 0x110F0F1E, 0xCBB0B07B, 0xFC5454A8, + 0xD6BBBB6D, 0x3A16162C}, + { + 0x6363C6A5, 0x7C7CF884, 0x7777EE99, 0x7B7BF68D, 0xF2F2FF0D, 0x6B6BD6BD, + 0x6F6FDEB1, 0xC5C59154, + 0x30306050, 0x01010203, 0x6767CEA9, 0x2B2B567D, 0xFEFEE719, 0xD7D7B562, + 0xABAB4DE6, 0x7676EC9A, + 0xCACA8F45, 0x82821F9D, 0xC9C98940, 0x7D7DFA87, 0xFAFAEF15, 0x5959B2EB, + 0x47478EC9, 0xF0F0FB0B, + 0xADAD41EC, 0xD4D4B367, 0xA2A25FFD, 0xAFAF45EA, 0x9C9C23BF, 0xA4A453F7, + 0x7272E496, 0xC0C09B5B, + 0xB7B775C2, 0xFDFDE11C, 0x93933DAE, 0x26264C6A, 0x36366C5A, 0x3F3F7E41, + 0xF7F7F502, 0xCCCC834F, + 0x3434685C, 0xA5A551F4, 0xE5E5D134, 0xF1F1F908, 0x7171E293, 0xD8D8AB73, + 0x31316253, 0x15152A3F, + 0x0404080C, 0xC7C79552, 0x23234665, 0xC3C39D5E, 0x18183028, 0x969637A1, + 0x05050A0F, 0x9A9A2FB5, + 0x07070E09, 0x12122436, 0x80801B9B, 0xE2E2DF3D, 0xEBEBCD26, 0x27274E69, + 0xB2B27FCD, 0x7575EA9F, + 0x0909121B, 0x83831D9E, 0x2C2C5874, 0x1A1A342E, 0x1B1B362D, 0x6E6EDCB2, + 0x5A5AB4EE, 0xA0A05BFB, + 0x5252A4F6, 0x3B3B764D, 0xD6D6B761, 0xB3B37DCE, 0x2929527B, 0xE3E3DD3E, + 0x2F2F5E71, 0x84841397, + 0x5353A6F5, 0xD1D1B968, 0000000000, 0xEDEDC12C, 0x20204060, 0xFCFCE31F, + 0xB1B179C8, 0x5B5BB6ED, + 0x6A6AD4BE, 0xCBCB8D46, 0xBEBE67D9, 0x3939724B, 0x4A4A94DE, 0x4C4C98D4, + 0x5858B0E8, 0xCFCF854A, + 0xD0D0BB6B, 0xEFEFC52A, 0xAAAA4FE5, 0xFBFBED16, 0x434386C5, 0x4D4D9AD7, + 0x33336655, 0x85851194, + 0x45458ACF, 0xF9F9E910, 0x02020406, 0x7F7FFE81, 0x5050A0F0, 0x3C3C7844, + 0x9F9F25BA, 0xA8A84BE3, + 0x5151A2F3, 0xA3A35DFE, 0x404080C0, 0x8F8F058A, 0x92923FAD, 0x9D9D21BC, + 0x38387048, 0xF5F5F104, + 0xBCBC63DF, 0xB6B677C1, 0xDADAAF75, 0x21214263, 0x10102030, 0xFFFFE51A, + 0xF3F3FD0E, 0xD2D2BF6D, + 0xCDCD814C, 0x0C0C1814, 0x13132635, 0xECECC32F, 0x5F5FBEE1, 0x979735A2, + 0x444488CC, 0x17172E39, + 0xC4C49357, 0xA7A755F2, 0x7E7EFC82, 0x3D3D7A47, 0x6464C8AC, 0x5D5DBAE7, + 0x1919322B, 0x7373E695, + 0x6060C0A0, 0x81811998, 0x4F4F9ED1, 0xDCDCA37F, 0x22224466, 0x2A2A547E, + 0x90903BAB, 0x88880B83, + 0x46468CCA, 0xEEEEC729, 0xB8B86BD3, 0x1414283C, 0xDEDEA779, 0x5E5EBCE2, + 0x0B0B161D, 0xDBDBAD76, + 0xE0E0DB3B, 0x32326456, 0x3A3A744E, 0x0A0A141E, 0x494992DB, 0x06060C0A, + 0x2424486C, 0x5C5CB8E4, + 0xC2C29F5D, 0xD3D3BD6E, 0xACAC43EF, 0x6262C4A6, 0x919139A8, 0x959531A4, + 0xE4E4D337, 0x7979F28B, + 0xE7E7D532, 0xC8C88B43, 0x37376E59, 0x6D6DDAB7, 0x8D8D018C, 0xD5D5B164, + 0x4E4E9CD2, 0xA9A949E0, + 0x6C6CD8B4, 0x5656ACFA, 0xF4F4F307, 0xEAEACF25, 0x6565CAAF, 0x7A7AF48E, + 0xAEAE47E9, 0x08081018, + 0xBABA6FD5, 0x7878F088, 0x25254A6F, 0x2E2E5C72, 0x1C1C3824, 0xA6A657F1, + 0xB4B473C7, 0xC6C69751, + 0xE8E8CB23, 0xDDDDA17C, 0x7474E89C, 0x1F1F3E21, 0x4B4B96DD, 0xBDBD61DC, + 0x8B8B0D86, 0x8A8A0F85, + 0x7070E090, 0x3E3E7C42, 0xB5B571C4, 0x6666CCAA, 0x484890D8, 0x03030605, + 0xF6F6F701, 0x0E0E1C12, + 0x6161C2A3, 0x35356A5F, 0x5757AEF9, 0xB9B969D0, 0x86861791, 0xC1C19958, + 0x1D1D3A27, 0x9E9E27B9, + 0xE1E1D938, 0xF8F8EB13, 0x98982BB3, 0x11112233, 0x6969D2BB, 0xD9D9A970, + 0x8E8E0789, 0x949433A7, + 0x9B9B2DB6, 0x1E1E3C22, 0x87871592, 0xE9E9C920, 0xCECE8749, 0x5555AAFF, + 0x28285078, 0xDFDFA57A, + 0x8C8C038F, 0xA1A159F8, 0x89890980, 0x0D0D1A17, 0xBFBF65DA, 0xE6E6D731, + 0x424284C6, 0x6868D0B8, + 0x414182C3, 0x999929B0, 0x2D2D5A77, 0x0F0F1E11, 0xB0B07BCB, 0x5454A8FC, + 0xBBBB6DD6, 0x16162C3A}, + { + 0x63C6A563, 0x7CF8847C, 0x77EE9977, 0x7BF68D7B, 0xF2FF0DF2, 0x6BD6BD6B, + 0x6FDEB16F, 0xC59154C5, + 0x30605030, 0x01020301, 0x67CEA967, 0x2B567D2B, 0xFEE719FE, 0xD7B562D7, + 0xAB4DE6AB, 0x76EC9A76, + 0xCA8F45CA, 0x821F9D82, 0xC98940C9, 0x7DFA877D, 0xFAEF15FA, 0x59B2EB59, + 0x478EC947, 0xF0FB0BF0, + 0xAD41ECAD, 0xD4B367D4, 0xA25FFDA2, 0xAF45EAAF, 0x9C23BF9C, 0xA453F7A4, + 0x72E49672, 0xC09B5BC0, + 0xB775C2B7, 0xFDE11CFD, 0x933DAE93, 0x264C6A26, 0x366C5A36, 0x3F7E413F, + 0xF7F502F7, 0xCC834FCC, + 0x34685C34, 0xA551F4A5, 0xE5D134E5, 0xF1F908F1, 0x71E29371, 0xD8AB73D8, + 0x31625331, 0x152A3F15, + 0x04080C04, 0xC79552C7, 0x23466523, 0xC39D5EC3, 0x18302818, 0x9637A196, + 0x050A0F05, 0x9A2FB59A, + 0x070E0907, 0x12243612, 0x801B9B80, 0xE2DF3DE2, 0xEBCD26EB, 0x274E6927, + 0xB27FCDB2, 0x75EA9F75, + 0x09121B09, 0x831D9E83, 0x2C58742C, 0x1A342E1A, 0x1B362D1B, 0x6EDCB26E, + 0x5AB4EE5A, 0xA05BFBA0, + 0x52A4F652, 0x3B764D3B, 0xD6B761D6, 0xB37DCEB3, 0x29527B29, 0xE3DD3EE3, + 0x2F5E712F, 0x84139784, + 0x53A6F553, 0xD1B968D1, 0000000000, 0xEDC12CED, 0x20406020, 0xFCE31FFC, + 0xB179C8B1, 0x5BB6ED5B, + 0x6AD4BE6A, 0xCB8D46CB, 0xBE67D9BE, 0x39724B39, 0x4A94DE4A, 0x4C98D44C, + 0x58B0E858, 0xCF854ACF, + 0xD0BB6BD0, 0xEFC52AEF, 0xAA4FE5AA, 0xFBED16FB, 0x4386C543, 0x4D9AD74D, + 0x33665533, 0x85119485, + 0x458ACF45, 0xF9E910F9, 0x02040602, 0x7FFE817F, 0x50A0F050, 0x3C78443C, + 0x9F25BA9F, 0xA84BE3A8, + 0x51A2F351, 0xA35DFEA3, 0x4080C040, 0x8F058A8F, 0x923FAD92, 0x9D21BC9D, + 0x38704838, 0xF5F104F5, + 0xBC63DFBC, 0xB677C1B6, 0xDAAF75DA, 0x21426321, 0x10203010, 0xFFE51AFF, + 0xF3FD0EF3, 0xD2BF6DD2, + 0xCD814CCD, 0x0C18140C, 0x13263513, 0xECC32FEC, 0x5FBEE15F, 0x9735A297, + 0x4488CC44, 0x172E3917, + 0xC49357C4, 0xA755F2A7, 0x7EFC827E, 0x3D7A473D, 0x64C8AC64, 0x5DBAE75D, + 0x19322B19, 0x73E69573, + 0x60C0A060, 0x81199881, 0x4F9ED14F, 0xDCA37FDC, 0x22446622, 0x2A547E2A, + 0x903BAB90, 0x880B8388, + 0x468CCA46, 0xEEC729EE, 0xB86BD3B8, 0x14283C14, 0xDEA779DE, 0x5EBCE25E, + 0x0B161D0B, 0xDBAD76DB, + 0xE0DB3BE0, 0x32645632, 0x3A744E3A, 0x0A141E0A, 0x4992DB49, 0x060C0A06, + 0x24486C24, 0x5CB8E45C, + 0xC29F5DC2, 0xD3BD6ED3, 0xAC43EFAC, 0x62C4A662, 0x9139A891, 0x9531A495, + 0xE4D337E4, 0x79F28B79, + 0xE7D532E7, 0xC88B43C8, 0x376E5937, 0x6DDAB76D, 0x8D018C8D, 0xD5B164D5, + 0x4E9CD24E, 0xA949E0A9, + 0x6CD8B46C, 0x56ACFA56, 0xF4F307F4, 0xEACF25EA, 0x65CAAF65, 0x7AF48E7A, + 0xAE47E9AE, 0x08101808, + 0xBA6FD5BA, 0x78F08878, 0x254A6F25, 0x2E5C722E, 0x1C38241C, 0xA657F1A6, + 0xB473C7B4, 0xC69751C6, + 0xE8CB23E8, 0xDDA17CDD, 0x74E89C74, 0x1F3E211F, 0x4B96DD4B, 0xBD61DCBD, + 0x8B0D868B, 0x8A0F858A, + 0x70E09070, 0x3E7C423E, 0xB571C4B5, 0x66CCAA66, 0x4890D848, 0x03060503, + 0xF6F701F6, 0x0E1C120E, + 0x61C2A361, 0x356A5F35, 0x57AEF957, 0xB969D0B9, 0x86179186, 0xC19958C1, + 0x1D3A271D, 0x9E27B99E, + 0xE1D938E1, 0xF8EB13F8, 0x982BB398, 0x11223311, 0x69D2BB69, 0xD9A970D9, + 0x8E07898E, 0x9433A794, + 0x9B2DB69B, 0x1E3C221E, 0x87159287, 0xE9C920E9, 0xCE8749CE, 0x55AAFF55, + 0x28507828, 0xDFA57ADF, + 0x8C038F8C, 0xA159F8A1, 0x89098089, 0x0D1A170D, 0xBF65DABF, 0xE6D731E6, + 0x4284C642, 0x68D0B868, + 0x4182C341, 0x9929B099, 0x2D5A772D, 0x0F1E110F, 0xB07BCBB0, 0x54A8FC54, + 0xBB6DD6BB, 0x162C3A16}, + { + 0xC6A56363, 0xF8847C7C, 0xEE997777, 0xF68D7B7B, 0xFF0DF2F2, 0xD6BD6B6B, + 0xDEB16F6F, 0x9154C5C5, + 0x60503030, 0x02030101, 0xCEA96767, 0x567D2B2B, 0xE719FEFE, 0xB562D7D7, + 0x4DE6ABAB, 0xEC9A7676, + 0x8F45CACA, 0x1F9D8282, 0x8940C9C9, 0xFA877D7D, 0xEF15FAFA, 0xB2EB5959, + 0x8EC94747, 0xFB0BF0F0, + 0x41ECADAD, 0xB367D4D4, 0x5FFDA2A2, 0x45EAAFAF, 0x23BF9C9C, 0x53F7A4A4, + 0xE4967272, 0x9B5BC0C0, + 0x75C2B7B7, 0xE11CFDFD, 0x3DAE9393, 0x4C6A2626, 0x6C5A3636, 0x7E413F3F, + 0xF502F7F7, 0x834FCCCC, + 0x685C3434, 0x51F4A5A5, 0xD134E5E5, 0xF908F1F1, 0xE2937171, 0xAB73D8D8, + 0x62533131, 0x2A3F1515, + 0x080C0404, 0x9552C7C7, 0x46652323, 0x9D5EC3C3, 0x30281818, 0x37A19696, + 0x0A0F0505, 0x2FB59A9A, + 0x0E090707, 0x24361212, 0x1B9B8080, 0xDF3DE2E2, 0xCD26EBEB, 0x4E692727, + 0x7FCDB2B2, 0xEA9F7575, + 0x121B0909, 0x1D9E8383, 0x58742C2C, 0x342E1A1A, 0x362D1B1B, 0xDCB26E6E, + 0xB4EE5A5A, 0x5BFBA0A0, + 0xA4F65252, 0x764D3B3B, 0xB761D6D6, 0x7DCEB3B3, 0x527B2929, 0xDD3EE3E3, + 0x5E712F2F, 0x13978484, + 0xA6F55353, 0xB968D1D1, 0000000000, 0xC12CEDED, 0x40602020, 0xE31FFCFC, + 0x79C8B1B1, 0xB6ED5B5B, + 0xD4BE6A6A, 0x8D46CBCB, 0x67D9BEBE, 0x724B3939, 0x94DE4A4A, 0x98D44C4C, + 0xB0E85858, 0x854ACFCF, + 0xBB6BD0D0, 0xC52AEFEF, 0x4FE5AAAA, 0xED16FBFB, 0x86C54343, 0x9AD74D4D, + 0x66553333, 0x11948585, + 0x8ACF4545, 0xE910F9F9, 0x04060202, 0xFE817F7F, 0xA0F05050, 0x78443C3C, + 0x25BA9F9F, 0x4BE3A8A8, + 0xA2F35151, 0x5DFEA3A3, 0x80C04040, 0x058A8F8F, 0x3FAD9292, 0x21BC9D9D, + 0x70483838, 0xF104F5F5, + 0x63DFBCBC, 0x77C1B6B6, 0xAF75DADA, 0x42632121, 0x20301010, 0xE51AFFFF, + 0xFD0EF3F3, 0xBF6DD2D2, + 0x814CCDCD, 0x18140C0C, 0x26351313, 0xC32FECEC, 0xBEE15F5F, 0x35A29797, + 0x88CC4444, 0x2E391717, + 0x9357C4C4, 0x55F2A7A7, 0xFC827E7E, 0x7A473D3D, 0xC8AC6464, 0xBAE75D5D, + 0x322B1919, 0xE6957373, + 0xC0A06060, 0x19988181, 0x9ED14F4F, 0xA37FDCDC, 0x44662222, 0x547E2A2A, + 0x3BAB9090, 0x0B838888, + 0x8CCA4646, 0xC729EEEE, 0x6BD3B8B8, 0x283C1414, 0xA779DEDE, 0xBCE25E5E, + 0x161D0B0B, 0xAD76DBDB, + 0xDB3BE0E0, 0x64563232, 0x744E3A3A, 0x141E0A0A, 0x92DB4949, 0x0C0A0606, + 0x486C2424, 0xB8E45C5C, + 0x9F5DC2C2, 0xBD6ED3D3, 0x43EFACAC, 0xC4A66262, 0x39A89191, 0x31A49595, + 0xD337E4E4, 0xF28B7979, + 0xD532E7E7, 0x8B43C8C8, 0x6E593737, 0xDAB76D6D, 0x018C8D8D, 0xB164D5D5, + 0x9CD24E4E, 0x49E0A9A9, + 0xD8B46C6C, 0xACFA5656, 0xF307F4F4, 0xCF25EAEA, 0xCAAF6565, 0xF48E7A7A, + 0x47E9AEAE, 0x10180808, + 0x6FD5BABA, 0xF0887878, 0x4A6F2525, 0x5C722E2E, 0x38241C1C, 0x57F1A6A6, + 0x73C7B4B4, 0x9751C6C6, + 0xCB23E8E8, 0xA17CDDDD, 0xE89C7474, 0x3E211F1F, 0x96DD4B4B, 0x61DCBDBD, + 0x0D868B8B, 0x0F858A8A, + 0xE0907070, 0x7C423E3E, 0x71C4B5B5, 0xCCAA6666, 0x90D84848, 0x06050303, + 0xF701F6F6, 0x1C120E0E, + 0xC2A36161, 0x6A5F3535, 0xAEF95757, 0x69D0B9B9, 0x17918686, 0x9958C1C1, + 0x3A271D1D, 0x27B99E9E, + 0xD938E1E1, 0xEB13F8F8, 0x2BB39898, 0x22331111, 0xD2BB6969, 0xA970D9D9, + 0x07898E8E, 0x33A79494, + 0x2DB69B9B, 0x3C221E1E, 0x15928787, 0xC920E9E9, 0x8749CECE, 0xAAFF5555, + 0x50782828, 0xA57ADFDF, + 0x038F8C8C, 0x59F8A1A1, 0x09808989, 0x1A170D0D, 0x65DABFBF, 0xD731E6E6, + 0x84C64242, 0xD0B86868, + 0x82C34141, 0x29B09999, 0x5A772D2D, 0x1E110F0F, 0x7BCBB0B0, 0xA8FC5454, + 0x6DD6BBBB, 0x2C3A1616} }; -static u32 fl_tab[4][256] = -{ - { - 0x00000063,0x0000007C,0x00000077,0x0000007B,0x000000F2,0x0000006B,0x0000006F,0x000000C5, - 0x00000030,0x00000001,0x00000067,0x0000002B,0x000000FE,0x000000D7,0x000000AB,0x00000076, - 0x000000CA,0x00000082,0x000000C9,0x0000007D,0x000000FA,0x00000059,0x00000047,0x000000F0, - 0x000000AD,0x000000D4,0x000000A2,0x000000AF,0x0000009C,0x000000A4,0x00000072,0x000000C0, - 0x000000B7,0x000000FD,0x00000093,0x00000026,0x00000036,0x0000003F,0x000000F7,0x000000CC, - 0x00000034,0x000000A5,0x000000E5,0x000000F1,0x00000071,0x000000D8,0x00000031,0x00000015, - 0x00000004,0x000000C7,0x00000023,0x000000C3,0x00000018,0x00000096,0x00000005,0x0000009A, - 0x00000007,0x00000012,0x00000080,0x000000E2,0x000000EB,0x00000027,0x000000B2,0x00000075, - 0x00000009,0x00000083,0x0000002C,0x0000001A,0x0000001B,0x0000006E,0x0000005A,0x000000A0, - 0x00000052,0x0000003B,0x000000D6,0x000000B3,0x00000029,0x000000E3,0x0000002F,0x00000084, - 0x00000053,0x000000D1,0x00000000,0x000000ED,0x00000020,0x000000FC,0x000000B1,0x0000005B, - 0x0000006A,0x000000CB,0x000000BE,0x00000039,0x0000004A,0x0000004C,0x00000058,0x000000CF, - 0x000000D0,0x000000EF,0x000000AA,0x000000FB,0x00000043,0x0000004D,0x00000033,0x00000085, - 0x00000045,0x000000F9,0x00000002,0x0000007F,0x00000050,0x0000003C,0x0000009F,0x000000A8, - 0x00000051,0x000000A3,0x00000040,0x0000008F,0x00000092,0x0000009D,0x00000038,0x000000F5, - 0x000000BC,0x000000B6,0x000000DA,0x00000021,0x00000010,0x000000FF,0x000000F3,0x000000D2, - 0x000000CD,0x0000000C,0x00000013,0x000000EC,0x0000005F,0x00000097,0x00000044,0x00000017, - 0x000000C4,0x000000A7,0x0000007E,0x0000003D,0x00000064,0x0000005D,0x00000019,0x00000073, - 0x00000060,0x00000081,0x0000004F,0x000000DC,0x00000022,0x0000002A,0x00000090,0x00000088, - 0x00000046,0x000000EE,0x000000B8,0x00000014,0x000000DE,0x0000005E,0x0000000B,0x000000DB, - 0x000000E0,0x00000032,0x0000003A,0x0000000A,0x00000049,0x00000006,0x00000024,0x0000005C, - 0x000000C2,0x000000D3,0x000000AC,0x00000062,0x00000091,0x00000095,0x000000E4,0x00000079, - 0x000000E7,0x000000C8,0x00000037,0x0000006D,0x0000008D,0x000000D5,0x0000004E,0x000000A9, - 0x0000006C,0x00000056,0x000000F4,0x000000EA,0x00000065,0x0000007A,0x000000AE,0x00000008, - 0x000000BA,0x00000078,0x00000025,0x0000002E,0x0000001C,0x000000A6,0x000000B4,0x000000C6, - 0x000000E8,0x000000DD,0x00000074,0x0000001F,0x0000004B,0x000000BD,0x0000008B,0x0000008A, - 0x00000070,0x0000003E,0x000000B5,0x00000066,0x00000048,0x00000003,0x000000F6,0x0000000E, - 0x00000061,0x00000035,0x00000057,0x000000B9,0x00000086,0x000000C1,0x0000001D,0x0000009E, - 0x000000E1,0x000000F8,0x00000098,0x00000011,0x00000069,0x000000D9,0x0000008E,0x00000094, - 0x0000009B,0x0000001E,0x00000087,0x000000E9,0x000000CE,0x00000055,0x00000028,0x000000DF, - 0x0000008C,0x000000A1,0x00000089,0x0000000D,0x000000BF,0x000000E6,0x00000042,0x00000068, - 0x00000041,0x00000099,0x0000002D,0x0000000F,0x000000B0,0x00000054,0x000000BB,0x00000016 - }, - { - 0x00006300,0x00007C00,0x00007700,0x00007B00,0x0000F200,0x00006B00,0x00006F00,0x0000C500, - 0x00003000,0x00000100,0x00006700,0x00002B00,0x0000FE00,0x0000D700,0x0000AB00,0x00007600, - 0x0000CA00,0x00008200,0x0000C900,0x00007D00,0x0000FA00,0x00005900,0x00004700,0x0000F000, - 0x0000AD00,0x0000D400,0x0000A200,0x0000AF00,0x00009C00,0x0000A400,0x00007200,0x0000C000, - 0x0000B700,0x0000FD00,0x00009300,0x00002600,0x00003600,0x00003F00,0x0000F700,0x0000CC00, - 0x00003400,0x0000A500,0x0000E500,0x0000F100,0x00007100,0x0000D800,0x00003100,0x00001500, - 0x00000400,0x0000C700,0x00002300,0x0000C300,0x00001800,0x00009600,0x00000500,0x00009A00, - 0x00000700,0x00001200,0x00008000,0x0000E200,0x0000EB00,0x00002700,0x0000B200,0x00007500, - 0x00000900,0x00008300,0x00002C00,0x00001A00,0x00001B00,0x00006E00,0x00005A00,0x0000A000, - 0x00005200,0x00003B00,0x0000D600,0x0000B300,0x00002900,0x0000E300,0x00002F00,0x00008400, - 0x00005300,0x0000D100,0000000000,0x0000ED00,0x00002000,0x0000FC00,0x0000B100,0x00005B00, - 0x00006A00,0x0000CB00,0x0000BE00,0x00003900,0x00004A00,0x00004C00,0x00005800,0x0000CF00, - 0x0000D000,0x0000EF00,0x0000AA00,0x0000FB00,0x00004300,0x00004D00,0x00003300,0x00008500, - 0x00004500,0x0000F900,0x00000200,0x00007F00,0x00005000,0x00003C00,0x00009F00,0x0000A800, - 0x00005100,0x0000A300,0x00004000,0x00008F00,0x00009200,0x00009D00,0x00003800,0x0000F500, - 0x0000BC00,0x0000B600,0x0000DA00,0x00002100,0x00001000,0x0000FF00,0x0000F300,0x0000D200, - 0x0000CD00,0x00000C00,0x00001300,0x0000EC00,0x00005F00,0x00009700,0x00004400,0x00001700, - 0x0000C400,0x0000A700,0x00007E00,0x00003D00,0x00006400,0x00005D00,0x00001900,0x00007300, - 0x00006000,0x00008100,0x00004F00,0x0000DC00,0x00002200,0x00002A00,0x00009000,0x00008800, - 0x00004600,0x0000EE00,0x0000B800,0x00001400,0x0000DE00,0x00005E00,0x00000B00,0x0000DB00, - 0x0000E000,0x00003200,0x00003A00,0x00000A00,0x00004900,0x00000600,0x00002400,0x00005C00, - 0x0000C200,0x0000D300,0x0000AC00,0x00006200,0x00009100,0x00009500,0x0000E400,0x00007900, - 0x0000E700,0x0000C800,0x00003700,0x00006D00,0x00008D00,0x0000D500,0x00004E00,0x0000A900, - 0x00006C00,0x00005600,0x0000F400,0x0000EA00,0x00006500,0x00007A00,0x0000AE00,0x00000800, - 0x0000BA00,0x00007800,0x00002500,0x00002E00,0x00001C00,0x0000A600,0x0000B400,0x0000C600, - 0x0000E800,0x0000DD00,0x00007400,0x00001F00,0x00004B00,0x0000BD00,0x00008B00,0x00008A00, - 0x00007000,0x00003E00,0x0000B500,0x00006600,0x00004800,0x00000300,0x0000F600,0x00000E00, - 0x00006100,0x00003500,0x00005700,0x0000B900,0x00008600,0x0000C100,0x00001D00,0x00009E00, - 0x0000E100,0x0000F800,0x00009800,0x00001100,0x00006900,0x0000D900,0x00008E00,0x00009400, - 0x00009B00,0x00001E00,0x00008700,0x0000E900,0x0000CE00,0x00005500,0x00002800,0x0000DF00, - 0x00008C00,0x0000A100,0x00008900,0x00000D00,0x0000BF00,0x0000E600,0x00004200,0x00006800, - 0x00004100,0x00009900,0x00002D00,0x00000F00,0x0000B000,0x00005400,0x0000BB00,0x00001600 - }, - { - 0x00630000,0x007C0000,0x00770000,0x007B0000,0x00F20000,0x006B0000,0x006F0000,0x00C50000, - 0x00300000,0x00010000,0x00670000,0x002B0000,0x00FE0000,0x00D70000,0x00AB0000,0x00760000, - 0x00CA0000,0x00820000,0x00C90000,0x007D0000,0x00FA0000,0x00590000,0x00470000,0x00F00000, - 0x00AD0000,0x00D40000,0x00A20000,0x00AF0000,0x009C0000,0x00A40000,0x00720000,0x00C00000, - 0x00B70000,0x00FD0000,0x00930000,0x00260000,0x00360000,0x003F0000,0x00F70000,0x00CC0000, - 0x00340000,0x00A50000,0x00E50000,0x00F10000,0x00710000,0x00D80000,0x00310000,0x00150000, - 0x00040000,0x00C70000,0x00230000,0x00C30000,0x00180000,0x00960000,0x00050000,0x009A0000, - 0x00070000,0x00120000,0x00800000,0x00E20000,0x00EB0000,0x00270000,0x00B20000,0x00750000, - 0x00090000,0x00830000,0x002C0000,0x001A0000,0x001B0000,0x006E0000,0x005A0000,0x00A00000, - 0x00520000,0x003B0000,0x00D60000,0x00B30000,0x00290000,0x00E30000,0x002F0000,0x00840000, - 0x00530000,0x00D10000,0000000000,0x00ED0000,0x00200000,0x00FC0000,0x00B10000,0x005B0000, - 0x006A0000,0x00CB0000,0x00BE0000,0x00390000,0x004A0000,0x004C0000,0x00580000,0x00CF0000, - 0x00D00000,0x00EF0000,0x00AA0000,0x00FB0000,0x00430000,0x004D0000,0x00330000,0x00850000, - 0x00450000,0x00F90000,0x00020000,0x007F0000,0x00500000,0x003C0000,0x009F0000,0x00A80000, - 0x00510000,0x00A30000,0x00400000,0x008F0000,0x00920000,0x009D0000,0x00380000,0x00F50000, - 0x00BC0000,0x00B60000,0x00DA0000,0x00210000,0x00100000,0x00FF0000,0x00F30000,0x00D20000, - 0x00CD0000,0x000C0000,0x00130000,0x00EC0000,0x005F0000,0x00970000,0x00440000,0x00170000, - 0x00C40000,0x00A70000,0x007E0000,0x003D0000,0x00640000,0x005D0000,0x00190000,0x00730000, - 0x00600000,0x00810000,0x004F0000,0x00DC0000,0x00220000,0x002A0000,0x00900000,0x00880000, - 0x00460000,0x00EE0000,0x00B80000,0x00140000,0x00DE0000,0x005E0000,0x000B0000,0x00DB0000, - 0x00E00000,0x00320000,0x003A0000,0x000A0000,0x00490000,0x00060000,0x00240000,0x005C0000, - 0x00C20000,0x00D30000,0x00AC0000,0x00620000,0x00910000,0x00950000,0x00E40000,0x00790000, - 0x00E70000,0x00C80000,0x00370000,0x006D0000,0x008D0000,0x00D50000,0x004E0000,0x00A90000, - 0x006C0000,0x00560000,0x00F40000,0x00EA0000,0x00650000,0x007A0000,0x00AE0000,0x00080000, - 0x00BA0000,0x00780000,0x00250000,0x002E0000,0x001C0000,0x00A60000,0x00B40000,0x00C60000, - 0x00E80000,0x00DD0000,0x00740000,0x001F0000,0x004B0000,0x00BD0000,0x008B0000,0x008A0000, - 0x00700000,0x003E0000,0x00B50000,0x00660000,0x00480000,0x00030000,0x00F60000,0x000E0000, - 0x00610000,0x00350000,0x00570000,0x00B90000,0x00860000,0x00C10000,0x001D0000,0x009E0000, - 0x00E10000,0x00F80000,0x00980000,0x00110000,0x00690000,0x00D90000,0x008E0000,0x00940000, - 0x009B0000,0x001E0000,0x00870000,0x00E90000,0x00CE0000,0x00550000,0x00280000,0x00DF0000, - 0x008C0000,0x00A10000,0x00890000,0x000D0000,0x00BF0000,0x00E60000,0x00420000,0x00680000, - 0x00410000,0x00990000,0x002D0000,0x000F0000,0x00B00000,0x00540000,0x00BB0000,0x00160000 - }, - { - 0x63000000,0x7C000000,0x77000000,0x7B000000,0xF2000000,0x6B000000,0x6F000000,0xC5000000, - 0x30000000,0x01000000,0x67000000,0x2B000000,0xFE000000,0xD7000000,0xAB000000,0x76000000, - 0xCA000000,0x82000000,0xC9000000,0x7D000000,0xFA000000,0x59000000,0x47000000,0xF0000000, - 0xAD000000,0xD4000000,0xA2000000,0xAF000000,0x9C000000,0xA4000000,0x72000000,0xC0000000, - 0xB7000000,0xFD000000,0x93000000,0x26000000,0x36000000,0x3F000000,0xF7000000,0xCC000000, - 0x34000000,0xA5000000,0xE5000000,0xF1000000,0x71000000,0xD8000000,0x31000000,0x15000000, - 0x04000000,0xC7000000,0x23000000,0xC3000000,0x18000000,0x96000000,0x05000000,0x9A000000, - 0x07000000,0x12000000,0x80000000,0xE2000000,0xEB000000,0x27000000,0xB2000000,0x75000000, - 0x09000000,0x83000000,0x2C000000,0x1A000000,0x1B000000,0x6E000000,0x5A000000,0xA0000000, - 0x52000000,0x3B000000,0xD6000000,0xB3000000,0x29000000,0xE3000000,0x2F000000,0x84000000, - 0x53000000,0xD1000000,0000000000,0xED000000,0x20000000,0xFC000000,0xB1000000,0x5B000000, - 0x6A000000,0xCB000000,0xBE000000,0x39000000,0x4A000000,0x4C000000,0x58000000,0xCF000000, - 0xD0000000,0xEF000000,0xAA000000,0xFB000000,0x43000000,0x4D000000,0x33000000,0x85000000, - 0x45000000,0xF9000000,0x02000000,0x7F000000,0x50000000,0x3C000000,0x9F000000,0xA8000000, - 0x51000000,0xA3000000,0x40000000,0x8F000000,0x92000000,0x9D000000,0x38000000,0xF5000000, - 0xBC000000,0xB6000000,0xDA000000,0x21000000,0x10000000,0xFF000000,0xF3000000,0xD2000000, - 0xCD000000,0x0C000000,0x13000000,0xEC000000,0x5F000000,0x97000000,0x44000000,0x17000000, - 0xC4000000,0xA7000000,0x7E000000,0x3D000000,0x64000000,0x5D000000,0x19000000,0x73000000, - 0x60000000,0x81000000,0x4F000000,0xDC000000,0x22000000,0x2A000000,0x90000000,0x88000000, - 0x46000000,0xEE000000,0xB8000000,0x14000000,0xDE000000,0x5E000000,0x0B000000,0xDB000000, - 0xE0000000,0x32000000,0x3A000000,0x0A000000,0x49000000,0x06000000,0x24000000,0x5C000000, - 0xC2000000,0xD3000000,0xAC000000,0x62000000,0x91000000,0x95000000,0xE4000000,0x79000000, - 0xE7000000,0xC8000000,0x37000000,0x6D000000,0x8D000000,0xD5000000,0x4E000000,0xA9000000, - 0x6C000000,0x56000000,0xF4000000,0xEA000000,0x65000000,0x7A000000,0xAE000000,0x08000000, - 0xBA000000,0x78000000,0x25000000,0x2E000000,0x1C000000,0xA6000000,0xB4000000,0xC6000000, - 0xE8000000,0xDD000000,0x74000000,0x1F000000,0x4B000000,0xBD000000,0x8B000000,0x8A000000, - 0x70000000,0x3E000000,0xB5000000,0x66000000,0x48000000,0x03000000,0xF6000000,0x0E000000, - 0x61000000,0x35000000,0x57000000,0xB9000000,0x86000000,0xC1000000,0x1D000000,0x9E000000, - 0xE1000000,0xF8000000,0x98000000,0x11000000,0x69000000,0xD9000000,0x8E000000,0x94000000, - 0x9B000000,0x1E000000,0x87000000,0xE9000000,0xCE000000,0x55000000,0x28000000,0xDF000000, - 0x8C000000,0xA1000000,0x89000000,0x0D000000,0xBF000000,0xE6000000,0x42000000,0x68000000, - 0x41000000,0x99000000,0x2D000000,0x0F000000,0xB0000000,0x54000000,0xBB000000,0x16000000 - } +static u32 fl_tab[4][256] = { + { + 0x00000063, 0x0000007C, 0x00000077, 0x0000007B, 0x000000F2, 0x0000006B, + 0x0000006F, 0x000000C5, + 0x00000030, 0x00000001, 0x00000067, 0x0000002B, 0x000000FE, 0x000000D7, + 0x000000AB, 0x00000076, + 0x000000CA, 0x00000082, 0x000000C9, 0x0000007D, 0x000000FA, 0x00000059, + 0x00000047, 0x000000F0, + 0x000000AD, 0x000000D4, 0x000000A2, 0x000000AF, 0x0000009C, 0x000000A4, + 0x00000072, 0x000000C0, + 0x000000B7, 0x000000FD, 0x00000093, 0x00000026, 0x00000036, 0x0000003F, + 0x000000F7, 0x000000CC, + 0x00000034, 0x000000A5, 0x000000E5, 0x000000F1, 0x00000071, 0x000000D8, + 0x00000031, 0x00000015, + 0x00000004, 0x000000C7, 0x00000023, 0x000000C3, 0x00000018, 0x00000096, + 0x00000005, 0x0000009A, + 0x00000007, 0x00000012, 0x00000080, 0x000000E2, 0x000000EB, 0x00000027, + 0x000000B2, 0x00000075, + 0x00000009, 0x00000083, 0x0000002C, 0x0000001A, 0x0000001B, 0x0000006E, + 0x0000005A, 0x000000A0, + 0x00000052, 0x0000003B, 0x000000D6, 0x000000B3, 0x00000029, 0x000000E3, + 0x0000002F, 0x00000084, + 0x00000053, 0x000000D1, 0x00000000, 0x000000ED, 0x00000020, 0x000000FC, + 0x000000B1, 0x0000005B, + 0x0000006A, 0x000000CB, 0x000000BE, 0x00000039, 0x0000004A, 0x0000004C, + 0x00000058, 0x000000CF, + 0x000000D0, 0x000000EF, 0x000000AA, 0x000000FB, 0x00000043, 0x0000004D, + 0x00000033, 0x00000085, + 0x00000045, 0x000000F9, 0x00000002, 0x0000007F, 0x00000050, 0x0000003C, + 0x0000009F, 0x000000A8, + 0x00000051, 0x000000A3, 0x00000040, 0x0000008F, 0x00000092, 0x0000009D, + 0x00000038, 0x000000F5, + 0x000000BC, 0x000000B6, 0x000000DA, 0x00000021, 0x00000010, 0x000000FF, + 0x000000F3, 0x000000D2, + 0x000000CD, 0x0000000C, 0x00000013, 0x000000EC, 0x0000005F, 0x00000097, + 0x00000044, 0x00000017, + 0x000000C4, 0x000000A7, 0x0000007E, 0x0000003D, 0x00000064, 0x0000005D, + 0x00000019, 0x00000073, + 0x00000060, 0x00000081, 0x0000004F, 0x000000DC, 0x00000022, 0x0000002A, + 0x00000090, 0x00000088, + 0x00000046, 0x000000EE, 0x000000B8, 0x00000014, 0x000000DE, 0x0000005E, + 0x0000000B, 0x000000DB, + 0x000000E0, 0x00000032, 0x0000003A, 0x0000000A, 0x00000049, 0x00000006, + 0x00000024, 0x0000005C, + 0x000000C2, 0x000000D3, 0x000000AC, 0x00000062, 0x00000091, 0x00000095, + 0x000000E4, 0x00000079, + 0x000000E7, 0x000000C8, 0x00000037, 0x0000006D, 0x0000008D, 0x000000D5, + 0x0000004E, 0x000000A9, + 0x0000006C, 0x00000056, 0x000000F4, 0x000000EA, 0x00000065, 0x0000007A, + 0x000000AE, 0x00000008, + 0x000000BA, 0x00000078, 0x00000025, 0x0000002E, 0x0000001C, 0x000000A6, + 0x000000B4, 0x000000C6, + 0x000000E8, 0x000000DD, 0x00000074, 0x0000001F, 0x0000004B, 0x000000BD, + 0x0000008B, 0x0000008A, + 0x00000070, 0x0000003E, 0x000000B5, 0x00000066, 0x00000048, 0x00000003, + 0x000000F6, 0x0000000E, + 0x00000061, 0x00000035, 0x00000057, 0x000000B9, 0x00000086, 0x000000C1, + 0x0000001D, 0x0000009E, + 0x000000E1, 0x000000F8, 0x00000098, 0x00000011, 0x00000069, 0x000000D9, + 0x0000008E, 0x00000094, + 0x0000009B, 0x0000001E, 0x00000087, 0x000000E9, 0x000000CE, 0x00000055, + 0x00000028, 0x000000DF, + 0x0000008C, 0x000000A1, 0x00000089, 0x0000000D, 0x000000BF, 0x000000E6, + 0x00000042, 0x00000068, + 0x00000041, 0x00000099, 0x0000002D, 0x0000000F, 0x000000B0, 0x00000054, + 0x000000BB, 0x00000016}, + { + 0x00006300, 0x00007C00, 0x00007700, 0x00007B00, 0x0000F200, 0x00006B00, + 0x00006F00, 0x0000C500, + 0x00003000, 0x00000100, 0x00006700, 0x00002B00, 0x0000FE00, 0x0000D700, + 0x0000AB00, 0x00007600, + 0x0000CA00, 0x00008200, 0x0000C900, 0x00007D00, 0x0000FA00, 0x00005900, + 0x00004700, 0x0000F000, + 0x0000AD00, 0x0000D400, 0x0000A200, 0x0000AF00, 0x00009C00, 0x0000A400, + 0x00007200, 0x0000C000, + 0x0000B700, 0x0000FD00, 0x00009300, 0x00002600, 0x00003600, 0x00003F00, + 0x0000F700, 0x0000CC00, + 0x00003400, 0x0000A500, 0x0000E500, 0x0000F100, 0x00007100, 0x0000D800, + 0x00003100, 0x00001500, + 0x00000400, 0x0000C700, 0x00002300, 0x0000C300, 0x00001800, 0x00009600, + 0x00000500, 0x00009A00, + 0x00000700, 0x00001200, 0x00008000, 0x0000E200, 0x0000EB00, 0x00002700, + 0x0000B200, 0x00007500, + 0x00000900, 0x00008300, 0x00002C00, 0x00001A00, 0x00001B00, 0x00006E00, + 0x00005A00, 0x0000A000, + 0x00005200, 0x00003B00, 0x0000D600, 0x0000B300, 0x00002900, 0x0000E300, + 0x00002F00, 0x00008400, + 0x00005300, 0x0000D100, 0000000000, 0x0000ED00, 0x00002000, 0x0000FC00, + 0x0000B100, 0x00005B00, + 0x00006A00, 0x0000CB00, 0x0000BE00, 0x00003900, 0x00004A00, 0x00004C00, + 0x00005800, 0x0000CF00, + 0x0000D000, 0x0000EF00, 0x0000AA00, 0x0000FB00, 0x00004300, 0x00004D00, + 0x00003300, 0x00008500, + 0x00004500, 0x0000F900, 0x00000200, 0x00007F00, 0x00005000, 0x00003C00, + 0x00009F00, 0x0000A800, + 0x00005100, 0x0000A300, 0x00004000, 0x00008F00, 0x00009200, 0x00009D00, + 0x00003800, 0x0000F500, + 0x0000BC00, 0x0000B600, 0x0000DA00, 0x00002100, 0x00001000, 0x0000FF00, + 0x0000F300, 0x0000D200, + 0x0000CD00, 0x00000C00, 0x00001300, 0x0000EC00, 0x00005F00, 0x00009700, + 0x00004400, 0x00001700, + 0x0000C400, 0x0000A700, 0x00007E00, 0x00003D00, 0x00006400, 0x00005D00, + 0x00001900, 0x00007300, + 0x00006000, 0x00008100, 0x00004F00, 0x0000DC00, 0x00002200, 0x00002A00, + 0x00009000, 0x00008800, + 0x00004600, 0x0000EE00, 0x0000B800, 0x00001400, 0x0000DE00, 0x00005E00, + 0x00000B00, 0x0000DB00, + 0x0000E000, 0x00003200, 0x00003A00, 0x00000A00, 0x00004900, 0x00000600, + 0x00002400, 0x00005C00, + 0x0000C200, 0x0000D300, 0x0000AC00, 0x00006200, 0x00009100, 0x00009500, + 0x0000E400, 0x00007900, + 0x0000E700, 0x0000C800, 0x00003700, 0x00006D00, 0x00008D00, 0x0000D500, + 0x00004E00, 0x0000A900, + 0x00006C00, 0x00005600, 0x0000F400, 0x0000EA00, 0x00006500, 0x00007A00, + 0x0000AE00, 0x00000800, + 0x0000BA00, 0x00007800, 0x00002500, 0x00002E00, 0x00001C00, 0x0000A600, + 0x0000B400, 0x0000C600, + 0x0000E800, 0x0000DD00, 0x00007400, 0x00001F00, 0x00004B00, 0x0000BD00, + 0x00008B00, 0x00008A00, + 0x00007000, 0x00003E00, 0x0000B500, 0x00006600, 0x00004800, 0x00000300, + 0x0000F600, 0x00000E00, + 0x00006100, 0x00003500, 0x00005700, 0x0000B900, 0x00008600, 0x0000C100, + 0x00001D00, 0x00009E00, + 0x0000E100, 0x0000F800, 0x00009800, 0x00001100, 0x00006900, 0x0000D900, + 0x00008E00, 0x00009400, + 0x00009B00, 0x00001E00, 0x00008700, 0x0000E900, 0x0000CE00, 0x00005500, + 0x00002800, 0x0000DF00, + 0x00008C00, 0x0000A100, 0x00008900, 0x00000D00, 0x0000BF00, 0x0000E600, + 0x00004200, 0x00006800, + 0x00004100, 0x00009900, 0x00002D00, 0x00000F00, 0x0000B000, 0x00005400, + 0x0000BB00, 0x00001600}, + { + 0x00630000, 0x007C0000, 0x00770000, 0x007B0000, 0x00F20000, 0x006B0000, + 0x006F0000, 0x00C50000, + 0x00300000, 0x00010000, 0x00670000, 0x002B0000, 0x00FE0000, 0x00D70000, + 0x00AB0000, 0x00760000, + 0x00CA0000, 0x00820000, 0x00C90000, 0x007D0000, 0x00FA0000, 0x00590000, + 0x00470000, 0x00F00000, + 0x00AD0000, 0x00D40000, 0x00A20000, 0x00AF0000, 0x009C0000, 0x00A40000, + 0x00720000, 0x00C00000, + 0x00B70000, 0x00FD0000, 0x00930000, 0x00260000, 0x00360000, 0x003F0000, + 0x00F70000, 0x00CC0000, + 0x00340000, 0x00A50000, 0x00E50000, 0x00F10000, 0x00710000, 0x00D80000, + 0x00310000, 0x00150000, + 0x00040000, 0x00C70000, 0x00230000, 0x00C30000, 0x00180000, 0x00960000, + 0x00050000, 0x009A0000, + 0x00070000, 0x00120000, 0x00800000, 0x00E20000, 0x00EB0000, 0x00270000, + 0x00B20000, 0x00750000, + 0x00090000, 0x00830000, 0x002C0000, 0x001A0000, 0x001B0000, 0x006E0000, + 0x005A0000, 0x00A00000, + 0x00520000, 0x003B0000, 0x00D60000, 0x00B30000, 0x00290000, 0x00E30000, + 0x002F0000, 0x00840000, + 0x00530000, 0x00D10000, 0000000000, 0x00ED0000, 0x00200000, 0x00FC0000, + 0x00B10000, 0x005B0000, + 0x006A0000, 0x00CB0000, 0x00BE0000, 0x00390000, 0x004A0000, 0x004C0000, + 0x00580000, 0x00CF0000, + 0x00D00000, 0x00EF0000, 0x00AA0000, 0x00FB0000, 0x00430000, 0x004D0000, + 0x00330000, 0x00850000, + 0x00450000, 0x00F90000, 0x00020000, 0x007F0000, 0x00500000, 0x003C0000, + 0x009F0000, 0x00A80000, + 0x00510000, 0x00A30000, 0x00400000, 0x008F0000, 0x00920000, 0x009D0000, + 0x00380000, 0x00F50000, + 0x00BC0000, 0x00B60000, 0x00DA0000, 0x00210000, 0x00100000, 0x00FF0000, + 0x00F30000, 0x00D20000, + 0x00CD0000, 0x000C0000, 0x00130000, 0x00EC0000, 0x005F0000, 0x00970000, + 0x00440000, 0x00170000, + 0x00C40000, 0x00A70000, 0x007E0000, 0x003D0000, 0x00640000, 0x005D0000, + 0x00190000, 0x00730000, + 0x00600000, 0x00810000, 0x004F0000, 0x00DC0000, 0x00220000, 0x002A0000, + 0x00900000, 0x00880000, + 0x00460000, 0x00EE0000, 0x00B80000, 0x00140000, 0x00DE0000, 0x005E0000, + 0x000B0000, 0x00DB0000, + 0x00E00000, 0x00320000, 0x003A0000, 0x000A0000, 0x00490000, 0x00060000, + 0x00240000, 0x005C0000, + 0x00C20000, 0x00D30000, 0x00AC0000, 0x00620000, 0x00910000, 0x00950000, + 0x00E40000, 0x00790000, + 0x00E70000, 0x00C80000, 0x00370000, 0x006D0000, 0x008D0000, 0x00D50000, + 0x004E0000, 0x00A90000, + 0x006C0000, 0x00560000, 0x00F40000, 0x00EA0000, 0x00650000, 0x007A0000, + 0x00AE0000, 0x00080000, + 0x00BA0000, 0x00780000, 0x00250000, 0x002E0000, 0x001C0000, 0x00A60000, + 0x00B40000, 0x00C60000, + 0x00E80000, 0x00DD0000, 0x00740000, 0x001F0000, 0x004B0000, 0x00BD0000, + 0x008B0000, 0x008A0000, + 0x00700000, 0x003E0000, 0x00B50000, 0x00660000, 0x00480000, 0x00030000, + 0x00F60000, 0x000E0000, + 0x00610000, 0x00350000, 0x00570000, 0x00B90000, 0x00860000, 0x00C10000, + 0x001D0000, 0x009E0000, + 0x00E10000, 0x00F80000, 0x00980000, 0x00110000, 0x00690000, 0x00D90000, + 0x008E0000, 0x00940000, + 0x009B0000, 0x001E0000, 0x00870000, 0x00E90000, 0x00CE0000, 0x00550000, + 0x00280000, 0x00DF0000, + 0x008C0000, 0x00A10000, 0x00890000, 0x000D0000, 0x00BF0000, 0x00E60000, + 0x00420000, 0x00680000, + 0x00410000, 0x00990000, 0x002D0000, 0x000F0000, 0x00B00000, 0x00540000, + 0x00BB0000, 0x00160000}, + { + 0x63000000, 0x7C000000, 0x77000000, 0x7B000000, 0xF2000000, 0x6B000000, + 0x6F000000, 0xC5000000, + 0x30000000, 0x01000000, 0x67000000, 0x2B000000, 0xFE000000, 0xD7000000, + 0xAB000000, 0x76000000, + 0xCA000000, 0x82000000, 0xC9000000, 0x7D000000, 0xFA000000, 0x59000000, + 0x47000000, 0xF0000000, + 0xAD000000, 0xD4000000, 0xA2000000, 0xAF000000, 0x9C000000, 0xA4000000, + 0x72000000, 0xC0000000, + 0xB7000000, 0xFD000000, 0x93000000, 0x26000000, 0x36000000, 0x3F000000, + 0xF7000000, 0xCC000000, + 0x34000000, 0xA5000000, 0xE5000000, 0xF1000000, 0x71000000, 0xD8000000, + 0x31000000, 0x15000000, + 0x04000000, 0xC7000000, 0x23000000, 0xC3000000, 0x18000000, 0x96000000, + 0x05000000, 0x9A000000, + 0x07000000, 0x12000000, 0x80000000, 0xE2000000, 0xEB000000, 0x27000000, + 0xB2000000, 0x75000000, + 0x09000000, 0x83000000, 0x2C000000, 0x1A000000, 0x1B000000, 0x6E000000, + 0x5A000000, 0xA0000000, + 0x52000000, 0x3B000000, 0xD6000000, 0xB3000000, 0x29000000, 0xE3000000, + 0x2F000000, 0x84000000, + 0x53000000, 0xD1000000, 0000000000, 0xED000000, 0x20000000, 0xFC000000, + 0xB1000000, 0x5B000000, + 0x6A000000, 0xCB000000, 0xBE000000, 0x39000000, 0x4A000000, 0x4C000000, + 0x58000000, 0xCF000000, + 0xD0000000, 0xEF000000, 0xAA000000, 0xFB000000, 0x43000000, 0x4D000000, + 0x33000000, 0x85000000, + 0x45000000, 0xF9000000, 0x02000000, 0x7F000000, 0x50000000, 0x3C000000, + 0x9F000000, 0xA8000000, + 0x51000000, 0xA3000000, 0x40000000, 0x8F000000, 0x92000000, 0x9D000000, + 0x38000000, 0xF5000000, + 0xBC000000, 0xB6000000, 0xDA000000, 0x21000000, 0x10000000, 0xFF000000, + 0xF3000000, 0xD2000000, + 0xCD000000, 0x0C000000, 0x13000000, 0xEC000000, 0x5F000000, 0x97000000, + 0x44000000, 0x17000000, + 0xC4000000, 0xA7000000, 0x7E000000, 0x3D000000, 0x64000000, 0x5D000000, + 0x19000000, 0x73000000, + 0x60000000, 0x81000000, 0x4F000000, 0xDC000000, 0x22000000, 0x2A000000, + 0x90000000, 0x88000000, + 0x46000000, 0xEE000000, 0xB8000000, 0x14000000, 0xDE000000, 0x5E000000, + 0x0B000000, 0xDB000000, + 0xE0000000, 0x32000000, 0x3A000000, 0x0A000000, 0x49000000, 0x06000000, + 0x24000000, 0x5C000000, + 0xC2000000, 0xD3000000, 0xAC000000, 0x62000000, 0x91000000, 0x95000000, + 0xE4000000, 0x79000000, + 0xE7000000, 0xC8000000, 0x37000000, 0x6D000000, 0x8D000000, 0xD5000000, + 0x4E000000, 0xA9000000, + 0x6C000000, 0x56000000, 0xF4000000, 0xEA000000, 0x65000000, 0x7A000000, + 0xAE000000, 0x08000000, + 0xBA000000, 0x78000000, 0x25000000, 0x2E000000, 0x1C000000, 0xA6000000, + 0xB4000000, 0xC6000000, + 0xE8000000, 0xDD000000, 0x74000000, 0x1F000000, 0x4B000000, 0xBD000000, + 0x8B000000, 0x8A000000, + 0x70000000, 0x3E000000, 0xB5000000, 0x66000000, 0x48000000, 0x03000000, + 0xF6000000, 0x0E000000, + 0x61000000, 0x35000000, 0x57000000, 0xB9000000, 0x86000000, 0xC1000000, + 0x1D000000, 0x9E000000, + 0xE1000000, 0xF8000000, 0x98000000, 0x11000000, 0x69000000, 0xD9000000, + 0x8E000000, 0x94000000, + 0x9B000000, 0x1E000000, 0x87000000, 0xE9000000, 0xCE000000, 0x55000000, + 0x28000000, 0xDF000000, + 0x8C000000, 0xA1000000, 0x89000000, 0x0D000000, 0xBF000000, 0xE6000000, + 0x42000000, 0x68000000, + 0x41000000, 0x99000000, 0x2D000000, 0x0F000000, 0xB0000000, 0x54000000, + 0xBB000000, 0x16000000} }; /*----------------- The workspace ------------------------------*/ -static u32 Ekey[44]; /* The expanded key */ +static u32 Ekey[44]; /* The expanded key */ /*------ The round Function. 4 table lookups and 4 Exors ------*/ #define f_rnd(x, n) \ @@ -390,24 +637,23 @@ */ void RijndaelKeySchedule(u8 key[16]) { - u32 t; - u32 *ek=Ekey, /* pointer to the expanded key */ - *rc=rnd_con; /* pointer to the round constant */ - - Ekey[0] = u32_in(key ); - Ekey[1] = u32_in(key + 4); - Ekey[2] = u32_in(key + 8); - Ekey[3] = u32_in(key + 12); + u32 t; + u32 *ek = Ekey, /* pointer to the expanded key */ + *rc = rnd_con; /* pointer to the round constant */ + + Ekey[0] = u32_in(key); + Ekey[1] = u32_in(key + 4); + Ekey[2] = u32_in(key + 8); + Ekey[3] = u32_in(key + 12); - while(ek < Ekey + 40) - { + while (ek < Ekey + 40) { t = rot3(ek[3]); - ek[4] = ek[0] ^ ls_box(t) ^ *rc++; - ek[5] = ek[1] ^ ek[4]; - ek[6] = ek[2] ^ ek[5]; - ek[7] = ek[3] ^ ek[6]; - ek += 4; - } + ek[4] = ek[0] ^ ls_box(t) ^ *rc++; + ek[5] = ek[1] ^ ek[4]; + ek[6] = ek[2] ^ ek[5]; + ek[7] = ek[3] ^ ek[6]; + ek += 4; + } } /*----------------------------------------------------------- @@ -416,25 +662,25 @@ */ void RijndaelEncrypt(u8 in[16], u8 out[16]) { - u32 b0[4], b1[4], *kp = Ekey; + u32 b0[4], b1[4], *kp = Ekey; - b0[0] = u32_in(in ) ^ *kp++; - b0[1] = u32_in(in + 4) ^ *kp++; - b0[2] = u32_in(in + 8) ^ *kp++; - b0[3] = u32_in(in + 12) ^ *kp++; - - f_round(b1, b0, kp); - f_round(b0, b1, kp); - f_round(b1, b0, kp); - f_round(b0, b1, kp); - f_round(b1, b0, kp); - f_round(b0, b1, kp); - f_round(b1, b0, kp); - f_round(b0, b1, kp); - f_round(b1, b0, kp); - - u32_out(out, lf_rnd(b1, 0) ^ kp[0]); - u32_out(out + 4, lf_rnd(b1, 1) ^ kp[1]); - u32_out(out + 8, lf_rnd(b1, 2) ^ kp[2]); - u32_out(out + 12, lf_rnd(b1, 3) ^ kp[3]); + b0[0] = u32_in(in) ^ *kp++; + b0[1] = u32_in(in + 4) ^ *kp++; + b0[2] = u32_in(in + 8) ^ *kp++; + b0[3] = u32_in(in + 12) ^ *kp++; + + f_round(b1, b0, kp); + f_round(b0, b1, kp); + f_round(b1, b0, kp); + f_round(b0, b1, kp); + f_round(b1, b0, kp); + f_round(b0, b1, kp); + f_round(b1, b0, kp); + f_round(b0, b1, kp); + f_round(b1, b0, kp); + + u32_out(out, lf_rnd(b1, 0) ^ kp[0]); + u32_out(out + 4, lf_rnd(b1, 1) ^ kp[1]); + u32_out(out + 8, lf_rnd(b1, 2) ^ kp[2]); + u32_out(out + 12, lf_rnd(b1, 3) ^ kp[3]); } diff -Nru libexosip2-3.3.0/src/rijndael.h libexosip2-3.6.0/src/rijndael.h --- libexosip2-3.3.0/src/rijndael.h 2008-10-26 15:09:00.000000000 +0000 +++ libexosip2-3.6.0/src/rijndael.h 2010-01-06 14:57:57.000000000 +0000 @@ -19,8 +19,8 @@ #define RIJNDAEL_H -void RijndaelKeySchedule( u8 key[16] ); -void RijndaelEncrypt( u8 input[16], u8 output[16] ); +void RijndaelKeySchedule(u8 key[16]); +void RijndaelEncrypt(u8 input[16], u8 output[16]); #endif diff -Nru libexosip2-3.3.0/src/sdp_offans.c libexosip2-3.6.0/src/sdp_offans.c --- libexosip2-3.3.0/src/sdp_offans.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/sdp_offans.c 2010-01-06 14:57:57.000000000 +0000 @@ -26,328 +26,296 @@ extern eXosip_t eXosip; -sdp_message_t *_eXosip_get_remote_sdp (osip_transaction_t * invite_tr); -sdp_message_t *_eXosip_get_local_sdp (osip_transaction_t * invite_tr); +sdp_message_t *_eXosip_get_remote_sdp(osip_transaction_t * invite_tr); +sdp_message_t *_eXosip_get_local_sdp(osip_transaction_t * invite_tr); -sdp_message_t * -eXosip_get_remote_sdp_from_tid (int tid) +sdp_message_t *eXosip_get_remote_sdp_from_tid(int tid) { - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *tr = NULL; - - if (tid > 0) - { - _eXosip_call_transaction_find (tid, &jc, &jd, &tr); - } - if (jc == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return NULL; - } - if (tr == NULL) - return NULL; - - return _eXosip_get_remote_sdp (tr); -} - - -sdp_message_t * -eXosip_get_local_sdp_from_tid (int tid) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *tr = NULL; - - if (tid > 0) - { - _eXosip_call_transaction_find (tid, &jc, &jd, &tr); - } - if (jc == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return NULL; - } - if (tr == NULL) - return NULL; - - return _eXosip_get_local_sdp (tr); -} - -sdp_message_t * -eXosip_get_remote_sdp (int jid) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *invite_tr = NULL; - - if (jid > 0) - { - eXosip_call_dialog_find (jid, &jc, &jd); - } - if (jc == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return NULL; - } - invite_tr = eXosip_find_last_invite (jc, jd); - if (invite_tr == NULL) - return NULL; - - return _eXosip_get_remote_sdp (invite_tr); -} - -sdp_message_t * -eXosip_get_previous_local_sdp (int jid) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *invite_tr = NULL; - - if (jid > 0) - { - eXosip_call_dialog_find (jid, &jc, &jd); - } - if (jc == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return NULL; - } - invite_tr = eXosip_find_last_invite (jc, jd); - if (invite_tr == NULL) - return NULL; - invite_tr = eXosip_find_previous_invite (jc, jd, invite_tr); - if (invite_tr == NULL) - return NULL; - - return _eXosip_get_local_sdp (invite_tr); -} - -sdp_message_t * -eXosip_get_local_sdp (int jid) -{ - eXosip_dialog_t *jd = NULL; - eXosip_call_t *jc = NULL; - osip_transaction_t *invite_tr = NULL; - - if (jid > 0) - { - eXosip_call_dialog_find (jid, &jc, &jd); - } - if (jc == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: No call here?\n")); - return NULL; - } - invite_tr = eXosip_find_last_invite (jc, jd); - if (invite_tr == NULL) - return NULL; - - return _eXosip_get_local_sdp (invite_tr); -} - -sdp_message_t * -_eXosip_get_remote_sdp (osip_transaction_t * invite_tr) -{ - osip_message_t *message; - - if (invite_tr == NULL) - return NULL; - if (invite_tr->ctx_type == IST || invite_tr->ctx_type == NIST) - message = invite_tr->orig_request; - else if (invite_tr->ctx_type == ICT || invite_tr->ctx_type == NICT) - message = invite_tr->last_response; - else - return NULL; - - return eXosip_get_sdp_info (message); -} - -sdp_message_t * -_eXosip_get_local_sdp (osip_transaction_t * invite_tr) -{ - osip_message_t *message; - - if (invite_tr == NULL) - return NULL; - if (invite_tr->ctx_type == IST || invite_tr->ctx_type == NIST) - message = invite_tr->last_response; - else if (invite_tr->ctx_type == ICT || invite_tr->ctx_type == NICT) - message = invite_tr->orig_request; - else - return NULL; - - return eXosip_get_sdp_info (message); -} - -sdp_message_t * -eXosip_get_sdp_info (osip_message_t * message) -{ - osip_content_type_t *ctt; - sdp_message_t *sdp; - osip_body_t *oldbody; - int pos; - - if (message == NULL) - return NULL; - - /* get content-type info */ - ctt = osip_message_get_content_type (message); - if (ctt == NULL) - return NULL; /* previous message was not correct or empty */ - - if (ctt->type == NULL || ctt->subtype == NULL) - return NULL; - if (osip_strcasecmp (ctt->type, "multipart") == 0) - { - /* probably within the multipart attachement */ - } else if (osip_strcasecmp (ctt->type, "application") != 0 || - osip_strcasecmp (ctt->subtype, "sdp") != 0) - return NULL; - - pos = 0; - while (!osip_list_eol (&message->bodies, pos)) - { - int i; - - oldbody = (osip_body_t *) osip_list_get (&message->bodies, pos); - pos++; - sdp_message_init (&sdp); - i = sdp_message_parse (sdp, oldbody->body); - if (i == 0) - return sdp; - sdp_message_free (sdp); - sdp = NULL; - } - return NULL; -} - - -sdp_connection_t * -eXosip_get_audio_connection (sdp_message_t * sdp) -{ - int pos = 0; - sdp_media_t *med = (sdp_media_t *) osip_list_get (&sdp->m_medias, 0); - - while (med != NULL) - { - if (med->m_media != NULL && osip_strcasecmp (med->m_media, "audio") == 0) - break; - pos++; - med = (sdp_media_t *) osip_list_get (&sdp->m_medias, pos); - } - if (med == NULL) - return NULL; /* no audio stream */ - if (osip_list_eol (&med->c_connections, 0)) - return sdp->c_connection; - - /* just return the first one... */ - return (sdp_connection_t *) osip_list_get (&med->c_connections, 0); -} - - -sdp_media_t * -eXosip_get_audio_media (sdp_message_t * sdp) -{ - int pos = 0; - sdp_media_t *med = (sdp_media_t *) osip_list_get (&sdp->m_medias, 0); - - while (med != NULL) - { - if (med->m_media != NULL && osip_strcasecmp (med->m_media, "audio") == 0) - return med; - pos++; - med = (sdp_media_t *) osip_list_get (&sdp->m_medias, pos); - } - - return NULL; -} - -sdp_connection_t * -eXosip_get_video_connection (sdp_message_t * sdp) -{ - int pos = 0; - sdp_media_t *med = (sdp_media_t *) osip_list_get (&sdp->m_medias, 0); - - while (med != NULL) - { - if (med->m_media != NULL && osip_strcasecmp (med->m_media, "video") == 0) - break; - pos++; - med = (sdp_media_t *) osip_list_get (&sdp->m_medias, pos); - } - if (med == NULL) - return NULL; /* no video stream */ - if (osip_list_eol (&med->c_connections, 0)) - return sdp->c_connection; - - /* just return the first one... */ - return (sdp_connection_t *) osip_list_get (&med->c_connections, 0); -} - - -sdp_media_t * -eXosip_get_video_media (sdp_message_t * sdp) -{ - int pos = 0; - sdp_media_t *med = (sdp_media_t *) osip_list_get (&sdp->m_medias, 0); - - while (med != NULL) - { - if (med->m_media != NULL && osip_strcasecmp (med->m_media, "video") == 0) - return med; - pos++; - med = (sdp_media_t *) osip_list_get (&sdp->m_medias, pos); - } - - return NULL; -} - -sdp_connection_t * -eXosip_get_connection (sdp_message_t * sdp, const char *media) -{ - int pos = 0; - sdp_media_t *med = (sdp_media_t *) osip_list_get (&sdp->m_medias, 0); - - while (med != NULL) - { - if (med->m_media != NULL && osip_strcasecmp (med->m_media, media) == 0) - break; - pos++; - med = (sdp_media_t *) osip_list_get (&sdp->m_medias, pos); - } - if (med == NULL) - return NULL; /* no video stream */ - if (osip_list_eol (&med->c_connections, 0)) - return sdp->c_connection; - - /* just return the first one... */ - return (sdp_connection_t *) osip_list_get (&med->c_connections, 0); -} - -sdp_media_t * -eXosip_get_media (sdp_message_t * sdp, const char *media) -{ - int pos = 0; - sdp_media_t *med = (sdp_media_t *) osip_list_get (&sdp->m_medias, 0); - - while (med != NULL) - { - if (med->m_media != NULL && osip_strcasecmp (med->m_media, media) == 0) - return med; - pos++; - med = (sdp_media_t *) osip_list_get (&sdp->m_medias, pos); - } + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *tr = NULL; - return NULL; + if (tid > 0) { + _eXosip_call_transaction_find(tid, &jc, &jd, &tr); + } + if (jc == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return NULL; + } + if (tr == NULL) + return NULL; + + return _eXosip_get_remote_sdp(tr); +} + + +sdp_message_t *eXosip_get_local_sdp_from_tid(int tid) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *tr = NULL; + + if (tid > 0) { + _eXosip_call_transaction_find(tid, &jc, &jd, &tr); + } + if (jc == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return NULL; + } + if (tr == NULL) + return NULL; + + return _eXosip_get_local_sdp(tr); +} + +sdp_message_t *eXosip_get_remote_sdp(int jid) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *invite_tr = NULL; + + if (jid > 0) { + eXosip_call_dialog_find(jid, &jc, &jd); + } + if (jc == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return NULL; + } + invite_tr = eXosip_find_last_invite(jc, jd); + if (invite_tr == NULL) + return NULL; + + return _eXosip_get_remote_sdp(invite_tr); +} + +sdp_message_t *eXosip_get_previous_local_sdp(int jid) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *invite_tr = NULL; + + if (jid > 0) { + eXosip_call_dialog_find(jid, &jc, &jd); + } + if (jc == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return NULL; + } + invite_tr = eXosip_find_last_invite(jc, jd); + if (invite_tr == NULL) + return NULL; + invite_tr = eXosip_find_previous_invite(jc, jd, invite_tr); + if (invite_tr == NULL) + return NULL; + + return _eXosip_get_local_sdp(invite_tr); +} + +sdp_message_t *eXosip_get_local_sdp(int jid) +{ + eXosip_dialog_t *jd = NULL; + eXosip_call_t *jc = NULL; + osip_transaction_t *invite_tr = NULL; + + if (jid > 0) { + eXosip_call_dialog_find(jid, &jc, &jd); + } + if (jc == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: No call here?\n")); + return NULL; + } + invite_tr = eXosip_find_last_invite(jc, jd); + if (invite_tr == NULL) + return NULL; + + return _eXosip_get_local_sdp(invite_tr); +} + +sdp_message_t *_eXosip_get_remote_sdp(osip_transaction_t * invite_tr) +{ + osip_message_t *message; + + if (invite_tr == NULL) + return NULL; + if (invite_tr->ctx_type == IST || invite_tr->ctx_type == NIST) + message = invite_tr->orig_request; + else if (invite_tr->ctx_type == ICT || invite_tr->ctx_type == NICT) + message = invite_tr->last_response; + else + return NULL; + + return eXosip_get_sdp_info(message); +} + +sdp_message_t *_eXosip_get_local_sdp(osip_transaction_t * invite_tr) +{ + osip_message_t *message; + + if (invite_tr == NULL) + return NULL; + if (invite_tr->ctx_type == IST || invite_tr->ctx_type == NIST) + message = invite_tr->last_response; + else if (invite_tr->ctx_type == ICT || invite_tr->ctx_type == NICT) + message = invite_tr->orig_request; + else + return NULL; + + return eXosip_get_sdp_info(message); +} + +sdp_message_t *eXosip_get_sdp_info(osip_message_t * message) +{ + osip_content_type_t *ctt; + sdp_message_t *sdp; + osip_body_t *oldbody; + int pos; + + if (message == NULL) + return NULL; + + /* get content-type info */ + ctt = osip_message_get_content_type(message); + if (ctt == NULL) + return NULL; /* previous message was not correct or empty */ + + if (ctt->type == NULL || ctt->subtype == NULL) + return NULL; + if (osip_strcasecmp(ctt->type, "multipart") == 0) { + /* probably within the multipart attachement */ + } else if (osip_strcasecmp(ctt->type, "application") != 0 || + osip_strcasecmp(ctt->subtype, "sdp") != 0) + return NULL; + + pos = 0; + while (!osip_list_eol(&message->bodies, pos)) { + int i; + + oldbody = (osip_body_t *) osip_list_get(&message->bodies, pos); + pos++; + sdp_message_init(&sdp); + i = sdp_message_parse(sdp, oldbody->body); + if (i == 0) + return sdp; + sdp_message_free(sdp); + sdp = NULL; + } + return NULL; +} + + +sdp_connection_t *eXosip_get_audio_connection(sdp_message_t * sdp) +{ + int pos = 0; + sdp_media_t *med = (sdp_media_t *) osip_list_get(&sdp->m_medias, 0); + + while (med != NULL) { + if (med->m_media != NULL && osip_strcasecmp(med->m_media, "audio") == 0) + break; + pos++; + med = (sdp_media_t *) osip_list_get(&sdp->m_medias, pos); + } + if (med == NULL) + return NULL; /* no audio stream */ + if (osip_list_eol(&med->c_connections, 0)) + return sdp->c_connection; + + /* just return the first one... */ + return (sdp_connection_t *) osip_list_get(&med->c_connections, 0); +} + + +sdp_media_t *eXosip_get_audio_media(sdp_message_t * sdp) +{ + int pos = 0; + sdp_media_t *med = (sdp_media_t *) osip_list_get(&sdp->m_medias, 0); + + while (med != NULL) { + if (med->m_media != NULL && osip_strcasecmp(med->m_media, "audio") == 0) + return med; + pos++; + med = (sdp_media_t *) osip_list_get(&sdp->m_medias, pos); + } + + return NULL; +} + +sdp_connection_t *eXosip_get_video_connection(sdp_message_t * sdp) +{ + int pos = 0; + sdp_media_t *med = (sdp_media_t *) osip_list_get(&sdp->m_medias, 0); + + while (med != NULL) { + if (med->m_media != NULL && osip_strcasecmp(med->m_media, "video") == 0) + break; + pos++; + med = (sdp_media_t *) osip_list_get(&sdp->m_medias, pos); + } + if (med == NULL) + return NULL; /* no video stream */ + if (osip_list_eol(&med->c_connections, 0)) + return sdp->c_connection; + + /* just return the first one... */ + return (sdp_connection_t *) osip_list_get(&med->c_connections, 0); +} + + +sdp_media_t *eXosip_get_video_media(sdp_message_t * sdp) +{ + int pos = 0; + sdp_media_t *med = (sdp_media_t *) osip_list_get(&sdp->m_medias, 0); + + while (med != NULL) { + if (med->m_media != NULL && osip_strcasecmp(med->m_media, "video") == 0) + return med; + pos++; + med = (sdp_media_t *) osip_list_get(&sdp->m_medias, pos); + } + + return NULL; +} + +sdp_connection_t *eXosip_get_connection(sdp_message_t * sdp, const char *media) +{ + int pos = 0; + sdp_media_t *med = (sdp_media_t *) osip_list_get(&sdp->m_medias, 0); + + while (med != NULL) { + if (med->m_media != NULL && osip_strcasecmp(med->m_media, media) == 0) + break; + pos++; + med = (sdp_media_t *) osip_list_get(&sdp->m_medias, pos); + } + if (med == NULL) + return NULL; /* no video stream */ + if (osip_list_eol(&med->c_connections, 0)) + return sdp->c_connection; + + /* just return the first one... */ + return (sdp_connection_t *) osip_list_get(&med->c_connections, 0); +} + +sdp_media_t *eXosip_get_media(sdp_message_t * sdp, const char *media) +{ + int pos = 0; + sdp_media_t *med = (sdp_media_t *) osip_list_get(&sdp->m_medias, 0); + + while (med != NULL) { + if (med->m_media != NULL && osip_strcasecmp(med->m_media, media) == 0) + return med; + pos++; + med = (sdp_media_t *) osip_list_get(&sdp->m_medias, pos); + } + + return NULL; } diff -Nru libexosip2-3.3.0/src/udp.c libexosip2-3.6.0/src/udp.c --- libexosip2-3.3.0/src/udp.c 2008-10-26 15:08:11.000000000 +0000 +++ libexosip2-3.6.0/src/udp.c 2011-10-04 07:56:59.000000000 +0000 @@ -38,1628 +38,1529 @@ #endif extern eXosip_t eXosip; -extern int ipv6_enable; /* Private functions */ -static void eXosip_send_default_answer (eXosip_dialog_t * jd, - osip_transaction_t * transaction, - osip_event_t * evt, - int status, - char *reason_phrase, - char *warning, int line); -static void eXosip_process_bye (eXosip_call_t * jc, eXosip_dialog_t * jd, - osip_transaction_t * transaction, - osip_event_t * evt); -static void eXosip_process_ack (eXosip_call_t * jc, eXosip_dialog_t * jd, - osip_event_t * evt); -static void eXosip_process_prack (eXosip_call_t * jc, eXosip_dialog_t * jd, - osip_transaction_t * transaction, - osip_event_t * evt); -static int cancel_match_invite (osip_transaction_t * invite, - osip_message_t * cancel); -static void eXosip_process_cancel (osip_transaction_t * transaction, - osip_event_t * evt); -static void eXosip_process_reinvite (eXosip_call_t * jc, - eXosip_dialog_t * jd, - osip_transaction_t * - transaction, osip_event_t * evt); -static void eXosip_process_new_invite (osip_transaction_t * transaction, - osip_event_t * evt); +static void eXosip_send_default_answer(eXosip_dialog_t * jd, + osip_transaction_t * transaction, + osip_event_t * evt, + int status, + char *reason_phrase, + char *warning, int line); +static void eXosip_process_bye(eXosip_call_t * jc, eXosip_dialog_t * jd, + osip_transaction_t * transaction, + osip_event_t * evt); +static void eXosip_process_ack(eXosip_call_t * jc, eXosip_dialog_t * jd, + osip_event_t * evt); +static void eXosip_process_prack(eXosip_call_t * jc, eXosip_dialog_t * jd, + osip_transaction_t * transaction, + osip_event_t * evt); +static int cancel_match_invite(osip_transaction_t * invite, + osip_message_t * cancel); +static void eXosip_process_cancel(osip_transaction_t * transaction, + osip_event_t * evt); +static void eXosip_process_reinvite(eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_transaction_t * + transaction, osip_event_t * evt); +static void eXosip_process_new_invite(osip_transaction_t * transaction, + osip_event_t * evt); #ifndef MINISIZE -static void eXosip_process_new_subscribe (osip_transaction_t * transaction, - osip_event_t * evt); -static void eXosip_process_subscribe_within_call (eXosip_notify_t * jn, - eXosip_dialog_t * jd, - osip_transaction_t * - transaction, osip_event_t * evt); -static void eXosip_process_notify_within_dialog (eXosip_subscribe_t * js, - eXosip_dialog_t * jd, - osip_transaction_t * - transaction, osip_event_t * evt); -static int eXosip_match_notify_for_subscribe (eXosip_subscribe_t * js, - osip_message_t * notify); -#endif -static void eXosip_process_message_within_dialog (eXosip_call_t * jc, - eXosip_dialog_t * jd, - osip_transaction_t * - transaction, osip_event_t * evt); -static void eXosip_process_newrequest (osip_event_t * evt, int socket); -static void eXosip_process_response_out_of_transaction (osip_event_t * evt); -static int eXosip_pendingosip_transaction_exist (eXosip_call_t * jc, - eXosip_dialog_t * jd); -static int eXosip_release_finished_calls (eXosip_call_t * jc, - eXosip_dialog_t * jd); -static int eXosip_release_aborted_calls (eXosip_call_t * jc, eXosip_dialog_t * jd); +static void eXosip_process_new_subscribe(osip_transaction_t * transaction, + osip_event_t * evt); +static void eXosip_process_subscribe_within_call(eXosip_notify_t * jn, + eXosip_dialog_t * jd, + osip_transaction_t * + transaction, osip_event_t * evt); +static void eXosip_process_notify_within_dialog(eXosip_subscribe_t * js, + eXosip_dialog_t * jd, + osip_transaction_t * + transaction, osip_event_t * evt); +static int eXosip_match_notify_for_subscribe(eXosip_subscribe_t * js, + osip_message_t * notify); +#endif +static void eXosip_process_message_within_dialog(eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_transaction_t * + transaction, osip_event_t * evt); +static void eXosip_process_newrequest(osip_event_t * evt, int socket); +static void eXosip_process_response_out_of_transaction(osip_event_t * evt); +static int eXosip_pendingosip_transaction_exist(eXosip_call_t * jc, + eXosip_dialog_t * jd); +static int eXosip_release_finished_calls(eXosip_call_t * jc, eXosip_dialog_t * jd); +static int eXosip_release_aborted_calls(eXosip_call_t * jc, eXosip_dialog_t * jd); -static int eXosip_release_finished_transactions (eXosip_call_t * jc, - eXosip_dialog_t * jd); +static int eXosip_release_finished_transactions(eXosip_call_t * jc, + eXosip_dialog_t * jd); #ifndef MINISIZE -static int eXosip_release_finished_transactions_for_subscription (eXosip_dialog_t * - jd); +static int eXosip_release_finished_transactions_for_subscription(eXosip_dialog_t * + jd); #endif static void -eXosip_send_default_answer (eXosip_dialog_t * jd, - osip_transaction_t * transaction, - osip_event_t * evt, - int status, - char *reason_phrase, char *warning, int line) -{ - osip_event_t *evt_answer; - osip_message_t *answer; - int i; - - /* osip_list_add(&eXosip.j_transactions, transaction, 0); */ - osip_transaction_set_your_instance (transaction, NULL); - - /* THIS METHOD DOES NOT ACCEPT STATUS CODE BETWEEN 101 and 299 */ - if (status > 100 && status < 299 && MSG_IS_INVITE (evt->sip)) - return; - - if (jd != NULL) - i = _eXosip_build_response_default (&answer, jd->d_dialog, status, evt->sip); - else - i = _eXosip_build_response_default (&answer, NULL, status, evt->sip); - - if (i != 0 || answer == NULL) - { - return; - } - - if (reason_phrase != NULL) - { - char *_reason; - - _reason = osip_message_get_reason_phrase (answer); - if (_reason != NULL) - osip_free (_reason); - _reason = osip_strdup (reason_phrase); - osip_message_set_reason_phrase (answer, _reason); - } - - osip_message_set_content_length (answer, "0"); - - if (status == 500) - osip_message_set_retry_after (answer, "10"); - - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; - osip_transaction_add_event (transaction, evt_answer); - __eXosip_wakeup (); +eXosip_send_default_answer(eXosip_dialog_t * jd, + osip_transaction_t * transaction, + osip_event_t * evt, + int status, + char *reason_phrase, char *warning, int line) +{ + osip_event_t *evt_answer; + osip_message_t *answer; + int i; + + /* osip_list_add(&eXosip.j_transactions, transaction, 0); */ + osip_transaction_set_your_instance(transaction, NULL); + + /* THIS METHOD DOES NOT ACCEPT STATUS CODE BETWEEN 101 and 299 */ + if (status > 100 && status < 299 && MSG_IS_INVITE(evt->sip)) + return; + + if (jd != NULL) + i = _eXosip_build_response_default(&answer, jd->d_dialog, status, + evt->sip); + else + i = _eXosip_build_response_default(&answer, NULL, status, evt->sip); + + if (i != 0 || answer == NULL) { + return; + } + + if (reason_phrase != NULL) { + char *_reason; + + _reason = osip_message_get_reason_phrase(answer); + if (_reason != NULL) + osip_free(_reason); + _reason = osip_strdup(reason_phrase); + osip_message_set_reason_phrase(answer, _reason); + } + + osip_message_set_content_length(answer, "0"); + + if (status == 500) + osip_message_set_retry_after(answer, "10"); + + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; + osip_transaction_add_event(transaction, evt_answer); + __eXosip_wakeup(); } static void -eXosip_process_bye (eXosip_call_t * jc, eXosip_dialog_t * jd, - osip_transaction_t * transaction, osip_event_t * evt) +eXosip_process_bye(eXosip_call_t * jc, eXosip_dialog_t * jd, + osip_transaction_t * transaction, osip_event_t * evt) { - osip_event_t *evt_answer; - osip_message_t *answer; - int i; + osip_event_t *evt_answer; + osip_message_t *answer; + int i; #ifndef MINISIZE - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (jc, NULL /*jd */ , - NULL, NULL)); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, NULL /*jd */ , + NULL, NULL)); #else - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (jc, NULL /*jd */ )); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, NULL /*jd */ )); #endif - i = _eXosip_build_response_default (&answer, jd->d_dialog, 200, evt->sip); - if (i != 0) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - return; - } - osip_message_set_content_length (answer, "0"); + i = _eXosip_build_response_default(&answer, jd->d_dialog, 200, evt->sip); + if (i != 0) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + return; + } + osip_message_set_content_length(answer, "0"); - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; - osip_list_add (jd->d_inc_trs, transaction, 0); + osip_list_add(jd->d_inc_trs, transaction, 0); - /* Release the eXosip_dialog */ - osip_dialog_free (jd->d_dialog); - jd->d_dialog = NULL; + /* Release the eXosip_dialog */ + osip_dialog_free(jd->d_dialog); + jd->d_dialog = NULL; - osip_transaction_add_event (transaction, evt_answer); + osip_transaction_add_event(transaction, evt_answer); - osip_nist_execute (eXosip.j_osip); - report_call_event (EXOSIP_CALL_MESSAGE_NEW, jc, jd, transaction); - report_call_event (EXOSIP_CALL_CLOSED, jc, jd, transaction); - eXosip_update (); /* AMD 30/09/05 */ + osip_nist_execute(eXosip.j_osip); + report_call_event(EXOSIP_CALL_MESSAGE_NEW, jc, jd, transaction); + report_call_event(EXOSIP_CALL_CLOSED, jc, jd, transaction); + eXosip_update(); /* AMD 30/09/05 */ - __eXosip_wakeup (); + __eXosip_wakeup(); } static void -eXosip_process_ack (eXosip_call_t * jc, eXosip_dialog_t * jd, osip_event_t * evt) +eXosip_process_ack(eXosip_call_t * jc, eXosip_dialog_t * jd, osip_event_t * evt) { - /* TODO: We should find the matching transaction for this ACK - and also add the ACK in the event. */ - eXosip_event_t *je; - int i; - - - je = eXosip_event_init_for_call (EXOSIP_CALL_ACK, jc, jd, NULL); - if (je != NULL) - { - osip_transaction_t *tr; - tr = eXosip_find_last_inc_invite (jc, jd); - if (tr != NULL) - { - je->tid = tr->transactionid; - /* fill request and answer */ - if (tr->orig_request != NULL) - { - i = osip_message_clone (tr->orig_request, &je->request); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "failed to clone request for event\n")); - } - } - if (tr->last_response != NULL) - { - i = osip_message_clone (tr->last_response, &je->response); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "failed to clone response for event\n")); - } - } - } - - i = osip_message_clone (evt->sip, &je->ack); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "failed to clone ACK for event\n")); - } - } - - /* stop ACK retransmission, in case there is any */ - jd->d_count = 0; - osip_message_free (jd->d_200Ok); - jd->d_200Ok = NULL; + /* TODO: We should find the matching transaction for this ACK + and also add the ACK in the event. */ + eXosip_event_t *je; + int i; + + + je = eXosip_event_init_for_call(EXOSIP_CALL_ACK, jc, jd, NULL); + if (je != NULL) { + osip_transaction_t *tr; + tr = eXosip_find_last_inc_invite(jc, jd); + if (tr != NULL) { + je->tid = tr->transactionid; + /* fill request and answer */ + if (tr->orig_request != NULL) { + i = osip_message_clone(tr->orig_request, &je->request); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "failed to clone request for event\n")); + } + } + if (tr->last_response != NULL) { + i = osip_message_clone(tr->last_response, &je->response); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "failed to clone response for event\n")); + } + } + } + + i = osip_message_clone(evt->sip, &je->ack); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "failed to clone ACK for event\n")); + } + } + + /* stop ACK retransmission, in case there is any */ + jd->d_count = 0; + osip_message_free(jd->d_200Ok); + jd->d_200Ok = NULL; - if (je != NULL) - report_event (je, NULL); + if (je != NULL) + report_event(je, NULL); - osip_event_free (evt); + osip_event_free(evt); } static void -eXosip_process_prack (eXosip_call_t * jc, eXosip_dialog_t * jd, - osip_transaction_t * transaction, osip_event_t * evt) +eXosip_process_prack(eXosip_call_t * jc, eXosip_dialog_t * jd, + osip_transaction_t * transaction, osip_event_t * evt) { - osip_event_t *evt_answer; - osip_message_t *answer; - int i; + osip_event_t *evt_answer; + osip_message_t *answer; + int i; #ifndef MINISIZE - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (jc, jd, NULL, NULL)); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, jd, NULL, NULL)); #else - osip_transaction_set_your_instance (transaction, __eXosip_new_jinfo (jc, jd)); + osip_transaction_set_your_instance(transaction, __eXosip_new_jinfo(jc, jd)); #endif - i = _eXosip_build_response_default (&answer, jd->d_dialog, 200, evt->sip); - if (i != 0) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - return; - } + i = _eXosip_build_response_default(&answer, jd->d_dialog, 200, evt->sip); + if (i != 0) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + return; + } - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; - osip_list_add (jd->d_inc_trs, transaction, 0); + osip_list_add(jd->d_inc_trs, transaction, 0); - osip_transaction_add_event (transaction, evt_answer); - __eXosip_wakeup (); + osip_transaction_add_event(transaction, evt_answer); + __eXosip_wakeup(); } static int -cancel_match_invite (osip_transaction_t * invite, osip_message_t * cancel) +cancel_match_invite(osip_transaction_t * invite, osip_message_t * cancel) { - osip_generic_param_t *br; - osip_generic_param_t *br2; - osip_via_t *via; - - osip_via_param_get_byname (invite->topvia, "branch", &br); - via = osip_list_get (&cancel->vias, 0); - if (via == NULL) - return OSIP_SYNTAXERROR; /* request without via??? */ - osip_via_param_get_byname (via, "branch", &br2); - if (br != NULL && br2 == NULL) - return OSIP_UNDEFINED_ERROR; - if (br2 != NULL && br == NULL) - return OSIP_UNDEFINED_ERROR; - if (br2 != NULL && br != NULL) /* compliant UA :) */ - { - if (br->gvalue != NULL && br2->gvalue != NULL && - 0 == strcmp (br->gvalue, br2->gvalue)) - return OSIP_SUCCESS; - return OSIP_UNDEFINED_ERROR; - } - /* old backward compatibility mechanism */ - if (0 != osip_call_id_match (invite->callid, cancel->call_id)) - return OSIP_UNDEFINED_ERROR; - if (0 != osip_to_tag_match (invite->to, cancel->to)) - return OSIP_UNDEFINED_ERROR; - if (0 != osip_from_tag_match (invite->from, cancel->from)) - return OSIP_UNDEFINED_ERROR; - if (0 != osip_via_match (invite->topvia, via)) - return OSIP_UNDEFINED_ERROR; - return OSIP_SUCCESS; + osip_generic_param_t *br; + osip_generic_param_t *br2; + osip_via_t *via; + + osip_via_param_get_byname(invite->topvia, "branch", &br); + via = osip_list_get(&cancel->vias, 0); + if (via == NULL) + return OSIP_SYNTAXERROR; /* request without via??? */ + osip_via_param_get_byname(via, "branch", &br2); + if (br != NULL && br2 == NULL) + return OSIP_UNDEFINED_ERROR; + if (br2 != NULL && br == NULL) + return OSIP_UNDEFINED_ERROR; + if (br2 != NULL && br != NULL) { /* compliant UA :) */ + if (br->gvalue != NULL && br2->gvalue != NULL && + 0 == strcmp(br->gvalue, br2->gvalue)) + return OSIP_SUCCESS; + return OSIP_UNDEFINED_ERROR; + } + /* old backward compatibility mechanism */ + if (0 != osip_call_id_match(invite->callid, cancel->call_id)) + return OSIP_UNDEFINED_ERROR; + if (0 != osip_to_tag_match(invite->to, cancel->to)) + return OSIP_UNDEFINED_ERROR; + if (0 != osip_from_tag_match(invite->from, cancel->from)) + return OSIP_UNDEFINED_ERROR; + if (0 != osip_via_match(invite->topvia, via)) + return OSIP_UNDEFINED_ERROR; + return OSIP_SUCCESS; } static void -eXosip_process_cancel (osip_transaction_t * transaction, osip_event_t * evt) +eXosip_process_cancel(osip_transaction_t * transaction, osip_event_t * evt) { - osip_transaction_t *tr; - osip_event_t *evt_answer; - osip_message_t *answer; - int i; - - eXosip_call_t *jc; - eXosip_dialog_t *jd; - - tr = NULL; - jd = NULL; - /* first, look for a Dialog in the map of element */ - for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) - { - if (jc->c_inc_tr != NULL) - { - i = cancel_match_invite (jc->c_inc_tr, evt->sip); - if (i == 0) - { - tr = jc->c_inc_tr; - /* fixed */ - if (jc->c_dialogs != NULL) - jd = jc->c_dialogs; - break; - } - } - tr = NULL; - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - int pos = 0; - - while (!osip_list_eol (jd->d_inc_trs, pos)) - { - tr = osip_list_get (jd->d_inc_trs, pos); - i = cancel_match_invite (tr, evt->sip); - if (i == 0) - break; - tr = NULL; - pos++; - } - } - if (jd != NULL) - break; /* tr has just been found! */ - } - - if (tr == NULL) /* we didn't found the transaction to cancel */ - { - i = _eXosip_build_response_default (&answer, NULL, 481, evt->sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot cancel transaction.\n")); - osip_list_add (&eXosip.j_transactions, tr, 0); - osip_transaction_set_your_instance (tr, NULL); - return; - } - osip_message_set_content_length (answer, "0"); - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; - osip_transaction_add_event (transaction, evt_answer); - - osip_list_add (&eXosip.j_transactions, transaction, 0); - osip_transaction_set_your_instance (transaction, NULL); - __eXosip_wakeup (); - return; - } - - if (tr->state == IST_TERMINATED || tr->state == IST_CONFIRMED - || tr->state == IST_COMPLETED) - { - /* I can't find the status code in the rfc? - (I read I must answer 200? wich I found strange) - I probably misunderstood it... and prefer to send 481 - as the transaction has been answered. */ - if (jd == NULL) - i = _eXosip_build_response_default (&answer, NULL, 481, evt->sip); - else - i = _eXosip_build_response_default (&answer, jd->d_dialog, 481, evt->sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot cancel transaction.\n")); - osip_list_add (&eXosip.j_transactions, tr, 0); - osip_transaction_set_your_instance (tr, NULL); - return; - } - osip_message_set_content_length (answer, "0"); - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; - osip_transaction_add_event (transaction, evt_answer); - - if (jd != NULL) - osip_list_add (jd->d_inc_trs, transaction, 0); - else - osip_list_add (&eXosip.j_transactions, transaction, 0); - osip_transaction_set_your_instance (transaction, NULL); - __eXosip_wakeup (); - - return; - } - - { - if (jd == NULL) - i = _eXosip_build_response_default (&answer, NULL, 200, evt->sip); - else - i = _eXosip_build_response_default (&answer, jd->d_dialog, 200, evt->sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot cancel transaction.\n")); - osip_list_add (&eXosip.j_transactions, tr, 0); - osip_transaction_set_your_instance (tr, NULL); - return; - } - osip_message_set_content_length (answer, "0"); - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; - osip_transaction_add_event (transaction, evt_answer); - __eXosip_wakeup (); - - if (jd != NULL) - osip_list_add (jd->d_inc_trs, transaction, 0); - else - osip_list_add (&eXosip.j_transactions, transaction, 0); - osip_transaction_set_your_instance (transaction, NULL); - - /* answer transaction to cancel */ - if (jd == NULL) - i = _eXosip_build_response_default (&answer, NULL, 487, tr->orig_request); - else - i = _eXosip_build_response_default (&answer, jd->d_dialog, 487, - tr->orig_request); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot cancel transaction.\n")); - osip_list_add (&eXosip.j_transactions, tr, 0); - osip_transaction_set_your_instance (tr, NULL); - return; - } - osip_message_set_content_length (answer, "0"); - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = tr->transactionid; - osip_transaction_add_event (tr, evt_answer); - __eXosip_wakeup (); - } + osip_transaction_t *tr; + osip_event_t *evt_answer; + osip_message_t *answer; + int i; + + eXosip_call_t *jc; + eXosip_dialog_t *jd; + + tr = NULL; + jd = NULL; + /* first, look for a Dialog in the map of element */ + for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) { + if (jc->c_inc_tr != NULL) { + i = cancel_match_invite(jc->c_inc_tr, evt->sip); + if (i == 0) { + tr = jc->c_inc_tr; + /* fixed */ + if (jc->c_dialogs != NULL) + jd = jc->c_dialogs; + break; + } + } + tr = NULL; + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + int pos = 0; + + while (!osip_list_eol(jd->d_inc_trs, pos)) { + tr = osip_list_get(jd->d_inc_trs, pos); + i = cancel_match_invite(tr, evt->sip); + if (i == 0) + break; + tr = NULL; + pos++; + } + if (tr!=NULL) + break; + } + if (jd != NULL) + break; /* tr has just been found! */ + } + + if (tr == NULL) { /* we didn't found the transaction to cancel */ + i = _eXosip_build_response_default(&answer, NULL, 481, evt->sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot cancel transaction.\n")); + /*BUG fixed 32/12/2010 + osip_list_add(&eXosip.j_transactions, tr, 0); + osip_transaction_set_your_instance(tr, NULL); + replaced with */ + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + return; + } + osip_message_set_content_length(answer, "0"); + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; + osip_transaction_add_event(transaction, evt_answer); + + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + __eXosip_wakeup(); + return; + } + + if (tr->state == IST_TERMINATED || tr->state == IST_CONFIRMED + || tr->state == IST_COMPLETED) { + /* I can't find the status code in the rfc? + (I read I must answer 200? wich I found strange) + I probably misunderstood it... and prefer to send 481 + as the transaction has been answered. */ + if (jd == NULL) + i = _eXosip_build_response_default(&answer, NULL, 481, evt->sip); + else + i = _eXosip_build_response_default(&answer, jd->d_dialog, 481, + evt->sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot cancel transaction.\n")); + /*BUG fixed 32/12/2010 + osip_list_add(&eXosip.j_transactions, tr, 0); + osip_transaction_set_your_instance(tr, NULL); + replaced with */ + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + return; + } + osip_message_set_content_length(answer, "0"); + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; + osip_transaction_add_event(transaction, evt_answer); + + if (jd != NULL) + osip_list_add(jd->d_inc_trs, transaction, 0); + else + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + __eXosip_wakeup(); + + return; + } + + { + if (jd == NULL) + i = _eXosip_build_response_default(&answer, NULL, 200, evt->sip); + else + i = _eXosip_build_response_default(&answer, jd->d_dialog, 200, + evt->sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot cancel transaction.\n")); + /*BUG fixed 32/12/2010 + osip_list_add(&eXosip.j_transactions, tr, 0); + osip_transaction_set_your_instance(tr, NULL); + replaced with */ + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + return; + } + osip_message_set_content_length(answer, "0"); + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; + osip_transaction_add_event(transaction, evt_answer); + __eXosip_wakeup(); + + if (jd != NULL) + osip_list_add(jd->d_inc_trs, transaction, 0); + else + osip_list_add(&eXosip.j_transactions, transaction, 0); +#ifndef MINISIZE + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, jd , + NULL, NULL)); +#else + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, jd )); +#endif + + /* answer transaction to cancel */ + if (jd == NULL) + i = _eXosip_build_response_default(&answer, NULL, 487, + tr->orig_request); + else + i = _eXosip_build_response_default(&answer, jd->d_dialog, 487, + tr->orig_request); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot cancel transaction.\n")); + /*BUG fixed 32/12/2010 + osip_list_add(&eXosip.j_transactions, tr, 0); + osip_transaction_set_your_instance(tr, NULL); */ + return; + } + osip_message_set_content_length(answer, "0"); + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = tr->transactionid; + osip_transaction_add_event(tr, evt_answer); + __eXosip_wakeup(); + } } static void -eXosip_process_reinvite (eXosip_call_t * jc, eXosip_dialog_t * jd, - osip_transaction_t * transaction, osip_event_t * evt) +eXosip_process_reinvite(eXosip_call_t * jc, eXosip_dialog_t * jd, + osip_transaction_t * transaction, osip_event_t * evt) { #ifndef MINISIZE - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (jc, jd, NULL, NULL)); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, jd, NULL, NULL)); #else - osip_transaction_set_your_instance (transaction, __eXosip_new_jinfo (jc, jd)); + osip_transaction_set_your_instance(transaction, __eXosip_new_jinfo(jc, jd)); #endif - osip_list_add (jd->d_inc_trs, transaction, 0); - osip_ist_execute (eXosip.j_osip); - report_call_event (EXOSIP_CALL_REINVITE, jc, jd, transaction); + osip_list_add(jd->d_inc_trs, transaction, 0); + osip_ist_execute(eXosip.j_osip); + report_call_event(EXOSIP_CALL_REINVITE, jc, jd, transaction); } static void -eXosip_process_new_invite (osip_transaction_t * transaction, osip_event_t * evt) +eXosip_process_new_invite(osip_transaction_t * transaction, osip_event_t * evt) { - osip_event_t *evt_answer; - int i; - eXosip_call_t *jc; - eXosip_dialog_t *jd; - osip_message_t *answer; - osip_generic_param_t *to_tag = NULL; - if (evt->sip != NULL && evt->sip->to != NULL) - osip_from_param_get_byname (evt->sip->to, "tag", &to_tag); - - if (to_tag != NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: Existing To-Tag in new INVITE -> reject with 481\n")); - i = _eXosip_build_response_default (&answer, NULL, 481, evt->sip); - if (i == 0) - { - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; - eXosip_update (); - osip_transaction_add_event (transaction, evt_answer); - return; - } - osip_message_set_content_length (answer, "0"); - osip_list_add (&eXosip.j_transactions, transaction, 0); - osip_transaction_set_your_instance (transaction, NULL); - return; - } - - eXosip_call_init (&jc); - - ADD_ELEMENT (eXosip.j_calls, jc); - - i = _eXosip_build_response_default (&answer, NULL, 101, evt->sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot create dialog.")); - osip_list_add (&eXosip.j_transactions, transaction, 0); - osip_transaction_set_your_instance (transaction, NULL); - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: Could not create response for invite\n")); - return; - } - osip_message_set_content_length (answer, "0"); - i = complete_answer_that_establish_a_dialog (answer, evt->sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot complete answer!\n")); - osip_list_add (&eXosip.j_transactions, transaction, 0); - osip_transaction_set_your_instance (transaction, NULL); - osip_message_free (answer); - return; - } - - i = eXosip_dialog_init_as_uas (&jd, evt->sip, answer); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot create dialog!\n")); - osip_list_add (&eXosip.j_transactions, transaction, 0); - osip_transaction_set_your_instance (transaction, NULL); - osip_message_free (answer); - return; - } - ADD_ELEMENT (jc->c_dialogs, jd); + osip_event_t *evt_answer; + int i; + eXosip_call_t *jc; + eXosip_dialog_t *jd; + osip_message_t *answer; + osip_generic_param_t *to_tag = NULL; + if (evt->sip != NULL && evt->sip->to != NULL) + osip_from_param_get_byname(evt->sip->to, "tag", &to_tag); + + if (to_tag != NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: Existing To-Tag in new INVITE -> reject with 481\n")); + i = _eXosip_build_response_default(&answer, NULL, 481, evt->sip); + if (i == 0) { + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; + eXosip_update(); + osip_transaction_add_event(transaction, evt_answer); + return; + } + osip_message_set_content_length(answer, "0"); + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + return; + } + + eXosip_call_init(&jc); + + ADD_ELEMENT(eXosip.j_calls, jc); + + i = _eXosip_build_response_default(&answer, NULL, 101, evt->sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot create dialog.")); + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: Could not create response for invite\n")); + return; + } + osip_message_set_content_length(answer, "0"); + i = complete_answer_that_establish_a_dialog(answer, evt->sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot complete answer!\n")); + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + osip_message_free(answer); + return; + } + + i = eXosip_dialog_init_as_uas(&jd, evt->sip, answer); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot create dialog!\n")); + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + osip_message_free(answer); + return; + } + ADD_ELEMENT(jc->c_dialogs, jd); #ifndef MINISIZE - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (jc, jd, NULL, NULL)); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, jd, NULL, NULL)); #else - osip_transaction_set_your_instance (transaction, __eXosip_new_jinfo (jc, jd)); + osip_transaction_set_your_instance(transaction, __eXosip_new_jinfo(jc, jd)); #endif - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; - eXosip_update (); - jc->c_inc_tr = transaction; - osip_transaction_add_event (transaction, evt_answer); + eXosip_update(); + jc->c_inc_tr = transaction; + osip_transaction_add_event(transaction, evt_answer); - /* be sure the invite will be processed - before any API call on this dialog */ - osip_ist_execute (eXosip.j_osip); + /* be sure the invite will be processed + before any API call on this dialog */ + osip_ist_execute(eXosip.j_osip); - if (transaction->orig_request != NULL) - { - report_call_event (EXOSIP_CALL_INVITE, jc, jd, transaction); - } + if (transaction->orig_request != NULL) { + report_call_event(EXOSIP_CALL_INVITE, jc, jd, transaction); + } - __eXosip_wakeup (); + __eXosip_wakeup(); } #ifndef MINISIZE static void -eXosip_process_new_subscribe (osip_transaction_t * transaction, osip_event_t * evt) +eXosip_process_new_subscribe(osip_transaction_t * transaction, osip_event_t * evt) { - osip_event_t *evt_answer; - eXosip_notify_t *jn; - eXosip_dialog_t *jd; - osip_message_t *answer; - int i; - osip_generic_param_t *to_tag = NULL; - - if (evt->sip != NULL && evt->sip->to != NULL) - osip_from_param_get_byname (evt->sip->to, "tag", &to_tag); - - if (to_tag != NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: Existing To-Tag in new SUBSCRIBE -> reject with 481\n")); - i = _eXosip_build_response_default (&answer, NULL, 481, evt->sip); - if (i == 0) - { - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; - eXosip_update (); - osip_message_set_content_length (answer, "0"); - osip_transaction_add_event (transaction, evt_answer); - } - osip_list_add (&eXosip.j_transactions, transaction, 0); - osip_transaction_set_your_instance (transaction, NULL); - return; - } - - i = eXosip_notify_init (&jn, evt->sip); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: missing contact or memory\n")); - i = _eXosip_build_response_default (&answer, NULL, 400, evt->sip); - if (i == 0) - { - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; - eXosip_update (); - osip_message_set_content_length (answer, "0"); - osip_transaction_add_event (transaction, evt_answer); - } - osip_list_add (&eXosip.j_transactions, transaction, 0); - osip_transaction_set_your_instance (transaction, NULL); - return; - } - _eXosip_notify_set_refresh_interval (jn, evt->sip); - - i = _eXosip_build_response_default (&answer, NULL, 101, evt->sip); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "ERROR: Could not create response for invite\n")); - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_notify_free (jn); - return; - } - i = complete_answer_that_establish_a_dialog (answer, evt->sip); - if (i != 0) - { - osip_message_free (answer); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot complete answer!\n")); - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_notify_free (jn); - return; - } - - i = eXosip_dialog_init_as_uas (&jd, evt->sip, answer); - if (i != 0) - { - osip_message_free (answer); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot create dialog!\n")); - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_notify_free (jn); - return; - } - ADD_ELEMENT (jn->n_dialogs, jd); - - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, jd, NULL, jn)); - - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; - osip_transaction_add_event (transaction, evt_answer); + osip_event_t *evt_answer; + eXosip_notify_t *jn; + eXosip_dialog_t *jd; + osip_message_t *answer; + int i; + osip_generic_param_t *to_tag = NULL; + + if (evt->sip != NULL && evt->sip->to != NULL) + osip_from_param_get_byname(evt->sip->to, "tag", &to_tag); + + if (to_tag != NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: Existing To-Tag in new SUBSCRIBE -> reject with 481\n")); + i = _eXosip_build_response_default(&answer, NULL, 481, evt->sip); + if (i == 0) { + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; + eXosip_update(); + osip_message_set_content_length(answer, "0"); + osip_transaction_add_event(transaction, evt_answer); + } + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + return; + } + + i = eXosip_notify_init(&jn, evt->sip); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: missing contact or memory\n")); + i = _eXosip_build_response_default(&answer, NULL, 400, evt->sip); + if (i == 0) { + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; + eXosip_update(); + osip_message_set_content_length(answer, "0"); + osip_transaction_add_event(transaction, evt_answer); + } + osip_list_add(&eXosip.j_transactions, transaction, 0); + osip_transaction_set_your_instance(transaction, NULL); + return; + } + _eXosip_notify_set_refresh_interval(jn, evt->sip); + + i = _eXosip_build_response_default(&answer, NULL, 101, evt->sip); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "ERROR: Could not create response for invite\n")); + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_notify_free(jn); + return; + } + i = complete_answer_that_establish_a_dialog(answer, evt->sip); + if (i != 0) { + osip_message_free(answer); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot complete answer!\n")); + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_notify_free(jn); + return; + } + + i = eXosip_dialog_init_as_uas(&jd, evt->sip, answer); + if (i != 0) { + osip_message_free(answer); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot create dialog!\n")); + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_notify_free(jn); + return; + } + ADD_ELEMENT(jn->n_dialogs, jd); + + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, jd, NULL, jn)); + + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; + osip_transaction_add_event(transaction, evt_answer); - ADD_ELEMENT (eXosip.j_notifies, jn); - __eXosip_wakeup (); + ADD_ELEMENT(eXosip.j_notifies, jn); + __eXosip_wakeup(); - jn->n_inc_tr = transaction; + jn->n_inc_tr = transaction; - eXosip_update (); - __eXosip_wakeup (); + eXosip_update(); + __eXosip_wakeup(); } static void -eXosip_process_subscribe_within_call (eXosip_notify_t * jn, - eXosip_dialog_t * jd, - osip_transaction_t * transaction, - osip_event_t * evt) -{ - _eXosip_notify_set_refresh_interval (jn, evt->sip); - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, jd, NULL, jn)); - - /* if subscribe request contains expires="0", close the subscription */ - { - time_t now = time (NULL); - - if (jn->n_ss_expires - now <= 0) - { - jn->n_ss_status = EXOSIP_SUBCRSTATE_TERMINATED; - jn->n_ss_reason = TIMEOUT; - } - } - - osip_list_add (jd->d_inc_trs, transaction, 0); - __eXosip_wakeup (); - return; +eXosip_process_subscribe_within_call(eXosip_notify_t * jn, + eXosip_dialog_t * jd, + osip_transaction_t * transaction, + osip_event_t * evt) +{ + _eXosip_notify_set_refresh_interval(jn, evt->sip); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, jd, NULL, jn)); + + /* if subscribe request contains expires="0", close the subscription */ + { + time_t now = time(NULL); + + if (jn->n_ss_expires - now <= 0) { + jn->n_ss_status = EXOSIP_SUBCRSTATE_TERMINATED; + jn->n_ss_reason = TIMEOUT; + } + } + + osip_list_add(jd->d_inc_trs, transaction, 0); + __eXosip_wakeup(); + return; } static void -eXosip_process_notify_within_dialog (eXosip_subscribe_t * js, - eXosip_dialog_t * jd, - osip_transaction_t * transaction, - osip_event_t * evt) -{ - osip_message_t *answer; - osip_event_t *sipevent; - osip_header_t *sub_state; +eXosip_process_notify_within_dialog(eXosip_subscribe_t * js, + eXosip_dialog_t * jd, + osip_transaction_t * transaction, + osip_event_t * evt) +{ + osip_message_t *answer; + osip_event_t *sipevent; + osip_header_t *sub_state; #ifdef SUPPORT_MSN - osip_header_t *expires; + osip_header_t *expires; #endif - int i; + int i; - if (jd == NULL) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 500, - "Internal SIP Error", - "No dialog for this NOTIFY", __LINE__); - return; - } + if (jd == NULL) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 500, + "Internal SIP Error", + "No dialog for this NOTIFY", __LINE__); + return; + } - /* if subscription-state has a reason state set to terminated, - we close the dialog */ + /* if subscription-state has a reason state set to terminated, + we close the dialog */ #ifndef SUPPORT_MSN - osip_message_header_get_byname (evt->sip, "subscription-state", 0, &sub_state); - if (sub_state == NULL || sub_state->hvalue == NULL) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 400, NULL, NULL, __LINE__); - return; - } -#endif - - i = _eXosip_build_response_default (&answer, jd->d_dialog, 200, evt->sip); - if (i != 0) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 500, - "Internal SIP Error", - "Failed to build Answer for NOTIFY", __LINE__); - return; - } + osip_message_header_get_byname(evt->sip, "subscription-state", 0, &sub_state); + if (sub_state == NULL || sub_state->hvalue == NULL) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 400, NULL, NULL, + __LINE__); + return; + } +#endif + + i = _eXosip_build_response_default(&answer, jd->d_dialog, 200, evt->sip); + if (i != 0) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 500, + "Internal SIP Error", + "Failed to build Answer for NOTIFY", __LINE__); + return; + } #ifdef SUPPORT_MSN - osip_message_header_get_byname (evt->sip, "expires", 0, &expires); - if (expires != NULL && expires->hvalue != NULL - && 0 == osip_strcasecmp (expires->hvalue, "0")) - { - /* delete the dialog! */ - js->s_ss_status = EXOSIP_SUBCRSTATE_TERMINATED; - { - eXosip_event_t *je; - - je = eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_NOTIFY, js, jd); - eXosip_event_add (je); - } - - sipevent = osip_new_outgoing_sipmessage (answer); - sipevent->transactionid = transaction->transactionid; - osip_transaction_add_event (transaction, sipevent); - - osip_list_add (&eXosip.j_transactions, transaction, 0); - - REMOVE_ELEMENT (eXosip.j_subscribes, js); - eXosip_subscribe_free (js); - __eXosip_wakeup (); - - return; - } else - { - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, jd, js, NULL)); - js->s_ss_status = EXOSIP_SUBCRSTATE_ACTIVE; - } + osip_message_header_get_byname(evt->sip, "expires", 0, &expires); + if (expires != NULL && expires->hvalue != NULL + && 0 == osip_strcasecmp(expires->hvalue, "0")) { + /* delete the dialog! */ + js->s_ss_status = EXOSIP_SUBCRSTATE_TERMINATED; + { + eXosip_event_t *je; + + je = eXosip_event_init_for_subscribe(EXOSIP_SUBSCRIPTION_NOTIFY, js, + jd); + eXosip_event_add(je); + } + + sipevent = osip_new_outgoing_sipmessage(answer); + sipevent->transactionid = transaction->transactionid; + osip_transaction_add_event(transaction, sipevent); + + osip_list_add(&eXosip.j_transactions, transaction, 0); + + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + __eXosip_wakeup(); + + return; + } else { + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, jd, js, NULL)); + js->s_ss_status = EXOSIP_SUBCRSTATE_ACTIVE; + } #else - /* modify the status of user */ - if (0 == osip_strncasecmp (sub_state->hvalue, "active", 6)) - { - js->s_ss_status = EXOSIP_SUBCRSTATE_ACTIVE; - } else if (0 == osip_strncasecmp (sub_state->hvalue, "pending", 7)) - { - js->s_ss_status = EXOSIP_SUBCRSTATE_PENDING; - } - - if (0 == osip_strncasecmp (sub_state->hvalue, "terminated", 10)) - { - /* delete the dialog! */ - js->s_ss_status = EXOSIP_SUBCRSTATE_TERMINATED; - - { - eXosip_event_t *je; - - je = - eXosip_event_init_for_subscribe (EXOSIP_SUBSCRIPTION_NOTIFY, js, jd, - transaction); - if (je->request == NULL && evt->sip != NULL) - { - i = osip_message_clone (evt->sip, &je->request); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "failed to clone request for event\n")); - } - } - - eXosip_event_add (je); - } - - sipevent = osip_new_outgoing_sipmessage (answer); - sipevent->transactionid = transaction->transactionid; - osip_transaction_add_event (transaction, sipevent); - - osip_list_add (&eXosip.j_transactions, transaction, 0); - - REMOVE_ELEMENT (eXosip.j_subscribes, js); - eXosip_subscribe_free (js); - __eXosip_wakeup (); - return; - } else - { - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (NULL, jd, js, NULL)); - } -#endif - - osip_list_add (jd->d_inc_trs, transaction, 0); - - sipevent = osip_new_outgoing_sipmessage (answer); - sipevent->transactionid = transaction->transactionid; - osip_transaction_add_event (transaction, sipevent); + /* modify the status of user */ + if (0 == osip_strncasecmp(sub_state->hvalue, "active", 6)) { + js->s_ss_status = EXOSIP_SUBCRSTATE_ACTIVE; + } else if (0 == osip_strncasecmp(sub_state->hvalue, "pending", 7)) { + js->s_ss_status = EXOSIP_SUBCRSTATE_PENDING; + } + + if (0 == osip_strncasecmp(sub_state->hvalue, "terminated", 10)) { + /* delete the dialog! */ + js->s_ss_status = EXOSIP_SUBCRSTATE_TERMINATED; + + { + eXosip_event_t *je; + + je = eXosip_event_init_for_subscribe(EXOSIP_SUBSCRIPTION_NOTIFY, js, + jd, transaction); + if (je->request == NULL && evt->sip != NULL) { + i = osip_message_clone(evt->sip, &je->request); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "failed to clone request for event\n")); + } + } + + eXosip_event_add(je); + } + + sipevent = osip_new_outgoing_sipmessage(answer); + sipevent->transactionid = transaction->transactionid; + osip_transaction_add_event(transaction, sipevent); + + osip_list_add(&eXosip.j_transactions, transaction, 0); + + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + __eXosip_wakeup(); + return; + } else { + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(NULL, jd, js, NULL)); + } +#endif + + osip_list_add(jd->d_inc_trs, transaction, 0); + + sipevent = osip_new_outgoing_sipmessage(answer); + sipevent->transactionid = transaction->transactionid; + osip_transaction_add_event(transaction, sipevent); - __eXosip_wakeup (); - return; + __eXosip_wakeup(); + return; } static int -eXosip_match_notify_for_subscribe (eXosip_subscribe_t * js, - osip_message_t * notify) +eXosip_match_notify_for_subscribe(eXosip_subscribe_t * js, osip_message_t * notify) { - osip_transaction_t *out_sub; + osip_transaction_t *out_sub; - if (js == NULL) - return OSIP_BADPARAMETER; - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Trying to match notify with subscribe\n")); - - out_sub = eXosip_find_last_out_subscribe (js, NULL); - if (out_sub == NULL || out_sub->orig_request == NULL) - return OSIP_NOTFOUND; - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "subscribe transaction found\n")); - - /* some checks to avoid crashing on bad requests */ - if (notify == NULL) - return OSIP_BADPARAMETER; - - if (notify->cseq == NULL || notify->cseq->method == NULL || notify->to == NULL) - return OSIP_SYNTAXERROR; - - if (0 != osip_call_id_match (out_sub->callid, notify->call_id)) - return OSIP_UNDEFINED_ERROR; - - { - /* The From tag of outgoing request must match - the To tag of incoming notify: - */ - osip_generic_param_t *tag_from; - osip_generic_param_t *tag_to; - - osip_from_param_get_byname (out_sub->from, "tag", &tag_from); - osip_from_param_get_byname (notify->to, "tag", &tag_to); - if (tag_to == NULL || tag_to->gvalue == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Uncompliant user agent: no tag in from of outgoing request\n")); - return OSIP_SYNTAXERROR; - } - if (tag_from == NULL || tag_to->gvalue == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Uncompliant user agent: no tag in to of incoming request\n")); - return OSIP_SYNTAXERROR; - } - - if (0 != strcmp (tag_from->gvalue, tag_to->gvalue)) - return OSIP_UNDEFINED_ERROR; - } + if (js == NULL) + return OSIP_BADPARAMETER; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Trying to match notify with subscribe\n")); + + out_sub = eXosip_find_last_out_subscribe(js, NULL); + if (out_sub == NULL || out_sub->orig_request == NULL) + return OSIP_NOTFOUND; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "subscribe transaction found\n")); + + /* some checks to avoid crashing on bad requests */ + if (notify == NULL) + return OSIP_BADPARAMETER; + + if (notify->cseq == NULL || notify->cseq->method == NULL || notify->to == NULL) + return OSIP_SYNTAXERROR; + + if (0 != osip_call_id_match(out_sub->callid, notify->call_id)) + return OSIP_UNDEFINED_ERROR; + + { + /* The From tag of outgoing request must match + the To tag of incoming notify: + */ + osip_generic_param_t *tag_from; + osip_generic_param_t *tag_to; + + osip_from_param_get_byname(out_sub->from, "tag", &tag_from); + osip_from_param_get_byname(notify->to, "tag", &tag_to); + if (tag_to == NULL || tag_to->gvalue == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Uncompliant user agent: no tag in from of outgoing request\n")); + return OSIP_SYNTAXERROR; + } + if (tag_from == NULL || tag_to->gvalue == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Uncompliant user agent: no tag in to of incoming request\n")); + return OSIP_SYNTAXERROR; + } + + if (0 != strcmp(tag_from->gvalue, tag_to->gvalue)) + return OSIP_UNDEFINED_ERROR; + } - return OSIP_SUCCESS; + return OSIP_SUCCESS; } #endif static void -eXosip_process_message_within_dialog (eXosip_call_t * jc, - eXosip_dialog_t * jd, - osip_transaction_t * transaction, - osip_event_t * evt) +eXosip_process_message_within_dialog(eXosip_call_t * jc, + eXosip_dialog_t * jd, + osip_transaction_t * transaction, + osip_event_t * evt) { - osip_list_add (jd->d_inc_trs, transaction, 0); + osip_list_add(jd->d_inc_trs, transaction, 0); #ifndef MINISIZE - osip_transaction_set_your_instance (transaction, - __eXosip_new_jinfo (jc, jd, NULL, NULL)); + osip_transaction_set_your_instance(transaction, + __eXosip_new_jinfo(jc, jd, NULL, NULL)); #else - osip_transaction_set_your_instance (transaction, __eXosip_new_jinfo (jc, jd)); + osip_transaction_set_your_instance(transaction, __eXosip_new_jinfo(jc, jd)); #endif - __eXosip_wakeup (); - return; + __eXosip_wakeup(); + return; } -static void -eXosip_process_newrequest (osip_event_t * evt, int socket) +static void eXosip_process_newrequest(osip_event_t * evt, int socket) { - osip_transaction_t *transaction; + osip_transaction_t *transaction; #ifndef MINISIZE - osip_event_t *evt_answer; - osip_message_t *answer; + osip_event_t *evt_answer; + osip_message_t *answer; #endif - int i; - int ctx_type; - eXosip_call_t *jc; + int i; + int ctx_type; + eXosip_call_t *jc; #ifndef MINISIZE - eXosip_subscribe_t *js; - eXosip_notify_t *jn; + eXosip_subscribe_t *js; + eXosip_notify_t *jn; #endif - eXosip_dialog_t *jd; + eXosip_dialog_t *jd; - if (MSG_IS_INVITE (evt->sip)) - { - ctx_type = IST; - } else if (MSG_IS_ACK (evt->sip)) - { /* this should be a ACK for 2xx (but could be a late ACK!) */ - ctx_type = -1; - } else if (MSG_IS_REQUEST (evt->sip)) - { - ctx_type = NIST; - } else - { /* We should handle late response and 200 OK before coming here. */ - ctx_type = -1; - osip_event_free (evt); - return; - } - - transaction = NULL; - if (ctx_type != -1) - { - i = _eXosip_transaction_init (&transaction, - (osip_fsm_type_t) ctx_type, - eXosip.j_osip, evt->sip); - if (i != 0) - { - osip_event_free (evt); - return; - } - - osip_transaction_set_in_socket (transaction, socket); - osip_transaction_set_out_socket (transaction, socket); - - evt->transactionid = transaction->transactionid; - osip_transaction_set_your_instance (transaction, NULL); - - osip_transaction_add_event (transaction, evt); - } - - if (MSG_IS_CANCEL (evt->sip)) - { - /* special handling for CANCEL */ - /* in the new spec, if the CANCEL has a Via branch, then it - is the same as the one in the original INVITE */ - eXosip_process_cancel (transaction, evt); - return; - } - - jd = NULL; - /* first, look for a Dialog in the map of element */ - for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) - { - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog != NULL) - { - if (osip_dialog_match_as_uas (jd->d_dialog, evt->sip) == 0) - break; - } - } - if (jd != NULL) - break; - } - - /* check CSeq */ - if (jd != NULL && transaction != NULL && evt->sip != NULL - && evt->sip->cseq != NULL && evt->sip->cseq->number != NULL) - { - if (jd->d_dialog != NULL && jd->d_dialog->remote_cseq > 0) - { - int cseq = osip_atoi (evt->sip->cseq->number); - if (cseq == jd->d_dialog->remote_cseq) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: receive a request with same cseq??\n")); - osip_transaction_free (transaction); - return; - } - if (cseq <= jd->d_dialog->remote_cseq) - { - eXosip_send_default_answer (jd, transaction, evt, 500, - NULL, "Wrong Lower CSeq", __LINE__); - return; - } - } - } + if (MSG_IS_INVITE(evt->sip)) { + ctx_type = IST; + } else if (MSG_IS_ACK(evt->sip)) { /* this should be a ACK for 2xx (but could be a late ACK!) */ + ctx_type = -1; + } else if (MSG_IS_REQUEST(evt->sip)) { + ctx_type = NIST; + } else { /* We should handle late response and 200 OK before coming here. */ + ctx_type = -1; + osip_event_free(evt); + return; + } + + transaction = NULL; + if (ctx_type != -1) { + i = _eXosip_transaction_init(&transaction, + (osip_fsm_type_t) ctx_type, + eXosip.j_osip, evt->sip); + if (i != 0) { + osip_event_free(evt); + return; + } + + osip_transaction_set_in_socket(transaction, socket); + osip_transaction_set_out_socket(transaction, socket); + + evt->transactionid = transaction->transactionid; + osip_transaction_set_your_instance(transaction, NULL); + + osip_transaction_add_event(transaction, evt); + } + + if (MSG_IS_CANCEL(evt->sip)) { + /* special handling for CANCEL */ + /* in the new spec, if the CANCEL has a Via branch, then it + is the same as the one in the original INVITE */ + eXosip_process_cancel(transaction, evt); + return; + } + + jd = NULL; + /* first, look for a Dialog in the map of element */ + for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) { + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog != NULL) { + if (osip_dialog_match_as_uas(jd->d_dialog, evt->sip) == 0) + break; + } + } + if (jd != NULL) + break; + } + + /* check CSeq */ + if (jd != NULL && transaction != NULL && evt->sip != NULL + && evt->sip->cseq != NULL && evt->sip->cseq->number != NULL) { + if (jd->d_dialog != NULL && jd->d_dialog->remote_cseq > 0) { + int cseq = osip_atoi(evt->sip->cseq->number); + if (cseq == jd->d_dialog->remote_cseq) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: receive a request with same cseq??\n")); + _eXosip_dnsutils_release(transaction->naptr_record); + transaction->naptr_record=NULL; + osip_transaction_free(transaction); + return; + } + if (cseq <= jd->d_dialog->remote_cseq) { + eXosip_send_default_answer(jd, transaction, evt, 500, + NULL, "Wrong Lower CSeq", __LINE__); + return; + } + } + } #ifndef MINISIZE - if (ctx_type == IST) - { - i = _eXosip_build_response_default (&answer, NULL, 100, evt->sip); - if (i != 0) - { - __eXosip_delete_jinfo (transaction); - osip_transaction_free (transaction); - return; - } - - osip_message_set_content_length (answer, "0"); - /* send message to transaction layer */ - - evt_answer = osip_new_outgoing_sipmessage (answer); - evt_answer->transactionid = transaction->transactionid; - - /* add the REQUEST & the 100 Trying */ - osip_transaction_add_event (transaction, evt_answer); - __eXosip_wakeup (); - } -#endif - - if (jd != NULL) - { - osip_transaction_t *old_trn; - - /* it can be: - 1: a new INVITE offer. - 2: a REFER request from one of the party. - 2: a BYE request from one of the party. - 3: a REQUEST with a wrong CSeq. - 4: a NOT-SUPPORTED method with a wrong CSeq. - */ - - if (transaction == NULL) - { - /* cannot answer ACK transaction */ - } else if (!MSG_IS_BYE (evt->sip)) - { - /* reject all requests for a closed dialog */ - old_trn = eXosip_find_last_inc_transaction (jc, jd, "BYE"); - if (old_trn == NULL) - old_trn = eXosip_find_last_out_transaction (jc, jd, "BYE"); - - if (old_trn != NULL) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 481, NULL, - NULL, __LINE__); - return; - } - } - - if (transaction != NULL) /* NOT for ACK */ - osip_dialog_update_osip_cseq_as_uas (jd->d_dialog, evt->sip); - - if (MSG_IS_INVITE (evt->sip)) - { - /* the previous transaction MUST be freed */ - old_trn = eXosip_find_last_inc_invite (jc, jd); - - if (old_trn != NULL && old_trn->state != IST_COMPLETED - && old_trn->state != IST_TERMINATED) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 500, - "Retry Later", - "An INVITE is not terminated", __LINE__); - return; - } - - old_trn = eXosip_find_last_out_invite (jc, jd); - if (old_trn != NULL && old_trn->state != ICT_COMPLETED - && old_trn->state != ICT_TERMINATED) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 491, NULL, - NULL, __LINE__); - return; - } - - /* osip_dialog_update_osip_cseq_as_uas (jd->d_dialog, evt->sip); */ - osip_dialog_update_route_set_as_uas (jd->d_dialog, evt->sip); - - eXosip_process_reinvite (jc, jd, transaction, evt); - } else if (MSG_IS_BYE (evt->sip)) - { - osip_generic_param_t *tag_to = NULL; - if (evt->sip->to != NULL) - osip_from_param_get_byname (evt->sip->to, "tag", &tag_to); - if (tag_to == NULL || tag_to->gvalue == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Uncompliant user agent: missing a tag in To of incoming BYE\n")); - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 481, - "Missing tags in BYE", - "Missing tags in BYE", __LINE__); - return; - } - - old_trn = eXosip_find_last_inc_transaction (jc, jd, "BYE"); - - if (old_trn != NULL) /* && old_trn->state!=NIST_TERMINATED) */ - { /* this situation should NEVER occur?? (we can't receive - two different BYE for one call! */ - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 500, - "Call Already Terminated", - "A pending BYE has already terminate this call", - __LINE__); - return; - } - /* osip_transaction_free(old_trn); */ - eXosip_process_bye (jc, jd, transaction, evt); - } else if (MSG_IS_ACK (evt->sip)) - { - eXosip_process_ack (jc, jd, evt); - } else - { - eXosip_process_message_within_dialog (jc, jd, transaction, evt); - } - return; - } - - if (MSG_IS_ACK (evt->sip)) - { - /* no transaction has been found for this ACK! */ - osip_event_free (evt); - return; - } - - if (MSG_IS_INFO (evt->sip)) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 481, NULL, NULL, __LINE__); - return; /* fixed */ - } - if (MSG_IS_INVITE (evt->sip)) - { - eXosip_process_new_invite (transaction, evt); - return; - } else if (MSG_IS_BYE (evt->sip)) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 481, NULL, NULL, __LINE__); - return; - } + if (ctx_type == IST) { + i = _eXosip_build_response_default(&answer, NULL, 100, evt->sip); + if (i != 0) { + __eXosip_delete_jinfo(transaction); + _eXosip_dnsutils_release(transaction->naptr_record); + transaction->naptr_record=NULL; + osip_transaction_free(transaction); + return; + } + + osip_message_set_content_length(answer, "0"); + /* send message to transaction layer */ + + evt_answer = osip_new_outgoing_sipmessage(answer); + evt_answer->transactionid = transaction->transactionid; + + /* add the REQUEST & the 100 Trying */ + osip_transaction_add_event(transaction, evt_answer); + __eXosip_wakeup(); + } +#endif + + if (jd != NULL) { + osip_transaction_t *old_trn; + + /* it can be: + 1: a new INVITE offer. + 2: a REFER request from one of the party. + 2: a BYE request from one of the party. + 3: a REQUEST with a wrong CSeq. + 4: a NOT-SUPPORTED method with a wrong CSeq. + */ + + if (transaction == NULL) { + /* cannot answer ACK transaction */ + } else if (!MSG_IS_BYE(evt->sip)) { + /* reject all requests for a closed dialog */ + old_trn = eXosip_find_last_inc_transaction(jc, jd, "BYE"); + if (old_trn == NULL) + old_trn = eXosip_find_last_out_transaction(jc, jd, "BYE"); + + if (old_trn != NULL) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 481, NULL, + NULL, __LINE__); + return; + } + } + + if (transaction != NULL) /* NOT for ACK */ + osip_dialog_update_osip_cseq_as_uas(jd->d_dialog, evt->sip); + + if (MSG_IS_INVITE(evt->sip)) { + /* the previous transaction MUST be freed */ + old_trn = eXosip_find_last_inc_invite(jc, jd); + + if (old_trn != NULL && old_trn->state != IST_COMPLETED + && old_trn->state != IST_CONFIRMED + && old_trn->state != IST_TERMINATED) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 500, + "Retry Later", + "An INVITE is not terminated", + __LINE__); + return; + } + + old_trn = eXosip_find_last_out_invite(jc, jd); + if (old_trn != NULL && old_trn->state != ICT_COMPLETED + && old_trn->state != ICT_TERMINATED) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 491, NULL, + NULL, __LINE__); + return; + } + + /* osip_dialog_update_osip_cseq_as_uas (jd->d_dialog, evt->sip); */ + osip_dialog_update_route_set_as_uas(jd->d_dialog, evt->sip); + + eXosip_process_reinvite(jc, jd, transaction, evt); + } else if (MSG_IS_BYE(evt->sip)) { + osip_generic_param_t *tag_to = NULL; + if (evt->sip->to != NULL) + osip_from_param_get_byname(evt->sip->to, "tag", &tag_to); + if (tag_to == NULL || tag_to->gvalue == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Uncompliant user agent: missing a tag in To of incoming BYE\n")); + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 481, + "Missing tags in BYE", + "Missing tags in BYE", __LINE__); + return; + } + + old_trn = eXosip_find_last_inc_transaction(jc, jd, "BYE"); + + if (old_trn != NULL) { /* && old_trn->state!=NIST_TERMINATED) *//* this situation should NEVER occur?? (we can't receive + two different BYE for one call! */ + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 500, + "Call Already Terminated", + "A pending BYE has already terminate this call", + __LINE__); + return; + } + eXosip_process_bye(jc, jd, transaction, evt); + } else if (MSG_IS_ACK(evt->sip)) { + eXosip_process_ack(jc, jd, evt); + } else { + eXosip_process_message_within_dialog(jc, jd, transaction, evt); + } + return; + } + + if (MSG_IS_ACK(evt->sip)) { + /* no transaction has been found for this ACK! */ + osip_event_free(evt); + return; + } + + if (MSG_IS_INFO(evt->sip)) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 481, NULL, NULL, + __LINE__); + return; /* fixed */ + } + if (MSG_IS_INVITE(evt->sip)) { + eXosip_process_new_invite(transaction, evt); + return; + } else if (MSG_IS_BYE(evt->sip)) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 481, NULL, NULL, + __LINE__); + return; + } #ifndef MINISIZE - js = NULL; - /* first, look for a Dialog in the map of element */ - for (js = eXosip.j_subscribes; js != NULL; js = js->next) - { - for (jd = js->s_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog != NULL) - { - if (osip_dialog_match_as_uas (jd->d_dialog, evt->sip) == 0) - break; - } - } - if (jd != NULL) - break; - } - - if (js != NULL) - { - /* dialog found */ - osip_transaction_t *old_trn; - - /* it can be: - 1: a new INVITE offer. - 2: a REFER request from one of the party. - 2: a BYE request from one of the party. - 3: a REQUEST with a wrong CSeq. - 4: a NOT-SUPPORTED method with a wrong CSeq. - */ - if (MSG_IS_MESSAGE (evt->sip)) - { - /* eXosip_process_imessage_within_subscribe_dialog(transaction, evt); */ - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, - SIP_NOT_IMPLEMENTED, NULL, - "MESSAGEs within dialogs are not implemented.", - __LINE__); - return; - } else if (MSG_IS_NOTIFY (evt->sip)) - { - /* the previous transaction MUST be freed */ - old_trn = eXosip_find_last_inc_notify (js, jd); - - /* shouldn't we wait for the COMPLETED state? */ - if (old_trn != NULL && old_trn->state != NIST_TERMINATED) - { - /* retry later? */ - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 500, - "Retry Later", - "A pending NOTIFY is not terminated", - __LINE__); - return; - } - - osip_dialog_update_osip_cseq_as_uas (jd->d_dialog, evt->sip); - osip_dialog_update_route_set_as_uas (jd->d_dialog, evt->sip); - - eXosip_process_notify_within_dialog (js, jd, transaction, evt); - } else - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 501, NULL, - "Just Not Implemented", __LINE__); - } - return; - } - - if (MSG_IS_NOTIFY (evt->sip)) - { - /* let's try to check if the NOTIFY is related to an existing - subscribe */ - js = NULL; - /* first, look for a Dialog in the map of element */ - for (js = eXosip.j_subscribes; js != NULL; js = js->next) - { - if (eXosip_match_notify_for_subscribe (js, evt->sip) == 0) - { - i = eXosip_dialog_init_as_uac (&jd, evt->sip); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "eXosip: cannot establish a dialog\n")); - return; - } - - /* update local cseq from subscribe request */ - if (js->s_out_tr != NULL && js->s_out_tr->cseq != NULL - && js->s_out_tr->cseq->number != NULL) - { - jd->d_dialog->local_cseq = atoi (js->s_out_tr->cseq->number); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: local cseq has been updated\n")); - } - - ADD_ELEMENT (js->s_dialogs, jd); - eXosip_update (); - - eXosip_process_notify_within_dialog (js, jd, transaction, evt); - return; - } - } - - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (NULL, transaction, evt, 481, NULL, NULL, - __LINE__); - return; - } - - jn = NULL; - /* first, look for a Dialog in the map of element */ - for (jn = eXosip.j_notifies; jn != NULL; jn = jn->next) - { - for (jd = jn->n_dialogs; jd != NULL; jd = jd->next) - { - if (jd->d_dialog != NULL) - { - if (osip_dialog_match_as_uas (jd->d_dialog, evt->sip) == 0) - break; - } - } - if (jd != NULL) - break; - } - - if (jn != NULL) - { - /* dialog found */ - osip_transaction_t *old_trn; - - /* it can be: - 1: a new INVITE offer. - 2: a REFER request from one of the party. - 2: a BYE request from one of the party. - 3: a REQUEST with a wrong CSeq. - 4: a NOT-SUPPORTED method with a wrong CSeq. - */ - if (MSG_IS_MESSAGE (evt->sip)) - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, - SIP_NOT_IMPLEMENTED, NULL, - "MESSAGEs within dialogs are not implemented.", - __LINE__); - return; - } else if (MSG_IS_SUBSCRIBE (evt->sip)) - { - /* the previous transaction MUST be freed */ - old_trn = eXosip_find_last_inc_subscribe (jn, jd); - - /* shouldn't we wait for the COMPLETED state? */ - if (old_trn != NULL && old_trn->state != NIST_TERMINATED - && old_trn->state != NIST_COMPLETED) - { - /* retry later? */ - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 500, - "Retry Later", - "A SUBSCRIBE is not terminated", - __LINE__); - return; - } - - osip_dialog_update_osip_cseq_as_uas (jd->d_dialog, evt->sip); - osip_dialog_update_route_set_as_uas (jd->d_dialog, evt->sip); - - eXosip_process_subscribe_within_call (jn, jd, transaction, evt); - } else - { - osip_list_add (&eXosip.j_transactions, transaction, 0); - eXosip_send_default_answer (jd, transaction, evt, 501, NULL, NULL, - __LINE__); - } - return; - } + js = NULL; + /* first, look for a Dialog in the map of element */ + for (js = eXosip.j_subscribes; js != NULL; js = js->next) { + for (jd = js->s_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog != NULL) { + if (osip_dialog_match_as_uas(jd->d_dialog, evt->sip) == 0) + break; + } + } + if (jd != NULL) + break; + } + + if (js != NULL) { + /* dialog found */ + osip_transaction_t *old_trn; + + /* it can be: + 1: a new INVITE offer. + 2: a REFER request from one of the party. + 2: a BYE request from one of the party. + 3: a REQUEST with a wrong CSeq. + 4: a NOT-SUPPORTED method with a wrong CSeq. + */ + if (MSG_IS_MESSAGE(evt->sip)) { + /* eXosip_process_imessage_within_subscribe_dialog(transaction, evt); */ + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, + SIP_NOT_IMPLEMENTED, NULL, + "MESSAGEs within dialogs are not implemented.", + __LINE__); + return; + } else if (MSG_IS_NOTIFY(evt->sip)) { + /* the previous transaction MUST be freed */ + old_trn = eXosip_find_last_inc_notify(js, jd); + + /* shouldn't we wait for the COMPLETED state? */ + if (old_trn != NULL && old_trn->state != NIST_TERMINATED) { + /* retry later? */ + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 500, + "Retry Later", + "A pending NOTIFY is not terminated", + __LINE__); + return; + } + + osip_dialog_update_osip_cseq_as_uas(jd->d_dialog, evt->sip); + osip_dialog_update_route_set_as_uas(jd->d_dialog, evt->sip); + + eXosip_process_notify_within_dialog(js, jd, transaction, evt); + } else { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 501, NULL, + "Just Not Implemented", __LINE__); + } + return; + } + + if (MSG_IS_NOTIFY(evt->sip)) { + /* let's try to check if the NOTIFY is related to an existing + subscribe */ + js = NULL; + /* first, look for a Dialog in the map of element */ + for (js = eXosip.j_subscribes; js != NULL; js = js->next) { + if (eXosip_match_notify_for_subscribe(js, evt->sip) == 0) { + i = eXosip_dialog_init_as_uac(&jd, evt->sip); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "eXosip: cannot establish a dialog\n")); + return; + } + + /* update local cseq from subscribe request */ + if (js->s_out_tr != NULL && js->s_out_tr->cseq != NULL + && js->s_out_tr->cseq->number != NULL) { + jd->d_dialog->local_cseq = atoi(js->s_out_tr->cseq->number); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: local cseq has been updated\n")); + } + + ADD_ELEMENT(js->s_dialogs, jd); + eXosip_update(); + + eXosip_process_notify_within_dialog(js, jd, transaction, evt); + return; + } + } + + osip_list_add(&eXosip.j_transactions, transaction, 0); + return; + } + + jn = NULL; + /* first, look for a Dialog in the map of element */ + for (jn = eXosip.j_notifies; jn != NULL; jn = jn->next) { + for (jd = jn->n_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_dialog != NULL) { + if (osip_dialog_match_as_uas(jd->d_dialog, evt->sip) == 0) + break; + } + } + if (jd != NULL) + break; + } + + if (jn != NULL) { + /* dialog found */ + osip_transaction_t *old_trn; + + /* it can be: + 1: a new INVITE offer. + 2: a REFER request from one of the party. + 2: a BYE request from one of the party. + 3: a REQUEST with a wrong CSeq. + 4: a NOT-SUPPORTED method with a wrong CSeq. + */ + if (MSG_IS_MESSAGE(evt->sip)) { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, + SIP_NOT_IMPLEMENTED, NULL, + "MESSAGEs within dialogs are not implemented.", + __LINE__); + return; + } else if (MSG_IS_SUBSCRIBE(evt->sip)) { + /* the previous transaction MUST be freed */ + old_trn = eXosip_find_last_inc_subscribe(jn, jd); + + /* shouldn't we wait for the COMPLETED state? */ + if (old_trn != NULL && old_trn->state != NIST_TERMINATED + && old_trn->state != NIST_COMPLETED) { + /* retry later? */ + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 500, + "Retry Later", + "A SUBSCRIBE is not terminated", + __LINE__); + return; + } + + osip_dialog_update_osip_cseq_as_uas(jd->d_dialog, evt->sip); + osip_dialog_update_route_set_as_uas(jd->d_dialog, evt->sip); + + eXosip_process_subscribe_within_call(jn, jd, transaction, evt); + } else { + osip_list_add(&eXosip.j_transactions, transaction, 0); + eXosip_send_default_answer(jd, transaction, evt, 501, NULL, NULL, + __LINE__); + } + return; + } #endif #ifndef MINISIZE - if (MSG_IS_SUBSCRIBE (evt->sip)) - { - eXosip_process_new_subscribe (transaction, evt); - return; - } -#endif - - /* default answer */ - osip_list_add (&eXosip.j_transactions, transaction, 0); - __eXosip_wakeup (); /* needed? */ -} - -static void -eXosip_process_response_out_of_transaction (osip_event_t * evt) -{ - eXosip_call_t *jc = NULL; - eXosip_dialog_t *jd = NULL; - time_t now; - - now = time (NULL); - if (evt->sip == NULL - || evt->sip->cseq == NULL - || evt->sip->cseq->number == NULL - || evt->sip->to == NULL || evt->sip->from == NULL) - { - osip_event_free (evt); - return; - } - - /* search for existing dialog: match branch & to tag */ - for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) - { - /* search for calls with only ONE outgoing transaction */ - if (jc->c_id >= 1 && jc->c_dialogs != NULL && jc->c_out_tr != NULL) - { - for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) - { - /* only initial request are concerned with this */ - if (jd->d_id >= 1 && jd->d_dialog != NULL) - { - /* match answer with dialog */ - osip_generic_param_t *tag; - - osip_from_get_tag (evt->sip->to, &tag); - - if (jd->d_dialog->remote_tag == NULL || tag == NULL) - continue; - if (jd->d_dialog->remote_tag != NULL && tag != NULL - && tag->gvalue != NULL - && 0 == strcmp (jd->d_dialog->remote_tag, tag->gvalue)) - break; - } - } - if (jd != NULL) - break; /* found a matching dialog! */ - - /* check if the transaction match this from tag */ - if (jc->c_out_tr->orig_request != NULL - && jc->c_out_tr->orig_request->from != NULL) - { - osip_generic_param_t *tag_invite; - osip_generic_param_t *tag; - osip_from_get_tag (jc->c_out_tr->orig_request->from, &tag_invite); - osip_from_get_tag (evt->sip->from, &tag); - - if (tag_invite == NULL || tag == NULL) - continue; - if (tag_invite->gvalue != NULL && tag->gvalue != NULL - && 0 == strcmp (tag_invite->gvalue, tag->gvalue)) - break; - } - } - } - - if (jc == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Incoming 2xx has no relations with current calls: Message discarded.\r\n")); - osip_event_free (evt); - return; - } + if (MSG_IS_SUBSCRIBE(evt->sip)) { + eXosip_process_new_subscribe(transaction, evt); + return; + } +#endif + + /* default answer */ + osip_list_add(&eXosip.j_transactions, transaction, 0); + __eXosip_wakeup(); /* needed? */ +} + +static void eXosip_process_response_out_of_transaction(osip_event_t * evt) +{ + eXosip_call_t *jc = NULL; + eXosip_dialog_t *jd = NULL; + time_t now; + + now = time(NULL); + if (evt->sip == NULL + || evt->sip->cseq == NULL + || evt->sip->cseq->number == NULL + || evt->sip->to == NULL || evt->sip->from == NULL) { + osip_event_free(evt); + return; + } + + if (!MSG_IS_RESPONSE_FOR(evt->sip, "INVITE")) + { + osip_event_free(evt); + return; + } + + /* search for existing dialog: match branch & to tag */ + for (jc = eXosip.j_calls; jc != NULL; jc = jc->next) { + /* search for calls with only ONE outgoing transaction */ + if (jc->c_id >= 1 && jc->c_dialogs != NULL && jc->c_out_tr != NULL) { + for (jd = jc->c_dialogs; jd != NULL; jd = jd->next) { + if (jd->d_id >= 1 && jd->d_dialog != NULL) { + /* match answer with dialog */ + osip_generic_param_t *tag; + + osip_from_get_tag(evt->sip->to, &tag); + + if (jd->d_dialog->remote_tag == NULL || tag == NULL) + continue; + if (jd->d_dialog->remote_tag != NULL && tag != NULL + && tag->gvalue != NULL + && 0 == strcmp(jd->d_dialog->remote_tag, tag->gvalue)) + break; + } + } + if (jd != NULL) + break; /* found a matching dialog! */ + + /* check if the transaction match this from tag */ + if (jc->c_out_tr->orig_request != NULL + && jc->c_out_tr->orig_request->from != NULL) { + osip_generic_param_t *tag_invite; + osip_generic_param_t *tag; + osip_from_get_tag(jc->c_out_tr->orig_request->from, &tag_invite); + osip_from_get_tag(evt->sip->from, &tag); + + if (tag_invite == NULL || tag == NULL) + continue; + if (tag_invite->gvalue != NULL && tag->gvalue != NULL + && 0 == strcmp(tag_invite->gvalue, tag->gvalue)) + break; + } + } + } + + if (jc == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Incoming 2xx has no relations with current calls: Message discarded.\r\n")); + osip_event_free(evt); + return; + } #ifndef MINISIZE - if (jc != NULL && jd != NULL) - { - /* we have to restransmit the ACK (if already available) */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "2xx restransmission receveid.\r\n")); - /* check if the 2xx is for the same ACK */ - if (jd->d_ack != NULL && jd->d_ack->cseq != NULL - && jd->d_ack->cseq->number != NULL) - { - if (0 == - osip_strcasecmp (jd->d_ack->cseq->number, evt->sip->cseq->number)) - { - cb_snd_message (NULL, jd->d_ack, NULL, 0, -1); - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "ACK restransmission sent.\r\n")); - } - } - - osip_event_free (evt); - return; - } -#endif - - if (jc != NULL) - { - /* match answer with dialog */ - osip_dialog_t *dlg; + if (jc != NULL && jd != NULL) { + /* we have to restransmit the ACK (if already available) */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "2xx restransmission receveid.\r\n")); + /* check if the 2xx is for the same ACK */ + if (jd->d_ack != NULL && jd->d_ack->cseq != NULL + && jd->d_ack->cseq->number != NULL) { + if (0 == + osip_strcasecmp(jd->d_ack->cseq->number, evt->sip->cseq->number)) { + cb_snd_message(NULL, jd->d_ack, NULL, 0, -1); + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "ACK restransmission sent.\r\n")); + } + } + + osip_event_free(evt); + return; + } +#endif + + if (jc != NULL) { + /* match answer with dialog */ + osip_dialog_t *dlg; #ifndef MINISIZE - osip_transaction_t *last_tr; + osip_transaction_t *last_tr; #endif - int i; + int i; - /* we match an existing dialog: send a retransmission of ACK */ - i = osip_dialog_init_as_uac (&dlg, evt->sip); - if (i != 0 || dlg == NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Cannot build dialog for 200ok.\r\n")); - osip_event_free (evt); - return; - } - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "sending ACK for 2xx out of transaction.\r\n")); - - { - osip_message_t *bye; - char *transport = _eXosip_transport_protocol (evt->sip); -#ifndef MINISIZE /* Don't send ACK in MINISIZE mode to save code size */ - osip_message_t *ack; - if (transport == NULL) - i = _eXosip_build_request_within_dialog (&ack, "ACK", dlg, "UDP"); - else - i = _eXosip_build_request_within_dialog (&ack, "ACK", dlg, transport); - if (i != 0) - { - osip_dialog_free (dlg); - osip_event_free (evt); - return; - } - /* copy all credentials from INVITE! */ - last_tr = jc->c_out_tr; - if (last_tr != NULL) - { - int pos = 0; - int i; - osip_proxy_authorization_t *pa = NULL; - - i = - osip_message_get_proxy_authorization (last_tr->orig_request, pos, - &pa); - while (i >= 0 && pa != NULL) - { - osip_proxy_authorization_t *pa2; - - i = osip_proxy_authorization_clone (pa, &pa2); - if (i != 0) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, - "Error in credential from INVITE\n")); - break; - } - osip_list_add (&ack->proxy_authorizations, pa2, -1); - pa = NULL; - pos++; - i = - osip_message_get_proxy_authorization (last_tr->orig_request, pos, - &pa); - } - } - cb_snd_message (NULL, ack, NULL, 0, -1); - osip_message_free (ack); -#endif - /* in some case, PRACK and UPDATE may have been sent - so we have to send a cseq which is above the previous - one. */ - dlg->local_cseq = dlg->local_cseq + 4; - - /* ready to send a BYE */ - if (transport == NULL) - i = generating_bye (&bye, dlg, "UDP"); - else - i = generating_bye (&bye, dlg, transport); - cb_snd_message (NULL, bye, NULL, 0, -1); - osip_message_free (bye); - } - - osip_dialog_free (dlg); - osip_event_free (evt); - return; - } + /* we match an existing dialog: send a retransmission of ACK */ + i = osip_dialog_init_as_uac(&dlg, evt->sip); + if (i != 0 || dlg == NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "Cannot build dialog for 200ok.\r\n")); + osip_event_free(evt); + return; + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "sending ACK for 2xx out of transaction.\r\n")); + + { + osip_message_t *bye = NULL; + char *transport = _eXosip_transport_protocol(evt->sip); +#ifndef MINISIZE /* Don't send ACK in MINISIZE mode to save code size */ + osip_message_t *ack; + if (transport == NULL) + i = _eXosip_build_request_within_dialog(&ack, "ACK", dlg, "UDP"); + else + i = _eXosip_build_request_within_dialog(&ack, "ACK", dlg, + transport); + if (i != 0) { + osip_dialog_free(dlg); + osip_event_free(evt); + return; + } + /* copy all credentials from INVITE! */ + last_tr = jc->c_out_tr; + if (last_tr != NULL) { + int pos = 0; + int i; + osip_proxy_authorization_t *pa = NULL; + + i = osip_message_get_proxy_authorization(last_tr->orig_request, + pos, &pa); + while (i >= 0 && pa != NULL) { + osip_proxy_authorization_t *pa2; + + i = osip_proxy_authorization_clone(pa, &pa2); + if (i != 0) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_ERROR, NULL, + "Error in credential from INVITE\n")); + break; + } + osip_list_add(&ack->proxy_authorizations, pa2, -1); + pa = NULL; + pos++; + i = osip_message_get_proxy_authorization(last_tr->orig_request, + pos, &pa); + } + } + cb_snd_message(NULL, ack, NULL, 0, -1); + osip_message_free(ack); +#endif + /* in some case, PRACK and UPDATE may have been sent + so we have to send a cseq which is above the previous + one. */ + dlg->local_cseq = dlg->local_cseq + 4; + + /* ready to send a BYE */ + if (transport == NULL) + i = generating_bye(&bye, dlg, "UDP"); + else + i = generating_bye(&bye, dlg, transport); + if (bye != NULL && i == OSIP_SUCCESS) + cb_snd_message(NULL, bye, NULL, 0, -1); + osip_message_free(bye); + } + + osip_dialog_free(dlg); + osip_event_free(evt); + return; + } - /* we don't match any existing dialog: send a ACK & send a BYE */ - osip_event_free (evt); + /* ...code not reachable... */ } int -_eXosip_handle_incoming_message (char *buf, size_t length, int socket, - char *host, int port) +_eXosip_handle_incoming_message(char *buf, size_t length, int socket, + char *host, int port) { - int i; - osip_event_t *se; + int i; + osip_event_t *se; - se = (osip_event_t *) osip_malloc (sizeof (osip_event_t)); - if (se == NULL) - return OSIP_NOMEM; - se->type = UNKNOWN_EVT; - se->sip = NULL; - se->transactionid = 0; - - /* parse message and set up an event */ - i = osip_message_init (&(se->sip)); - if (i != 0) - { - osip_free (se); - return i; - } - i = osip_message_parse (se->sip, buf, length); - if (i != 0) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_ERROR, NULL, - "could not parse message\n")); - osip_message_free (se->sip); - osip_free (se); - return i; - } - - if (se->sip->call_id != NULL && se->sip->call_id->number != NULL) - { - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO3, NULL, - "MESSAGE REC. CALLID:%s\n", se->sip->call_id->number)); - } - - if (eXosip.cbsipCallback != NULL) - { - eXosip.cbsipCallback (se->sip, 1); - } - - if (MSG_IS_REQUEST (se->sip)) - { - if (se->sip->sip_method == NULL || se->sip->req_uri == NULL) - { - osip_message_free (se->sip); - osip_free (se); - return OSIP_SYNTAXERROR; - } - } - - if (MSG_IS_REQUEST (se->sip)) - { - if (MSG_IS_INVITE (se->sip)) - se->type = RCV_REQINVITE; - else if (MSG_IS_ACK (se->sip)) - se->type = RCV_REQACK; - else - se->type = RCV_REQUEST; - } else - { - if (MSG_IS_STATUS_1XX (se->sip)) - se->type = RCV_STATUS_1XX; - else if (MSG_IS_STATUS_2XX (se->sip)) - se->type = RCV_STATUS_2XX; - else - se->type = RCV_STATUS_3456XX; - } - - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Message received from: %s:%i\n", host, port)); - - osip_message_fix_last_via_header (se->sip, host, port); - - i = osip_find_transaction_and_add_event (eXosip.j_osip, se); - if (i != 0) - { - /* this event has no transaction, */ - OSIP_TRACE (osip_trace - (__FILE__, __LINE__, OSIP_INFO1, NULL, - "This is a request\n", buf)); - eXosip_lock (); - if (MSG_IS_REQUEST (se->sip)) - eXosip_process_newrequest (se, socket); - else if (MSG_IS_RESPONSE (se->sip)) - eXosip_process_response_out_of_transaction (se); - eXosip_unlock (); - } else - { - /* handled by oSIP ! */ - return OSIP_SUCCESS; - } - return OSIP_SUCCESS; + se = (osip_event_t *) osip_malloc(sizeof(osip_event_t)); + if (se == NULL) + return OSIP_NOMEM; + se->type = UNKNOWN_EVT; + se->sip = NULL; + se->transactionid = 0; + + /* parse message and set up an event */ + i = osip_message_init(&(se->sip)); + if (i != 0) { + osip_free(se); + return i; + } + i = osip_message_parse(se->sip, buf, length); + if (i != 0) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_ERROR, NULL, + "could not parse message\n")); + osip_message_free(se->sip); + osip_free(se); + return i; + } + + if (se->sip->call_id != NULL && se->sip->call_id->number != NULL) { + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO3, NULL, + "MESSAGE REC. CALLID:%s\n", se->sip->call_id->number)); + } + + if (eXosip.cbsipCallback != NULL) { + eXosip.cbsipCallback(se->sip, 1); + } + + if (MSG_IS_REQUEST(se->sip)) { + if (se->sip->sip_method == NULL || se->sip->req_uri == NULL) { + osip_message_free(se->sip); + osip_free(se); + return OSIP_SYNTAXERROR; + } + } + + if (MSG_IS_REQUEST(se->sip)) { + if (MSG_IS_INVITE(se->sip)) + se->type = RCV_REQINVITE; + else if (MSG_IS_ACK(se->sip)) + se->type = RCV_REQACK; + else + se->type = RCV_REQUEST; + } else { + if (MSG_IS_STATUS_1XX(se->sip)) + se->type = RCV_STATUS_1XX; + else if (MSG_IS_STATUS_2XX(se->sip)) + se->type = RCV_STATUS_2XX; + else + se->type = RCV_STATUS_3456XX; + } + + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "Message received from: %s:%i\n", host, port)); + + osip_message_fix_last_via_header(se->sip, host, port); + + i = osip_find_transaction_and_add_event(eXosip.j_osip, se); + if (i != 0) { + /* this event has no transaction, */ + OSIP_TRACE(osip_trace + (__FILE__, __LINE__, OSIP_INFO1, NULL, + "This is a request\n", buf)); + eXosip_lock(); + if (MSG_IS_REQUEST(se->sip)) + eXosip_process_newrequest(se, socket); + else if (MSG_IS_RESPONSE(se->sip)) + eXosip_process_response_out_of_transaction(se); + eXosip_unlock(); + } else { + /* handled by oSIP ! */ + return OSIP_SUCCESS; + } + return OSIP_SUCCESS; } #if defined (WIN32) || defined (_WIN32_WCE) @@ -1670,783 +1571,712 @@ /* if second==-1 && useconds==-1 -> wait for ever if max_message_nb<=0 -> infinite loop.... */ -int -eXosip_read_message (int max_message_nb, int sec_max, int usec_max) +int eXosip_read_message(int max_message_nb, int sec_max, int usec_max) { - fd_set osip_fdset; - struct timeval tv; - - tv.tv_sec = sec_max; - tv.tv_usec = usec_max; - - while (max_message_nb != 0 && eXosip.j_stop_ua == 0) - { - int i; - int max = 0; + fd_set osip_fdset; + fd_set osip_wrset; + struct timeval tv; + + tv.tv_sec = sec_max; + tv.tv_usec = usec_max; + + while (max_message_nb != 0 && eXosip.j_stop_ua == 0) { + int i; + int max = 0; #ifdef OSIP_MT - int wakeup_socket = jpipe_get_read_descr (eXosip.j_socketctl); + int wakeup_socket = jpipe_get_read_descr(eXosip.j_socketctl); #endif - FD_ZERO (&osip_fdset); - eXtl_udp.tl_set_fdset (&osip_fdset, &max); - eXtl_tcp.tl_set_fdset (&osip_fdset, &max); + FD_ZERO(&osip_fdset); + FD_ZERO(&osip_wrset); + eXtl_udp.tl_set_fdset(&osip_fdset, &osip_wrset, &max); + eXtl_tcp.tl_set_fdset(&osip_fdset, &osip_wrset, &max); #ifdef HAVE_OPENSSL_SSL_H #if !(OPENSSL_VERSION_NUMBER < 0x00908000L) - eXtl_dtls.tl_set_fdset (&osip_fdset, &max); + eXtl_dtls.tl_set_fdset(&osip_fdset, &osip_wrset, &max); #endif - eXtl_tls.tl_set_fdset (&osip_fdset, &max); + eXtl_tls.tl_set_fdset(&osip_fdset, &osip_wrset, &max); #endif #ifdef OSIP_MT - eXFD_SET (wakeup_socket, &osip_fdset); - if (wakeup_socket > max) - max = wakeup_socket; + eXFD_SET(wakeup_socket, &osip_fdset); + if (wakeup_socket > max) + max = wakeup_socket; #endif - if ((sec_max == -1) || (usec_max == -1)) - i = select (max + 1, &osip_fdset, NULL, NULL, NULL); - else - i = select (max + 1, &osip_fdset, NULL, NULL, &tv); + if ((sec_max == -1) || (usec_max == -1)) + i = select(max + 1, &osip_fdset, NULL, NULL, NULL); + else + i = select(max + 1, &osip_fdset, NULL, NULL, &tv); #if defined (_WIN32_WCE) - /* TODO: fix me for wince */ - /* if (i == -1) - continue; */ + /* TODO: fix me for wince */ + /* if (i == -1) + continue; */ #else - if ((i == -1) && (errno == EINTR || errno == EAGAIN)) - continue; + if ((i == -1) && (errno == EINTR || errno == EAGAIN)) + continue; #endif #ifdef OSIP_MT - if ((i > 0) && FD_ISSET (wakeup_socket, &osip_fdset)) - { - char buf2[500]; - - jpipe_read (eXosip.j_socketctl, buf2, 499); - } -#endif - - if (0 == i || eXosip.j_stop_ua != 0) - { - } else if (-1 == i) - { -#if !defined (_WIN32_WCE) /* TODO: fix me for wince */ - return -2000; /* error */ -#endif - } else - { - eXtl_udp.tl_read_message (&osip_fdset); - eXtl_tcp.tl_read_message (&osip_fdset); + if ((i > 0) && FD_ISSET(wakeup_socket, &osip_fdset)) { + char buf2[500]; + + jpipe_read(eXosip.j_socketctl, buf2, 499); + } +#endif + + if (0 == i || eXosip.j_stop_ua != 0) { + } else if (-1 == i) { +#if !defined (_WIN32_WCE) /* TODO: fix me for wince */ + return -2000; /* error */ +#endif + } else { + eXtl_udp.tl_read_message(&osip_fdset, &osip_wrset); + eXtl_tcp.tl_read_message(&osip_fdset, &osip_wrset); #ifdef HAVE_OPENSSL_SSL_H #if !(OPENSSL_VERSION_NUMBER < 0x00908000L) - eXtl_dtls.tl_read_message (&osip_fdset); + eXtl_dtls.tl_read_message(&osip_fdset, &osip_wrset); #endif - eXtl_tls.tl_read_message (&osip_fdset); + eXtl_tls.tl_read_message(&osip_fdset, &osip_wrset); #endif - } + } - max_message_nb--; - } - return OSIP_SUCCESS; + max_message_nb--; + } + return OSIP_SUCCESS; } static int -eXosip_pendingosip_transaction_exist (eXosip_call_t * jc, eXosip_dialog_t * jd) +eXosip_pendingosip_transaction_exist(eXosip_call_t * jc, eXosip_dialog_t * jd) { - osip_transaction_t *tr; - time_t now = time (NULL); - - tr = eXosip_find_last_inc_transaction (jc, jd, "BYE"); - if (tr != NULL && tr->state != NIST_TERMINATED) - { /* Don't want to wait forever on broken transaction!! */ - if (tr->birth_time + 180 < now) /* Wait a max of 2 minutes */ - { - /* remove the transaction from oSIP: */ - osip_remove_transaction (eXosip.j_osip, tr); - eXosip_remove_transaction_from_call (tr, jc); - osip_list_add (&eXosip.j_transactions, tr, 0); - } else - return OSIP_SUCCESS; - } - - tr = eXosip_find_last_out_transaction (jc, jd, "BYE"); - if (tr != NULL && tr->state != NICT_TERMINATED) - { /* Don't want to wait forever on broken transaction!! */ - if (tr->birth_time + 180 < now) /* Wait a max of 2 minutes */ - { - /* remove the transaction from oSIP: */ - osip_remove_transaction (eXosip.j_osip, tr); - eXosip_remove_transaction_from_call (tr, jc); - osip_list_add (&eXosip.j_transactions, tr, 0); - } else - return OSIP_SUCCESS; - } - - tr = eXosip_find_last_inc_invite (jc, jd); - if (tr != NULL && tr->state != IST_TERMINATED) - { /* Don't want to wait forever on broken transaction!! */ - if (tr->birth_time + 180 < now) /* Wait a max of 2 minutes */ - { - /* remove the transaction from oSIP: */ - /* osip_remove_transaction(eXosip.j_osip, tr); - eXosip_remove_transaction_from_call(tr, jc); - osip_transaction_free(tr); */ - } else - return OSIP_SUCCESS; - } - - tr = eXosip_find_last_out_invite (jc, jd); - if (tr != NULL && tr->state != ICT_TERMINATED) - { /* Don't want to wait forever on broken transaction!! */ - if (tr->birth_time + 180 < now) /* Wait a max of 2 minutes */ - { - /* remove the transaction from oSIP: */ - /* osip_remove_transaction(eXosip.j_osip, tr); - eXosip_remove_transaction_from_call(tr, jc); - osip_transaction_free(tr); */ - } else - return OSIP_SUCCESS; - } - - tr = eXosip_find_last_inc_transaction (jc, jd, "REFER"); - if (tr != NULL && tr->state != NIST_TERMINATED) - { /* Don't want to wait forever on broken transaction!! */ - if (tr->birth_time + 180 < now) /* Wait a max of 2 minutes */ - { - /* remove the transaction from oSIP: */ - osip_remove_transaction (eXosip.j_osip, tr); - eXosip_remove_transaction_from_call (tr, jc); - osip_list_add (&eXosip.j_transactions, tr, 0); - } else - return OSIP_SUCCESS; - } - - tr = eXosip_find_last_out_transaction (jc, jd, "REFER"); - if (tr != NULL && tr->state != NICT_TERMINATED) - { /* Don't want to wait forever on broken transaction!! */ - if (tr->birth_time + 180 < now) /* Wait a max of 2 minutes */ - { - /* remove the transaction from oSIP: */ - osip_remove_transaction (eXosip.j_osip, tr); - eXosip_remove_transaction_from_call (tr, jc); - osip_list_add (&eXosip.j_transactions, tr, 0); - } else - return OSIP_SUCCESS; - } - - return OSIP_UNDEFINED_ERROR; -} + osip_transaction_t *tr; + time_t now = time(NULL); -static int -eXosip_release_finished_transactions (eXosip_call_t * jc, eXosip_dialog_t * jd) -{ - time_t now = time (NULL); - osip_transaction_t *inc_tr; - osip_transaction_t *out_tr; - osip_transaction_t *last_invite; - int pos; - int ret; - - ret = -1; - - last_invite = eXosip_find_last_inc_invite (jc, jd); - - if (jd != NULL) - { - /* go through all incoming transactions of this dialog */ - pos = 1; - while (!osip_list_eol (jd->d_inc_trs, pos)) - { - inc_tr = osip_list_get (jd->d_inc_trs, pos); - if (0 != osip_strcasecmp (inc_tr->cseq->method, "INVITE")) - { - /* remove, if transaction too old, independent of the state */ - if ((inc_tr->state == NIST_TERMINATED) && (inc_tr->birth_time + 30 < now)) /* Wait a max of 30 seconds */ - { - /* remove the transaction from oSIP */ - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: release non-INVITE server transaction (did=%i)\n", - jd->d_id)); - osip_remove_transaction (eXosip.j_osip, inc_tr); - osip_list_remove (jd->d_inc_trs, pos); - osip_list_add (&eXosip.j_transactions, inc_tr, 0); - - ret = 0; - break; - } - } else - { - /* remove, if transaction too old, independent of the state */ - if (last_invite != inc_tr && (inc_tr->state == IST_TERMINATED) && (inc_tr->birth_time + 30 < now)) /* Wait a max of 30 seconds */ - { - /* remove the transaction from oSIP */ - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: release INVITE server transaction (did=%i)\n", - jd->d_id)); - osip_remove_transaction (eXosip.j_osip, inc_tr); - osip_list_remove (jd->d_inc_trs, pos); - osip_list_add (&eXosip.j_transactions, inc_tr, 0); - - ret = 0; - break; - } - } - pos++; - } - - last_invite = eXosip_find_last_out_invite (jc, jd); - - /* go through all outgoing transactions of this dialog */ - pos = 1; - while (!osip_list_eol (jd->d_out_trs, pos)) - { - out_tr = osip_list_get (jd->d_out_trs, pos); - if (0 != osip_strcasecmp (out_tr->cseq->method, "INVITE")) - { - /* remove, if transaction too old, independent of the state */ - if ((out_tr->state == NICT_TERMINATED) && (out_tr->birth_time + 30 < now)) /* Wait a max of 30 seconds */ - { - /* remove the transaction from oSIP */ - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: release non INVITE client transaction (did=%i)\n", - jd->d_id)); - osip_remove_transaction (eXosip.j_osip, out_tr); - osip_list_remove (jd->d_out_trs, pos); - osip_list_add (&eXosip.j_transactions, out_tr, 0); - - ret = 0; - break; - } - } else - { - /* remove, if transaction too old, independent of the state */ - if (last_invite != out_tr && (out_tr->state == ICT_TERMINATED) && (out_tr->birth_time + 30 < now)) /* Wait a max of 30 seconds */ - { - /* remove the transaction from oSIP */ - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: release INVITE client transaction (did=%i)\n", - jd->d_id)); - osip_remove_transaction (eXosip.j_osip, out_tr); - osip_list_remove (jd->d_out_trs, pos); - osip_list_add (&eXosip.j_transactions, out_tr, 0); - - ret = 0; - break; - } - } - pos++; - } - } + tr = eXosip_find_last_inc_transaction(jc, jd, "BYE"); + if (tr != NULL && tr->state != NIST_TERMINATED) { /* Don't want to wait forever on broken transaction!! */ + if (tr->birth_time + 180 < now) { /* Wait a max of 2 minutes */ + /* remove the transaction from oSIP: */ + osip_remove_transaction(eXosip.j_osip, tr); + eXosip_remove_transaction_from_call(tr, jc); + osip_list_add(&eXosip.j_transactions, tr, 0); + } else + return OSIP_SUCCESS; + } + + tr = eXosip_find_last_out_transaction(jc, jd, "BYE"); + if (tr != NULL && tr->state != NICT_TERMINATED) { /* Don't want to wait forever on broken transaction!! */ + if (tr->birth_time + 180 < now) { /* Wait a max of 2 minutes */ + /* remove the transaction from oSIP: */ + osip_remove_transaction(eXosip.j_osip, tr); + eXosip_remove_transaction_from_call(tr, jc); + osip_list_add(&eXosip.j_transactions, tr, 0); + } else + return OSIP_SUCCESS; + } + + tr = eXosip_find_last_inc_invite(jc, jd); + if (tr != NULL && tr->state != IST_TERMINATED) { /* Don't want to wait forever on broken transaction!! */ + if (tr->birth_time + 180 < now) { /* Wait a max of 2 minutes */ + } else + return OSIP_SUCCESS; + } + + tr = eXosip_find_last_out_invite(jc, jd); + if (tr != NULL && tr->state != ICT_TERMINATED) { /* Don't want to wait forever on broken transaction!! */ + if (jc->expire_time < now) { + } else + return OSIP_SUCCESS; + } + + tr = eXosip_find_last_inc_transaction(jc, jd, "REFER"); + if (tr != NULL && tr->state != NIST_TERMINATED) { /* Don't want to wait forever on broken transaction!! */ + if (tr->birth_time + 180 < now) { /* Wait a max of 2 minutes */ + /* remove the transaction from oSIP: */ + osip_remove_transaction(eXosip.j_osip, tr); + eXosip_remove_transaction_from_call(tr, jc); + osip_list_add(&eXosip.j_transactions, tr, 0); + } else + return OSIP_SUCCESS; + } + + tr = eXosip_find_last_out_transaction(jc, jd, "REFER"); + if (tr != NULL && tr->state != NICT_TERMINATED) { /* Don't want to wait forever on broken transaction!! */ + if (tr->birth_time + 180 < now) { /* Wait a max of 2 minutes */ + /* remove the transaction from oSIP: */ + osip_remove_transaction(eXosip.j_osip, tr); + eXosip_remove_transaction_from_call(tr, jc); + osip_list_add(&eXosip.j_transactions, tr, 0); + } else + return OSIP_SUCCESS; + } - return ret; + return OSIP_UNDEFINED_ERROR; } static int -eXosip_release_finished_calls (eXosip_call_t * jc, eXosip_dialog_t * jd) +eXosip_release_finished_transactions(eXosip_call_t * jc, eXosip_dialog_t * jd) { - osip_transaction_t *tr; - - tr = eXosip_find_last_inc_transaction (jc, jd, "BYE"); - if (tr == NULL) - tr = eXosip_find_last_out_transaction (jc, jd, "BYE"); - - if (tr != NULL && (tr->state == NIST_TERMINATED || tr->state == NICT_TERMINATED)) - { - int did = -2; - - if (jd != NULL) - did = jd->d_id; - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_finished_calls remove a dialog (cid=%i did=%i)\n", - jc->c_id, did)); - /* Remove existing reference to the dialog from transactions! */ - __eXosip_call_remove_dialog_reference_in_call (jc, jd); - REMOVE_ELEMENT (jc->c_dialogs, jd); - eXosip_dialog_free (jd); - return OSIP_SUCCESS; - } - return OSIP_UNDEFINED_ERROR; + time_t now = time(NULL); + osip_transaction_t *inc_tr; + osip_transaction_t *out_tr; + osip_transaction_t *last_invite; + int pos; + int ret; + + ret = -1; + + last_invite = eXosip_find_last_inc_invite(jc, jd); + + if (jd != NULL) { + /* go through all incoming transactions of this dialog */ + pos = 1; + while (!osip_list_eol(jd->d_inc_trs, pos)) { + inc_tr = osip_list_get(jd->d_inc_trs, pos); + if (0 != osip_strcasecmp(inc_tr->cseq->method, "INVITE")) { + /* remove, if transaction too old, independent of the state */ + if ((inc_tr->state == NIST_TERMINATED) && (inc_tr->birth_time + 30 < now)) { /* Wait a max of 30 seconds */ + /* remove the transaction from oSIP */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: release non-INVITE server transaction (did=%i)\n", + jd->d_id)); + osip_remove_transaction(eXosip.j_osip, inc_tr); + osip_list_remove(jd->d_inc_trs, pos); + osip_list_add(&eXosip.j_transactions, inc_tr, 0); + + ret = 0; + break; + } + } else { + /* remove, if transaction too old, independent of the state */ + if (last_invite != inc_tr && (inc_tr->state == IST_TERMINATED) && (inc_tr->birth_time + 30 < now)) { /* Wait a max of 30 seconds */ + /* remove the transaction from oSIP */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: release INVITE server transaction (did=%i)\n", + jd->d_id)); + osip_remove_transaction(eXosip.j_osip, inc_tr); + osip_list_remove(jd->d_inc_trs, pos); + osip_list_add(&eXosip.j_transactions, inc_tr, 0); + + ret = 0; + break; + } + } + pos++; + } + + last_invite = eXosip_find_last_out_invite(jc, jd); + + /* go through all outgoing transactions of this dialog */ + pos = 1; + while (!osip_list_eol(jd->d_out_trs, pos)) { + out_tr = osip_list_get(jd->d_out_trs, pos); + if (0 != osip_strcasecmp(out_tr->cseq->method, "INVITE")) { + /* remove, if transaction too old, independent of the state */ + if ((out_tr->state == NICT_TERMINATED) && (out_tr->birth_time + 30 < now)) { /* Wait a max of 30 seconds */ + /* remove the transaction from oSIP */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: release non INVITE client transaction (did=%i)\n", + jd->d_id)); + osip_remove_transaction(eXosip.j_osip, out_tr); + osip_list_remove(jd->d_out_trs, pos); + osip_list_add(&eXosip.j_transactions, out_tr, 0); + + ret = 0; + break; + } + } else { + /* remove, if transaction too old, independent of the state */ + if (last_invite != out_tr && (out_tr->state == ICT_TERMINATED) && (out_tr->birth_time + 30 < now)) { /* Wait a max of 30 seconds */ + /* remove the transaction from oSIP */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: release INVITE client transaction (did=%i)\n", + jd->d_id)); + osip_remove_transaction(eXosip.j_osip, out_tr); + osip_list_remove(jd->d_out_trs, pos); + osip_list_add(&eXosip.j_transactions, out_tr, 0); + + ret = 0; + break; + } + } + pos++; + } + } + + return ret; +} + +static int eXosip_release_finished_calls(eXosip_call_t * jc, eXosip_dialog_t * jd) +{ + osip_transaction_t *tr; + + tr = eXosip_find_last_inc_transaction(jc, jd, "BYE"); + if (tr == NULL) + tr = eXosip_find_last_out_transaction(jc, jd, "BYE"); + + if (tr != NULL + && (tr->state == NIST_TERMINATED || tr->state == NICT_TERMINATED)) { + int did = -2; + + if (jd != NULL) + did = jd->d_id; + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_finished_calls remove a dialog (cid=%i did=%i)\n", + jc->c_id, did)); + /* Remove existing reference to the dialog from transactions! */ + __eXosip_call_remove_dialog_reference_in_call(jc, jd); + REMOVE_ELEMENT(jc->c_dialogs, jd); + eXosip_dialog_free(jd); + return OSIP_SUCCESS; + } + return OSIP_UNDEFINED_ERROR; +} + + + +static void __eXosip_release_call(eXosip_call_t * jc, eXosip_dialog_t * jd) +{ + REMOVE_ELEMENT(eXosip.j_calls, jc); + report_call_event(EXOSIP_CALL_RELEASED, jc, jd, NULL); + eXosip_call_free(jc); + __eXosip_wakeup(); } - -static void -__eXosip_release_call (eXosip_call_t * jc, eXosip_dialog_t * jd) -{ - REMOVE_ELEMENT (eXosip.j_calls, jc); - report_call_event (EXOSIP_CALL_RELEASED, jc, jd, NULL); - eXosip_call_free (jc); - __eXosip_wakeup (); -} - - -static int -eXosip_release_aborted_calls (eXosip_call_t * jc, eXosip_dialog_t * jd) +static int eXosip_release_aborted_calls(eXosip_call_t * jc, eXosip_dialog_t * jd) { - time_t now = time (NULL); - osip_transaction_t *tr; + time_t now = time(NULL); + osip_transaction_t *tr; #if 0 - tr = eXosip_find_last_inc_invite (jc, jd); - if (tr == NULL) - tr = eXosip_find_last_out_invite (jc, jd); + tr = eXosip_find_last_inc_invite(jc, jd); + if (tr == NULL) + tr = eXosip_find_last_out_invite(jc, jd); #else - /* close calls only when the initial INVITE failed */ - tr = jc->c_inc_tr; - if (tr == NULL) - tr = jc->c_out_tr; -#endif - - if (tr == NULL) - { - if (jd != NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls remove an empty dialog\n")); - __eXosip_call_remove_dialog_reference_in_call (jc, jd); - REMOVE_ELEMENT (jc->c_dialogs, jd); - eXosip_dialog_free (jd); - return OSIP_SUCCESS; - } - return OSIP_UNDEFINED_ERROR; - } - - if (tr != NULL && tr->state != IST_TERMINATED && tr->state != ICT_TERMINATED && tr->birth_time + 180 < now) /* Wait a max of 2 minutes */ - { - if (jd != NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls remove a dialog for an unfinished transaction\n")); - __eXosip_call_remove_dialog_reference_in_call (jc, jd); - REMOVE_ELEMENT (jc->c_dialogs, jd); - report_call_event (EXOSIP_CALL_NOANSWER, jc, jd, NULL); - eXosip_dialog_free (jd); - __eXosip_wakeup (); - return OSIP_SUCCESS; - } - } - - if (tr != NULL && (tr->state == IST_TERMINATED || tr->state == ICT_TERMINATED)) - { - if (tr == jc->c_inc_tr) - { - if (jc->c_inc_tr->last_response == NULL) - { - /* OSIP_TRACE(osip_trace(__FILE__,__LINE__,OSIP_INFO2,NULL, - "eXosip: eXosip_release_aborted_calls transaction with no answer\n")); */ - } + /* close calls only when the initial INVITE failed */ + tr = jc->c_inc_tr; + if (tr == NULL) + tr = jc->c_out_tr; +#endif + + if (tr == NULL) { + if (jd != NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls remove an empty dialog\n")); + __eXosip_call_remove_dialog_reference_in_call(jc, jd); + REMOVE_ELEMENT(jc->c_dialogs, jd); + eXosip_dialog_free(jd); + return OSIP_SUCCESS; + } + return OSIP_UNDEFINED_ERROR; + } + + if (tr != NULL && tr->state != IST_TERMINATED && tr->state != ICT_TERMINATED && tr->birth_time + 180 < now) { /* Wait a max of 2 minutes */ + if (jd != NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls remove a dialog for an unfinished transaction\n")); + __eXosip_call_remove_dialog_reference_in_call(jc, jd); + REMOVE_ELEMENT(jc->c_dialogs, jd); + report_call_event(EXOSIP_CALL_NOANSWER, jc, jd, NULL); + eXosip_dialog_free(jd); + __eXosip_wakeup(); + return OSIP_SUCCESS; + } + } + + if (tr != NULL && (tr->state == IST_TERMINATED || tr->state == ICT_TERMINATED)) { + if (tr == jc->c_inc_tr) { + if (jc->c_inc_tr->last_response == NULL) { + /* OSIP_TRACE(osip_trace(__FILE__,__LINE__,OSIP_INFO2,NULL, + "eXosip: eXosip_release_aborted_calls transaction with no answer\n")); */ + } #ifndef MINISIZE - else if (MSG_IS_STATUS_3XX (jc->c_inc_tr->last_response)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls answered with a 3xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } else if (MSG_IS_STATUS_4XX (jc->c_inc_tr->last_response)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls answered with a 4xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } else if (MSG_IS_STATUS_5XX (jc->c_inc_tr->last_response)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls answered with a 5xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } else if (MSG_IS_STATUS_6XX (jc->c_inc_tr->last_response)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls answered with a 6xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } + else if (MSG_IS_STATUS_3XX(jc->c_inc_tr->last_response)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls answered with a 3xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } else if (MSG_IS_STATUS_4XX(jc->c_inc_tr->last_response)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls answered with a 4xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } else if (MSG_IS_STATUS_5XX(jc->c_inc_tr->last_response)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls answered with a 5xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } else if (MSG_IS_STATUS_6XX(jc->c_inc_tr->last_response)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls answered with a 6xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } #else - else if (jc->c_inc_tr->last_response->status_code >= 300) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls answered with a answer above 3xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } -#endif - } else if (tr == jc->c_out_tr) - { - if (jc->c_out_tr->last_response == NULL) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls completed with no answer\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } + else if (jc->c_inc_tr->last_response->status_code >= 300) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls answered with a answer above 3xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } +#endif + } else if (tr == jc->c_out_tr) { + if (jc->c_out_tr->last_response == NULL) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls completed with no answer\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } #ifndef MINISIZE - else if (MSG_IS_STATUS_3XX (jc->c_out_tr->last_response)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls completed answered with 3xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } else if (MSG_IS_STATUS_4XX (jc->c_out_tr->last_response)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls completed answered with 4xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } else if (MSG_IS_STATUS_5XX (jc->c_out_tr->last_response)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls completed answered with 5xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } else if (MSG_IS_STATUS_6XX (jc->c_out_tr->last_response)) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls completed answered with 6xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } + else if (MSG_IS_STATUS_3XX(jc->c_out_tr->last_response)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls completed answered with 3xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } else if (MSG_IS_STATUS_4XX(jc->c_out_tr->last_response)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls completed answered with 4xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } else if (MSG_IS_STATUS_5XX(jc->c_out_tr->last_response)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls completed answered with 5xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } else if (MSG_IS_STATUS_6XX(jc->c_out_tr->last_response)) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls completed answered with 6xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } #else - else if (jc->c_out_tr->last_response->status_code >= 300) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_aborted_calls completed answered with 3xx\n")); - __eXosip_release_call (jc, jd); - return OSIP_SUCCESS; - } -#endif - } - } - - return OSIP_UNDEFINED_ERROR; -} - - -void -eXosip_release_terminated_calls (void) -{ - eXosip_dialog_t *jd; - eXosip_dialog_t *jdnext; - eXosip_call_t *jc; - eXosip_call_t *jcnext; - time_t now = time (NULL); - int pos; - - - for (jc = eXosip.j_calls; jc != NULL;) - { - jcnext = jc->next; - /* free call terminated with a BYE */ - - for (jd = jc->c_dialogs; jd != NULL;) - { - jdnext = jd->next; - if (0 == eXosip_pendingosip_transaction_exist (jc, jd)) - { - } else if (0 == eXosip_release_finished_transactions (jc, jd)) - { - } else if (0 == eXosip_release_finished_calls (jc, jd)) - { - jd = jc->c_dialogs; - } else if (0 == eXosip_release_aborted_calls (jc, jd)) - { - jdnext = NULL; - } else if (jd->d_id == -1) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: eXosip_release_terminated_calls delete a removed dialog (cid=%i did=%i)\n", - jc->c_id, jd->d_id)); - /* Remove existing reference to the dialog from transactions! */ - __eXosip_call_remove_dialog_reference_in_call (jc, jd); - REMOVE_ELEMENT (jc->c_dialogs, jd); - eXosip_dialog_free (jd); - - jd = jc->c_dialogs; - } - jd = jdnext; - } - jc = jcnext; - } - - for (jc = eXosip.j_calls; jc != NULL;) - { - jcnext = jc->next; - if (jc->c_dialogs == NULL) - { - if (jc->c_inc_tr != NULL - && jc->c_inc_tr->state != IST_TERMINATED - && jc->c_inc_tr->birth_time + 180 < now) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: remove an incoming call with no final answer\n")); - __eXosip_release_call (jc, NULL); - } else if (jc->c_out_tr != NULL - && jc->c_out_tr->state != ICT_TERMINATED - && jc->c_out_tr->birth_time + 180 < now) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: remove an outgoing call with no final answer\n")); - __eXosip_release_call (jc, NULL); - } else if (jc->c_inc_tr != NULL && jc->c_inc_tr->state != IST_TERMINATED) - { - } else if (jc->c_out_tr != NULL && jc->c_out_tr->state != ICT_TERMINATED) - { - } else if (jc->c_out_tr != NULL - && jc->c_out_tr->state == ICT_TERMINATED - && jc->c_out_tr->completed_time + 10 > now) - { - /* With unreliable protocol, the transaction enter the terminated - state right after the ACK is sent: In this case, we really want - to wait for additionnal user/automatic action to be processed - before we decide to delete the call. - */ - - - } else /* no active pending transaction */ - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "eXosip: remove a call\n")); - __eXosip_release_call (jc, NULL); - } - } - jc = jcnext; - } - - pos = 0; - while (!osip_list_eol (&eXosip.j_transactions, pos)) - { - osip_transaction_t *tr = - (osip_transaction_t *) osip_list_get (&eXosip.j_transactions, pos); - if (tr->state == IST_TERMINATED || tr->state == ICT_TERMINATED - || tr->state == NICT_TERMINATED || tr->state == NIST_TERMINATED) - - { /* free (transaction is already removed from the oSIP stack) */ - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO3, NULL, - "Release a terminated transaction\n")); - osip_list_remove (&eXosip.j_transactions, pos); - __eXosip_delete_jinfo (tr); - osip_transaction_free (tr); - } else if (tr->birth_time + 180 < now) /* Wait a max of 2 minutes */ - { - osip_list_remove (&eXosip.j_transactions, pos); - __eXosip_delete_jinfo (tr); - osip_transaction_free (tr); - } else - pos++; - } -} - -void -eXosip_release_terminated_registrations (void) -{ - eXosip_reg_t *jr; - eXosip_reg_t *jrnext; - time_t now = time (NULL); - - for (jr = eXosip.j_reg; jr != NULL;) - { - jrnext = jr->next; - if (jr->r_reg_period == 0 && jr->r_last_tr != NULL) - { - if (now - jr->r_last_tr->birth_time > 60) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Release a terminated registration\n")); - REMOVE_ELEMENT (eXosip.j_reg, jr); - eXosip_reg_free (jr); - } else if (jr->r_last_tr->last_response != NULL - && jr->r_last_tr->last_response->status_code >= 200 - && jr->r_last_tr->last_response->status_code <= 299) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Release a terminated registration with 2xx\n")); - REMOVE_ELEMENT (eXosip.j_reg, jr); - eXosip_reg_free (jr); - } - } - - jr = jrnext; - } - - return; -} - -void -eXosip_release_terminated_publications (void) -{ - eXosip_pub_t *jpub; - eXosip_pub_t *jpubnext; - time_t now = time (NULL); - - for (jpub = eXosip.j_pub; jpub != NULL;) - { - jpubnext = jpub->next; - if (jpub->p_period == 0 && jpub->p_last_tr != NULL) - { - if (now - jpub->p_last_tr->birth_time > 60) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Release a terminated publication\n")); - REMOVE_ELEMENT (eXosip.j_pub, jpub); - _eXosip_pub_free (jpub); - } else if (jpub->p_last_tr->last_response != NULL - && jpub->p_last_tr->last_response->status_code >= 200 - && jpub->p_last_tr->last_response->status_code <= 299) - { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO1, NULL, - "Release a terminated publication with 2xx\n")); - REMOVE_ELEMENT (eXosip.j_pub, jpub); - _eXosip_pub_free (jpub); - } - } + else if (jc->c_out_tr->last_response->status_code >= 300) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_aborted_calls completed answered with 3xx\n")); + __eXosip_release_call(jc, jd); + return OSIP_SUCCESS; + } +#endif + } + } + + return OSIP_UNDEFINED_ERROR; +} + + +void eXosip_release_terminated_calls(void) +{ + eXosip_dialog_t *jd; + eXosip_dialog_t *jdnext; + eXosip_call_t *jc; + eXosip_call_t *jcnext; + time_t now = time(NULL); + int pos; + + + for (jc = eXosip.j_calls; jc != NULL;) { + jcnext = jc->next; + /* free call terminated with a BYE */ + + for (jd = jc->c_dialogs; jd != NULL;) { + jdnext = jd->next; + if (0 == eXosip_pendingosip_transaction_exist(jc, jd)) { + } else if (0 == eXosip_release_finished_transactions(jc, jd)) { + } else if (0 == eXosip_release_finished_calls(jc, jd)) { + jd = jc->c_dialogs; + } else if (0 == eXosip_release_aborted_calls(jc, jd)) { + jdnext = NULL; + } else if (jd->d_id == -1) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: eXosip_release_terminated_calls delete a removed dialog (cid=%i did=%i)\n", + jc->c_id, jd->d_id)); + /* Remove existing reference to the dialog from transactions! */ + __eXosip_call_remove_dialog_reference_in_call(jc, jd); + REMOVE_ELEMENT(jc->c_dialogs, jd); + eXosip_dialog_free(jd); + + jd = jc->c_dialogs; + } + jd = jdnext; + } + jc = jcnext; + } + + for (jc = eXosip.j_calls; jc != NULL;) { + jcnext = jc->next; + if (jc->c_dialogs == NULL) { + if (jc->c_inc_tr != NULL + && jc->c_inc_tr->state != IST_TERMINATED + && jc->c_inc_tr->birth_time + 180 < now) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: remove an incoming call with no final answer\n")); + __eXosip_release_call(jc, NULL); + } else if (jc->c_out_tr != NULL + && jc->c_out_tr->state != ICT_TERMINATED + && jc->c_out_tr->birth_time + 180 < now) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: remove an outgoing call with no final answer\n")); + __eXosip_release_call(jc, NULL); + } else if (jc->c_inc_tr != NULL + && jc->c_inc_tr->state != IST_TERMINATED) { + } else if (jc->c_out_tr != NULL + && jc->c_out_tr->state != ICT_TERMINATED) { + } else if (jc->c_out_tr != NULL + && jc->c_out_tr->state == ICT_TERMINATED + && jc->c_out_tr->completed_time + 10 > now) { + /* With unreliable protocol, the transaction enter the terminated + state right after the ACK is sent: In this case, we really want + to wait for additionnal user/automatic action to be processed + before we decide to delete the call. + */ + + + } else { /* no active pending transaction */ + + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "eXosip: remove a call\n")); + __eXosip_release_call(jc, NULL); + } + } + jc = jcnext; + } + + pos = 0; + while (!osip_list_eol(&eXosip.j_transactions, pos)) { + osip_transaction_t *tr = + (osip_transaction_t *) osip_list_get(&eXosip.j_transactions, pos); + if (tr->state == NICT_TERMINATED + && tr->last_response!=NULL + && tr->completed_time + 5 > now) { + /* keep transaction until authentication or ... */ + pos++; + } else if (tr->state == IST_TERMINATED || tr->state == ICT_TERMINATED || tr->state == NICT_TERMINATED || tr->state == NIST_TERMINATED) { /* free (transaction is already removed from the oSIP stack) */ + osip_list_remove(&eXosip.j_transactions, pos); + __eXosip_delete_jinfo(tr); + _eXosip_dnsutils_release(tr->naptr_record); + tr->naptr_record=NULL; + osip_transaction_free(tr); + } else if (tr->birth_time + 180 < now) { /* Wait a max of 2 minutes */ + osip_list_remove(&eXosip.j_transactions, pos); + __eXosip_delete_jinfo(tr); + _eXosip_dnsutils_release(tr->naptr_record); + tr->naptr_record=NULL; + osip_transaction_free(tr); + } else + pos++; + } +} + +void eXosip_release_terminated_registrations(void) +{ + eXosip_reg_t *jr; + eXosip_reg_t *jrnext; + time_t now = time(NULL); + + for (jr = eXosip.j_reg; jr != NULL;) { + jrnext = jr->next; + if (jr->r_reg_period == 0 && jr->r_last_tr != NULL) { + if (now - jr->r_last_tr->birth_time > 75) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Release a terminated registration\n")); + REMOVE_ELEMENT(eXosip.j_reg, jr); + eXosip_reg_free(jr); + } else if (jr->r_last_tr->last_response != NULL + && jr->r_last_tr->last_response->status_code >= 200 + && jr->r_last_tr->last_response->status_code <= 299) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Release a terminated registration with 2xx\n")); + REMOVE_ELEMENT(eXosip.j_reg, jr); + eXosip_reg_free(jr); + } + } + + jr = jrnext; + } + + return; +} + +void eXosip_release_terminated_publications(void) +{ + eXosip_pub_t *jpub; + eXosip_pub_t *jpubnext; + time_t now = time(NULL); + + for (jpub = eXosip.j_pub; jpub != NULL;) { + jpubnext = jpub->next; + if (jpub->p_period == 0 && jpub->p_last_tr != NULL) { + if (now - jpub->p_last_tr->birth_time > 75) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Release a terminated publication\n")); + REMOVE_ELEMENT(eXosip.j_pub, jpub); + _eXosip_pub_free(jpub); + } else if (jpub->p_last_tr->last_response != NULL + && jpub->p_last_tr->last_response->status_code >= 200 + && jpub->p_last_tr->last_response->status_code <= 299) { + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL, + "Release a terminated publication with 2xx\n")); + REMOVE_ELEMENT(eXosip.j_pub, jpub); + _eXosip_pub_free(jpub); + } + } - jpub = jpubnext; - } + jpub = jpubnext; + } } #ifndef MINISIZE static int -eXosip_release_finished_transactions_for_subscription (eXosip_dialog_t * jd) +eXosip_release_finished_transactions_for_subscription(eXosip_dialog_t * jd) { - time_t now = time (NULL); - osip_transaction_t *inc_tr; - osip_transaction_t *out_tr; - int skip_first = 0; - int pos; - int ret; - - ret = OSIP_UNDEFINED_ERROR; - - if (jd != NULL) - { - /* go through all incoming transactions of this dialog */ - pos = 0; - while (!osip_list_eol (jd->d_inc_trs, pos)) - { - inc_tr = osip_list_get (jd->d_inc_trs, pos); - /* remove, if transaction too old, independent of the state */ - if ((skip_first == 1) && (inc_tr->state == NIST_TERMINATED) && (inc_tr->birth_time + 30 < now)) /* keep it for 30 seconds */ - { - /* remove the transaction from oSIP */ - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: releaase non-INVITE server transaction (did=%i)\n", - jd->d_id)); - osip_remove_transaction (eXosip.j_osip, inc_tr); - osip_list_remove (jd->d_inc_trs, pos); - osip_list_add (&eXosip.j_transactions, inc_tr, 0); - - ret = OSIP_SUCCESS; /* return "released" */ - break; - } - if (0 == osip_strcasecmp (inc_tr->cseq->method, "SUBSCRIBE")) - skip_first = 1; - if (0 == osip_strcasecmp (inc_tr->cseq->method, "NOTIFY")) - skip_first = 1; - pos++; - } - - skip_first = 0; - - /* go through all outgoing transactions of this dialog */ - pos = 0; - while (!osip_list_eol (jd->d_out_trs, pos)) - { - out_tr = osip_list_get (jd->d_out_trs, pos); - /* remove, if transaction too old, independent of the state */ - if ((skip_first == 1) && (out_tr->state == NICT_TERMINATED) && (out_tr->birth_time + 30 < now)) /* Wait a max of 30 seconds */ - { - /* remove the transaction from oSIP */ - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, - "eXosip: release non INVITE client transaction (did=%i)\n", - jd->d_id)); - osip_remove_transaction (eXosip.j_osip, out_tr); - osip_list_remove (jd->d_out_trs, pos); - osip_list_add (&eXosip.j_transactions, out_tr, 0); - - ret = OSIP_SUCCESS; /* return "released" */ - break; - } - if (0 == osip_strcasecmp (out_tr->cseq->method, "SUBSCRIBE")) - skip_first = 1; - if (0 == osip_strcasecmp (out_tr->cseq->method, "NOTIFY")) - skip_first = 1; - pos++; - } - } - - return ret; -} - -void -eXosip_release_terminated_subscriptions () -{ - time_t now = time (NULL); - eXosip_dialog_t *jd; - eXosip_dialog_t *jdnext; - eXosip_subscribe_t *js; - eXosip_subscribe_t *jsnext; - - for (js = eXosip.j_subscribes; js != NULL;) - { - jsnext = js->next; - - if (js->s_dialogs == NULL) - { - if (js->s_out_tr != NULL && js->s_out_tr->birth_time + 64 < now) /* Wait a max of 64 sec */ - { - /* destroy non established contexts after max of 64 sec */ - REMOVE_ELEMENT (eXosip.j_subscribes, js); - eXosip_subscribe_free (js); - __eXosip_wakeup (); - return; - } - } else - { - for (jd = js->s_dialogs; jd != NULL;) - { - jdnext = jd->next; - eXosip_release_finished_transactions_for_subscription (jd); - - if (jd->d_dialog == NULL || jd->d_dialog->state == DIALOG_EARLY) - { - if (js->s_out_tr != NULL && js->s_out_tr->birth_time + 64 < now) /* Wait a max of 2 minutes */ - { - /* destroy non established contexts after max of 64 sec */ - REMOVE_ELEMENT (eXosip.j_subscribes, js); - eXosip_subscribe_free (js); - __eXosip_wakeup (); - return; - } - } - - jd = jdnext; - } - } - js = jsnext; - } - -} - -void -eXosip_release_terminated_in_subscriptions (void) -{ - eXosip_dialog_t *jd; - eXosip_dialog_t *jdnext; - eXosip_notify_t *jn; - eXosip_notify_t *jnnext; - - for (jn = eXosip.j_notifies; jn != NULL;) - { - jnnext = jn->next; - - for (jd = jn->n_dialogs; jd != NULL;) - { - jdnext = jd->next; - eXosip_release_finished_transactions_for_subscription (jd); - jd = jdnext; - } - jn = jnnext; - } + time_t now = time(NULL); + osip_transaction_t *inc_tr; + osip_transaction_t *out_tr; + int skip_first = 0; + int pos; + int ret; + + ret = OSIP_UNDEFINED_ERROR; + + if (jd != NULL) { + /* go through all incoming transactions of this dialog */ + pos = 0; + while (!osip_list_eol(jd->d_inc_trs, pos)) { + inc_tr = osip_list_get(jd->d_inc_trs, pos); + /* remove, if transaction too old, independent of the state */ + if ((skip_first == 1) && (inc_tr->state == NIST_TERMINATED) && (inc_tr->birth_time + 30 < now)) { /* keep it for 30 seconds */ + /* remove the transaction from oSIP */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: releaase non-INVITE server transaction (did=%i)\n", + jd->d_id)); + osip_remove_transaction(eXosip.j_osip, inc_tr); + osip_list_remove(jd->d_inc_trs, pos); + osip_list_add(&eXosip.j_transactions, inc_tr, 0); + + ret = OSIP_SUCCESS; /* return "released" */ + break; + } + if (0 == osip_strcasecmp(inc_tr->cseq->method, "SUBSCRIBE")) + skip_first = 1; + if (0 == osip_strcasecmp(inc_tr->cseq->method, "NOTIFY")) + skip_first = 1; + pos++; + } + + skip_first = 0; + + /* go through all outgoing transactions of this dialog */ + pos = 0; + while (!osip_list_eol(jd->d_out_trs, pos)) { + out_tr = osip_list_get(jd->d_out_trs, pos); + /* remove, if transaction too old, independent of the state */ + if ((skip_first == 1) && (out_tr->state == NICT_TERMINATED) && (out_tr->birth_time + 30 < now)) { /* Wait a max of 30 seconds */ + /* remove the transaction from oSIP */ + OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO2, NULL, + "eXosip: release non INVITE client transaction (did=%i)\n", + jd->d_id)); + osip_remove_transaction(eXosip.j_osip, out_tr); + osip_list_remove(jd->d_out_trs, pos); + osip_list_add(&eXosip.j_transactions, out_tr, 0); + + ret = OSIP_SUCCESS; /* return "released" */ + break; + } + if (0 == osip_strcasecmp(out_tr->cseq->method, "SUBSCRIBE")) + skip_first = 1; + if (0 == osip_strcasecmp(out_tr->cseq->method, "NOTIFY")) + skip_first = 1; + pos++; + } + } + + return ret; +} + +void eXosip_release_terminated_subscriptions() +{ + time_t now = time(NULL); + eXosip_dialog_t *jd; + eXosip_dialog_t *jdnext; + eXosip_subscribe_t *js; + eXosip_subscribe_t *jsnext; + + for (js = eXosip.j_subscribes; js != NULL;) { + jsnext = js->next; + + if (js->s_dialogs == NULL) { + if (js->s_out_tr != NULL && js->s_out_tr->birth_time + 64 < now) { /* Wait a max of 64 sec */ + /* destroy non established contexts after max of 64 sec */ + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + __eXosip_wakeup(); + return; + } + } else { + /* fix 14/07/11. NULL pointer */ + jd = js->s_dialogs; + if (jd!= NULL) { + osip_transaction_t *transaction = eXosip_find_last_out_subscribe(js, jd); + if (transaction != NULL + && transaction->orig_request!=NULL + && transaction->state == NICT_TERMINATED + && transaction->birth_time + 15 < now) + { + osip_header_t *expires; + + osip_message_get_expires(transaction->orig_request, 0, &expires); + if (expires == NULL || expires->hvalue == NULL) { + } else if (0 == strcmp(expires->hvalue, "0")) { + /* In TCP mode, we don't have enough time to authenticate */ + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + __eXosip_wakeup(); + return; + } + } + } + + for (jd = js->s_dialogs; jd != NULL;) { + jdnext = jd->next; + eXosip_release_finished_transactions_for_subscription(jd); + + if (jd->d_dialog == NULL || jd->d_dialog->state == DIALOG_EARLY) { + if (js->s_out_tr != NULL && js->s_out_tr->birth_time + 64 < now) { /* Wait a max of 2 minutes */ + /* destroy non established contexts after max of 64 sec */ + REMOVE_ELEMENT(eXosip.j_subscribes, js); + eXosip_subscribe_free(js); + __eXosip_wakeup(); + return; + } + } + + jd = jdnext; + } + } + js = jsnext; + } + +} + +void eXosip_release_terminated_in_subscriptions(void) +{ + eXosip_dialog_t *jd; + eXosip_dialog_t *jdnext; + eXosip_notify_t *jn; + eXosip_notify_t *jnnext; + + for (jn = eXosip.j_notifies; jn != NULL;) { + jnnext = jn->next; + + for (jd = jn->n_dialogs; jd != NULL;) { + jdnext = jd->next; + eXosip_release_finished_transactions_for_subscription(jd); + jd = jdnext; + } + jn = jnnext; + } } #endif diff -Nru libexosip2-3.3.0/tools/Makefile.in libexosip2-3.6.0/tools/Makefile.in --- libexosip2-3.3.0/tools/Makefile.in 2009-03-04 11:05:38.000000000 +0000 +++ libexosip2-3.6.0/tools/Makefile.in 2011-10-05 14:27:29.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +15,12 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -48,8 +46,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_sip_reg_OBJECTS = sip_reg.$(OBJEXT) sip_reg_OBJECTS = $(am_sip_reg_OBJECTS) @@ -57,49 +55,41 @@ sip_reg_DEPENDENCIES = $(top_builddir)/src/libeXosip2.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(sip_reg_SOURCES) DIST_SOURCES = $(sip_reg_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_MAXSIZE_FALSE = @BUILD_MAXSIZE_FALSE@ -BUILD_MAXSIZE_TRUE = @BUILD_MAXSIZE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPILE_TOOLS_FALSE = @COMPILE_TOOLS_FALSE@ -COMPILE_TOOLS_TRUE = @COMPILE_TOOLS_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -108,35 +98,43 @@ EXOSIP_FLAGS = @EXOSIP_FLAGS@ EXOSIP_LIB = @EXOSIP_LIB@ EXOSIP_VERSION = @EXOSIP_VERSION@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ -INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ -INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXOSIP_SO_VERSION = @LIBEXOSIP_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -147,14 +145,13 @@ STRIP = @STRIP@ TOOLS_LIBS = @TOOLS_LIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_aux_dir = @ac_aux_dir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -166,6 +163,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -184,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -193,8 +192,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ AM_CFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@ @EXOSIP_FLAGS@ sip_reg_SOURCES = sip_reg.c sip_reg_LDADD = $(top_builddir)/src/libeXosip2.la @TOOLS_LIBS@ $(OSIP_LIBS) $(EXOSIP_LIB) $(PTHREAD_LIBS) @@ -207,14 +210,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu tools/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -232,37 +235,53 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list sip_reg$(EXEEXT): $(sip_reg_OBJECTS) $(sip_reg_DEPENDENCIES) @rm -f sip_reg$(EXEEXT) - $(LINK) $(sip_reg_LDFLAGS) $(sip_reg_OBJECTS) $(sip_reg_LDADD) $(LIBS) + $(LINK) $(sip_reg_OBJECTS) $(sip_reg_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -273,22 +292,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sip_reg.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -299,82 +318,85 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -383,7 +405,7 @@ all-am: Makefile $(PROGRAMS) installdirs: for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -405,6 +427,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -417,7 +440,7 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -425,18 +448,38 @@ html: html-am +html-am: + info: info-am info-am: install-data-am: +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: install-binPROGRAMS +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -457,19 +500,24 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-info-am +uninstall-am: uninstall-binPROGRAMS + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-libtool ctags distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-info-am + uninstall-binPROGRAMS + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libexosip2-3.3.0/tools/sip_reg.c libexosip2-3.6.0/tools/sip_reg.c --- libexosip2-3.3.0/tools/sip_reg.c 2008-10-26 15:00:31.000000000 +0000 +++ libexosip2-3.6.0/tools/sip_reg.c 2010-01-06 14:57:57.000000000 +0000 @@ -67,11 +67,12 @@ #if defined(WIN32) || defined(_WIN32_WCE) static void syslog_wrapper(int a, const char *fmt, ...) { - va_list args; - va_start (args, fmt); - vfprintf (stdout, fmt, args); - va_end (args); + va_list args; + va_start(args, fmt); + vfprintf(stdout, fmt, args); + va_end(args); } + #define LOG_INFO 0 #define LOG_ERR 0 #define LOG_WARNING 0 @@ -85,321 +86,297 @@ #endif -static void usage (void); +static void usage(void); #ifdef OSIP_MT -static void *register_proc (void *arg); +static void *register_proc(void *arg); #endif -static void -usage (void) +static void usage(void) { - printf ("Usage: " PROG_NAME " [required_options] [optional_options]\n" - "\n\t[required_options]\n" - "\t-r --proxy\tsip:proxyhost[:port]\n" - "\t-u --from\tsip:user@host[:port]\n" - "\n\t[optional_options]\n" - "\t-c --contact\tsip:user@host[:port]\n" - "\t-d --debug (log to stderr and do not fork)\n" - "\t-e --expiry\tnumber (default 3600)\n" - "\t-f --firewallip\tN.N.N.N\n" - "\t-h --help\n" - "\t-l --localip\tN.N.N.N (force local IP address)\n" - "\t-p --port\tnumber (default 5060)\n" - "\t-U --username\tauthentication username\n" - "\t-P --password\tauthentication password\n"); + printf("Usage: " PROG_NAME " [required_options] [optional_options]\n" + "\n\t[required_options]\n" + "\t-r --proxy\tsip:proxyhost[:port]\n" + "\t-u --from\tsip:user@host[:port]\n" + "\n\t[optional_options]\n" + "\t-c --contact\tsip:user@host[:port]\n" + "\t-d --debug (log to stderr and do not fork)\n" + "\t-e --expiry\tnumber (default 3600)\n" + "\t-f --firewallip\tN.N.N.N\n" + "\t-h --help\n" + "\t-l --localip\tN.N.N.N (force local IP address)\n" + "\t-p --port\tnumber (default 5060)\n" + "\t-U --username\tauthentication username\n" + "\t-P --password\tauthentication password\n"); } -typedef struct regparam_t -{ - int regid; - int expiry; - int auth; +typedef struct regparam_t { + int regid; + int expiry; + int auth; } regparam_t; #ifdef OSIP_MT -static void * -register_proc (void *arg) +static void *register_proc(void *arg) { - struct regparam_t *regparam = arg; - int reg; + struct regparam_t *regparam = arg; + int reg; - for (;;) - { + for (;;) { #ifdef _WIN32_WCE - Sleep ((regparam->expiry / 2)*1000); + Sleep((regparam->expiry / 2) * 1000); #else - sleep (regparam->expiry / 2); + sleep(regparam->expiry / 2); #endif - eXosip_lock (); - reg = eXosip_register_send_register (regparam->regid, NULL); - if (0 > reg) - { + eXosip_lock(); + reg = eXosip_register_send_register(regparam->regid, NULL); + if (0 > reg) { #ifdef _WIN32_WCE - fprintf(stdout, "eXosip_register: error while registring"); + fprintf(stdout, "eXosip_register: error while registring"); #else - perror ("eXosip_register"); + perror("eXosip_register"); #endif - exit (1); - } - regparam->auth = 0; - eXosip_unlock (); - } - return NULL; + exit(1); + } + regparam->auth = 0; + eXosip_unlock(); + } + return NULL; } #endif #ifdef _WIN32_WCE -int WINAPI WinMain( HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) +int WINAPI WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) #else -int main (int argc, char *argv[]) +int main(int argc, char *argv[]) #endif { - int c; - int port = 5060; - char *contact = NULL; - char *fromuser = NULL; - const char *localip = NULL; - const char *firewallip = NULL; - char *proxy = NULL; + int c; + int port = 5060; + char *contact = NULL; + char *fromuser = NULL; + const char *localip = NULL; + const char *firewallip = NULL; + char *proxy = NULL; #if !defined(__arc__) - struct servent *service; + struct servent *service; #endif - char *username = NULL; - char *password = NULL; - struct regparam_t regparam = { 0, 3600, 0 }; + char *username = NULL; + char *password = NULL; + struct regparam_t regparam = { 0, 3600, 0 }; #ifdef OSIP_MT - struct osip_thread *register_thread; + struct osip_thread *register_thread; #endif - int debug = 0; - int nofork = 0; + int debug = 0; + int nofork = 0; #ifdef _WIN32_WCE - proxy = osip_strdup("sip:sip.antisip.com"); - fromuser = osip_strdup("sip:jack@sip.antisip.com"); + proxy = osip_strdup("sip:sip.antisip.com"); + fromuser = osip_strdup("sip:jack@sip.antisip.com"); #else - for (;;) - { + for (;;) { #define short_options "c:de:f:hl:p:r:u:U:P:" #ifdef _GNU_SOURCE - int option_index = 0; - static struct option long_options[] = { - {"contact", required_argument, NULL, 'c'}, - {"debug", no_argument, NULL, 'd'}, - {"expiry", required_argument, NULL, 'e'}, - {"firewallip", required_argument, NULL, 'f'}, - {"from", required_argument, NULL, 'u'}, - {"help", no_argument, NULL, 'h'}, - {"localip", required_argument, NULL, 'l'}, - {"port", required_argument, NULL, 'p'}, - {"proxy", required_argument, NULL, 'r'}, - {"username", required_argument, NULL, 'U'}, - {"password", required_argument, NULL, 'P'}, - {NULL, 0, NULL, 0} - }; + int option_index = 0; + static struct option long_options[] = { + {"contact", required_argument, NULL, 'c'}, + {"debug", no_argument, NULL, 'd'}, + {"expiry", required_argument, NULL, 'e'}, + {"firewallip", required_argument, NULL, 'f'}, + {"from", required_argument, NULL, 'u'}, + {"help", no_argument, NULL, 'h'}, + {"localip", required_argument, NULL, 'l'}, + {"port", required_argument, NULL, 'p'}, + {"proxy", required_argument, NULL, 'r'}, + {"username", required_argument, NULL, 'U'}, + {"password", required_argument, NULL, 'P'}, + {NULL, 0, NULL, 0} + }; - c = getopt_long (argc, argv, short_options, long_options, &option_index); + c = getopt_long(argc, argv, short_options, long_options, &option_index); #else - c = getopt (argc, argv, short_options); + c = getopt(argc, argv, short_options); #endif - if (c == -1) - break; + if (c == -1) + break; - switch (c) - { - case 'c': - contact = optarg; - break; - case 'd': - nofork = 1; + switch (c) { + case 'c': + contact = optarg; + break; + case 'd': + nofork = 1; #ifdef LOG_PERROR - debug = LOG_PERROR; + debug = LOG_PERROR; #endif - break; - case 'e': - regparam.expiry = atoi (optarg); - break; - case 'f': - firewallip = optarg; - break; - case 'h': - usage (); - exit (0); - case 'l': - localip = optarg; - break; - case 'p': + break; + case 'e': + regparam.expiry = atoi(optarg); + break; + case 'f': + firewallip = optarg; + break; + case 'h': + usage(); + exit(0); + case 'l': + localip = optarg; + break; + case 'p': #if !defined(__arc__) - service = getservbyname (optarg, "udp"); - if (service) - port = ntohs(service->s_port); - else - port = atoi (optarg); + service = getservbyname(optarg, "udp"); + if (service) + port = ntohs(service->s_port); + else + port = atoi(optarg); #else - port = atoi (optarg); + port = atoi(optarg); #endif - break; - case 'r': - proxy = optarg; - break; - case 'u': - fromuser = optarg; - break; - case 'U': - username = optarg; - break; - case 'P': - password = optarg; - break; - default: - break; - } - } + break; + case 'r': + proxy = optarg; + break; + case 'u': + fromuser = optarg; + break; + case 'U': + username = optarg; + break; + case 'P': + password = optarg; + break; + default: + break; + } + } #endif - if (!proxy || !fromuser) - { - usage (); - exit (1); - } - + if (!proxy || !fromuser) { + usage(); + exit(1); + } #ifndef _WIN32_WCE - if (!nofork) - { - int cpid = fork (); - - if (cpid) /* parent */ - exit (0); - /* child */ - close (0); - close (1); - close (2); - } + if (!nofork) { + int cpid = fork(); + + if (cpid) /* parent */ + exit(0); + /* child */ + close(0); + close(1); + close(2); + } #endif #if 0 - openlog (PROG_NAME, LOG_PID | debug, SYSLOG_FACILITY); + openlog(PROG_NAME, LOG_PID | debug, SYSLOG_FACILITY); #endif - syslog_wrapper (LOG_INFO, UA_STRING " up and running"); - syslog_wrapper (LOG_INFO, "proxy: %s", proxy); - syslog_wrapper (LOG_INFO, "fromuser: %s", fromuser); - syslog_wrapper (LOG_INFO, "contact: %s", contact); - syslog_wrapper (LOG_INFO, "expiry: %d", regparam.expiry); - syslog_wrapper (LOG_INFO, "local port: %d", port); - - if (debug>0) - TRACE_INITIALIZE (6, NULL); - - if (eXosip_init ()) - { - syslog_wrapper (LOG_ERR, "eXosip_init failed"); - exit (1); - } - if (eXosip_listen_addr (IPPROTO_UDP, NULL, port, AF_INET, 0)) - { - syslog_wrapper (LOG_ERR, "eXosip_listen_addr failed"); - exit (1); - } - - if (localip) - { - syslog_wrapper (LOG_INFO, "local address: %s", localip); - eXosip_masquerade_contact (localip, port); - } - - if (firewallip) - { - syslog_wrapper (LOG_INFO, "firewall address: %s:%i", firewallip, port); - eXosip_masquerade_contact (firewallip, port); - } - - eXosip_set_user_agent (UA_STRING); - - if (username && password) - { - syslog_wrapper (LOG_INFO, "username: %s", username); - syslog_wrapper (LOG_INFO, "password: [removed]"); - if (eXosip_add_authentication_info - (username, username, password, NULL, NULL)) - { - syslog_wrapper (LOG_ERR, "eXosip_add_authentication_info failed"); - exit (1); - } - } - - { - osip_message_t *reg = NULL; - int i; - - regparam.regid = - eXosip_register_build_initial_register (fromuser, proxy, contact, regparam.expiry*2, - ®); - if (regparam.regid < 1) - { - syslog_wrapper (LOG_ERR, "eXosip_register_build_initial_register failed"); - exit (1); - } - i = eXosip_register_send_register (regparam.regid, reg); - if (i != 0) - { - syslog_wrapper (LOG_ERR, "eXosip_register_send_register failed"); - exit (1); - } - } + syslog_wrapper(LOG_INFO, UA_STRING " up and running"); + syslog_wrapper(LOG_INFO, "proxy: %s", proxy); + syslog_wrapper(LOG_INFO, "fromuser: %s", fromuser); + syslog_wrapper(LOG_INFO, "contact: %s", contact); + syslog_wrapper(LOG_INFO, "expiry: %d", regparam.expiry); + syslog_wrapper(LOG_INFO, "local port: %d", port); + + if (debug > 0) + TRACE_INITIALIZE(6, NULL); + + if (eXosip_init()) { + syslog_wrapper(LOG_ERR, "eXosip_init failed"); + exit(1); + } + if (eXosip_listen_addr(IPPROTO_UDP, NULL, port, AF_INET, 0)) { + syslog_wrapper(LOG_ERR, "eXosip_listen_addr failed"); + exit(1); + } + + if (localip) { + syslog_wrapper(LOG_INFO, "local address: %s", localip); + eXosip_masquerade_contact(localip, port); + } + + if (firewallip) { + syslog_wrapper(LOG_INFO, "firewall address: %s:%i", firewallip, port); + eXosip_masquerade_contact(firewallip, port); + } + + eXosip_set_user_agent(UA_STRING); + + if (username && password) { + syslog_wrapper(LOG_INFO, "username: %s", username); + syslog_wrapper(LOG_INFO, "password: [removed]"); + if (eXosip_add_authentication_info + (username, username, password, NULL, NULL)) { + syslog_wrapper(LOG_ERR, "eXosip_add_authentication_info failed"); + exit(1); + } + } + + { + osip_message_t *reg = NULL; + int i; + + regparam.regid = + eXosip_register_build_initial_register(fromuser, proxy, contact, + regparam.expiry * 2, ®); + if (regparam.regid < 1) { + syslog_wrapper(LOG_ERR, + "eXosip_register_build_initial_register failed"); + exit(1); + } + i = eXosip_register_send_register(regparam.regid, reg); + if (i != 0) { + syslog_wrapper(LOG_ERR, "eXosip_register_send_register failed"); + exit(1); + } + } #ifdef OSIP_MT - register_thread = osip_thread_create (20000, register_proc, ®param); - if (register_thread==NULL) - { - syslog_wrapper (LOG_ERR, "pthread_create failed"); - exit (1); - } + register_thread = osip_thread_create(20000, register_proc, ®param); + if (register_thread == NULL) { + syslog_wrapper(LOG_ERR, "pthread_create failed"); + exit(1); + } #endif - for (;;) - { - eXosip_event_t *event; + for (;;) { + eXosip_event_t *event; - if (!(event = eXosip_event_wait (0, 1))) - { + if (!(event = eXosip_event_wait(0, 1))) { #ifndef OSIP_MT - eXosip_execute(); - eXosip_automatic_action (); + eXosip_execute(); + eXosip_automatic_action(); #endif - osip_usleep (10000); - continue; - } - + osip_usleep(10000); + continue; + } #ifndef OSIP_MT - eXosip_execute(); + eXosip_execute(); #endif - eXosip_automatic_action (); - switch (event->type) - { - case EXOSIP_REGISTRATION_NEW: - syslog_wrapper (LOG_INFO, "received new registration"); - break; - case EXOSIP_REGISTRATION_SUCCESS: - syslog_wrapper (LOG_INFO, "registrered successfully"); - break; - case EXOSIP_REGISTRATION_FAILURE: - regparam.auth = 1; - break; - case EXOSIP_REGISTRATION_TERMINATED: - printf ("Registration terminated\n"); - break; - default: - syslog_wrapper (LOG_DEBUG, - "recieved unknown eXosip event (type, did, cid) = (%d, %d, %d)", - event->type, event->did, event->cid); - - } - eXosip_event_free (event); - } + eXosip_automatic_action(); + switch (event->type) { + case EXOSIP_REGISTRATION_NEW: + syslog_wrapper(LOG_INFO, "received new registration"); + break; + case EXOSIP_REGISTRATION_SUCCESS: + syslog_wrapper(LOG_INFO, "registrered successfully"); + break; + case EXOSIP_REGISTRATION_FAILURE: + regparam.auth = 1; + break; + case EXOSIP_REGISTRATION_TERMINATED: + printf("Registration terminated\n"); + break; + default: + syslog_wrapper(LOG_DEBUG, + "recieved unknown eXosip event (type, did, cid) = (%d, %d, %d)", + event->type, event->did, event->cid); + + } + eXosip_event_free(event); + } }